Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Résout les issues #73 et #74 #75

Closed
wants to merge 3 commits into from
Closed

Résout les issues #73 et #74 #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20ae6bc
Better cookie management and return to old settings
remzouille Dec 6, 2024
0a3f16f
Adaptation to plugin structure
remzouille Dec 7, 2024
0c7ff90
_login reworked
remzouille Dec 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
159 changes: 72 additions & 87 deletions resources/lib/providers/abstract_orange_provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import re
from abc import ABC
from datetime import date, datetime, timedelta
from time import strptime
from typing import List
from urllib.parse import urlencode

Expand All @@ -15,7 +16,7 @@
from lib.exceptions import AuthenticationRequired, StreamDataDecodeError, StreamNotIncluded
from lib.providers.abstract_provider import AbstractProvider
from lib.utils.kodi import build_addon_url, get_addon_setting, get_drm, get_global_setting, log, set_addon_setting
from lib.utils.request import request, request_json, to_cookie_string
from lib.utils.request import request, request_json

_PROGRAMS_ENDPOINT = "https://rp-ott-mediation-tv.woopic.com/api-gw/live/v3/applications/STB4PC/programs?period={period}&epgIds=all&mco={mco}"
_CATCHUP_CHANNELS_ENDPOINT = "https://rp-ott-mediation-tv.woopic.com/api-gw/catchup/v4/applications/PC/channels"
Expand All @@ -29,6 +30,7 @@
_STREAM_LOGO_URL = "https://proxymedia.woopic.com/api/v1/images/2090{path}"
_LIVE_HOMEPAGE_URL = "https://chaines-tv.orange.fr/"
_CATCHUP_VIDEO_URL = "https://replay.orange.fr/videos/{stream_id}"
_LOGIN_URL = 'https://login.orange.fr'


