Skip to content
This repository has been archived by the owner on Apr 20, 2022. It is now read-only.

Commit

Permalink
sharedKey TOTP scheme, Add Content-Security-Policy + X-Frame-Options,…
Browse files Browse the repository at this point in the history
… fix /blocks, add filesaver.js
  • Loading branch information
Ben Reeves committed Oct 7, 2013
1 parent 48367eb commit d68a836
Show file tree
Hide file tree
Showing 16 changed files with 378 additions and 167 deletions.
218 changes: 218 additions & 0 deletions FileSaver.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,218 @@
/* FileSaver.js
* A saveAs() FileSaver implementation.
* 2013-01-23
*
* By Eli Grey, http://eligrey.com
* License: X11/MIT
* See LICENSE.md
*/

/*global self */
/*jslint bitwise: true, regexp: true, confusion: true, es5: true, vars: true, white: true,
plusplus: true */

/*! @source http://purl.eligrey.com/github/FileSaver.js/blob/master/FileSaver.js */

var saveAs = saveAs
|| (navigator.msSaveOrOpenBlob && navigator.msSaveOrOpenBlob.bind(navigator))
|| (function(view) {
"use strict";
var
doc = view.document
// only get URL when necessary in case BlobBuilder.js hasn't overridden it yet
, get_URL = function() {
return view.URL || view.webkitURL || view;
}
, URL = view.URL || view.webkitURL || view
, save_link = doc.createElementNS("http://www.w3.org/1999/xhtml", "a")
, can_use_save_link = !view.externalHost && "download" in save_link
, click = function(node) {
var event = doc.createEvent("MouseEvents");
event.initMouseEvent(
"click", true, false, view, 0, 0, 0, 0, 0
, false, false, false, false, 0, null
);
node.dispatchEvent(event);
}
, webkit_req_fs = view.webkitRequestFileSystem
, req_fs = view.requestFileSystem || webkit_req_fs || view.mozRequestFileSystem
, throw_outside = function (ex) {
(view.setImmediate || view.setTimeout)(function() {
throw ex;
}, 0);
}
, force_saveable_type = "application/octet-stream"
, fs_min_size = 0
, deletion_queue = []
, process_deletion_queue = function() {
var i = deletion_queue.length;
while (i--) {
var file = deletion_queue[i];
if (typeof file === "string") { // file is an object URL
URL.revokeObjectURL(file);
} else { // file is a File
file.remove();
}
}
deletion_queue.length = 0; // clear queue
}
, dispatch = function(filesaver, event_types, event) {
event_types = [].concat(event_types);
var i = event_types.length;
while (i--) {
var listener = filesaver["on" + event_types[i]];
if (typeof listener === "function") {
try {
listener.call(filesaver, event || filesaver);
} catch (ex) {
throw_outside(ex);
}
}
}
}
, FileSaver = function(blob, name) {
// First try a.download, then web filesystem, then object URLs
var
filesaver = this
, type = blob.type
, blob_changed = false
, object_url
, target_view
, get_object_url = function() {
var object_url = get_URL().createObjectURL(blob);
deletion_queue.push(object_url);
return object_url;
}
, dispatch_all = function() {
dispatch(filesaver, "writestart progress write writeend".split(" "));
}
// on any filesys errors revert to saving with object URLs
, fs_error = function() {
// don't create more object URLs than needed
if (blob_changed || !object_url) {
object_url = get_object_url(blob);
}
if (target_view) {
target_view.location.href = object_url;
} else {
window.open(object_url, "_blank");
}
filesaver.readyState = filesaver.DONE;
dispatch_all();
}
, abortable = function(func) {
return function() {
if (filesaver.readyState !== filesaver.DONE) {
return func.apply(this, arguments);
}
};
}
, create_if_not_found = {create: true, exclusive: false}
, slice
;
filesaver.readyState = filesaver.INIT;
if (!name) {
name = "download";
}
if (can_use_save_link) {
object_url = get_object_url(blob);
save_link.href = object_url;
save_link.download = name;
click(save_link);
filesaver.readyState = filesaver.DONE;
dispatch_all();
return;
}
// Object and web filesystem URLs have a problem saving in Google Chrome when
// viewed in a tab, so I force save with application/octet-stream
// http://code.google.com/p/chromium/issues/detail?id=91158
if (view.chrome && type && type !== force_saveable_type) {
slice = blob.slice || blob.webkitSlice;
blob = slice.call(blob, 0, blob.size, force_saveable_type);
blob_changed = true;
}
// Since I can't be sure that the guessed media type will trigger a download
// in WebKit, I append .download to the filename.
// https://bugs.webkit.org/show_bug.cgi?id=65440
if (webkit_req_fs && name !== "download") {
name += ".download";
}
if (type === force_saveable_type || webkit_req_fs) {
target_view = view;
}
if (!req_fs) {
fs_error();
return;
}
fs_min_size += blob.size;
req_fs(view.TEMPORARY, fs_min_size, abortable(function(fs) {
fs.root.getDirectory("saved", create_if_not_found, abortable(function(dir) {
var save = function() {
dir.getFile(name, create_if_not_found, abortable(function(file) {
file.createWriter(abortable(function(writer) {
writer.onwriteend = function(event) {
target_view.location.href = file.toURL();
deletion_queue.push(file);
filesaver.readyState = filesaver.DONE;
dispatch(filesaver, "writeend", event);
};
writer.onerror = function() {
var error = writer.error;
if (error.code !== error.ABORT_ERR) {
fs_error();
}
};
"writestart progress write abort".split(" ").forEach(function(event) {
writer["on" + event] = filesaver["on" + event];
});
writer.write(blob);
filesaver.abort = function() {
writer.abort();
filesaver.readyState = filesaver.DONE;
};
filesaver.readyState = filesaver.WRITING;
}), fs_error);
}), fs_error);
};
dir.getFile(name, {create: false}, abortable(function(file) {
// delete file if it already exists
file.remove();
save();
}), abortable(function(ex) {
if (ex.code === ex.NOT_FOUND_ERR) {
save();
} else {
fs_error();
}
}));
}), fs_error);
}), fs_error);
}
, FS_proto = FileSaver.prototype
, saveAs = function(blob, name) {
return new FileSaver(blob, name);
}
;
FS_proto.abort = function() {
var filesaver = this;
filesaver.readyState = filesaver.DONE;
dispatch(filesaver, "abort");
};
FS_proto.readyState = FS_proto.INIT = 0;
FS_proto.WRITING = 1;
FS_proto.DONE = 2;

FS_proto.error =
FS_proto.onwritestart =
FS_proto.onprogress =
FS_proto.onwrite =
FS_proto.onabort =
FS_proto.onerror =
FS_proto.onwriteend =
null;

view.addEventListener("unload", process_deletion_queue, false);
return saveAs;
}(self));

