Skip to content

Commit

Permalink
fix(USA): ssl signature (#501)
Browse files Browse the repository at this point in the history
  • Loading branch information
renatkh authored Feb 11, 2024
1 parent 9dff741 commit 0df2d2b
Showing 1 changed file with 20 additions and 5 deletions.
25 changes: 20 additions & 5 deletions hyundai_kia_connect_api/KiaUvoAPIUSA.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import random
import re
import secrets
import ssl
import string
import time
import typing
Expand All @@ -14,6 +15,8 @@
import pytz
import requests
from requests import RequestException, Response
from requests.adapters import HTTPAdapter
from urllib3.util.ssl_ import create_urllib3_context

from .ApiImpl import ApiImpl, ClimateRequestOptions
from .Token import Token
Expand All @@ -31,6 +34,16 @@
_LOGGER = logging.getLogger(__name__)


# This is the key part of our patch. We get the standard SSLContext that requests would
# normally use, and add ciphers that Kia USA may need for compatibility.
class KiaSSLAdapter(HTTPAdapter):
def init_poolmanager(self, *args, **kwargs):
context = create_urllib3_context(
ciphers='DEFAULT:@SECLEVEL=1', ssl_version=ssl.PROTOCOL_TLSv1_2)
kwargs['ssl_context'] = context
return super().init_poolmanager(*args, **kwargs)


class AuthError(RequestException):
"""AuthError"""

Expand Down Expand Up @@ -108,6 +121,8 @@ def __init__(self, region: int, brand: int, language) -> None:

self.BASE_URL: str = "api.owners.kia.com"
self.API_URL: str = "https://" + self.BASE_URL + "/apigw/v1/"
self.session = requests.Session()
self.session.mount("https://", KiaSSLAdapter())

def api_headers(self) -> dict:
offset = time.localtime().tm_gmtoff / 60 / 60
Expand Down Expand Up @@ -149,15 +164,15 @@ def post_request_with_logging_and_active_session(
self, token: Token, url: str, json_body: dict, vehicle: Vehicle
) -> Response:
headers = self.authed_api_headers(token, vehicle)
return requests.post(url, json=json_body, headers=headers)
return self.session.post(url, json=json_body, headers=headers)

@request_with_active_session
@request_with_logging
def get_request_with_logging_and_active_session(
self, token: Token, url: str, vehicle: Vehicle
) -> Response:
headers = self.authed_api_headers(token, vehicle)
return requests.get(url, headers=headers)
return self.session.get(url, headers=headers)

def login(self, username: str, password: str) -> Token:
"""Login into cloud endpoints and return Token"""
Expand All @@ -170,7 +185,7 @@ def login(self, username: str, password: str) -> Token:
"userCredential": {"userId": username, "password": password},
}
headers = self.api_headers()
response = requests.post(url, json=data, headers=headers)
response = self.session.post(url, json=data, headers=headers)
_LOGGER.debug(f"{DOMAIN} - Sign In Response {response.text}")
session_id = response.headers.get("sid")
if not session_id:
Expand All @@ -191,7 +206,7 @@ def get_vehicles(self, token: Token) -> list[Vehicle]:
url = self.API_URL + "ownr/gvl"
headers = self.api_headers()
headers["sid"] = token.access_token
response = requests.get(url, headers=headers)
response = self.session.get(url, headers=headers)
_LOGGER.debug(f"{DOMAIN} - Get Vehicles Response {response.text}")
response = response.json()
result = []
Expand All @@ -216,7 +231,7 @@ def refresh_vehicles(
url = self.API_URL + "ownr/gvl"
headers = self.api_headers()
headers["sid"] = token.access_token
response = requests.get(url, headers=headers)
response = self.session.get(url, headers=headers)
_LOGGER.debug(f"{DOMAIN} - Get Vehicles Response {response.text}")
_LOGGER.debug(f"{DOMAIN} - Vehicles Type Passed in: {type(vehicles)}")
_LOGGER.debug(f"{DOMAIN} - Vehicles Passed in: {vehicles}")
Expand Down

0 comments on commit 0df2d2b

Please sign in to comment.