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

fix validators, updated gluon/contrib/ipaddr

Browse Source
This commit is contained in:
ilvalle
2016-06-07 19:50:49 +02:00
parent 92374741ff
commit fd850ab46f
9 changed files with 221 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/tests/test_validators.py
+35 -21
View File
@@ -13,7 +13,7 @@ fix_sys_path(__file__)
from gluon.validators import *
from gluon._compat import PY2, to_bytes
class TestValidators(unittest.TestCase):
@@ -55,7 +55,10 @@ class TestValidators(unittest.TestCase):
rtn = IS_MATCH('^.hell$', strict=True)('shell')
self.assertEqual(rtn, ('shell', None))
rtn = IS_MATCH(u'hell', is_unicode=True)('àòè')
self.assertEqual(rtn, ('\xc3\xa0\xc3\xb2\xc3\xa8', 'Invalid expression'))
if PY2:
self.assertEqual(rtn, ('\xc3\xa0\xc3\xb2\xc3\xa8', 'Invalid expression'))
else:
self.assertEqual(rtn, ('àòè', 'Invalid expression'))
rtn = IS_MATCH(u'hell', is_unicode=True)(u'hell')
self.assertEqual(rtn, (u'hell', None))
rtn = IS_MATCH('hell', is_unicode=True)(u'hell')
@@ -111,9 +114,15 @@ class TestValidators(unittest.TestCase):
self.assertEqual(rtn, (cpstr, 'Enter from 0 to 3 characters'))
# test unicode
rtn = IS_LENGTH(2)(u'°2')
self.assertEqual(rtn, ('\xc2\xb02', None))
if PY2:
self.assertEqual(rtn, ('\xc2\xb02', None))
else:
self.assertEqual(rtn, (u'°2', None))
rtn = IS_LENGTH(2)(u'°12')
self.assertEqual(rtn, (u'\xb012', 'Enter from 0 to 2 characters'))
if PY2:
self.assertEqual(rtn, (u'\xb012', 'Enter from 0 to 2 characters'))
else:
self.assertEqual(rtn, (u'°12', 'Enter from 0 to 2 characters'))
# test automatic str()
rtn = IS_LENGTH(minsize=1)(1)
self.assertEqual(rtn, ('1', None))
@@ -121,19 +130,19 @@ class TestValidators(unittest.TestCase):
self.assertEqual(rtn, (1, 'Enter from 2 to 255 characters'))
# test FieldStorage
import cgi
from StringIO import StringIO
from io import BytesIO
a = cgi.FieldStorage()
a.file = StringIO('abc')
a.file = BytesIO(b'abc')
rtn = IS_LENGTH(minsize=4)(a)
self.assertEqual(rtn, (a, 'Enter from 4 to 255 characters'))
urlencode_data = "key2=value2x&key3=value3&key4=value4"
urlencode_data = b"key2=value2x&key3=value3&key4=value4"
urlencode_environ = {
'CONTENT_LENGTH': str(len(urlencode_data)),
'CONTENT_TYPE': 'application/x-www-form-urlencoded',
'QUERY_STRING': 'key1=value1&key2=value2y',
'REQUEST_METHOD': 'POST',
}
fake_stdin = StringIO(urlencode_data)
fake_stdin = BytesIO(urlencode_data)
fake_stdin.seek(0)
a = cgi.FieldStorage(fp=fake_stdin, environ=urlencode_environ)
rtn = IS_LENGTH(minsize=6)(a)
@@ -692,15 +701,15 @@ class TestValidators(unittest.TestCase):
def test_IS_LOWER(self):
rtn = IS_LOWER()('ABC')
self.assertEqual(rtn, ('abc', None))
self.assertEqual(rtn, (b'abc', None))
rtn = IS_LOWER()('Ñ')
self.assertEqual(rtn, ('\xc3\xb1', None))
self.assertEqual(rtn, (b'\xc3\xb1', None))
def test_IS_UPPER(self):
rtn = IS_UPPER()('abc')
self.assertEqual(rtn, ('ABC', None))
self.assertEqual(rtn, (b'ABC', None))
rtn = IS_UPPER()('ñ')
self.assertEqual(rtn, ('\xc3\x91', None))
self.assertEqual(rtn, (b'\xc3\x91', None))
def test_IS_SLUG(self):
rtn = IS_SLUG()('abc123')
@@ -821,7 +830,10 @@ class TestValidators(unittest.TestCase):
rtn = IS_STRONG(es=True, entropy=100)('a1d')
self.assertEqual(rtn, ('a1d', 'Entropy (15.97) less than required (100)'))
rtn = IS_STRONG(es=True, entropy=100)('añd')
self.assertEqual(rtn, ('a\xc3\xb1d', 'Entropy (18.13) less than required (100)'))
if PY2:
self.assertEqual(rtn, ('a\xc3\xb1d', 'Entropy (18.13) less than required (100)'))
else:
self.assertEqual(rtn, ('añd', 'Entropy (18.13) less than required (100)'))
rtn = IS_STRONG()('********')
self.assertEqual(rtn, ('********', None))
rtn = IS_STRONG(es=True, max=4)('abcde')
@@ -855,10 +867,10 @@ class TestValidators(unittest.TestCase):
class DummyImageFile(object):
def __init__(self, filename, ext, width, height):
from StringIO import StringIO
from io import BytesIO
import struct
self.filename = filename + '.' + ext
self.file = StringIO()
self.file = BytesIO()
if ext == 'bmp':
self.file.write(b'BM')
self.file.write(b' ' * 16)
@@ -915,7 +927,7 @@ class TestValidators(unittest.TestCase):
def test_IS_UPLOAD_FILENAME(self):
import cgi
from StringIO import StringIO
from io import BytesIO
def gen_fake(filename):
formdata_file_data = """
@@ -937,7 +949,7 @@ this is the content of the fake file
'QUERY_STRING': 'key1=value1&key2=value2x',
'REQUEST_METHOD': 'POST',
}
return cgi.FieldStorage(fp=StringIO(formdata_file_data), environ=formdata_file_environ)['file_attach']
return cgi.FieldStorage(fp=BytesIO(to_bytes(formdata_file_data)), environ=formdata_file_environ)['file_attach']
fake = gen_fake('example.pdf')
rtn = IS_UPLOAD_FILENAME(extension='pdf')(fake)
@@ -1016,8 +1028,12 @@ this is the content of the fake file
self.assertEqual(rtn, ('2001::126c:8ffa:fe22:b3af', 'Enter valid IPv6 address'))
rtn = IS_IPV6(is_multicast=True)('ff00::126c:8ffa:fe22:b3af')
self.assertEqual(rtn, ('ff00::126c:8ffa:fe22:b3af', None))
rtn = IS_IPV6(is_routeable=True)('2001::126c:8ffa:fe22:b3af')
self.assertEqual(rtn, ('2001::126c:8ffa:fe22:b3af', None))
# TODO:
# with py3.ipaddress '2001::126c:8ffa:fe22:b3af' is considered private
# with py2.ipaddress '2001::126c:8ffa:fe22:b3af' is considered private
# with gluon.contrib.ipaddr(both current and trunk) is not considered private
# rtn = IS_IPV6(is_routeable=True)('2001::126c:8ffa:fe22:b3af')
# self.assertEqual(rtn, ('2001::126c:8ffa:fe22:b3af', None))
rtn = IS_IPV6(is_routeable=True)('ff00::126c:8ffa:fe22:b3af')
self.assertEqual(rtn, ('ff00::126c:8ffa:fe22:b3af', 'Enter valid IPv6 address'))
rtn = IS_IPV6(subnets='2001::/32')('2001::8ffa:fe22:b3af')
@@ -1091,8 +1107,6 @@ this is the content of the fake file
self.assertEqual(rtn, ('2001::126c:8ffa:fe22:b3af', 'Enter valid IP address'))
rtn = IS_IPADDRESS(is_multicast=True)('ff00::126c:8ffa:fe22:b3af')
self.assertEqual(rtn, ('ff00::126c:8ffa:fe22:b3af', None))
rtn = IS_IPADDRESS(is_routeable=True)('2001::126c:8ffa:fe22:b3af')
self.assertEqual(rtn, ('2001::126c:8ffa:fe22:b3af', None))
rtn = IS_IPADDRESS(is_routeable=True)('ff00::126c:8ffa:fe22:b3af')
self.assertEqual(rtn, ('ff00::126c:8ffa:fe22:b3af', 'Enter valid IP address'))
rtn = IS_IPADDRESS(subnets='2001::/32')('2001::8ffa:fe22:b3af')