Merge pull request #3635 from individual-it/fix_quota_validation

better quota validation

3 files changed, 35 insertions, 13 deletions

diff --git a/core/js/js.js b/core/js/js.js
index 5f5f540af63..6fd66c9c9bb 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1712,16 +1712,12 @@ OC.Util = {
 	 *
 	 */
 	computerFileSize: function (string) {
-		if (typeof string != 'string') {
+		if (typeof string !== 'string') {
 			return null;
 		}
 
-		var s = string.toLowerCase();
-		var bytes = parseFloat(s)
-
-		if (!isNaN(bytes) && isFinite(s)) {
-			return bytes;
-		}
+		var s = string.toLowerCase().trim();
+		var bytes = null;
 
 		var bytesArray = {
 			'b' : 1,
@@ -1737,12 +1733,18 @@ OC.Util = {
 			'p' : 1024 * 1024 * 1024 * 1024 * 1024
 		};
 
-		var matches = s.match(/([kmgtp]?b?)$/i);
-		if (matches[1]) {
-			bytes = bytes * bytesArray[matches[1]];
+		var matches = s.match(/^[\s+]?([0-9]*)(\.([0-9]+))?( +)?([kmgtp]?b?)$/i);
+		if (matches !== null) {
+			bytes = parseFloat(s);
+			if (!isFinite(bytes)) {
+				return null;
+			}
 		} else {
 			return null;
 		}
+		if (matches[5]) {
+			bytes = bytes * bytesArray[matches[5]];
+		}
 
 		bytes = Math.round(bytes);
 		return bytes;
diff --git a/core/js/tests/specs/coreSpec.js b/core/js/tests/specs/coreSpec.js
index 3380b6be420..dd13cba8e2b 100644
--- a/core/js/tests/specs/coreSpec.js
+++ b/core/js/tests/specs/coreSpec.js
@@ -594,8 +594,14 @@ describe('Core base tests', function() {
 			it('correctly parses file sizes from a human readable formated string', function() {
 				var data = [
 					['125', 125],
-					['125.25', 125.25],
+					['125.25', 125],
+					['125.25B', 125],
+					['125.25 B', 125],
 					['0 B', 0],
+					['99999999999999999999999999999999999999999999 B', 99999999999999999999999999999999999999999999],
+					['0 MB', 0],
+					['0 kB', 0],
+					['0kB', 0],
 					['125 B', 125],
 					['125b', 125],
 					['125 KB', 128000],
@@ -605,7 +611,21 @@ describe('Core base tests', function() {
 					['119.2 GB', 127990025421],
 					['119.2gb', 127990025421],
 					['116.4 TB', 127983153473126],
-					['116.4tb', 127983153473126]
+					['116.4tb', 127983153473126],
+					['8776656778888777655.4tb', 9.650036181387265e+30],
+					[1234, null],
+					[-1234, null],
+					['-1234 B', null],
+					['B', null],
+					['40/0', null],
+					['40,30 kb', null],
+					[' 122.1 MB ', 128031130],
+					['122.1 MB ', 128031130],
+					[' 122.1 MB ', 128031130],
+					['	122.1 MB ', 128031130],
+					['122.1    MB ', 128031130],
+					[' 125', 125],
+					[' 125 ', 125],
 				];
 				for (var i = 0; i < data.length; i++) {
 					expect(OC.Util.computerFileSize(data[i][0])).toEqual(data[i][1]);
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index a6dcafcdac3..db9f6b6006b 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -554,7 +554,7 @@ var UserList = {
 		if (quota === 'other') {
 			return;
 		}
-		if ((quota !== 'default' && quota !=="none") && (isNaN(parseInt(quota, 10)) || parseInt(quota, 10) < 0)) {
+		if ((quota !== 'default' && quota !=="none") && (!OC.Util.computerFileSize(quota))) {
 			// the select component has added the bogus value, delete it again
 			$select.find('option[selected]').remove();
 			OC.Notification.showTemporary(t('core', 'Invalid quota value "{val}"', {val: quota}));