Skip to content

fix: preventing accessing predefined discovery URLs when override is provided #1324

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

Merged
gcf-merge-on-green merged 5 commits into from
Apr 29, 2021
Merged

fix: preventing accessing predefined discovery URLs when override is provided #1324

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0a52108
fix: preventing access to predefined discovery URLs when override is …
Fahrenheit2539 Apr 27, 2021
25fc4a7
Merge branch 'master' into discovery-url-fix2
Fahrenheit2539 Apr 28, 2021
868aba9
Update googleapiclient/discovery.py
Fahrenheit2539 Apr 29, 2021
cd7b4bb
Merge branch 'master' into discovery-url-fix2
parthea Apr 29, 2021
6da4308
Merge branch 'master' into discovery-url-fix2
parthea Apr 29, 2021
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
15 changes: 7 additions & 8 deletions googleapiclient/discovery.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,9 +274,6 @@ def build(
else:
static_discovery = False

if discoveryServiceUrl is None:
discoveryServiceUrl = DISCOVERY_URI

if http is None:
discovery_http = build_http()
else:
Expand Down Expand Up @@ -343,14 +340,16 @@ def _discovery_service_uri_options(discoveryServiceUrl, version):
A list of URIs to be tried for the Service Discovery, in order.
"""

urls = [discoveryServiceUrl, V2_DISCOVERY_URI]
# V1 Discovery won't work if the requested version is None
if discoveryServiceUrl == V1_DISCOVERY_URI and version is None:
if discoveryServiceUrl is not None:
return [discoveryServiceUrl]
if version is None:
# V1 Discovery won't work if the requested version is None
logger.warning(
"Discovery V1 does not support empty versions. Defaulting to V2..."
)
urls.pop(0)
return list(OrderedDict.fromkeys(urls))
return [V2_DISCOVERY_URI]
else:
return [DISCOVERY_URI, V2_DISCOVERY_URI]


def _retrieve_discovery_doc(
Expand Down