class AbstractOrangeProvider(AbstractProvider, ABC):
Expand Down Expand Up @@ -206,59 +208,22 @@ def _get_catchup_videos(self, channel_id: str, category_id: str, article_id: str

def _get_stream_info(self, auth_url: str, stream_endpoint: str, stream_id: str) -> dict:
"""Load stream info from Orange."""
provider_session_data = get_addon_setting("provider.session_data", dict)
tv_token, terminal_id, wassup = (provider_session_data.get(k) for k in ("tv_token", "terminal_id", "wassup"))
res = None

if tv_token and terminal_id:
try:
stream_endpoint_url = stream_endpoint.format(stream_id=stream_id, terminal_id=terminal_id)
headers = {"tv_token": f"Bearer {tv_token}", "Cookie": f"wassup={wassup}"}
res = request("GET", stream_endpoint_url, headers=headers)
log("Use stored session data", xbmc.LOGINFO)
except RequestException as e:
if e.response.status_code == 403:
raise StreamNotIncluded() from e
else:
log("Stored session data expired", xbmc.LOGWARNING)

if res is None:
set_addon_setting("provider.session_data", {})

try:
if get_addon_setting("provider.use_credentials", bool):
username, password = get_addon_setting("provider.username"), get_addon_setting("provider.password")
tv_token, terminal_id, wassup = self._retrieve_auth_data(auth_url, username, password)
else:
tv_token, terminal_id, wassup = self._retrieve_auth_data(auth_url)
except RequestException as e:
raise AuthenticationRequired("Authentication page load failed") from e
except AttributeError as e:
raise AuthenticationRequired("Cannot extract tv token or household id") from e

try:
stream_endpoint_url = stream_endpoint.format(stream_id=stream_id, terminal_id=terminal_id)
headers = {"tv_token": f"Bearer {tv_token}", "Cookie": f"wassup={wassup}"}
res = request("GET", stream_endpoint_url, headers=headers)
log("Initiate new session", xbmc.LOGINFO)
except RequestException as e:
if e.response.status_code == 403:
raise StreamNotIncluded() from e
else:
raise AuthenticationRequired("Cannot initiate new session") from e
tv_token, tv_token_expires, wassup = self._retrieve_auth_data(auth_url)

try:
stream_endpoint_url = stream_endpoint.format(stream_id=stream_id, terminal_id='')
headers = {"tv_token": f"Bearer {tv_token}", "Cookie": f"wassup={wassup}"}
res = request("GET", stream_endpoint_url, headers=headers)
stream = res.json()
log("Initiate new session", xbmc.LOGINFO)
except RequestException as e:
if e.response.status_code == 403:
raise StreamNotIncluded() from e
else:
raise AuthenticationRequired("Cannot initiate new session") from e
except JSONDecodeError as e:
raise StreamDataDecodeError() from e

provider_session_data = {
"tv_token": tv_token,
"terminal_id": terminal_id,
"wassup": wassup,
}

set_addon_setting("provider.session_data", provider_session_data)
return self._compute_stream_info(stream, tv_token, wassup)

def _compute_stream_info(self, stream: dict, tv_token: str, wassup: str) -> dict:
Expand Down Expand Up @@ -300,65 +265,85 @@ def _compute_stream_info(self, stream: dict, tv_token: str, wassup: str) -> dict
return stream_info

def _retrieve_auth_data(self, auth_url: str, login: str = None, password: str = None) -> (str, str, str):
"""Retreive auth data from Orange (tv token and terminal id, plus wassup cookie when using credentials)."""
cookies = {}

if login or password:
cookies = self._login(login, password)
"""Retreive auth data from Orange (tv token and wassup cookie)."""
provider_session_data = get_addon_setting("provider.session_data", dict)
tv_token, tv_token_expires, wassup = (provider_session_data.get(k) for k in ("tv_token", "tv_token_expires", "wassup"))

res = request("GET", auth_url, headers={"Cookie": to_cookie_string(cookies, ["trust", "wassup"])})
if not tv_token_expires or datetime.utcnow().timestamp() > tv_token_expires:
session = Session()

tv_token = re.search('instanceInfo:{token:"([a-zA-Z0-9-_.]+)"', res.text).group(1)
household_id = re.search('householdId:"([A-Z0-9]+)"', res.text).group(1)
if not self._expired_wassup(wassup):
log("Cookie reuse", xbmc.LOGINFO)
session.headers['Cookie'] = f'wassup={wassup}'

try:
response = request("GET", f'{_LIVE_HOMEPAGE_URL}token', s=session)
except RequestException:
log('Login required', xbmc.LOGINFO)
self._login(session)
response = request("GET", f'{_LIVE_HOMEPAGE_URL}token', s=session)

tv_token = response.json()
tv_token_expires = datetime.utcnow().timestamp() + 30 * 60

if 'wassup' in session.cookies:
wassup = session.cookies.get('wassup')

provider_session_data = {
"tv_token": tv_token,
"tv_token_expires": tv_token_expires,
"wassup": wassup,
}
set_addon_setting("provider.session_data", provider_session_data)

log(f"tv_token: {tv_token}, household_id: {household_id}, wassup: {cookies.get('wassup')}", xbmc.LOGDEBUG)
return tv_token, household_id, cookies.get("wassup")
log(f"tv_token: {tv_token}, tv_token_expires: {tv_token_expires}, wassup: {wassup}", xbmc.LOGDEBUG)
return tv_token, tv_token_expires, wassup

def _login(self, login: str, password: str) -> dict:
"""Login to Orange and return session cookie."""
cookies = {}
s = Session()
def _expired_wassup(self, wassup):
try:
wassup = bytes.fromhex(wassup).decode()
xwvd = re.search('\|X_WASSUP_VALID_DATE=(.*?)\|', wassup).group(1)
# wassup_expires = datetime.strptime(xwvd, '%Y%m%d%H%M%S').timestamp()
wassup_expires = datetime(*(strptime(xwvd, '%Y%m%d%H%M%S')[0:6])).timestamp()
return datetime.utcnow().timestamp() > wassup_expires
except (TypeError, AttributeError):
return True

def _login(self, session):
"""Login to Orange."""
login, password = get_addon_setting("provider.username"), get_addon_setting("provider.password")
session.headers = {
'Accept': 'application/xhtml+xml,application/xml',
'Accept-Encoding': 'gzip, deflate, br',
'Content-Type': 'application/json'
}

try:
res = request("GET", "https://login.orange.fr", s=s)
cookies = res.cookies.get_dict()
request("GET", _LOGIN_URL, headers=session.headers, s=session)
except RequestException:
log("Error while authenticating (init)", xbmc.LOGWARNING)
return {}
return

try:
res = request(
request(
"POST",
"https://login.orange.fr/api/login",
headers={
"Content-Type": "application/json",
"Cookie": to_cookie_string(cookies, ["xauth"]),
},
data=json.dumps({"login": login, "params": {}, "isSosh": False}),
s=s,
f"{_LOGIN_URL}/api/login",
data=json.dumps({'login': login, 'params': {}}),
s=session,
)
cookies = res.cookies.get_dict()
except RequestException:
log("Error while authenticating (login)", xbmc.LOGWARNING)
return {}
return

try:
res = request(
request(
"POST",
"https://login.orange.fr/api/password",
headers={
"Content-Type": "application/json",
"Cookie": to_cookie_string(cookies, ["xauth"]),
},
data=json.dumps({"password": password, "params": {}}),
s=s,
f"{_LOGIN_URL}/api/password",
data=json.dumps({'password': password, 'remember': True}),
s=session,
)
cookies = res.cookies.get_dict()
except RequestException:
log("Error while authenticating (password)", xbmc.LOGWARNING)
return {}

return cookies

def _extract_logo(self, logos: list, definition_type: str = "mobileAppliDark") -> str:
for logo in logos:
Expand Down
2 changes: 2 additions & 0 deletions resources/lib/utils/gui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ def create_play_item(stream_info: dict = None, inputstream_addon: str = "") -> L
play_item.setMimeType(stream_info.get("mime_type"))

play_item.setProperty("inputstream", inputstream_addon)
play_item.setProperty('inputstream.adaptive.manifest_type', stream_info['protocol'])
play_item.setProperty('inputstream.adaptive.play_timeshift_buffer', 'true')

drm_config = stream_info.get("drm_config", {})
keys = ["license_type", "license_key", "license_data", "server_certificate", "license_flags", "pre_init_data"]
Expand Down
31 changes: 7 additions & 24 deletions resources/settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,21 @@
<settings>
<!-- IPTV Integration -->
<category label="30100">
<setting id="iptv.channels_uri">
<level>4</level>
<default>plugin://plugin.video.orange.fr/iptv/channels</default>
</setting>
<setting id="iptv.epg_uri">
<level>4</level>
<default>plugin://plugin.video.orange.fr/iptv/epg</default>
</setting>
<setting id="iptv.channels_uri" default="plugin://plugin.video.orange.fr/iptv/channels"/>
<setting id="iptv.epg_uri" default="plugin://plugin.video.orange.fr/iptv/epg"/>
<setting visible="!System.HasAddon(service.iptv.manager)" label="30101" help="30102" type="action" action="InstallAddon(service.iptv.manager)" option="close"/>
<setting id="iptv.enabled" visible="System.HasAddon(service.iptv.manager)" label="30103" help="30104" type="bool">
<default>true</default>
</setting>
<setting id="iptv.enabled" visible="System.HasAddon(service.iptv.manager)" label="30103" help="30104" type="bool" default="true"/>
<setting visible="System.HasAddon(service.iptv.manager)" label="30105" help="30106" type="action" action="Addon.OpenSettings(service.iptv.manager)" option="close" subsetting="true"/>
</category>

<!-- Provider -->
<category label="30200">
<setting id="provider.country" label="30201" help="30202" type="select" values="France">
<default>France</default>
</setting>
<setting id="provider.name" visible="eq(-1,France)" label="30203" help="30204" type="labelenum" values="OQEE by Free|Orange|Orange Caraïbe|Orange Réunion">
<default>Orange</default>
</setting>
<setting id="provider.country" label="30201" help="30202" type="select" values="France" default="France"/>
<setting id="provider.name" visible="eq(-1,France)" label="30203" help="30204" type="labelenum" values="OQEE by Free|Orange|Orange Caraïbe|Orange Réunion" default="Orange"/>
<setting type="lsep"/>
<setting id="provider.session_data" visible="false">
<level>4</level>
<default>{}</default>
</setting>
<setting id="provider.session_data" visible="false" default="{}"/>
<setting id="provider.use_credentials" label="30205" help="30206" type="bool" default="false"/>
<setting id="provider.username" label="30207" help="30208" enable="eq(-1,true)" type="text">
<default/>
</setting>
<setting id="provider.username" label="30207" help="30208" enable="eq(-1,true)" type="text" default=""/>
<setting id="provider.password" label="30209" help="30210" enable="eq(-2,true)" type="text" default="" option="hidden"/>
</category>

Expand Down
Loading