add XSRF Token logon to vrtnu

youtube_dl/extractor/canvas.py

@@ -17,6 +17,7 @@ from ..utils import (
     str_or_none,
     strip_or_none,
     url_or_none,
+    urlencode_postdata
 )
 
 
@@ -259,7 +260,7 @@ class VrtNUIE(GigyaBaseIE):
         'expected_warnings': ['Unable to download asset JSON', 'is not a supported codec', 'Unknown MIME type'],
     }]
     _NETRC_MACHINE = 'vrtnu'
-    _APIKEY = '3_0Z2HujMtiWq_pkAjgnS2Md2E11a1AwZjYiBETtwNE-EoEHDINgtnvcAOpNgmrVGy'
+    _APIKEY = '3_qhEcPa5JGFROVwu5SWKqJ4mVOIkwlFNMSKwzPDAh8QZOtHqu6L4nD5Q7lk0eXOOG'
     _CONTEXT_ID = 'R3595707040'
 
     def _real_initialize(self):
@@ -270,35 +271,49 @@ class VrtNUIE(GigyaBaseIE):
         if username is None:
             return
 
-        auth_data = {
-            'APIKey': self._APIKEY,
-            'targetEnv': 'jssdk',
-            'loginID': username,
-            'password': password,
-            'authMode': 'cookie',
-        }
-
-        auth_info = self._gigya_login(auth_data)
+        # 1. Get Login Data
+        try:
+            auth_info = self._download_json(
+                'https://accounts.vrt.be/accounts.login', None,
+                note='Login data', errnote='Could not get Login data',
+                headers={}, data=urlencode_postdata({
+                    'loginID':username,
+                    'password':password,
+                    'sessionExpiration':'-2',
+                    'APIKey':self._APIKEY,
+                    'targetEnv':'jssdk',
+                }))
+        except ExtractorError as e:
+            self.report_warning("Cookie request HTTP code: %s" % e.cause.code)
+            raise e
 
         # Sometimes authentication fails for no good reason, retry
         login_attempt = 1
         while login_attempt <= 3:
             try:
-                # When requesting a token, no actual token is returned, but the
-                # necessary cookies are set.
-                self._request_webpage(
-                    'https://token.vrt.be',
+                # get XSRF Token
+                xsrf_req = self._request_webpage('https://token.vrt.be/vrtnuinitlogin',
+                    None, note='Requesting XSRF Token', errnote='Could not get XSRF Token', 
+                    query={'provider':'site', 'destination':'https://www.vrt.be/vrtnu/'})
+                
+                post_data = {
+                    'UID': auth_info['UID'],
+                    'UIDSignature': auth_info['UIDSignature'],
+                    'signatureTimestamp': auth_info['signatureTimestamp'],
+                    'client_id': 'vrtnu-site',
+                }
+                for cookie in self._downloader.cookiejar:
+                    if cookie.name == 'OIDCXSRF':
+                        post_data['_csrf'] = cookie.value
+                        break
+
+                # do login
+                vrt_token = self._request_webpage(
+                    'https://login.vrt.be/perform_login',
                     None, note='Requesting a token', errnote='Could not get a token',
-                    headers={
-                        'Content-Type': 'application/json',
-                        'Referer': 'https://www.vrt.be/vrtnu/',
-                    },
-                    data=json.dumps({
-                        'uid': auth_info['UID'],
-                        'uidsig': auth_info['UIDSignature'],
-                        'ts': auth_info['signatureTimestamp'],
-                        'email': auth_info['profile']['email'],
-                    }).encode('utf-8'))
+                    headers={}, data=urlencode_postdata(post_data)
+                )
+ 
             except ExtractorError as e:
                 if isinstance(e.cause, compat_HTTPError) and e.cause.code == 401:
                     login_attempt += 1