From: Calin Crisan <ccrisan@gmail.com>
Date: Wed, 7 Jan 2015 19:08:56 +0000 (+0200)
Subject: fixed auth signature issue when using slashes in picture or movie files
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=5f35cf2e2e4864daa8b772c3325321c8ed2672c4;p=motioneye-debian

fixed auth signature issue when using slashes in picture or movie files
---

diff --git a/static/js/main.js b/static/js/main.js
index 804a46f..b114f0a 100644
--- a/static/js/main.js
+++ b/static/js/main.js
@@ -143,16 +143,21 @@ function computeSignature(method, uri, body) {
     var query = parts.params;
     var baseUrl = parts.baseUrl;
     
+    /* sort query arguments alphabetically */
     query = Object.keys(query).map(function (key) {return {key: key, value: query[key]};});
-    query = query.filter(function (q) {return q.key !== 'signature';});
+    query = query.filter(function (q) {return q.key !== '_signature';});
     query.sortKey(function (q) {return q.key;});
-    query = query.map(function (q) {return q.key + '=' + q.value;}).join('&');
+    query = query.map(function (q) {return q.key + '=' + encodeURIComponent(q.value);}).join('&');
     uri = baseUrl + '?' + query; 
     
     return sha1(method + ':' + uri + ':' + (body || '') + ':' + window.password).toLowerCase();
 }
 
 function addAuthParams(method, url, body) {
+    if (!window.username) {
+        return url;
+    }
+
     if (url.indexOf('?') < 0) {
         url += '?';
     }