moparisthebest/mail
1
0
Fork 0
mirror of https://github.com/moparisthebest/mail synced 2025-03-03 02:01:45 -05:00
Code Issues Releases Wiki Activity

refactor email validation to happen in util

Browse Source
This commit is contained in:
Tankred Hase 2013-08-30 11:42:32 +02:00
parent bc9e635270
commit d1290e7a9f
2 changed files with 194 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

369
src/js/crypto/util.js
View File

@ -1,211 +1,220 @@
(function() { (function() {
'use strict'; 'use strict';
/** /**
* Various utitity methods for crypto, encoding & decoding * Various utitity methods for crypto, encoding & decoding
*/ */
var Util = function(forge, uuid, crypt) { var Util = function(forge, uuid, crypt) {
this._forge = forge;
this._uuid = uuid;
this._crypt = crypt;
};
/** /**
* Generates a new RFC 4122 version 4 compliant random UUID * Generates a new RFC 4122 version 4 compliant random UUID
*/ */
this.UUID = function() { Util.prototype.UUID = function() {
return uuid.v4(); return this._uuid.v4();
}; };
/** /**
* Generates a cryptographically secure random base64-encoded key or IV * Generates a cryptographically secure random base64-encoded key or IV
* @param keySize [Number] The size of the key in bits (e.g. 128, 256) * @param keySize [Number] The size of the key in bits (e.g. 128, 256)
* @return [String] The base64 encoded key/IV * @return [String] The base64 encoded key/IV
*/ */
this.random = function(keySize) { Util.prototype.random = function(keySize) {
var keyBase64, keyBuf; var keyBase64, keyBuf;
if (typeof module !== 'undefined' && module.exports) { if (typeof window !== 'undefined' && window.crypto && window.crypto.getRandomValues) {
// node.js // browser if secure rng exists
keyBuf = crypt.randomBytes(keySize / 8); keyBuf = new Uint8Array(keySize / 8);
keyBase64 = new Buffer(keyBuf).toString('base64'); window.crypto.getRandomValues(keyBuf);
keyBase64 = window.btoa(this.uint8Arr2BinStr(keyBuf));
} else if (typeof module !== 'undefined' && module.exports) {
// node.js
keyBuf = this._crypt.randomBytes(keySize / 8);
keyBase64 = new Buffer(keyBuf).toString('base64');
} else {
// generate random bytes with fortuna algorithm from forge
keyBase64 = window.btoa(this._forge.random.getBytesSync(keySize / 8));
}
} else if (typeof window !== 'undefined' && window.crypto && window.crypto.getRandomValues) { return keyBase64;
// browser if secure rng exists };
keyBuf = new Uint8Array(keySize / 8);
window.crypto.getRandomValues(keyBuf);
keyBase64 = window.btoa(this.uint8Arr2BinStr(keyBuf));
} else { /**
// generate random bytes with fortuna algorithm from forge * Parse a date string with the following format "1900-01-31 18:17:53"
keyBase64 = window.btoa(forge.random.getBytesSync(keySize / 8)); */
} Util.prototype.parseDate = function(str) {
var parts = str.match(/(\d+)/g);
return new Date(parts[0], parts[1] - 1, parts[2], parts[3], parts[4], parts[5]);
};
return keyBase64; /**
}; * Returns a string representation of a date in the format "1900-01-31 18:17:53"
*/
Util.prototype.formatDate = function(date) {
var year = "" + date.getFullYear();
var month = "" + (date.getMonth() + 1);
if (month.length === 1) {
month = "0" + month;
}
var day = "" + date.getDate();
if (day.length === 1) {
day = "0" + day;
}
var hour = "" + date.getHours();
if (hour.length === 1) {
hour = "0" + hour;
}
var minute = "" + date.getMinutes();
if (minute.length === 1) {
minute = "0" + minute;
}
var second = "" + date.getSeconds();
if (second.length === 1) {
second = "0" + second;
}
return year + "-" + month + "-" + day + " " + hour + ":" + minute + ":" + second;
};
/** /**
* Parse a date string with the following format "1900-01-31 18:17:53" * Converts a binary String (e.g. from the FileReader Api) to an ArrayBuffer
*/ * @param str [String] a binary string with integer values (0..255) per character
this.parseDate = function(str) { * @return [ArrayBuffer]
var parts = str.match(/(\d+)/g); */
return new Date(parts[0], parts[1] - 1, parts[2], parts[3], parts[4], parts[5]); Util.prototype.binStr2ArrBuf = function(str) {
}; var b = new ArrayBuffer(str.length);
var buf = new Uint8Array(b);
/** for (var i = 0; i < b.byteLength; i++) {
* Returns a string representation of a date in the format "1900-01-31 18:17:53" buf[i] = str.charCodeAt(i);
*/ }
this.formatDate = function(date) {
var year = "" + date.getFullYear();
var month = "" + (date.getMonth() + 1);
if (month.length === 1) {
month = "0" + month;
}
var day = "" + date.getDate();
if (day.length === 1) {
day = "0" + day;
}
var hour = "" + date.getHours();
if (hour.length === 1) {
hour = "0" + hour;
}
var minute = "" + date.getMinutes();
if (minute.length === 1) {
minute = "0" + minute;
}
var second = "" + date.getSeconds();
if (second.length === 1) {
second = "0" + second;
}
return year + "-" + month + "-" + day + " " + hour + ":" + minute + ":" + second;
};
/** return b;
* Converts a binary String (e.g. from the FileReader Api) to an ArrayBuffer };
* @param str [String] a binary string with integer values (0..255) per character
* @return [ArrayBuffer]
*/
this.binStr2ArrBuf = function(str) {
var b = new ArrayBuffer(str.length);
var buf = new Uint8Array(b);
for (var i = 0; i < b.byteLength; i++) { /**
buf[i] = str.charCodeAt(i); * Creates a Blob from an ArrayBuffer using the BlobBuilder Api
} * @param str [String] a binary string with integer values (0..255) per character
* @return [ArrayBuffer] either a data url or a filesystem url
*/
Util.prototype.arrBuf2Blob = function(buf, mimeType) {
var b = new Uint8Array(buf);
var blob = new Blob([b], {
type: mimeType
});
return b; return blob;
}; };
/** /**
* Creates a Blob from an ArrayBuffer using the BlobBuilder Api * Creates a binary String from a Blob using the FileReader Api
* @param str [String] a binary string with integer values (0..255) per character * @param blob [Blob/File] a blob containing the the binary data
* @return [ArrayBuffer] either a data url or a filesystem url * @return [String] a binary string with integer values (0..255) per character
*/ */
this.arrBuf2Blob = function(buf, mimeType) { Util.prototype.blob2BinStr = function(blob, callback) {
var b = new Uint8Array(buf); var reader = new FileReader();
var blob = new Blob([b], {
type: mimeType
});
return blob; reader.onload = function(event) {
}; callback(event.target.result);
};
/** reader.readAsBinaryString(blob);
* Creates a binary String from a Blob using the FileReader Api };
* @param blob [Blob/File] a blob containing the the binary data
* @return [String] a binary string with integer values (0..255) per character
*/
this.blob2BinStr = function(blob, callback) {
var reader = new FileReader();
reader.onload = function(event) { /**
callback(event.target.result); * Converts an ArrayBuffer to a binary String. This is a slower alternative to
}; * conversion with arrBuf2Blob -> blob2BinStr, since these use native apis,
* but it can be used on browsers without the BlodBuilder Api
* @param buf [ArrayBuffer]
* @return [String] a binary string with integer values (0..255) per character
*/
Util.prototype.arrBuf2BinStr = function(buf) {
var b = new Uint8Array(buf);
var str = '';
reader.readAsBinaryString(blob); for (var i = 0; i < b.length; i++) {
}; str += String.fromCharCode(b[i]);
}
/** return str;
* Converts an ArrayBuffer to a binary String. This is a slower alternative to };
* conversion with arrBuf2Blob -> blob2BinStr, since these use native apis,
* but it can be used on browsers without the BlodBuilder Api
* @param buf [ArrayBuffer]
* @return [String] a binary string with integer values (0..255) per character
*/
this.arrBuf2BinStr = function(buf) {
var b = new Uint8Array(buf);
var str = '';
for (var i = 0; i < b.length; i++) { /**
str += String.fromCharCode(b[i]); * Converts a UInt8Array to a binary String.
} * @param buf [UInt8Array]
* @return [String] a binary string with integer values (0..255) per character
*/
Util.prototype.uint8Arr2BinStr = function(buf) {
var str = '';
return str; for (var i = 0; i < buf.length; i++) {
}; str += String.fromCharCode(buf[i]);
}
/** return str;
* Converts a UInt8Array to a binary String. };
* @param buf [UInt8Array]
* @return [String] a binary string with integer values (0..255) per character
*/
this.uint8Arr2BinStr = function(buf) {
var str = '';
for (var i = 0; i < buf.length; i++) { /**
str += String.fromCharCode(buf[i]); * Converts a binary String (e.g. from the FileReader Api) to a UInt8Array
} * @param str [String] a binary string with integer values (0..255) per character
* @return [UInt8Array]
*/
Util.prototype.binStr2Uint8Arr = function(str) {
var c, buf = new Uint8Array(str.length);
return str; for (var i = 0; i < buf.length; i++) {
}; c = str.charCodeAt(i);
buf[i] = (c & 0xff);
}
/** return buf;
* Converts a binary String (e.g. from the FileReader Api) to a UInt8Array };
* @param str [String] a binary string with integer values (0..255) per character
* @return [UInt8Array]
*/
this.binStr2Uint8Arr = function(str) {
var c, buf = new Uint8Array(str.length);
for (var i = 0; i < buf.length; i++) { /**
c = str.charCodeAt(i); * Convert a str to base64 in a browser and in node.js
buf[i] = (c & 0xff); */
} Util.prototype.str2Base64 = function(str) {
if (typeof window !== 'undefined' && window.btoa) {
return window.btoa(str);
} else if (typeof module !== 'undefined' && module.exports) {
return new Buffer(str, 'binary').toString('base64');
} else {
return this._forge.util.encode64(str);
}
};
return buf; /**
}; * Convert a base64 encoded string in a browser and in node.js
*/
Util.prototype.base642Str = function(str) {
if (typeof window !== 'undefined' && window.atob) {
return window.atob(str);
} else if (typeof module !== 'undefined' && module.exports) {
return new Buffer(str, 'base64').toString('binary');
} else {
return this._forge.util.decode64(str);
}
};
/** /**
* Convert a str to base64 in a browser and in node.js * Validate an email address. This regex is taken from:
*/ * http://stackoverflow.com/questions/46155/validate-email-address-in-javascript
this.str2Base64 = function(str) { */
if (typeof module !== 'undefined' && module.exports) { Util.prototype.validateEmailAddress = function(emailAddress) {
return new Buffer(str, 'binary').toString('base64'); var re = /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
} else if (typeof window !== 'undefined' && window.btoa) { return re.test(emailAddress);
return window.btoa(str); };
} else {
return forge.util.encode64(str);
}
};
/** if (typeof define !== 'undefined' && define.amd) {
* Convert a base64 encoded string in a browser and in node.js // AMD
*/ define(['uuid', 'forge'], function(uuid, forge) {
this.base642Str = function(str) { return new Util(forge, uuid, undefined);
if (typeof module !== 'undefined' && module.exports) { });
return new Buffer(str, 'base64').toString('binary'); } else if (typeof module !== 'undefined' && module.exports) {
} else if (typeof window !== 'undefined' && window.atob) { // node.js
return window.atob(str); module.exports = new Util(require('node-forge'), require('node-uuid'), require('crypto'));
} else { }
return forge.util.decode64(str);
}
};
};
if (typeof define !== 'undefined' && define.amd) {
// AMD
define(['uuid', 'forge'], function(uuid, forge) {
return new Util(forge, uuid, undefined);
});
} else if (typeof module !== 'undefined' && module.exports) {
// node.js
module.exports = new Util(require('node-forge'), require('node-uuid'), require('crypto'));
}
})(); })();

23
src/js/dao/email-dao.js
View File

@ -36,7 +36,7 @@ define(function(require) {
// validate email address // validate email address
var emailAddress = self._account.emailAddress; var emailAddress = self._account.emailAddress;
if (!validateEmail(emailAddress)) { if (!util.validateEmailAddress(emailAddress)) {
callback({ callback({
errMsg: 'The user email address must be specified!' errMsg: 'The user email address must be specified!'
}); });
@ -124,7 +124,7 @@ define(function(require) {
// validate email addresses // validate email addresses
_.each(email.to, function(i) { _.each(email.to, function(i) {
if (!validateEmail(i.address)) { if (!util.validateEmailAddress(i.address)) {
invalidRecipient = i.address; invalidRecipient = i.address;
} }
}); });
@ -134,7 +134,7 @@ define(function(require) {
}); });
return; return;
} }
if (!validateEmail(email.from[0].address)) { if (!util.validateEmailAddress(email.from[0].address)) {
callback({ callback({
errMsg: 'Invalid sender: ' + email.from errMsg: 'Invalid sender: ' + email.from
}); });
@ -598,7 +598,7 @@ define(function(require) {
// validate email addresses // validate email addresses
var invalidRecipient; var invalidRecipient;
_.each(email.to, function(i) { _.each(email.to, function(i) {
if (!validateEmail(i.address)) { if (!util.validateEmailAddress(i.address)) {
invalidRecipient = i.address; invalidRecipient = i.address;
} }
}); });
@ -608,7 +608,7 @@ define(function(require) {
}); });
return; return;
} }
if (!validateEmail(email.from[0].address)) { if (!util.validateEmailAddress(email.from[0].address)) {
callback({ callback({
errMsg: 'Invalid sender: ' + email.from errMsg: 'Invalid sender: ' + email.from
}); });
@ -672,18 +672,5 @@ define(function(require) {
} }
}; };
//
// helper functions
//
/**
* Validates an email address
*/
function validateEmail(email) {
var re = /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
return re.test(email);
}
return EmailDAO; return EmailDAO;
}); });