Fix replay pour mycanal

[Arias800]

• URL_DEVICE_ID n'est plus accessible, donc j'ai remplacé par une autre fonction (créer par mtr81).
  Ça permet de retrouver lancer de nouveau les programmes.
  Je ne sais pas si la méthode de génération du DeviceId permets la lecture des DRM.
• J'ai remplacé les json.loads par la fonction json de base de requests.

[darodi]

je viens d'essayer, ça ne semble pas fonctionner

ERROR <general>: [Catch-up-TV-&-More.support] HTTPSConnectionPool(host='secure-gen-hapi.canal-plus.com', port=443): Max retries exceeded with url: /conso/playset/unit/14079732_50013 (Caused by SSLError(SSLError(1, '[SSL: DH_KEY_TOO_SMALL] dh key too small (_ssl.c:1056)')))
   Traceback (most recent call last):
     File "/home/osmc/.kodi/addons/script.module.urllib3/lib/urllib3/connectionpool.py", line 706, in urlopen
       chunked=chunked,
     File "/home/osmc/.kodi/addons/script.module.urllib3/lib/urllib3/connectionpool.py", line 382, in _make_request
       self._validate_conn(conn)
     File "/home/osmc/.kodi/addons/script.module.urllib3/lib/urllib3/connectionpool.py", line 1010, in _validate_conn
       conn.connect()
     File "/home/osmc/.kodi/addons/script.module.urllib3/lib/urllib3/connection.py", line 421, in connect
       tls_in_tls=tls_in_tls,
     File "/home/osmc/.kodi/addons/script.module.urllib3/lib/urllib3/util/ssl_.py", line 429, in ssl_wrap_socket
       sock, context, tls_in_tls, server_hostname=server_hostname
     File "/home/osmc/.kodi/addons/script.module.urllib3/lib/urllib3/util/ssl_.py", line 472, in _ssl_wrap_socket_impl
       return ssl_context.wrap_socket(sock, server_hostname=server_hostname)
     File "/usr/lib/python3.7/ssl.py", line 412, in wrap_socket
       session=session
     File "/usr/lib/python3.7/ssl.py", line 853, in _create
       self.do_handshake()
     File "/usr/lib/python3.7/ssl.py", line 1117, in do_handshake
       self._sslobj.do_handshake()
   ssl.SSLError: [SSL: DH_KEY_TOO_SMALL] dh key too small (_ssl.c:1056)

   During handling of the above exception, another exception occurred:

   Traceback (most recent call last):
     File "/home/osmc/.kodi/addons/script.module.requests/lib/requests/adapters.py", line 449, in send
       timeout=timeout
     File "/home/osmc/.kodi/addons/script.module.urllib3/lib/urllib3/connectionpool.py", line 756, in urlopen
       method, url, error=e, _pool=self, _stacktrace=sys.exc_info()[2]
     File "/home/osmc/.kodi/addons/script.module.urllib3/lib/urllib3/util/retry.py", line 574, in increment
       raise MaxRetryError(_pool, url, error or ResponseError(cause))
   urllib3.exceptions.MaxRetryError: HTTPSConnectionPool(host='secure-gen-hapi.canal-plus.com', port=443): Max retries exceeded with url: /conso/playset/unit/14079732_50013 (Caused by SSLError(SSLError(1, '[SSL: DH_KEY_TOO_SMALL] dh key too small (_ssl.c:1056)')))

   During handling of the above exception, another exception occurred:

   Traceback (most recent call last):
     File "/home/osmc/.kodi/addons/script.module.codequick/lib/codequick/support.py", line 306, in run_callback
       redirect = parent_ins(route, arg_params, self.callback_params)
     File "/home/osmc/.kodi/addons/script.module.codequick/lib/codequick/resolver.py", line 67, in __call__
       results = super(Resolver, self).__call__(route, args, kwargs)
     File "/home/osmc/.kodi/addons/script.module.codequick/lib/codequick/script.py", line 169, in __call__
       return route.function(self, *args, **kwargs)
     File "/home/osmc/.kodi/addons/plugin.video.catchuptvandmore/resources/lib/channels/fr/mycanal.py", line 455, in get_video_url
       value_datas_json = session_requests.get(URL_VIDEO_DATAS % video_id, headers=headers)

[Arias800]

Ce n'est pas vraiment un problème de de l'addon pour le coup.
Essaye de rajouter ça a la ligne 31 :

import urllib3

requests.packages.urllib3.disable_warnings()
requests.packages.urllib3.util.ssl_.DEFAULT_CIPHERS += ':HIGH:!DH:!aNULL'
try:
    requests.packages.urllib3.contrib.pyopenssl.util.ssl_.DEFAULT_CIPHERS += ':HIGH:!DH:!aNULL'
except AttributeError:
    # no pyopenssl support used / needed / available
    pass

[darodi]

@Arias800
la vidéo qui me posait problème hier n'est plus disponible sur le site.
Enfin soit... je n'ai plus le souci, merci pour le retour.

[joaopa00]

Merci pour le boulot. J'ai poussé le patch dans la brache de développement