fix(esn): Fixes ESN/Handshake race condition when user is not valid on Kodi startup

diff --git a/resources/lib/KodiHelper.py b/resources/lib/KodiHelper.py
index 6ffe6104bd0f235a3fae7d65fcf89d21d3f73b89..a40c5d85c45d4421cd7d0480fbce14cfbe1c97a3 100644 (file)
--- a/resources/lib/KodiHelper.py
+++ b/resources/lib/KodiHelper.py
@@ -196,6 +196,8 @@ class KodiHelper:
         """
         Returns the esn from settings
         """
+        self.log(msg='Is FILE: ' + str(isfile(self.msl_data_path + 'msl_data.json')))
+        self.log(msg=self.get_addon().getSetting('esn'))
         return self.get_addon().getSetting('esn')
 
     def set_esn(self, esn):
@@ -203,7 +205,7 @@ class KodiHelper:
         Returns the esn from settings
         """
         stored_esn = self.get_esn()
-        if not stored_esn:
+        if not stored_esn and esn:
             self.set_setting('esn', esn)
             self.delete_manifest_data()            
             return esn
@@ -215,6 +217,7 @@ class KodiHelper:
         if isfile(self.msl_data_path + 'manifest.json'):
             remove(self.msl_data_path + 'manifest.json')
         msl = MSL(kodi_helper=self)
+        msl.perform_key_handshake()
         msl.save_msl_data()
 
     def get_dolby_setting(self):
@@ -671,6 +674,7 @@ class KodiHelper:
         bool
             List could be build
         """
+        self.set_esn(esn)
         addon = self.get_addon()
         inputstream_addon = self.get_inputstream_addon()
         if inputstream_addon == None:

diff --git a/resources/lib/MSL.py b/resources/lib/MSL.py
index a5de5384bf1f3cca7372e9a6dce21db64c1dc344..d0387972ceeab83ea253a55bf22fb89bc2c748eb 100644 (file)
--- a/resources/lib/MSL.py
+++ b/resources/lib/MSL.py
@@ -71,13 +71,18 @@ class MSL:
         elif self.file_exists(self.kodi_helper.msl_data_path, 'rsa_key.bin'):
             self.kodi_helper.log(msg='RSA Keys do already exist load old ones')
             self.__load_rsa_keys()
-            self.__perform_key_handshake()
+            if self.kodi_helper.get_esn():
+                self.__perform_key_handshake()
         else:
             self.kodi_helper.log(msg='Create new RSA Keys')
             # Create new Key Pair and save
             self.rsa_key = RSA.generate(2048)
             self.__save_rsa_keys()
-            self.__perform_key_handshake()
+            if self.kodi_helper.get_esn():
+                self.__perform_key_handshake()
+    
+    def perform_key_handshake(self):
+        self.__perform_key_handshake()
 
     def load_manifest(self, viewable_id):
         """
@@ -510,6 +515,7 @@ class MSL:
         :return: Serialized JSON String of the encryption Envelope
         """
         esn = self.kodi_helper.get_esn()
+
         iv = get_random_bytes(16)
         encryption_envelope = {
             'ciphertext': '',
@@ -539,6 +545,7 @@ class MSL:
     def __perform_key_handshake(self):
         header = self.__generate_msl_header(is_key_request=True, is_handshake=True, compressionalgo="", encrypt=False)
         esn = self.kodi_helper.get_esn()
+
         request = {
             'entityauthdata': {
                 'scheme': 'NONE',