dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2094 from sethkinast/is-strong

Browse Source 
gluon.validators: update IS_STRONG to behave as it did in web2py < 2.15
This commit is contained in:
mdipierro
2019-02-17 16:19:26 -08:00
committed by GitHub
parent ddc99b3552 0077f29d71
commit 23bcfe4239
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gluon/tests/test_validators.py
View File

@@ -943,6 +943,14 @@ class TestValidators(unittest.TestCase):
'May not include any lowercase letters',
'May not include any numbers']))
)
rtn = IS_STRONG(special=0, es=True)('Abcde1!')
self.assertEqual(rtn,
('Abcde1!',
'|'.join(['Minimum length is 8',
'May not contain any of the following: ~!@#$%^&*()_+-=?<>,.:;{}[]|']))
)
rtn = IS_STRONG(upper=False, number=False, special=False, es=True)('Abcde1!')
self.assertEqual(rtn, ('Abcde1!', 'Minimum length is 8'))
def test_IS_IMAGE(self):
class DummyImageFile(object):

10
gluon/validators.py
View File

@@ -3163,6 +3163,10 @@ class IS_STRONG(object):
if not all_special.count(True) >= self.special:
failures.append(translate("Must include at least %s of the following: %s")
% (self.special, self.specials))
elif self.special is 0:
if len(all_special) > 0:
failures.append(translate("May not contain any of the following: %s")
% self.specials)
if self.invalid:
all_invalid = [ch in value for ch in self.invalid]
if all_invalid.count(True) > 0:
@@ -3174,7 +3178,7 @@ class IS_STRONG(object):
if not len(all_upper) >= self.upper:
failures.append(translate("Must include at least %s uppercase")
% str(self.upper))
else:
elif self.upper is 0:
if len(all_upper) > 0:
failures.append(
translate("May not include any uppercase letters"))
@@ -3184,7 +3188,7 @@ class IS_STRONG(object):
if not len(all_lower) >= self.lower:
failures.append(translate("Must include at least %s lowercase")
% str(self.lower))
else:
elif self.lower is 0:
if len(all_lower) > 0:
failures.append(
translate("May not include any lowercase letters"))
@@ -3197,7 +3201,7 @@ class IS_STRONG(object):
if not len(all_number) >= self.number:
failures.append(translate("Must include at least %s %s")
% (str(self.number), numbers))
else:
elif self.number is 0:
if len(all_number) > 0:
failures.append(translate("May not include any numbers"))
if len(failures) == 0: