Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #6637 from open-craft/mtyaka/validate-chars

Browse Source 
Improve JS course key validation to not allow special chars.
This commit is contained in:
Xavier Antoviaque
2015-01-20 16:02:32 +01:00
parent 957e0e28cc d8e076566d
commit 0c7620a544
2 changed files with 49 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
cms/static/js/spec/views/utils/view_utils_spec.js
View File

@@ -40,5 +40,53 @@ define(["jquery", "underscore", "js/views/baseview", "js/views/utils/view_utils"
ViewHelpers.verifyNotificationShowing(notificationSpy, /Testing/);
});
});
describe("course/library fields validation", function() {
describe("without unicode support", function() {
it("validates presence of field", function() {
var error = ViewUtils.validateURLItemEncoding('', false);
expect(error).toBeTruthy();
});
it("checks for presence of special characters in the field", function() {
var error;
// Special characters are not allowed.
error = ViewUtils.validateURLItemEncoding('my+field', false);
expect(error).toBeTruthy();
error = ViewUtils.validateURLItemEncoding('2014!', false);
expect(error).toBeTruthy();
error = ViewUtils.validateURLItemEncoding('*field*', false);
expect(error).toBeTruthy();
// Spaces not allowed.
error = ViewUtils.validateURLItemEncoding('Jan 2014', false);
expect(error).toBeTruthy();
// -_~. are allowed.
error = ViewUtils.validateURLItemEncoding('2015-Math_X1.0~', false);
expect(error).toBeFalsy();
});
it("does not allow unicode characters", function() {
var error = ViewUtils.validateURLItemEncoding('Field-\u010d', false);
expect(error).toBeTruthy();
});
});
describe("with unicode support", function() {
it("validates presence of field", function() {
var error = ViewUtils.validateURLItemEncoding('', true);
expect(error).toBeTruthy();
});
it("checks for presence of spaces", function() {
var error = ViewUtils.validateURLItemEncoding('My Field', true);
expect(error).toBeTruthy();
});
it("allows unicode characters", function() {
var error = ViewUtils.validateURLItemEncoding('Field-\u010d', true);
expect(error).toBeFalsy();
});
});
});
});
});

2
cms/static/js/views/utils/view_utils.js
View File

@@ -199,7 +199,7 @@ define(["jquery", "underscore", "gettext", "js/views/feedback_notification", "js
}
}
else {
if (item !== encodeURIComponent(item)) {
if (item !== encodeURIComponent(item) || item.match(/[!'()*]/)) {
return gettext('Please do not use any spaces or special characters in this field.');
}
}