Merge pull request OpenUserJS#361 from Martii/Issue-360fixLogicForMaxSize

Martii · Martii · commit c8f461c6e68c · 2014-10-15T16:32:44.000-06:00
Fix logical AND to logical OR for file uploads to prevent accidental too...

Auto merge
diff --git a/controllers/user.js b/controllers/user.js
@@ -1226,7 +1226,7 @@ exports.uploadScript = function (aReq, aRes, aNext) {
     var failUrl = '/user/add/' + (isLib ? 'lib' : 'scripts');
 
     // Reject non-js and huge files
-    if (script.type !== 'application/javascript' &&
+    if (script.type !== 'application/javascript' ||
       script.size > settings.maximum_upload_script_size) {
       return aRes.redirect(failUrl);
     }

Original file line number	Diff line number	Diff line change
`@@ -1226,7 +1226,7 @@ exports.uploadScript = function (aReq, aRes, aNext) {`
`1226`	`1226`	`var failUrl = '/user/add/' + (isLib ? 'lib' : 'scripts');`
`1227`	`1227`
`1228`	`1228`	`// Reject non-js and huge files`
`1229`		`- if (script.type !== 'application/javascript' &&`
	`1229`	`+ if (script.type !== 'application/javascript' \|\|`
`1230`	`1230`	`script.size > settings.maximum_upload_script_size) {`
`1231`	`1231`	`return aRes.redirect(failUrl);`
`1232`	`1232`	`}`