From 24284e058f478a134348835c38c3b741d370ffde Mon Sep 17 00:00:00 2001 From: Kevin Froman Date: Thu, 19 Mar 2020 01:40:52 -0500 Subject: [PATCH] ensure public api served blocks are not decrypted --- src/httpapi/apiutils/getblockdata.py | 4 ++-- src/httpapi/miscpublicapi/getblocks.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/httpapi/apiutils/getblockdata.py b/src/httpapi/apiutils/getblockdata.py index 9378d765..ad420ae1 100644 --- a/src/httpapi/apiutils/getblockdata.py +++ b/src/httpapi/apiutils/getblockdata.py @@ -5,7 +5,7 @@ import onionrexceptions class GetBlockData: def __init__(self, client_api_inst=None): return - + def get_block_data(self, bHash, decrypt=False, raw=False, headerOnly=False): if not stringvalidators.validate_hash(bHash): raise onionrexceptions.InvalidHexHash("block hash not valid hash format") bl = onionrblockapi.Block(bHash) @@ -26,7 +26,7 @@ class GetBlockData: validSig = False signer = bytesconverter.bytes_to_str(bl.signer) if bl.isSigned() and stringvalidators.validate_pub_key(signer) and bl.isSigner(signer): - validSig = True + validSig = True bl.bheader['validSig'] = validSig bl.bheader['meta'] = '' retData = {'meta': bl.bheader, 'metadata': bl.bmetadata} diff --git a/src/httpapi/miscpublicapi/getblocks.py b/src/httpapi/miscpublicapi/getblocks.py index a93909a1..887e8661 100755 --- a/src/httpapi/miscpublicapi/getblocks.py +++ b/src/httpapi/miscpublicapi/getblocks.py @@ -43,7 +43,7 @@ def get_block_data(publicAPI, data): if stringvalidators.validate_hash(data): if not config.get('general.hide_created_blocks', True) or data not in publicAPI.hideBlocks: if data in blockmetadb.get_block_list(): - block = apiutils.GetBlockData().get_block_data(data, raw=True) + block = apiutils.GetBlockData().get_block_data(data, raw=True, decrypt=False) try: block = block.encode() # Encode in case data is binary except AttributeError: