ash/BAPSicle
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #48 from UniversityRadioYork/marks/dont-log-api-keys

Browse source 
Don't log MyRadio API keys
This commit is contained in:
Matthew Stratford 2022-10-17 19:02:22 +01:00 committed by GitHub
commit d6ee435fbc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
helpers/myradio_api.py
View file

@ -94,12 +94,20 @@ class MyRadioAPI:
self._logException("Invalid API version. Request not sent.") self._logException("Invalid API version. Request not sent.")
return None return None
url_without_api_key = url
if "?" in url: if "?" in url:
url += "&api_key={}".format(self.config.get()["myradio_api_key"]) url += "&api_key={}".format(self.config.get()["myradio_api_key"])
url_without_api_key += "&api_key=REDACTED"
else: else:
url += "?api_key={}".format(self.config.get()["myradio_api_key"]) 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 request = None
try: try:
@ -107,7 +115,9 @@ class MyRadioAPI:
request = await self.async_call(url, method="GET", timeout=timeout) request = await self.async_call(url, method="GET", timeout=timeout)
elif method == "POST": elif method == "POST":
self._log("POST data: {}".format(data)) 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": elif method == "PUT":
request = await self.async_call(url, method="PUT", timeout=timeout) request = await self.async_call(url, method="PUT", timeout=timeout)
else: else:
@ -131,12 +141,20 @@ class MyRadioAPI:
self._logException("Invalid API version. Request not sent.") self._logException("Invalid API version. Request not sent.")
return None return None
url_without_api_key = url
if "?" in url: if "?" in url:
url += "&api_key={}".format(self.config.get()["myradio_api_key"]) url += "&api_key={}".format(self.config.get()["myradio_api_key"])
url_without_api_key += "&api_key=REDACTED"
else: else:
url += "?api_key={}".format(self.config.get()["myradio_api_key"]) 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 request = None
if method == "GET": if method == "GET":
@ -209,7 +227,9 @@ class MyRadioAPI:
# Audio Library # 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? format = "mp3" # TODO: Maybe we want this customisable?
if item.trackid: if item.trackid:
itemType = "track" itemType = "track"