Skip to content

fix(external_account): convert executable timeout_millis to seconds for Timeout.timeout #604

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

Draft
torreypayne wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix(external_account): convert executable timeout_millis to seconds for Timeout.timeout #604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion lib/googleauth/external_account/pluggable_credentials.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# limitations under the License.

require "open3"
require "timeout"
require "time"
require "json"
require "googleauth/errors"
Expand Down Expand Up @@ -88,7 +89,7 @@ def retrieve_subject_token!
# environment variable injection
env = inject_environment_variables
output = subprocess_with_timeout env, @credential_source_executable_command,
@credential_source_executable_timeout_millis
(@credential_source_executable_timeout_millis / 1000.0)
response = JSON.parse output, symbolize_names: true
parse_subject_token response
end
Expand Down
42 changes: 42 additions & 0 deletions spec/googleauth/external_account/pluggable_credentials_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,4 +531,46 @@
end
end
end

describe "test retrieve subject token executable timeout" do
let(:command) { "fake_cmd" }
let(:options) do
{
audience: AUDIENCE,
subject_token_type: SUBJECT_TOKEN_TYPE,
token_url: TOKEN_URL,
credential_source: {
executable: {
command: command,
timeout_millis: 12_000
}
}
}
end

before :example do
ENV[Google::Auth::ExternalAccount::PluggableAuthCredentials::ENABLE_PLUGGABLE_ENV] = "1"
end

it "converts configured timeout_millis to seconds for Timeout.timeout" do
expect(Timeout).to receive(:timeout).with(12.0).and_yield
allow(Open3).to receive(:capture3).and_return(
[JSON.generate(EXECUTABLE_SUCCESSFUL_OIDC_RESPONSE_ID_TOKEN), "", double("Process::Status", exitstatus: 0, success?: true)]
)

credentials = PluggableAuthCredentials.new options
expect(credentials.retrieve_subject_token!).to eq(EXECUTABLE_OIDC_TOKEN)
end

it "converts default timeout_millis to seconds for Timeout.timeout when unspecified" do
options[:credential_source][:executable].delete :timeout_millis
expect(Timeout).to receive(:timeout).with(30.0).and_yield
allow(Open3).to receive(:capture3).and_return(
[JSON.generate(EXECUTABLE_SUCCESSFUL_OIDC_RESPONSE_ID_TOKEN), "", double("Process::Status", exitstatus: 0, success?: true)]
)

credentials = PluggableAuthCredentials.new options
expect(credentials.retrieve_subject_token!).to eq(EXECUTABLE_OIDC_TOKEN)
end
end
end
Loading