chiu
/
google-auth-library-ruby
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Increase metadata timeout, matching the logic in google-cloud-env

This commit is contained in:
Daniel Azuma 2019-10-08 11:33:03 -07:00 committed by GitHub
parent 9c46b3b049
commit 41bb5f13b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/googleauth/compute_engine.rb
View File

@ -59,20 +59,14 @@ module Google
extend Memoist extend Memoist
# Detect if this appear to be a GCE instance, by checking if metadata # Detect if this appear to be a GCE instance, by checking if metadata
# is available # is available.
def on_gce? options = {} def on_gce? options = {}
# TODO: This should use google-cloud-env instead.
c = options[:connection] || Faraday.default_connection c = options[:connection] || Faraday.default_connection
headers = { "Metadata-Flavor" => "Google" } headers = { "Metadata-Flavor" => "Google" }
resp = c.get COMPUTE_CHECK_URI, nil, headers do |req| resp = c.get COMPUTE_CHECK_URI, nil, headers do |req|
# Comment from: oauth2client/client.py req.options.timeout = 1.0
# req.options.open_timeout = 0.1
# Note: the explicit `timeout` below is a workaround. The underlying
# issue is that resolving an unknown host on some networks will take
# 20-30 seconds; making this timeout short fixes the issue, but
# could lead to false negatives in the event that we are on GCE, but
# the metadata resolution was particularly slow. The latter case is
# "unlikely".
req.options.timeout = 0.1
end end
return false unless resp.status == 200 return false unless resp.status == 200
resp.headers["Metadata-Flavor"] == "Google" resp.headers["Metadata-Flavor"] == "Google"