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

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

@ -5,12 +5,16 @@
* Various utitity methods for crypto, encoding & decoding
*/
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
*/
this.UUID = function() {
return uuid.v4();
Util.prototype.UUID = function() {
return this._uuid.v4();
};
/**
@ -18,23 +22,21 @@
* @param keySize [Number] The size of the key in bits (e.g. 128, 256)
* @return [String] The base64 encoded key/IV
*/
this.random = function(keySize) {
Util.prototype.random = function(keySize) {
var keyBase64, keyBuf;
if (typeof module !== 'undefined' && module.exports) {
// node.js
keyBuf = crypt.randomBytes(keySize / 8);
keyBase64 = new Buffer(keyBuf).toString('base64');
} else if (typeof window !== 'undefined' && window.crypto && window.crypto.getRandomValues) {
if (typeof window !== 'undefined' && window.crypto && window.crypto.getRandomValues) {
// browser if secure rng exists
keyBuf = new Uint8Array(keySize / 8);
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(forge.random.getBytesSync(keySize / 8));
keyBase64 = window.btoa(this._forge.random.getBytesSync(keySize / 8));
}
return keyBase64;
@ -43,7 +45,7 @@
/**
* Parse a date string with the following format "1900-01-31 18:17:53"
*/
this.parseDate = function(str) {
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]);
};
@ -51,7 +53,7 @@
/**
* Returns a string representation of a date in the format "1900-01-31 18:17:53"
*/
this.formatDate = function(date) {
Util.prototype.formatDate = function(date) {
var year = "" + date.getFullYear();
var month = "" + (date.getMonth() + 1);
if (month.length === 1) {
@ -81,7 +83,7 @@
* @param str [String] a binary string with integer values (0..255) per character
* @return [ArrayBuffer]
*/
this.binStr2ArrBuf = function(str) {
Util.prototype.binStr2ArrBuf = function(str) {
var b = new ArrayBuffer(str.length);
var buf = new Uint8Array(b);
@ -97,7 +99,7 @@
* @param str [String] a binary string with integer values (0..255) per character
* @return [ArrayBuffer] either a data url or a filesystem url
*/
this.arrBuf2Blob = function(buf, mimeType) {
Util.prototype.arrBuf2Blob = function(buf, mimeType) {
var b = new Uint8Array(buf);
var blob = new Blob([b], {
type: mimeType
@ -111,7 +113,7 @@
* @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) {
Util.prototype.blob2BinStr = function(blob, callback) {
var reader = new FileReader();
reader.onload = function(event) {
@ -128,7 +130,7 @@
* @param buf [ArrayBuffer]
* @return [String] a binary string with integer values (0..255) per character
*/
this.arrBuf2BinStr = function(buf) {
Util.prototype.arrBuf2BinStr = function(buf) {
var b = new Uint8Array(buf);
var str = '';
@ -144,7 +146,7 @@
* @param buf [UInt8Array]
* @return [String] a binary string with integer values (0..255) per character
*/
this.uint8Arr2BinStr = function(buf) {
Util.prototype.uint8Arr2BinStr = function(buf) {
var str = '';
for (var i = 0; i < buf.length; i++) {
@ -159,7 +161,7 @@
* @param str [String] a binary string with integer values (0..255) per character
* @return [UInt8Array]
*/
this.binStr2Uint8Arr = function(str) {
Util.prototype.binStr2Uint8Arr = function(str) {
var c, buf = new Uint8Array(str.length);
for (var i = 0; i < buf.length; i++) {
@ -173,29 +175,36 @@
/**
* Convert a str to base64 in a browser and in node.js
*/
this.str2Base64 = function(str) {
if (typeof module !== 'undefined' && module.exports) {
return new Buffer(str, 'binary').toString('base64');
} else if (typeof window !== 'undefined' && window.btoa) {
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 forge.util.encode64(str);
return this._forge.util.encode64(str);
}
};
/**
* Convert a base64 encoded string in a browser and in node.js
*/
this.base642Str = function(str) {
if (typeof module !== 'undefined' && module.exports) {
return new Buffer(str, 'base64').toString('binary');
} else if (typeof window !== 'undefined' && window.atob) {
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 forge.util.decode64(str);
return this._forge.util.decode64(str);
}
};
/**
* Validate an email address. This regex is taken from:
* http://stackoverflow.com/questions/46155/validate-email-address-in-javascript
*/
Util.prototype.validateEmailAddress = function(emailAddress) {
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(emailAddress);
};
if (typeof define !== 'undefined' && define.amd) {

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

@ -36,7 +36,7 @@ define(function(require) {
// validate email address
var emailAddress = self._account.emailAddress;
if (!validateEmail(emailAddress)) {
if (!util.validateEmailAddress(emailAddress)) {
callback({
errMsg: 'The user email address must be specified!'
});
@ -124,7 +124,7 @@ define(function(require) {
// validate email addresses
_.each(email.to, function(i) {
if (!validateEmail(i.address)) {
if (!util.validateEmailAddress(i.address)) {
invalidRecipient = i.address;
}
});
@ -134,7 +134,7 @@ define(function(require) {
});
return;
}
if (!validateEmail(email.from[0].address)) {
if (!util.validateEmailAddress(email.from[0].address)) {
callback({
errMsg: 'Invalid sender: ' + email.from
});
@ -598,7 +598,7 @@ define(function(require) {
// validate email addresses
var invalidRecipient;
_.each(email.to, function(i) {
if (!validateEmail(i.address)) {
if (!util.validateEmailAddress(i.address)) {
invalidRecipient = i.address;
}
});
@ -608,7 +608,7 @@ define(function(require) {
});
return;
}
if (!validateEmail(email.from[0].address)) {
if (!util.validateEmailAddress(email.from[0].address)) {
callback({
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;
});