if (typeof module !== 'undefined') module.exports = saveAs;
1 change: 1 addition & 0 deletions demo-account.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ $(document).ready(function() {
setTimeout(function () {
$('#restore-password').val('demoaccountpassword');
$('#restore-wallet-continue').click();

clearInterval(interval);

setTimeout(function() {
Expand Down
2 changes: 2 additions & 0 deletions filesaver.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions import-export.js
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,6 @@ function _ImportExport() {
if (input_text == null || input_text.length == 0) {
throw 'No import data provided!';
}

var obj = null;

try {
Expand All @@ -247,10 +246,14 @@ function _ImportExport() {

if (obj == null)
throw 'null input_text';

if (obj.payload)
throw 'version 2 wallet';
} catch(e) {

//Maybe it's encrypted?
MyWallet.decryptWallet(input_text, opt.main_password, function(root) {
ImportExport.importJSON(JSON.stringify(root), opt, success, error);
MyWallet.decryptWallet(input_text, opt.main_password, function(obj, root) {
ImportExport.importJSON(JSON.stringify(obj), opt, success, error);
}, error);
return;
}
Expand Down
2 changes: 1 addition & 1 deletion import-export.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pay-now-button.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ $(document).ready(function() {
$.ajax({
type: "GET",
dataType: 'json',
url: root + './receive',
url: root + 'api/receive',
data : {method : 'create', address : encodeURIComponent(receivers_address), shared:shared, callback:callback_url},
success: function(response) {
button.find('.qr-code').empty();
Expand Down
6 changes: 3 additions & 3 deletions shared.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ function setBTCSymbol(new_symbol) {
//Assumes 10px margin (modals)
$.fn.center = function () {
scrollTo(0, 0);
this.css("top", Math.max(($(window).height() / 2) - (this.height() / 2), 0) + "px");
this.css("left", Math.max(($(window).width() / 2) - (this.width() / 2), 0) + "px");
this.css("top", parseInt(Math.max(($(window).height() / 2) - (this.height() / 2), 0)) + "px");
this.css("left", parseInt(Math.max(($(window).width() / 2) - (this.width() / 2), 0)) + "px");
return this;
};

Expand All @@ -70,7 +70,7 @@ function webSocketConnect(success) {
if (ii % 2 == 0)
var url = "wss://ws.blockchain.info/inv";
else
var url = "ws://ws.blockchain.info:8335/inv";
var url = "ws://ws.blockchain.info/inv";

++ii;

Expand Down
Loading

0 comments on commit d68a836

Please sign in to comment.