From 1bd5779b8a87aa1862943b389fb905c2e0f30336 Mon Sep 17 00:00:00 2001 From: Marks Polakovs Date: Sun, 16 Oct 2022 12:20:48 +0100 Subject: [PATCH 1/2] Don't log MyRadio API keys --- helpers/myradio_api.py | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/helpers/myradio_api.py b/helpers/myradio_api.py index f7bc5d0..f9d518f 100644 --- a/helpers/myradio_api.py +++ b/helpers/myradio_api.py @@ -94,12 +94,20 @@ class MyRadioAPI: self._logException("Invalid API version. Request not sent.") return None + url_without_api_key = url + if "?" in url: url += "&api_key={}".format(self.config.get()["myradio_api_key"]) + url_without_api_key += "&api_key=REDACTED" else: url += "?api_key={}".format(self.config.get()["myradio_api_key"]) + url_without_api_key += "?api_key=REDACTED" - self._log("Requesting API V2 URL with method {}: {}".format(method, url)) + self._log( + "Requesting API V2 URL with method {}: {}".format( + method, url_without_api_key + ) + ) request = None try: @@ -107,7 +115,9 @@ class MyRadioAPI: request = await self.async_call(url, method="GET", timeout=timeout) elif method == "POST": self._log("POST data: {}".format(data)) - request = await self.async_call(url, data=data, method="POST", timeout=timeout) + request = await self.async_call( + url, data=data, method="POST", timeout=timeout + ) elif method == "PUT": request = await self.async_call(url, method="PUT", timeout=timeout) else: @@ -131,12 +141,20 @@ class MyRadioAPI: self._logException("Invalid API version. Request not sent.") return None + url_without_api_key = url + if "?" in url: url += "&api_key={}".format(self.config.get()["myradio_api_key"]) + url_without_api_key += "&api_key=REDACTED" else: url += "?api_key={}".format(self.config.get()["myradio_api_key"]) + url_without_api_key += "?api_key=REDACTED" - self._log("Requesting API V2 URL with method {}: {}".format(method, url)) + self._log( + "Requesting API V2 URL with method {}: {}".format( + method, url_without_api_key + ) + ) request = None if method == "GET": @@ -209,7 +227,9 @@ class MyRadioAPI: # Audio Library - async def get_filename(self, item: PlanItem, did_download: bool = False, redownload=False): + async def get_filename( + self, item: PlanItem, did_download: bool = False, redownload=False + ): format = "mp3" # TODO: Maybe we want this customisable? if item.trackid: itemType = "track" @@ -317,7 +337,7 @@ class MyRadioAPI: async def get_playlist_aux_items(self, library_id: str): # Sometimes they have "aux-", we only need the index. if library_id.index("-") > -1: - library_id = library_id[library_id.index("-") + 1:] + library_id = library_id[library_id.index("-") + 1 :] url = "/nipswebPlaylist/{}/items".format(library_id) request = await self.async_api_call(url) From 92dbd19bf7a6c4fff87573e115fb718a41e6cf10 Mon Sep 17 00:00:00 2001 From: Matthew Stratford Date: Mon, 17 Oct 2022 18:57:04 +0100 Subject: [PATCH 2/2] Remove space. --- helpers/myradio_api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/myradio_api.py b/helpers/myradio_api.py index f9d518f..ee997fa 100644 --- a/helpers/myradio_api.py +++ b/helpers/myradio_api.py @@ -337,7 +337,7 @@ class MyRadioAPI: async def get_playlist_aux_items(self, library_id: str): # Sometimes they have "aux-", we only need the index. if library_id.index("-") > -1: - library_id = library_id[library_id.index("-") + 1 :] + library_id = library_id[library_id.index("-") + 1:] url = "/nipswebPlaylist/{}/items".format(library_id) request = await self.async_api_call(url)