Merge pull request #65 from alyec/upgradesign

Add signing to upgrade requests
fgpv-vpgf · Dec 8, 2016 · a0761db · a0761db
2 parents 9492b50 + 13ff5a4
commit a0761db
Showing 1 changed file with 25 additions and 16 deletions.
diff --git a/static/test.html b/static/test.html
@@ -399,6 +399,10 @@
         return '/' + $('[name=ver]:checked').val() + '/register/' + $('#smallkey').val();
     }
 
+    function get_upgrade_url(ver) {
+        return '/' + $('[name=ver]:checked').val() + '/upgrade/2.0/' + $('#smallkey').val();
+    }
+
     function get_update_url(ver) {
         return '/' + $('[name=ver]:checked').val() + '/update/' + $('#smallkey').val();
     }
@@ -415,6 +419,8 @@
         ret.isodate = $('#timeStamp').val();
         if ( urlType === 'update' ) {
             ret.path = get_update_url();
+        } else if ( urlType === 'upgrade' ) {
+            ret.path = get_upgrade_url();
         } else if ( urlType === 'updatefeature' ) {
             ret.path = get_updatefeature_url();
         } else {
@@ -512,7 +518,7 @@
 
         $('#updatetest').click( function() {
           var s = get_sig_params("update"),
-              sig = sign( s.key, s.path, s.id, s.isodate, s.body ),
+              sig = sign( s.key, s.path, s.id, s.isodate, '' ),
               h = make_headers(s,sig);
           console.log(h);
           $.ajax({
@@ -551,21 +557,24 @@
         });
 
         $('#upgradetest').click( function() {
-            var u = '/v2/upgrade/2.0/' + $('#smallkey').val();
-            log_info('Upgrade URL: '+u);
-            $.ajax({
-                type: "PUT",
-                url: u,
-                dataType: "json",
-            }).done(function (data) {
-                log_info('Upgrade done');
-                log_info(JSON.stringify(data));
-                $('#data').val(JSON.stringify(data));
-            }).fail(function (err) {
-                log_err('Upgrade failed '+err.status);
-                log_err(JSON.stringify(err));
-                console.log(err);
-            });
+          var s = get_sig_params("upgrade"),
+              sig = sign( s.key, s.path, s.id, s.isodate ),
+              h = make_headers(s,sig);
+          console.log(h);
+          $.ajax({
+              type: "POST",
+              contentType: "application/json; charset=utf-8",
+              url: s.target,
+              headers: h
+          }).done(function (data) {
+            log_info('Upgrade done');
+            log_info(JSON.stringify(data));
+            $('#data').val(JSON.stringify(data));
+          }).fail(function (err) {
+            log_err('Upgrade failed '+err.status);
+            log_err(JSON.stringify(err));
+            console.log(err);
+          });
         });
 
         $('#logclear').click( function() { $('#log').html(''); } );