Skip to content

Added 'content' validator to security #490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Aug 29, 2016
Merged

Added 'content' validator to security #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ef79a38
Added 'content' validator to security
jonuriarte Aug 25, 2016
6051883
Fix
jonuriarte Aug 25, 2016
61bc7f7
Fix 2
jonuriarte Aug 25, 2016
7f0d968
Fix 3
jonuriarte Aug 25, 2016
aac3074
Various fixes
jonuriarte Aug 27, 2016
060fe35
Fix
jonuriarte Aug 27, 2016
1629dfc
Added some test
jonuriarte Aug 29, 2016
a9e36a3
Fix 4
jonuriarte Aug 29, 2016
a221028
Fix
jonuriarte Aug 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/main/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,7 +686,14 @@
badPlPesel: 'The PESEL entered is invalid',
badPlNip: 'The NIP entered is invalid',
badPlRegon: 'The REGON entered is invalid',
badreCaptcha: 'Please confirm that you are not a bot'
badreCaptcha: 'Please confirm that you are not a bot',
passwordComplexityStart: 'Password must contain at least ',
passwordComplexitySeparator: ', ',
passwordComplexityUppercaseInfo: ' uppercase letter(s)',
passwordComplexityLowercaseInfo: ' lowercase letter(s)',
passwordComplexitySpecialCharsInfo: ' special character(s)',
passwordComplexityNumericCharsInfo: ' numeric character(s)',
passwordComplexityEnd: '.'
}
});

Expand Down
79 changes: 79 additions & 0 deletions src/modules/security.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,85 @@
errorMessageKey: 'requiredFields'
});

/*
* Check password content depending on following parameters:
* data-validation-require-uc-letter,
* data-validation-require-lc-letter,
* data-validation-require-special-char,
* data-validation-require-numeral
*
*/
$.formUtils.addValidator({
name : 'complexity',
validatorFunction : function(val, $el) {
var numRequiredUppercaseChars = $el.valAttr('require-uc-letter') || '0',
numRequiredLowercaseChars = $el.valAttr('require-lc-letter') || '0',
numRequiredSpecialChars = $el.valAttr('require-special-char') || '0',
numRequiredNumericChars = $el.valAttr('require-numeral') || '0',
patternUpperCaseChars = '^(?=(?:.*[A-Z]){'+numRequiredUppercaseChars+',}).+',
patternLowerCaseChars = '^(?=(?:.*[a-z]){'+numRequiredLowercaseChars+',}).+',
patternSpecialChars = '^(?=(?:.*(_|[!"#$%&\'()*+\\\\,-./:;<=>?@[\\]^_`{|}~])){'+numRequiredSpecialChars+',}).+',
patternNumericChars = '^(?=(?:.*\\d){'+numRequiredNumericChars+',}).+',
resultRegExpRequiredUppercaseChars = true,
resultRegExpRequiredLowercaseChars = true,
resultRegExpRequiredSpecialChars = true,
resultRegExpRequiredNumericChars = true,
error = false,
message_error = '';

if (numRequiredUppercaseChars !== '0'){
resultRegExpRequiredUppercaseChars = new RegExp(patternUpperCaseChars).test(val);
}
if (numRequiredLowercaseChars !== '0'){
resultRegExpRequiredLowercaseChars = new RegExp(patternLowerCaseChars).test(val);
}
if (numRequiredSpecialChars !== '0'){
resultRegExpRequiredSpecialChars = new RegExp(patternSpecialChars).test(val);
}
if (numRequiredNumericChars !== '0'){
resultRegExpRequiredNumericChars = new RegExp(patternNumericChars).test(val);
}

if (!resultRegExpRequiredUppercaseChars){
error = true;
message_error = $.formUtils.LANG.passwordComplexityStart + numRequiredUppercaseChars + $.formUtils.LANG.passwordComplexityUppercaseInfo;
}
if (!resultRegExpRequiredLowercaseChars){
if (error){
message_error = message_error + $.formUtils.LANG.passwordComplexitySeparator + numRequiredLowercaseChars + $.formUtils.LANG.passwordComplexityLowercaseInfo;
}
else{
error = true;
message_error = $.formUtils.LANG.passwordComplexityStart + numRequiredLowercaseChars + $.formUtils.LANG.passwordComplexityLowercaseInfo;
}
}
if (!resultRegExpRequiredSpecialChars){
if (error){
message_error = message_error + $.formUtils.LANG.passwordComplexitySeparator + numRequiredSpecialChars + $.formUtils.LANG.passwordComplexitySpecialCharsInfo;
}
else{
error = true;
message_error = $.formUtils.LANG.passwordComplexityStart + numRequiredSpecialChars + $.formUtils.LANG.passwordComplexitySpecialCharsInfo;
}
}
if (!resultRegExpRequiredNumericChars){
if (error){
message_error = message_error + $.formUtils.LANG.passwordComplexitySeparator + numRequiredNumericChars + $.formUtils.LANG.passwordComplexityNumericCharsInfo;
}
else{
message_error = $.formUtils.LANG.passwordComplexityStart + numRequiredNumericChars + $.formUtils.LANG.passwordComplexityNumericCharsInfo;
}
}

this.errorMessage = message_error + $.formUtils.LANG.passwordComplexityEnd;
if(resultRegExpRequiredUppercaseChars && resultRegExpRequiredLowercaseChars && resultRegExpRequiredSpecialChars && resultRegExpRequiredNumericChars){
return true;
}
return false;
},
errorMessage : '',
errorMessageKey: ''
});
/*
* Google reCaptcha 2
*/
Expand Down
47 changes: 46 additions & 1 deletion test/qunit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1062,8 +1062,53 @@
});

});
// TODO: Write more tests...

