linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

datatypes: require min, max ordering for size limits

Browse Source 
Change-Id: I165b7d932716082b4bb9996f58f742763398b454
Reviewed-on: https://forge.frm2.tum.de/review/19533
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
This commit is contained in:
Georg Brandl 2018-12-04 12:37:21 +01:00 committed by Enrico Faulhaber
parent da3187ff8f
commit 381495fe38
2 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
secop/datatypes.py
View File

@ -37,8 +37,6 @@ except NameError:
unicode = str # pylint: disable=redefined-builtin unicode = str # pylint: disable=redefined-builtin
Parser = Parser() Parser = Parser()
# Only export these classes for 'from secop.datatypes import *' # Only export these classes for 'from secop.datatypes import *'
@ -101,7 +99,7 @@ class FloatRange(DataType):
def validate(self, value): def validate(self, value):
try: try:
value = float(value) value = float(value)
except: except Exception:
raise ValueError(u'Can not validate %r to float' % value) raise ValueError(u'Can not validate %r to float' % value)
if self.min is not None and value < self.min: if self.min is not None and value < self.min:
raise ValueError(u'%r should not be less then %s' % raise ValueError(u'%r should not be less then %s' %
@ -159,7 +157,7 @@ class IntRange(DataType):
raise ValueError(u'%r should be an int between %d and %d' % raise ValueError(u'%r should be an int between %d and %d' %
(value, self.min or 0, self.max)) (value, self.min or 0, self.max))
return value return value
except: except Exception:
raise ValueError(u'Can not validate %r to int' % value) raise ValueError(u'Can not validate %r to int' % value)
def __repr__(self): def __repr__(self):
@ -215,18 +213,19 @@ class EnumType(DataType):
class BLOBType(DataType): class BLOBType(DataType):
minsize = None minsize = None
maxsize = None maxsize = None
def __init__(self, minsize=0, maxsize=None): def __init__(self, minsize=0, maxsize=None):
# if only one argument is given, use exactly that many bytes # if only one argument is given, use exactly that many bytes
# if nothing is given, default to 255 # if nothing is given, default to 255
if maxsize is None: if maxsize is None:
maxsize = minsize or 255 maxsize = minsize or 255
minsize = maxsize self.minsize = int(minsize)
minsize = int(minsize) self.maxsize = int(maxsize)
maxsize = int(maxsize)
self.minsize, self.maxsize = min(minsize, maxsize), max(minsize, maxsize)
if self.minsize < 0: if self.minsize < 0:
raise ValueError(u'sizes must be bigger than or equal to 0!') raise ValueError(u'sizes must be bigger than or equal to 0!')
self.as_json = [u'blob', minsize, maxsize] elif self.minsize > self.maxsize:
raise ValueError(u'maxsize must be bigger than or equal to minsize!')
self.as_json = [u'blob', self.minsize, self.maxsize]
def __repr__(self): def __repr__(self):
return u'BLOB(%s, %s)' % (unicode(self.minsize), unicode(self.maxsize)) return u'BLOB(%s, %s)' % (unicode(self.minsize), unicode(self.maxsize))
@ -267,13 +266,13 @@ class StringType(DataType):
def __init__(self, minsize=0, maxsize=None): def __init__(self, minsize=0, maxsize=None):
if maxsize is None: if maxsize is None:
maxsize = minsize or 255 maxsize = minsize or 255
minsize = 0 self.minsize = int(minsize)
minsize = int(minsize) self.maxsize = int(maxsize)
maxsize = int(maxsize)
self.minsize, self.maxsize = min(minsize, maxsize), max(minsize, maxsize)
if self.minsize < 0: if self.minsize < 0:
raise ValueError(u'sizes must be bigger than or equal to 0!') raise ValueError(u'sizes must be bigger than or equal to 0!')
self.as_json = [u'string', minsize, maxsize] elif self.minsize > self.maxsize:
raise ValueError(u'maxsize must be bigger than or equal to minsize!')
self.as_json = [u'string', self.minsize, self.maxsize]
def __repr__(self): def __repr__(self):
return u'StringType(%s, %s)' % (unicode(self.minsize), unicode(self.maxsize)) return u'StringType(%s, %s)' % (unicode(self.minsize), unicode(self.maxsize))
@ -346,28 +345,27 @@ class ArrayOf(DataType):
minsize = None minsize = None
maxsize = None maxsize = None
subtype = None subtype = None
def __init__(self, subtype, minsize=0, maxsize=None): def __init__(self, subtype, minsize=0, maxsize=None):
# one argument -> exactly that size # one argument -> exactly that size
# argument default to 10 # argument default to 10
if maxsize is None: if maxsize is None:
maxsize = minsize or 10 maxsize = minsize or 10
minsize = maxsize
if not isinstance(subtype, DataType): if not isinstance(subtype, DataType):
raise ValueError( raise ValueError(
u'ArrayOf only works with a DataType as first argument!') u'ArrayOf only works with a DataType as first argument!')
self.subtype = subtype self.subtype = subtype
minsize = int(minsize) self.minsize = int(minsize)
maxsize = int(maxsize) self.maxsize = int(maxsize)
minsize, maxsize = min(minsize, maxsize), max(minsize, maxsize) if self.minsize < 0:
if minsize < 0:
raise ValueError(u'sizes must be > 0') raise ValueError(u'sizes must be > 0')
if maxsize < 1: elif self.maxsize < 1:
raise ValueError(u'Maximum size must be >= 1!') raise ValueError(u'Maximum size must be >= 1!')
elif self.minsize > self.maxsize:
raise ValueError(u'maxsize must be bigger than or equal to minsize!')
# if only one arg is given, it is maxsize! # if only one arg is given, it is maxsize!
self.as_json = [u'array', minsize, maxsize, subtype.as_json] self.as_json = [u'array', self.minsize, self.maxsize, subtype.as_json]
self.minsize = minsize
self.maxsize = maxsize
def __repr__(self): def __repr__(self):
return u'ArrayOf(%s, %s, %s)' % ( return u'ArrayOf(%s, %s, %s)' % (

16
test/test_datatypes.py
View File

@ -127,7 +127,7 @@ def test_EnumType():
def test_BLOBType(): def test_BLOBType():
# test constructor catching illegal arguments # test constructor catching illegal arguments
dt = BLOBType() dt = BLOBType()
assert dt.as_json == ['blob', 255, 255] assert dt.as_json == ['blob', 0, 255]
dt = BLOBType(10) dt = BLOBType(10)
assert dt.as_json == ['blob', 10, 10] assert dt.as_json == ['blob', 10, 10]
@ -154,7 +154,7 @@ def test_StringType():
# test constructor catching illegal arguments # test constructor catching illegal arguments
dt = StringType() dt = StringType()
dt = StringType(12) dt = StringType(12)
assert dt.as_json == ['string', 0, 12] assert dt.as_json == ['string', 12, 12]
dt = StringType(4, 11) dt = StringType(4, 11)
assert dt.as_json == ['string', 4, 11] assert dt.as_json == ['string', 4, 11]
@ -249,7 +249,7 @@ def test_StructOf():
with pytest.raises(ProgrammingError): with pytest.raises(ProgrammingError):
StructOf(IntRange=1) StructOf(IntRange=1)
dt = StructOf(a_string=StringType(55), an_int=IntRange(0, 999)) dt = StructOf(a_string=StringType(0, 55), an_int=IntRange(0, 999))
assert dt.as_json == [u'struct', {u'a_string': [u'string', 0, 55], assert dt.as_json == [u'struct', {u'a_string': [u'string', 0, 55],
u'an_int': [u'int', 0, 999], u'an_int': [u'int', 0, 999],
}] }]
@ -310,8 +310,10 @@ def test_get_datatype():
get_datatype(['enum', [1, 2, 3]]) get_datatype(['enum', [1, 2, 3]])
assert isinstance(get_datatype(['blob', 1]), BLOBType) assert isinstance(get_datatype(['blob', 1]), BLOBType)
assert isinstance(get_datatype(['blob', 10, 1]), BLOBType) assert isinstance(get_datatype(['blob', 1, 10]), BLOBType)
with pytest.raises(ValueError):
get_datatype(['blob', 10, 1])
with pytest.raises(ValueError): with pytest.raises(ValueError):
get_datatype(['blob', 10, -10]) get_datatype(['blob', 10, -10])
with pytest.raises(ValueError): with pytest.raises(ValueError):
@ -319,8 +321,10 @@ def test_get_datatype():
get_datatype(['string']) get_datatype(['string'])
assert isinstance(get_datatype(['string', 1]), StringType) assert isinstance(get_datatype(['string', 1]), StringType)
assert isinstance(get_datatype(['string', 10, 1]), StringType) assert isinstance(get_datatype(['string', 1, 10]), StringType)
with pytest.raises(ValueError):
get_datatype(['string', 10, 1])
with pytest.raises(ValueError): with pytest.raises(ValueError):
get_datatype(['string', 10, -10]) get_datatype(['string', 10, -10])
with pytest.raises(ValueError): with pytest.raises(ValueError):
@ -337,6 +341,8 @@ def test_get_datatype():
with pytest.raises(ValueError): with pytest.raises(ValueError):
get_datatype(['array', ['blob', 1], -10]) get_datatype(['array', ['blob', 1], -10])
with pytest.raises(ValueError):
get_datatype(['array', ['blob', 1], 10, 1])
with pytest.raises(ValueError): with pytest.raises(ValueError):
get_datatype(['array', ['blob', 1], 10, -10]) get_datatype(['array', ['blob', 1], 10, -10])