fix(esn): Fixes inline paramter parsing & dynamic ESn loading

diff --git a/addon.xml b/addon.xml
index d04de3ea155895c5a0317a6c247ebe2985f01f1e..492844f79eacf471f42388c56985551744886f78 100644 (file)
--- a/addon.xml
+++ b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.netflix" name="Netflix" version="0.11.11" provider-name="libdev + jojo + asciidisco">
+<addon id="plugin.video.netflix" name="Netflix" version="0.11.12" provider-name="libdev + jojo + asciidisco">
   <requires>
     <import addon="xbmc.python" version="2.24.0"/>
     <import addon="script.module.beautifulsoup4" version="4.3.2"/>
@@ -28,7 +28,11 @@
     <license>MIT</license>
     <forum>http://www.kodinerds.net/index.php/Thread/55607-Inputstream-Agile-Betatest-Netflix/</forum>
     <source>https://github.com/asciidisco/plugin.video.netflix</source>
-    <news>v0.11.11 (2017-4-10)
+    <news>v0.11.12 (2017-6-29)
+    - Fix missing isFirstUse inline setting
+    - Fix dynamic ESN loading for widevine
+
+    v0.11.11 (2017-4-10)
     - Portugese translations
     - Swedish translations
 
@@ -40,9 +44,6 @@
     - Fix issues with persisted msl manifests
 
     v0.11.8 (2017-3-17)
