diff options
| author |   Laurent Ghigonis <laurent@p1sec.com> | 2013-06-18 22:18:24 +0200 |
|---|---|---|
| committer | Laurent Ghigonis <laurent@p1sec.com> | 2013-06-18 22:18:24 +0200 |
| commit | d34f168ab9e0f5a337f2153024312ba244da49c9 (patch) | |
| tree | 5f3e7f4280335a6a5968ba0ba94cfb8774731e52 /jsaccess/jsa | |
| parent | jsaccess: select first file by default (diff) | |
| download | laurent-tools-d34f168ab9e0f5a337f2153024312ba244da49c9.tar.xz laurent-tools-d34f168ab9e0f5a337f2153024312ba244da49c9.zip | |
jsaccess: hability to store and not encrypt some files
Diffstat (limited to 'jsaccess/jsa')
3 files changed, 36 insertions, 22 deletions
diff --git a/jsaccess/jsa/jsa.js b/jsaccess/jsa/jsa.js index 8c0eb81..eb34204 100644 --- a/jsaccess/jsa/jsa.js +++ b/jsaccess/jsa/jsa.js @@ -113,7 +113,11 @@ function _showfiles(data, pass, hash) { $.each(lines, function( idx, obj ){ obj = obj.trim(); - var btn = $('<label><input type="radio" name="file" value="'+obj+'">'+obj+'</input></label><br/>'); + var filename = obj.substring(0, obj.lastIndexOf(" ")); + var crypt = obj.split(" ").pop(); + if (crypt == '(nocrypt)') + filename += ' (n)'; + var btn = $('<label><input type="radio" name="file" value="'+obj+'">'+filename+'</input></label><br/>'); btn.appendTo('#files'); }); $("input:radio[name=file]:first").attr('checked', true); @@ -123,8 +127,10 @@ function _dl(file, pass) { var RMD160 = new Hashes.RMD160; var dirhash = RMD160.hex(pass); - var path = 'store/' + dirhash + '/' + RMD160.hex(dirhash + file); - _status("Downloading \""+file+"\" ..."); + var crypt = file.split(" ").pop(); + var filename = file.substring(0, file.lastIndexOf(" ")); + var path = 'store/' + dirhash + '/' + RMD160.hex(dirhash + filename); + _status("Downloading \""+filename+"\" ..."); dlreq = $.ajax({ url: path, @@ -132,8 +138,16 @@ function _dl(file, pass) { xhr.overrideMimeType("application/base64"); }, success: function ( data ) { - _status("Download complete, decrypting ...", - function() { _decrypt(data, pass, file); }); + switch (crypt) { + case '(base64+aes256)': + _status("Download complete, decrypting ...", + function() { _decrypt(data, pass, filename); }); + break; + case '(nocrypt)': + _status("Download complete, saving ..."); + _save(data, filename); + break; + } }, error: function (xhr, opts, err) { _status("Dowload failed (status="+xhr.status+")"); diff --git a/jsaccess/jsa/store/af022cd820fdad6cbcac8e15ac565c639a47dab0/caf3eefc85fc7c4ee06d38ea679318114b21d88d b/jsaccess/jsa/store/af022cd820fdad6cbcac8e15ac565c639a47dab0/caf3eefc85fc7c4ee06d38ea679318114b21d88d index e736127..f7d0ab5 100644 --- a/jsaccess/jsa/store/af022cd820fdad6cbcac8e15ac565c639a47dab0/caf3eefc85fc7c4ee06d38ea679318114b21d88d +++ b/jsaccess/jsa/store/af022cd820fdad6cbcac8e15ac565c639a47dab0/caf3eefc85fc7c4ee06d38ea679318114b21d88d @@ -1,15 +1,15 @@ -U2FsdGVkX1+FvE/p8efuYcbdBiVHSB1NJ+SDRoDzjwrF4MoYvhzeec1VthznLPE6 -1a41mflJ5zv235pwn/qkAFv9frBmlWQHNTppekpbI8nd+zdqfyN+j1kzSjj+hTez -JedVhsw68518kXr/Q9QmcQsIP4NZIZQl6BJJDePfeIbFiO8ylW9sXKIks5oESkPD -8us6ARmhU2qDMeYYr8Ne2uBO3ig2AEqdDO6cjledYV3VAR8j+r3DzI6YUiYPSWXI -LPj7Bpa0sWl+IMJvcFJdZ2D0eKEjTEt9uc5mjU7hn9ATzKKvo3JeWiN87Fqtropc -C25NqfvlqVs/5X5rRysATu4gDFuPywrKlUNkH2vih069Uo3X6aspEHwN21nuCabJ -mDY0pTfT9BlLnvvXqz95AH1+g1wnBmfOO0Lg+kLTB170kWhjwDI6AgmpQ+/IPVcq -3mbRTMV6dI614ZZCFG0gDp1YG7tpI/sKt/97b9E46qQOGLcs38C0rkOSXGYgrObW -32xw4Y/oqHFKwPBzkvVrRtrTe5CUWnfI7+LwmUzlQz5z+Ne4rMRuBXFK2RpeOutr -GeD8NhXv2+oHhXPM3Rs+Ur4UchrGCtQgRjolDEl0IenCrfT5S3r9VFnLqlPRXX68 -UcgkMz01whTJkL18u6zxDexiGD+j1A/h1tqMmOZ9dF+wca7b2W1AtfdQIXofLL+I -tEQUo2JkkM4KRMu1W1jzXMfCOv1k/qrAjMcLFPf/RvoAbrDC9HPMRrAy+VZGpR9O -t43znlEyYcmL2vsap92Ndlah4C+Thbpk85JRoOJVhHl7/BCNH1obN+IU3FD53pQt -S4+onPOKbOr+4eAzLy7PZU8x/LenBotaZIlBw/9oZqDH73Yu/iaDPMkR6DSyBj+E -eE2LkiiE6wyfu0SPBqyo7w== +U2FsdGVkX1+IILGA9muHwJcJAF1DEOSbqp+nv+Ek3ELUzfNWE8Hyv2Ca9byYYvsF +tXskVJkjF5geU63fZhhEpTFjlLoSSjA2itPb3M+i8GFdi1B/P/zjWdeaY3zNGLEG +bIRYFjjcTfaMRcDOX1qnPYt7PlrUKFDr8MRWMaUNeW80T3guzQAO4LQmywQaxN9q +OeLdbC+xfrEzOEjnXBJB2pAycdKwIu5bj4+A1L1Ue1HS1yWQEkmyy39Bx+kF+kuo +kDKlWwW50rJ7pMn5qMJ1q21zqFz+RWncBGQ++aGA26GRiCVWgkKg1qfnW8bwppcH +NEYs5+z9FQ9UvMaj0xWeMMTYDi/7b4FuxlBDHS/RoOXqebGA1bRNQuyTmyQMCXh7 +zkGD28Yu0wlf8y02ZEDU/HIWsZ6kUvCKrIYb9sQeuOn8Q+4VNFtyrZgvDDdYsXqJ +1dHt+T29a0/ngJZDxEgkX+fWckZgXhhdpK9g6sP9rIHlN5/hfjTOl1TYcy7nmA1E +NBwxHzB9jEeSLZMKVqokhK+AiFEh2lFTnnL/KJFTGqD7uwFIY0pMlAUK/ehU11O3 +qEUn7260sl9OQt7OXCVDCLqC9o1blfSboRTQRTMhALJYum5Hw2Qw0Nm4ot3K7DRR +HP3gYYpecFr5/Xsi0bsMtEUJe+D36wx8kv2NE1Ez7Q5lCwsITDW8i0VENUKneGJP +E9RqWZ1u4kcQC/jMQhyrRgfDLsnnqZJamm5xWC4YINhcZUNp5OvCIyUb5EwO2rjE +VaTtvGBrJ8I5gWkHWJTJSyI4xIcfo2ZRDYhIG/NfKweZAbRaiIfjAgjZhEs6uTlR +hPBtJH2Y8fUB9Dr4SATj8s15ECBke4VqYcjBnfWAngJTV9bkMrTDk6w3mwe4BwRQ +xVBx/d4OplnE7kXbfxIa9g== diff --git a/jsaccess/jsa/store/af022cd820fdad6cbcac8e15ac565c639a47dab0/index.txt b/jsaccess/jsa/store/af022cd820fdad6cbcac8e15ac565c639a47dab0/index.txt index bfb1efb..c43e7ab 100644 --- a/jsaccess/jsa/store/af022cd820fdad6cbcac8e15ac565c639a47dab0/index.txt +++ b/jsaccess/jsa/store/af022cd820fdad6cbcac8e15ac565c639a47dab0/index.txt @@ -1,2 +1,2 @@ -U2FsdGVkX197wflbwP/s09qNGf0tb2Wtl0hgXLEZAkUH45d0fkwYZaONMAo8YauS -WHu6vrUw1I5eXUx4cC1Pnw== +U2FsdGVkX1+Kt0ICwMcy3hkq8z55z2I1qc1FJ8kM6V+ZN/1xBsmX8iIcMFmhNwFb +br0WP++7VbGQo8R7qw4MWnvhIERToOUPlvs/VS9QKRM= |