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

Support for HTTPS #14

Merged
merged 2 commits into from
Nov 27, 2022
Merged

Support for HTTPS #14

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce57fa6
Added support for HTTPS with optional certificate validation.
r01k Nov 4, 2022
1d939d9
Now FullyKiosk defaults to HTTP instead of HTTPS.
r01k Nov 27, 2022
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
21 changes: 14 additions & 7 deletions fullykiosk/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,11 @@


class FullyKiosk:
def __init__(self, session, host, port, password):
self._rh = _RequestsHandler(session, host, port)
def __init__(self, session, host, port, password, use_ssl=False, verify_ssl=False):
if not use_ssl:
verify_ssl = False
self._rh = _RequestsHandler(session, host, port, use_ssl=use_ssl,
verify_ssl=verify_ssl)
self._password = password
self._deviceInfo = None
self._settings = None
Expand Down Expand Up @@ -119,26 +122,30 @@ async def rebootDevice(self):
class _RequestsHandler:
"""Internal class to create FullyKiosk requests"""

def __init__(self, session: aiohttp.ClientSession, host, port):
def __init__(self, session: aiohttp.ClientSession, host, port, use_ssl=False,
verify_ssl=False):
self.headers = {"Accept": "application/json"}

self.session = session
self.host = host
self.port = port
self.use_ssl = use_ssl
self.verify_ssl = verify_ssl

async def get(self, **kwargs):
url = f"http://{self.host}:{self.port}"
url = f"http{'s' if self.use_ssl else ''}://{self.host}:{self.port}"
params = []

for key, value in kwargs.items():
if value is not None:
params.append((key, str(value)))
req_params = {"url": url, "headers": self.headers, "params": params}
if not self.verify_ssl:
req_params["ssl"] = False

_LOGGER.debug("Sending request to: %s", url)
_LOGGER.debug("Parameters: %s", params)
async with self.session.get(
url, headers=self.headers, params=params
) as response:
async with self.session.get(**req_params) as response:
if response.status != 200:
_LOGGER.warning(
"Invalid response from Fully Kiosk Browser API: %s", response.status
Expand Down