anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Android App encrypt requires bytes

Browse Source
This commit is contained in:
JonnyWong16
2020-03-21 20:05:59 -07:00
parent 510dddf724
commit 42262b0bb6
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plexpy/notifiers.py
View File

@@ -875,11 +875,11 @@ class ANDROIDAPP(Notifier):
'body': body, 'body': body,
'action': action, 'action': action,
'priority': self.config['priority'], 'priority': self.config['priority'],
'session_key': pretty_metadata.parameters.get('session_key',''), 'session_key': pretty_metadata.parameters.get('session_key', ''),
'session_id': pretty_metadata.parameters.get('session_id',''), 'session_id': pretty_metadata.parameters.get('session_id', ''),
'user_id': pretty_metadata.parameters.get('user_id',''), 'user_id': pretty_metadata.parameters.get('user_id', ''),
'rating_key': pretty_metadata.parameters.get('rating_key',''), 'rating_key': pretty_metadata.parameters.get('rating_key', ''),
'poster_thumb': pretty_metadata.parameters.get('poster_thumb','')} 'poster_thumb': pretty_metadata.parameters.get('poster_thumb', '')}
#logger.debug("Plaintext data: {}".format(plaintext_data)) #logger.debug("Plaintext data: {}".format(plaintext_data))
@@ -897,7 +897,7 @@ class ANDROIDAPP(Notifier):
# Encrypt using AES GCM # Encrypt using AES GCM
nonce = get_random_bytes(16) nonce = get_random_bytes(16)
cipher = AES.new(key, AES.MODE_GCM, nonce) cipher = AES.new(key, AES.MODE_GCM, nonce)
encrypted_data, gcm_tag = cipher.encrypt_and_digest(json.dumps(plaintext_data)) encrypted_data, gcm_tag = cipher.encrypt_and_digest(json.dumps(plaintext_data).encode('utf-8'))
encrypted_data += gcm_tag encrypted_data += gcm_tag
#logger.debug("Encrypted data (base64): {}".format(base64.b64encode(encrypted_data))) #logger.debug("Encrypted data (base64): {}".format(base64.b64encode(encrypted_data)))