* fixed broken insertblock with bytes

* some work on improving tests
* temporarily disabled testblockapi test
This commit is contained in:
Kevin Froman 2018-07-02 03:13:18 -05:00
parent f5bd9220fc
commit 45234588e2
No known key found for this signature in database
GPG key ID: 0D414D0FE405B63B
4 changed files with 15 additions and 13 deletions

View file

@ -698,9 +698,13 @@ class Core:
else:
raise onionrexceptions.InvalidMetadata('encryptType must be asym or sym, or blank')
try:
data = data.encode()
except AttributeError:
pass
# sign before encrypt, as unauthenticated crypto should not be a problem here
if sign:
signature = self._crypto.edSign(jsonMeta + data, key=self._crypto.privKey, encodeResult=True)
signature = self._crypto.edSign(jsonMeta.encode() + data, key=self._crypto.privKey, encodeResult=True)
signer = self._crypto.pubKeyHashID()
if len(jsonMeta) > 1000:
@ -743,6 +747,7 @@ class Core:
payload = json.dumps(metadata).encode() + b'\n' + data
retData = self.setData(payload)
self.addToBlockDB(retData, selfInsert=True, dataSaved=True)
self.setBlockType(retData, meta['type'])
return retData