/*
* COMPLEXITY VALIDATION
*/
test("Complexity validation", function() {

clearForm();

var values = [
{val:input('abcdefgh', {'':'complexity'}), isValid:true},
{val:input('ABCDEFGH', {'':'complexity'}), isValid:true},
{val:input('12345678', {'':'complexity'}), isValid:true},
{val:input('@|#{}[]', {'':'complexity'}), isValid:true},
{val:input('abcdefgh', {'require-lc-letter':'2', '':'complexity'}), isValid:true},
{val:input('12@ABCDEFgh', {'require-lc-letter':'2', '':'complexity'}), isValid:true},
{val:input('12@ABCDEFGh', {'require-lc-letter':'2', '':'complexity'}), isValid:false},
{val:input('12@ABCDEFGH', {'require-lc-letter':'2', '':'complexity'}), isValid:false},
{val:input('12@ABCDEFGH', {'require-uc-letter':'2', '':'complexity'}), isValid:true},
{val:input('12@abcdefGH', {'require-uc-letter':'2', '':'complexity'}), isValid:true},
{val:input('12@abcdefgH', {'require-uc-letter':'2', '':'complexity'}), isValid:false},
{val:input('12@abcdefgh', {'require-uc-letter':'2', '':'complexity'}), isValid:false},
{val:input('@{}[]', {'require-special-char':'2', '':'complexity'}), isValid:true},
{val:input('12abcdfgh{}', {'require-special-char':'2', '':'complexity'}), isValid:true},
{val:input('12abcdefgh{', {'require-special-char':'2', '':'complexity'}), isValid:false},
{val:input('12abcdefgh', {'require-special-char':'2', '':'complexity'}), isValid:false},
{val:input('12345678', {'require-numeral':'2', '':'complexity'}), isValid:true},
{val:input('@abcdfgh78', {'require-numeral':'2', '':'complexity'}), isValid:true},
{val:input('@abcdefgh1', {'require-numeral':'2', '':'complexity'}), isValid:false},
{val:input('@abcdefgh', {'require-numeral':'2', '':'complexity'}), isValid:false},
{val:input('abCD{}12', {'require-lc-letter':'2', 'require-uc-letter':'2', 'require-special-char':'2', 'require-numeral':'2', '':'complexity'}), isValid:true},
{val:input('abCD{}1', {'require-lc-letter':'2', 'require-uc-letter':'2', 'require-special-char':'2', 'require-numeral':'2', '':'complexity'}), isValid:false},
{val:input('abCD{12', {'require-lc-letter':'2', 'require-uc-letter':'2', 'require-special-char':'2', 'require-numeral':'2', '':'complexity'}), isValid:false},
{val:input('abC{}12', {'require-lc-letter':'2', 'require-uc-letter':'2', 'require-special-char':'2', 'require-numeral':'2', '':'complexity'}), isValid:false},
{val:input('aCD{}12', {'require-lc-letter':'2', 'require-uc-letter':'2', 'require-special-char':'2', 'require-numeral':'2', '':'complexity'}), isValid:false},
{val:input('abCD{1', {'require-lc-letter':'2', 'require-uc-letter':'2', 'require-special-char':'2', 'require-numeral':'2', '':'complexity'}), isValid:false},
{val:input('abC{1', {'require-lc-letter':'2', 'require-uc-letter':'2', 'require-special-char':'2', 'require-numeral':'2', '':'complexity'}), isValid:false},
{val:input('aCD{1', {'require-lc-letter':'2', 'require-uc-letter':'2', 'require-special-char':'2', 'require-numeral':'2', '':'complexity'}), isValid:false},
{val:input('aD{1', {'require-lc-letter':'2', 'require-uc-letter':'2', 'require-special-char':'2', 'require-numeral':'2', '':'complexity'}), isValid:false},
{val:input('aDDFV{}@1356', {'require-lc-letter':'4', 'require-uc-letter':'2', 'require-special-char':'3', 'require-numeral':'2', '':'complexity'}), isValid:false}
];

$.each(values, function(i, obj) {
runTest(obj, 'complexity');
});
});

// TODO: Write more tests...
}

$.validate({
Expand Down