libves 2.1.1 → 2.3.0

package/libVES.node.js

@@ -27,7 +27,7 @@
  *
  * @title libVES
  * @dev A JavaScript end-to-end encryption interface to VESvault REST API
- * @version 2.00
+ * @version 2.03
  *
  * @dev Official source code: https://github.com/vesvault/libVES
  *
@@ -141,7 +141,7 @@ libVES.prototype = {
 	});
     },
     logout: function() {
-	this.token = undefined;
+	this.token = this.userMe = this.vaultKey = undefined;
 	return this.lock();
     },
     delegate: function(optns) {
@@ -191,11 +191,13 @@ libVES.prototype = {
     },
     authorize: function(msg) {
 	var self = this;
-	if (msg.token) this.token = msg.token;
-	if (msg.domain) this.domain = msg.domain;
-	if (msg.externalId) this.externalId = msg.externalId;
-	return (msg.VESkey ? this.unlock(msg.VESkey) : this.me()).then(function() {
-	    return self;
+	return this.logout().then(function() {
+	    if (msg.token) self.token = msg.token;
+	    if (msg.domain) self.domain = msg.domain;
+	    if (msg.externalId) self.externalId = msg.externalId;
+	    return (msg.VESkey ? self.unlock(msg.VESkey) : self.me()).then(function() {
+		return self;
+	    });
 	});
     },
     carry: function(optns) {
@@ -2683,6 +2685,10 @@ libVES.Cipher.AES256CBC = function(rec) {
     this.init(rec);
 };
 
+libVES.Cipher.AES256CFB = function(rec) {
+    this.init(rec);
+};
+
 libVES.Cipher.AES256GCM = function(rec) {
     this.init(rec);
 };
@@ -2713,6 +2719,7 @@ libVES.Cipher.AES.prototype = new libVES.Cipher({
 });
 
 libVES.Cipher.AES256CBC.prototype = new libVES.Cipher.AES({
+    a: 'AES256CBC',
     algo: 'AES-CBC',
     keySize: 32,
     ivSize: 16
@@ -2736,6 +2743,11 @@ libVES.Cipher.AES256CBC.info = function(chain,optns) {
     return Promise.resolve({algorithm: {name: 'AES-CBC', length: 256}});
 };
 
+libVES.Cipher.AES256CFB.prototype = new libVES.Cipher.AES({
+    a: 'AES256CFB',
+    algo: 'AES-CFB'
+});
+
 libVES.Cipher.AES256GCM.prototype = new libVES.Cipher.AES({
     algo: 'AES-GCM',
     keySize: 32,
@@ -2743,6 +2755,7 @@ libVES.Cipher.AES256GCM.prototype = new libVES.Cipher.AES({
 });
 
 libVES.Cipher.AES256GCMp.prototype = new libVES.Cipher.AES({
+    a: 'AES256GCMp',
     algo: 'AES-GCM',
     keySize: 32,
     ivSize: 12,
@@ -2764,6 +2777,7 @@ libVES.Cipher.AES256GCMp.prototype = new libVES.Cipher.AES({
 });
 
 libVES.Cipher.AES256GCM1K.prototype = new libVES.Cipher.AES({
+    a: 'AES256GCM1K',
     algo: 'AES-GCM',
     keySize: 32,
     ivSize: 12,
@@ -3204,9 +3218,12 @@ libVES.Delegate = {
 	    } catch(e) {
 		window.alert(self.htmlBlockerMsg);
 	    }
-	    window.addEventListener('message',self.listener.bind(self));
-	    window.addEventListener('focus',self.chkCancel.bind(self));
-	    window.addEventListener('beforeunload',self.cancel.bind(self));
+	    if (!self.listening) {
+		window.addEventListener('message',self.listener.bind(self));
+		window.addEventListener('focus',self.chkCancel.bind(self));
+		window.addEventListener('beforeunload',self.cancel.bind(self));
+		self.listening = true;
+	    }
 	    window.clearInterval(self.popupInterval);
 	    self.popupInterval = window.setInterval(self.chkCancel.bind(self),1000);
 	});
@@ -3458,8 +3475,12 @@ libVES.Flow.prototype.click = function(a) {
     var self = this;
     (a.origin == this.origin ? self.store() : self.addToken(a.href).then(function(url) {
 	a.href = url;
-    })).then(function() {
+    })).catch(function(e) {
+	if (!e || e.code != 'NotFound') throw e;
+    }).then(function() {
 	document.location.href = a.href;
+    }).catch(function(e) {
+	console.log(e);
     });
     return false;
 };
@@ -3540,4 +3561,103 @@ libVES.Flow.prototype.logout = function() {
     return libVES.Flow.logout();
 };
 
+
+libVES.Auth = function(optns) {
+    for (var k in optns) this[k] = optns[k];
+    return this;
+};
+
+libVES.Auth.prototype.getToken = function() {
+    if (this.vaultItem) return Promise.all([this.vaultItem.getId(), this.vaultItem.getField('verifyToken')]).then(function(flds) {
+	return 'vaultItem.' + flds[0] + '.' + flds[1];
+    });
+    else if (this.vaultKey) return Promise.all([this.vaultKey.getId(), this.vaultItem.getSessionToken()]).then(function(flds) {
+	return 'vaultKey.' + flds[0] + '.' + flds[1];
+    });
+    else if ((VES = this.VES) && VES.token) return this.VES.getVaultKey().then(function(vkey) {
+	return vkey.getId().then(function(id) {
+	    return 'vaultKey.' + id + '.' + VES.token;
+	});
+    });
+    return Promise.reject({code: 'VESauth', message: 'No object to generate a VESauth token for'});
+};
+
+libVES.Auth.prototype.getData = function(url, type) {
+    return this.getToken().then(function(tkn) {
+	return new Promise(function(resolve, reject) {
+	    var xhr = new XMLHttpRequest();
+	    xhr.open('GET', url);
+	    if (type) xhr.responseType = type;
+	    xhr.onreadystatechange = function() {
+		switch(xhr.readyState) {
+		    case 4:
+			if (xhr.status == 200) resolve(xhr.response);
+			else reject({code: xhr.status, message: xhr.statusText});
+		}
+	    };
+	    xhr.setRequestHeader('X-VES-Authorization', tkn);
+	    xhr.send();
+	});
+    });
+};
+
+libVES.Auth.prototype.getJSON = function(url) {
+    return this.getData(url, 'json').then(function(json) {
+	var a = document.createElement('a');
+	a.href = url;
+	if (!a.hash) return json;
+	var path = a.hash.split(/\//);
+	for (var i = 1; i < path.length; i++) if (path[i]) {
+	    if (json instanceof Array) json = json[Number(path[i])];
+	    else if (json instanceof Object) json = json[path[i]];
+	    else return null;
+	}
+	return json;
+    });
+};
+
+libVES.Auth.prototype.auth = function(token) {
+    return this.verify(token, true);
+};
+
+libVES.Auth.prototype.verify = function(token, auth) {
+    var tk = token.match(/^(\w*)\.(\d*)\.(.*)$/);
+    if (!tk) return Promise.reject(new libVES.Error('VESauth', 'Invalid VESauth token'));
+    var ves = new libVES({domain: (this.domain || '*'), token: tk[3]});
+    if (tk[1] == 'vaultItem') {
+	if (auth) return Promise.reject(new libVES.Error('VESauth', 'Verify token cannot be used for authentication'));
+	return Promise.resolve(this.vaultItem ? this.vaultItem.getId() : tk[2]).then(function(id) {
+	    var vi = new libVES.VaultItem({id: id}, ves);
+	    return vi.getFile().then(function(file) {
+		return vi.getField('deleted').then(function(f) {
+		    if (f) throw new libVES.Error('VESauth', 'Verify token expired');
+		    return file.getCreator();
+		});
+	    });
+	});
+    }
+    if (tk[1] != 'vaultKey') return Promise.reject(new libVES.Error('VESauth', 'Unknown token type'));
+    if (this.vaultItem) return this.vaultItem.getId().then(function(id) {
+	var vi = new libVES.VaultItem({id: id}, ves);
+	return vi.getVaultEntries().then(function(vents) {
+	    if (!auth && vents && vents.length) return ves.me();
+	    if (vents && tk[2]) for (var i = 0; i < vents.length; i++) if (vents[i].vaultKey && Number(vents[i].vaultKey.id) == Number(tk[2])) return ves.me();
+	    throw new libVES.Error('VESauth', 'ACL not authorized');
+	});
+    });
+    if (!auth) return ves.me();
+    return Promise.resolve(this.vaultKey ? this.vaultKey.getId() : tk[2]).then(function(id) {
+	return (new libVES.VaultKey({id: id}, ves)).getExternals().then(function(ext) {
+	    if (!ext || !ext[0]) throw new libVES.Error('VESauth', 'Bad vaultKey for VESauth');
+	    return ext[0].getDomain().then(function(dom) {
+		return ext[0].getExternalId().then(function(extid) {
+		    if (!extid || !extid.match(/^[^\!\@]+\@[^\!\@]+$/)) throw new libVES.Error('VESauth', 'Bad vaultKey for VESauth');
+		    if (dom && dom.toLowerCase() == ves.domain.toLowerCase()) return ves.me();
+		    throw new libVES.Error('VESuath', 'VES domain does not match');
+		});
+	    });
+	});
+    });
+};
+
 module.exports = libVES;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "libves",
-  "version": "2.1.1",
-  "description": "Simple, safe and secure end-to-end encryption for data at-rest",
+  "version": "2.3.0",
+  "description": "Simple, safe and secure end-to-end encryption at-rest",
   "main": "libVES.node.js",
   "scripts": {
     "test": "echo \"No test defined\" && exit 1"
@@ -24,7 +24,7 @@
   "dependencies": {
     "crypto": "*",
     "subtle": "*",
-    "xh2r": "*"
+    "xhr2": "*"
   },
   "author": "jz@vesvault.com",
   "license": "GPL-3.0",