William/Reticulum
1
0
Fork 0
mirror of https://github.com/markqvist/Reticulum.git synced 2024-11-26 15:30:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved group destination error handling

Browse Source
This commit is contained in:
Mark Qvist 2020-05-14 13:42:49 +02:00
parent eb2e4a86bd
commit 343f439ad9
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
RNS/Destination.py
View File

@ -171,11 +171,16 @@ class Destination:
if self.type == Destination.SINGLE and self.identity != None: if self.type == Destination.SINGLE and self.identity != None:
return self.identity.encrypt(plaintext) return self.identity.encrypt(plaintext)
if self.type == Destination.GROUP and self.prv != None: if self.type == Destination.GROUP:
try: if hasattr(self, "prv") and self.prv != None:
return base64.urlsafe_b64decode(self.prv.encrypt(plaintext)) try:
except: return base64.urlsafe_b64decode(self.prv.encrypt(plaintext))
return None except Exception as e:
RNS.log("The GROUP destination could not encrypt data", RNS.LOG_ERROR)
RNS.log("The contained exception was: "+str(e), RNS.LOG_ERROR)
else:
raise ValueError("No private key held by GROUP destination. Did you create or load one?")
def decrypt(self, ciphertext): def decrypt(self, ciphertext):
@ -186,7 +191,14 @@ class Destination:
return self.identity.decrypt(ciphertext) return self.identity.decrypt(ciphertext)
if self.type == Destination.GROUP: if self.type == Destination.GROUP:
return self.prv.decrypt(base64.urlsafe_b64encode(ciphertext)) if hasattr(self, "prv") and self.prv != None:
try:
return self.prv.decrypt(base64.urlsafe_b64encode(ciphertext))
except Exception as e:
RNS.log("The GROUP destination could not decrypt data", RNS.LOG_ERROR)
RNS.log("The contained exception was: "+str(e), RNS.LOG_ERROR)
else:
raise ValueError("No private key held by GROUP destination. Did you create or load one?")
def sign(self, message): def sign(self, message):