kev/Onionr
1
0
Fork 0
Code Issues 24 Pull Requests Projects Releases 2 Wiki Activity

encryptType no longer set when encryption not used

Browse Source
This commit is contained in:
Kevin Froman 2019-08-27 03:47:22 -05:00
parent 0c196e8135
commit dd87ad8999
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
onionr/onionrblocks/insert.py
View File

@ -53,9 +53,10 @@ def insert_block(data, header='txt', sign=False, encryptType='', symKey='', asym
meta['type'] = str(header) meta['type'] = str(header)
if encryptType in ('asym', 'sym', ''): if encryptType in ('asym', 'sym'):
metadata['encryptType'] = encryptType metadata['encryptType'] = encryptType
else: else:
if not encryptType in ('', None):
raise onionrexceptions.InvalidMetadata('encryptType must be asym or sym, or blank') raise onionrexceptions.InvalidMetadata('encryptType must be asym or sym, or blank')
try: try:

5
onionr/onionrutils/blockmetadata/fromdata.py
View File

@ -40,10 +40,5 @@ def get_block_metadata_from_data(block_data):
else: else:
data = block_data[block_data.find(b'\n'):].decode() data = block_data[block_data.find(b'\n'):].decode()
if not metadata['encryptType'] in ('asym', 'sym'):
try:
meta = json.loads(metadata['meta'])
except KeyError:
pass
meta = metadata['meta'] meta = metadata['meta']
return (metadata, meta, data) return (metadata, meta, data)

1
onionr/utils/createdirs.py
View File

@ -23,6 +23,7 @@ import dbcreator, filepaths
home = identifyhome.identify_home() home = identifyhome.identify_home()
def create_dirs(): def create_dirs():
"""Creates onionr data-related directories in order of the hardcoded list below"""
gen_dirs = [home, filepaths.block_data_location, filepaths.contacts_location, filepaths.export_location] gen_dirs = [home, filepaths.block_data_location, filepaths.contacts_location, filepaths.export_location]
for path in gen_dirs: for path in gen_dirs:
if not os.path.exists(path): if not os.path.exists(path):