Added U.encryptID() and U.decryptID().

petersirka · petersirka · commit 697e872a3252 · 2018-07-15T21:43:44.000+02:00
diff --git a/changes.txt b/changes.txt
@@ -95,9 +95,9 @@
 - added: `SchemaEntity.clear()` for removing all current definition
 - added: new view engine markup `@{#}` for simulating of root URL
 - added: `String.ROOT()` for replacing `@{#}` markup in strings
-- added: `Number.encrypt(key)` for encrypting number values
-- added: `String.decryptnumber(key)` for decrypting of number values
-- added: `F.config['secret-numbers']` as a hidden secret for encrypting/decrypting values
+- added: `U.decryptID(value, key)` for encrypting number/string values
+- added: `U.encryptID(value, key)` for decrypting of number/string values
+- added: `F.config['secret-uid']` as a hidden secret for encrypting/decrypting values
 
 - updated: (IMPORTANT) NoSQL binary divides files to independent directories for 1000 files per directory
 - updated: `GROUP()` by adding a new argument `url_prefix`
diff --git a/index.js b/index.js
@@ -647,7 +647,7 @@ function Framework() {
 		version: '1.0.0',
 		author: '',
 		secret: this.syshash,
-		'secret-numbers': 'numbers',
+		'secret-uid': this.syshash.substring(10),
 
 		'security.txt': 'Contact: mailto:support@totaljs.com\nContact: https://www.totaljs.com/contact/',
 		'etag-version': '',
@@ -8885,7 +8885,7 @@ F.$configure_configs = function(arr, rewrite) {
 
 		switch (name) {
 			case 'secret':
-			case 'secret-numbers':
+			case 'secret-uid':
 				obj[name] = value;
 				break;
 			case 'default-request-length':
@@ -9033,6 +9033,9 @@ F.$configure_configs = function(arr, rewrite) {
 
 	U.extend(F.config, obj, rewrite);
 
+	if (!F.config['secret-uid'])
+		F.config['secret-uid'] = (F.config.name).crc32(true).toString();
+
 	var tmp = F.config['mail-smtp-options'];
 	if (typeof(tmp) === 'string' && tmp) {
 		tmp = new Function('return ' + tmp)();
diff --git a/utils.js b/utils.js
@@ -3879,17 +3879,33 @@ String.prototype.decrypt = function(key, secret) {
 	return counter !== (val.length + key.length) ? null : val;
 };
 
-String.prototype.decryptnumber = function(salt) {
-	var val = this.decrypt(salt, F.config['secret-numbers']);
-	var num = 0;
-	if (val) {
-		num = +val;
-		if (isNaN(num))
-			return 0;
-		for (var i = 0; i < salt.length; i++)
-			num -= salt.charCodeAt(i);
-	}
-	return num;
+exports.encryptID = function(val, key) {
+
+	var num = typeof(val) === 'number';
+	var sum = 0;
+
+	if (!key)
+		key = F.config.secret;
+
+	val = val.toString();
+
+	for (var i = 0; i < val.length; i++)
+		sum += val.charCodeAt(i);
+
+	for (var i = 0; i < key.length; i++)
+		sum += key.charCodeAt(i);
+
+	return (num ? 'n' : 'x') + (F.config['secret-uid'] + val + sum + key).crc32(true).toString(16) + 'x' + val;
+};
+
+exports.decryptID = function(val, key) {
+	var num = val[0] === 'n';
+	var raw = val.substring(val.indexOf('x', 1) + 1);
+
+	if (num)
+		raw = +raw;
+
+	return exports.encryptID(raw, key) === val ? raw : null;
 };
 
 String.prototype.base64ToFile = function(filename, callback) {
@@ -4074,13 +4090,6 @@ String.prototype.removeTags = function() {
 	return this.replace(regexpTags, '');
 };
 
-Number.prototype.encrypt = function(salt) {
-	var num = this;
-	for (var i = 0; i < salt.length; i++)
-		num += salt.charCodeAt(i);
-	return num.toString().encrypt(salt, false, F.config['secret-numbers']);
-};
-
 Number.prototype.floor = function(decimals) {
 	return Math.floor(this * Math.pow(10, decimals)) / Math.pow(10, decimals);
 };
