Merge pull request #152 from 7anshuai/secure-baseurl

longbai · longbai · commit 8a488a21d0f0 · 2015-11-19T20:44:32.000+08:00
Make secure base url
diff --git a/qiniu/rs.js b/qiniu/rs.js
@@ -267,8 +267,10 @@ GetPolicy.prototype.makeRequest = function(baseUrl, mac) {
 
   return baseUrl + '&token=' + downloadToken;
 }
+
+// domain maybe 'http://hello.qiniu.com', 'https://hello.qiniu.com' and 'hello.qiniu.com'
 // query like '-thumbnail', '?imageMogr2/thumbnail/960x' and so on
 function makeBaseUrl(domain, key, query) {
   key = new Buffer(key);
-  return 'http://' + domain + '/' + querystring.escape(key) + (query || '');
+  return (/^https?:\/\//.test(domain) ? domain : 'http://' + domain) + '/' + querystring.escape(key) + (query || '');
 }

Original file line number	Diff line number	Diff line change
`@@ -267,8 +267,10 @@ GetPolicy.prototype.makeRequest = function(baseUrl, mac) {`
`267`	`267`
`268`	`268`	`return baseUrl + '&token=' + downloadToken;`
`269`	`269`	`}`
	`270`	`+`
	`271`	`+// domain maybe 'http://hello.qiniu.com', 'https://hello.qiniu.com' and 'hello.qiniu.com'`
`270`	`272`	`// query like '-thumbnail', '?imageMogr2/thumbnail/960x' and so on`
`271`	`273`	`function makeBaseUrl(domain, key, query) {`
`272`	`274`	`key = new Buffer(key);`
`273`		`- return 'http://' + domain + '/' + querystring.escape(key) + (query \|\| '');`
	`275`	`+ return (/^https?:\/\//.test(domain) ? domain : 'http://' + domain) + '/' + querystring.escape(key) + (query \|\| '');`
`274`	`276`	`}`