dxs/onionr
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

added option to disable plaintext blocks

Browse source
This commit is contained in:
Kevin Froman 2019-09-27 20:38:47 -05:00
parent 71c9337ab7
commit 60f0ef0fef
7 changed files with 43 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

1
onionr/onionrblocks/insert.py
View file

@ -64,6 +64,7 @@ def insert_block(data: Union[str, bytes], header: str ='txt',
if encryptType in ('asym', 'sym'):
metadata['encryptType'] = encryptType
else:
if not config.get('general.store_plaintext_blocks', True): raise onionrexceptions.InvalidMetadata("Plaintext blocks are disabled, yet a plaintext block was being inserted")
if not encryptType in ('', None):
raise onionrexceptions.InvalidMetadata('encryptType must be asym or sym, or blank')

1
onionr/onionrstorage/setdata.py
View file

@ -39,5 +39,4 @@ def set_data(data)->str:
else:
raise onionrexceptions.DataExists("Data is already set for " + dataHash)
print(dataHash, nonce_hash)
return dataHash

2
onionr/onionrutils/validatemetadata.py
View file

@ -73,6 +73,8 @@ def validate_metadata(metadata, block_data) -> bool:
elif i == 'encryptType':
try:
if not metadata[i] in ('asym', 'sym', ''): raise ValueError
if not config.get('general.store_plaintext_blocks', True):
break
except ValueError:
logger.warn('Invalid encryption mode')
break