-    - Fix 1 sec delay per request on windows (see https://github.com/asciidisco/plugin.video.netflix/issues/21 for details)
-
-    v0.11.7 (2017-3-17)
-    - Remove initial connection check as it´s causing trouble</news>
+    - Fix 1 sec delay per request on windows (see https://github.com/asciidisco/plugin.video.netflix/issues/21 for details)</news>
   </extension>
 </addon>

diff --git a/resources/language/Dutch/strings.po b/resources/language/Dutch/strings.po
index 366bd37c007b97d56edfdbf14827e67a111ce9b6..3cc76cf4a2e80781e5654a1668c0f7b8a2bf9b5b 100644 (file)
--- a/resources/language/Dutch/strings.po
+++ b/resources/language/Dutch/strings.po
@@ -1,7 +1,7 @@
 # Kodi Media Center language file
 # Addon Name: Netflix
 # Addon id: plugin.video.netflix
-# Addon version: 0.11.11
+# Addon version: 0.11.12
 # Addon Provider: libdev + jojo + asciidisco
 msgid ""
 msgstr ""

diff --git a/resources/language/English/strings.po b/resources/language/English/strings.po
index 965a0b3b822798cf55eeb3e23ea97c0fe4ad74d6..51ad4f565937a5fe788892495801eb89d002febd 100644 (file)
--- a/resources/language/English/strings.po
+++ b/resources/language/English/strings.po
@@ -1,7 +1,7 @@
 # Kodi Media Center language file
 # Addon Name: Netflix
 # Addon id: plugin.video.netflix
-# Addon version: 0.11.11
+# Addon version: 0.11.12
 # Addon Provider: libdev + jojo + asciidisco
 msgid ""
 msgstr ""

diff --git a/resources/language/German/strings.po b/resources/language/German/strings.po
index a20a10759b0a50672bc421716b5d2a3bd8402010..3cf40ad956957786441b23ccf52e9ed8134b680d 100644 (file)
--- a/resources/language/German/strings.po
+++ b/resources/language/German/strings.po
@@ -1,7 +1,7 @@
 # Kodi Media Center language file
 # Addon Name: Netflix
 # Addon id: plugin.video.netflix
-# Addon version: 0.11.11
+# Addon version: 0.11.12
 # Addon Provider: libdev + jojo + asciidisco
 msgid ""
 msgstr ""

diff --git a/resources/language/Polish/strings.po b/resources/language/Polish/strings.po
index 0580e1792f2dd7ebb63e0b34003bb3c0d9db90db..03e4d51fbdfab16bdf9df1df0b489d20414325e5 100644 (file)
--- a/resources/language/Polish/strings.po
+++ b/resources/language/Polish/strings.po
@@ -1,7 +1,7 @@
 # Kodi Media Center language file
 # Addon Name: Netflix
 # Addon id: plugin.video.netflix
-# Addon version: 0.11.11
+# Addon version: 0.11.12
 # Addon Provider: libdev + jojo + asciidisco
 msgid ""
 msgstr ""

diff --git a/resources/language/Portugese/strings.po b/resources/language/Portugese/strings.po
index 63e8ac3083b3681be7a861b9f2fbcfbe46443704..f652897f873e4453e421e7eb85249a8326c05c12 100644 (file)
--- a/resources/language/Portugese/strings.po
+++ b/resources/language/Portugese/strings.po
@@ -1,7 +1,7 @@
 # Kodi Media Center language file
 # Addon Name: Netflix
 # Addon id: plugin.video.netflix
-# Addon version: 0.11.11
+# Addon version: 0.11.12
 # Addon Provider: libdev + jojo + asciidisco
 msgid ""
 msgstr ""

diff --git a/resources/language/Slovak/strings.po b/resources/language/Slovak/strings.po
index df75c2cead4a81fd9e280ef01195dc5f2e30a08c..d8f513f137c98c06971b0fba72b893b6c9f730ca 100644 (file)
--- a/resources/language/Slovak/strings.po
+++ b/resources/language/Slovak/strings.po
@@ -1,7 +1,7 @@
 # Kodi Media Center language file
 # Addon Name: Netflix
 # Addon id: plugin.video.netflix
-# Addon version: 0.11.11
+# Addon version: 0.11.12
 # Addon Provider: libdev + jojo + asciidisco
 msgid ""
 msgstr ""

diff --git a/resources/language/Spanish/strings.po b/resources/language/Spanish/strings.po
index 16071d8053c44e5448c14b39fbb7104d69704291..2deda61ef39bc75ba6404bda634c85f77b1df6da 100644 (file)
--- a/resources/language/Spanish/strings.po
+++ b/resources/language/Spanish/strings.po
@@ -1,7 +1,7 @@
 # Kodi Media Center language file
 # Addon Name: Netflix
 # Addon id: plugin.video.netflix
-# Addon version: 0.11.11
+# Addon version: 0.11.12
 # Addon Provider: libdev + jojo + asciidisco
 msgid ""
 msgstr ""

diff --git a/resources/language/Swedish/strings.po b/resources/language/Swedish/strings.po
index c5cf9ae7d6109aa471bf6ba3455106fd8236f65e..ffbdeee9b3b8eb8de10bf08aae47c0f28d81d441 100644 (file)
--- a/resources/language/Swedish/strings.po
+++ b/resources/language/Swedish/strings.po
@@ -1,7 +1,7 @@
 # Kodi Media Center language file
 # Addon Name: Netflix
 # Addon id: plugin.video.netflix
-# Addon version: 0.11.11
+# Addon version: 0.11.12
 # Addon Provider: libdev + jojo + asciidisco
 msgid ""
 msgstr ""

diff --git a/resources/lib/KodiHelper.py b/resources/lib/KodiHelper.py
index 100f94e79c653bc293b5bede79533ac0b7ad2bf8..6ffe6104bd0f235a3fae7d65fcf89d21d3f73b89 100644 (file)
--- a/resources/lib/KodiHelper.py
+++ b/resources/lib/KodiHelper.py
@@ -7,7 +7,9 @@ import xbmcplugin
 import xbmcgui
 import xbmc
 import json
-from os.path import join
+from MSL import MSL
+from os import remove
+from os.path import join, isfile
 from urllib import urlencode
 from xbmcaddon import Addon
 from uuid import uuid4
@@ -190,6 +192,31 @@ class KodiHelper:
             'password': self.get_addon().getSetting('password')
         }
 
+    def get_esn(self):
+        """
+        Returns the esn from settings
+        """
+        return self.get_addon().getSetting('esn')
+
+    def set_esn(self, esn):
+        """
+        Returns the esn from settings
+        """
+        stored_esn = self.get_esn()
+        if not stored_esn:
+            self.set_setting('esn', esn)
+            self.delete_manifest_data()            
+            return esn
+        return stored_esn
+    
+    def delete_manifest_data(self):
+        if isfile(self.msl_data_path + 'msl_data.json'):
+            remove(self.msl_data_path + 'msl_data.json')
+        if isfile(self.msl_data_path + 'manifest.json'):
+            remove(self.msl_data_path + 'manifest.json')
+        msl = MSL(kodi_helper=self)
+        msl.save_msl_data()
+
     def get_dolby_setting(self):
         """
         Returns if the dolby sound is enabled

diff --git a/resources/lib/MSL.py b/resources/lib/MSL.py
index 5b7381d74acfe6140654888086c5ff145f030d29..a5de5384bf1f3cca7372e9a6dce21db64c1dc344 100644 (file)
--- a/resources/lib/MSL.py
+++ b/resources/lib/MSL.py
@@ -42,7 +42,7 @@ class MSL:
     last_drm_context = ''
     last_playback_context = ''
     #esn = "NFCDCH-LX-CQE0NU6PA5714R25VPLXVU2A193T36"
-    esn = "WWW-BROWSE-D7GW1G4NPXGR1F0X1H3EQGY3V1F5WE"
+    #esn = "WWW-BROWSE-D7GW1G4NPXGR1F0X1H3EQGY3V1F5WE"
     #esn = "NFCDIE-02-DCH84Q2EK3N6VFVQJ0NLRQ27498N0F"
     current_message_id = 0
     session = requests.session()
@@ -406,6 +406,7 @@ class MSL:
         }
 
     def __generate_msl_request_data(self, data):
+        self.__load_msl_data()
         header_encryption_envelope = self.__encrypt(self.__generate_msl_header())
         header = {
             'headerdata': base64.standard_b64encode(header_encryption_envelope),
@@ -453,9 +454,10 @@ class MSL:
         :return: The base64 encoded JSON String of the header
         """
         self.current_message_id = self.rndm.randint(0, pow(2, 52))
+        esn = self.kodi_helper.get_esn()
 
         header_data = {
-            'sender': self.esn,
+            'sender': esn,
             'handshake': is_handshake,
             'nonreplayable': False,
             'capabilities': {
@@ -507,10 +509,11 @@ class MSL:
         :param plaintext:
         :return: Serialized JSON String of the encryption Envelope
         """
+        esn = self.kodi_helper.get_esn()
         iv = get_random_bytes(16)
         encryption_envelope = {
             'ciphertext': '',
-            'keyid': self.esn + '_' + str(self.sequence_number),
+            'keyid': esn + '_' + str(self.sequence_number),
             'sha256': 'AA==',
             'iv': base64.standard_b64encode(iv)
         }
@@ -535,11 +538,12 @@ 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',
                 'authdata': {
-                    'identity': self.esn
+                    'identity': esn
                 }
             },
             'headerdata': base64.standard_b64encode(header),
@@ -596,6 +600,10 @@ class MSL:
         self.encryption_key = base64.standard_b64decode(msl_data['encryption_key'])
         self.sign_key = base64.standard_b64decode(msl_data['sign_key'])
 
+
+    def save_msl_data(self):
+        self.__save_msl_data()
+
     def __save_msl_data(self):
         """
         Saves the keys and tokens in json file

diff --git a/resources/lib/NetflixHttpSubRessourceHandler.py b/resources/lib/NetflixHttpSubRessourceHandler.py
index a4113a49612c37ee7237fb1d71a8e1a61acd3bee..55d95cada2161d58bdaa91402c67e30224d14347 100644 (file)
--- a/resources/lib/NetflixHttpSubRessourceHandler.py
+++ b/resources/lib/NetflixHttpSubRessourceHandler.py
@@ -40,6 +40,7 @@ class NetflixHttpSubRessourceHandler:
                 self.profiles = self.netflix_session.profiles
         else:
             self.profiles = []
+        self.kodi_helper.set_esn(self.netflix_session.esn)
 
     def is_logged_in (self, params):
         """Existing login proxy function

diff --git a/resources/lib/NetflixSession.py b/resources/lib/NetflixSession.py
index f4c9be3fda59bc99b8c5805fcda5e45b9f8e08e8..46f0d5bc5b2acd37b8b1a377c62acbdbc7a30a50 100644 (file)
--- a/resources/lib/NetflixSession.py
+++ b/resources/lib/NetflixSession.py
@@ -1884,11 +1884,10 @@ class NetflixSession:
             User Agent for platform
         """
         import platform
-        if platform == 'linux' or platform == 'linux2':
-            return 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36'
-        elif platform == 'darwin':
+        self.log(msg='Building User Agent for platform:' + str(platform.system()))
+        if platform.system() == 'Darwin':
             return 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36'
-        elif platform == 'win32':
+        elif platform.system() == 'Windows':
             return 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36'
         else:
             return 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36'
@@ -2207,7 +2206,6 @@ class NetflixSession:
         important_fields = [
             'profileName',
             'isActive',
-            'isFirstUse',
             'isAccountOwner',
             'isKids'
         ]
@@ -2220,7 +2218,7 @@ class NetflixSession:
                         profile.update({important_field: netflix_page_data['profiles'][profile_id]['summary'][important_field]})
                     avatar_base = netflix_page_data['nf'].get(netflix_page_data['profiles'][profile_id]['summary']['avatarName'], False);
                     avatar = 'https://secure.netflix.com/ffe/profiles/avatars_v2/320x320/PICON_029.png' if avatar_base == False else avatar_base['images']['byWidth']['320']['value']
-                    profile.update({'avatar': avatar})
+                    profile.update({'avatar': avatar, 'isFirstUse': False})
                     profiles.update({profile_id: profile})
             return profiles