DandelionNStuff/dkimpy-milter-smtputf8
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Complete multi-row dataset implementation for KeyTable* and SingingTable*

Browse Source
This commit is contained in:
Scott Kitterman
2019-10-21 14:00:17 -04:00
parent 5588748795
commit 43f6272b0d
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dkimpy_milter/config.py
+12
View File
@@ -288,6 +288,18 @@ def _dataset_to_list(dataset):
else: else:
for element in line.split(':'): for element in line.split(':'):
ds.append(element.strip().strip(':')) ds.append(element.strip().strip(':'))
if ds[0] == 'KeyTable' or ds[0] == 'KeyTableEd25519' or ds[0] =='SigningTable' or ds[0] =='SigningTableEd25519':
# These are the only multi-line dataset types
for row in ds[1]:
rowl = row.split(',')
for element in rowl:
rowl[rowl.index(element)] = element.strip().strip(',')
if (ds[0] == 'KeyTable' or ds[0] == 'KeyTableEd25519') and len(rowl) != 3:
raise dkim.ParameterError('Invalid {0} element (need three paramters per row): {1}'
.format(str(ds[0]), str(rowl)))
if (ds[0] == 'SigningTable' or ds[0] == 'SigningTableEd25519') and len(rowl) > 2:
raise dkim.ParameterError('Invalid {0} element (need one or two paramters per row): {1}'
.format(str(ds[0]), str(rowl)))
dsf.close() dsf.close()
return ds return ds
# If it's a str and csl, it has one value and we return a list # If it's a str and csl, it has one value and we return a list