diff --git a/.changes/next-release/feature-AWSSDKforJavav2-1cce30d.json b/.changes/next-release/feature-AWSSDKforJavav2-1cce30d.json index 60b813b41e80..3c397e773295 100644 --- a/.changes/next-release/feature-AWSSDKforJavav2-1cce30d.json +++ b/.changes/next-release/feature-AWSSDKforJavav2-1cce30d.json @@ -2,5 +2,5 @@ "type": "feature", "category": "AWS SDK for Java v2", "contributor": "", - "description": "Add CredentialDaemonCredentialsProvider, which resolves credentials from a local credential daemon over a Unix domain socket for profiles that set daemon_credential in the shared config file. Compatibility note: the provider requires Java 16 or later on Linux or macOS. On Java 8 to 15 it fails with UNSUPPORTED_PLATFORM, and a profile that runs `aws configure export-credentials` as its credential_process can be used instead." + "description": "Add CredentialDaemonCredentialsProvider, which resolves credentials from a local credential daemon over a Unix domain socket for profiles that set credential_daemon in the shared config file. Compatibility note: the provider requires Java 16 or later on Linux or macOS. On Java 8 to 15 it fails with UNSUPPORTED_PLATFORM, and a profile that runs `aws configure export-credentials` as its credential_process can be used instead." } diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/CredentialDaemonCredentialsProvider.java b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/CredentialDaemonCredentialsProvider.java index fd0b2af22dd8..c6d5114f5ea7 100644 --- a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/CredentialDaemonCredentialsProvider.java +++ b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/CredentialDaemonCredentialsProvider.java @@ -15,6 +15,7 @@ package software.amazon.awssdk.auth.credentials; +import java.nio.file.Path; import java.time.Clock; import java.time.Duration; import java.time.Instant; @@ -38,12 +39,14 @@ /** * Loads short-lived credentials from a local credential daemon over a Unix domain socket. This is used to support the - * {@code daemon_credential} setting in the shared config file. + * {@code credential_daemon} setting in the shared config file. * *

* Each fetch opens a new connection to the daemon and sends one JSON-RPC 2.0 {@code credential/get} request. The socket is * looked up again on every fetch, in this order: *

    + *
  1. The {@link Builder#socketPath(Path)} setting, when it is an absolute path.
  2. + *
  3. The {@code aws.credentialDaemonSocket} system property, when it holds an absolute path.
  4. *
  5. The {@code AWS_CREDENTIAL_DAEMON_SOCKET} environment variable, when it holds an absolute path.
  6. *
  7. {@code $HOME/.aws/credential-daemon.sock}, when anything is there: a socket, a symbolic link, or a link whose * target is missing. {@code HOME} is read from the environment, and this location is skipped when {@code HOME} is @@ -64,12 +67,12 @@ * *

    * On such a platform, an application can still use the daemon's credentials through the AWS CLI. Give it a separate profile - * that does not set {@code daemon_credential} and runs the CLI as a credential process, for example: + * that does not set {@code credential_daemon} and runs the CLI as a credential process, for example: *

      * [profile daemon-via-cli]
      * credential_process = aws configure export-credentials --profile my-daemon-profile --format process
      * 
    - * where {@code my-daemon-profile} is the profile that sets {@code daemon_credential}. + * where {@code my-daemon-profile} is the profile that sets {@code credential_daemon}. * *

    * Failures are raised as {@link CredentialDaemonException}, whose {@link CredentialDaemonException#errorCode()} identifies @@ -95,6 +98,7 @@ public final class CredentialDaemonCredentialsProvider private final String credentialName; private final String accountId; private final String roleName; + private final Path socketPath; private final Duration connectTimeout; private final Duration callTimeout; private final Boolean asyncCredentialUpdateEnabled; @@ -116,13 +120,14 @@ private CredentialDaemonCredentialsProvider(BuilderImpl builder) { this.accountId = builder.accountId; this.roleName = builder.roleName; Validate.isTrue((accountId == null) == (roleName == null), "accountId and roleName must be set together."); + this.socketPath = builder.socketPath; this.connectTimeout = Validate.isPositive(builder.connectTimeout, "connectTimeout"); this.callTimeout = Validate.isPositive(builder.callTimeout, "callTimeout"); this.asyncCredentialUpdateEnabled = builder.asyncCredentialUpdateEnabled; this.sourceChain = builder.sourceChain; String providerName = StringUtils.isEmpty(sourceChain) ? PROVIDER_NAME : sourceChain + "," + PROVIDER_NAME; this.request = new CredentialDaemonRequest(credentialName, accountId, roleName); - this.client = CredentialDaemonClient.create(connectTimeout, callTimeout, providerName); + this.client = CredentialDaemonClient.create(socketPath, connectTimeout, callTimeout, providerName); this.clock = builder.clock; CachedSupplier.Builder cacheBuilder = CachedSupplier.builder(this::refresh) @@ -192,6 +197,17 @@ public interface Builder extends CopyableBuilder + * Default: not set. + */ + Builder socketPath(Path socketPath); + /** * Sets how long to wait for the daemon to accept the connection. * @@ -241,6 +257,7 @@ static final class BuilderImpl implements Builder { private String credentialName; private String accountId; private String roleName; + private Path socketPath; private Duration connectTimeout = DEFAULT_CONNECT_TIMEOUT; private Duration callTimeout = DEFAULT_CALL_TIMEOUT; private Boolean asyncCredentialUpdateEnabled = false; @@ -254,6 +271,7 @@ private BuilderImpl(CredentialDaemonCredentialsProvider provider) { this.credentialName = provider.credentialName; this.accountId = provider.accountId; this.roleName = provider.roleName; + this.socketPath = provider.socketPath; this.connectTimeout = provider.connectTimeout; this.callTimeout = provider.callTimeout; this.asyncCredentialUpdateEnabled = provider.asyncCredentialUpdateEnabled; @@ -284,6 +302,12 @@ public Builder roleName(String roleName) { return this; } + @Override + public Builder socketPath(Path socketPath) { + this.socketPath = socketPath; + return this; + } + @Override public Builder connectTimeout(Duration connectTimeout) { this.connectTimeout = connectTimeout; diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/ProfileCredentialsUtils.java b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/ProfileCredentialsUtils.java index fb80e271df30..9e92404a5d71 100644 --- a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/ProfileCredentialsUtils.java +++ b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/ProfileCredentialsUtils.java @@ -121,7 +121,7 @@ private Optional credentialsProvider(Set childre * Internal method that returns both the credentials provider and its feature ID. */ private Optional credentialsProviderWithFeatureID(Set children) { - if (properties.containsKey(ProfileProperty.DAEMON_CREDENTIAL)) { + if (properties.containsKey(ProfileProperty.CREDENTIAL_DAEMON)) { Optional daemonProvider = daemonProfileCredentialsProvider(); if (daemonProvider.isPresent()) { return daemonProvider; @@ -176,8 +176,8 @@ private Optional credentialsProviderWithFeatureID(Set< } /** - * Load the credential daemon provider configured with {@code daemon_credential} in this profile. This is empty only for an - * SSO profile that sets neither sso_account_id nor sso_role_name, which is then resolved as if daemon_credential were + * Load the credential daemon provider configured with {@code credential_daemon} in this profile. This is empty only for an + * SSO profile that sets neither sso_account_id nor sso_role_name, which is then resolved as if credential_daemon were * absent. */ private Optional daemonProfileCredentialsProvider() { @@ -188,11 +188,11 @@ private Optional daemonProfileCredentialsProvider() { return Optional.empty(); } - String credentialName = properties.get(ProfileProperty.DAEMON_CREDENTIAL); + String credentialName = properties.get(ProfileProperty.CREDENTIAL_DAEMON); if (!CredentialDaemonUtils.isValidCredentialName(credentialName)) { throw CredentialDaemonUtils.error( CredentialDaemonException.INVALID_CONFIG, - "Profile '" + name + "' sets an invalid " + ProfileProperty.DAEMON_CREDENTIAL + ". A credential name is 1 to 64 " + "Profile '" + name + "' sets an invalid " + ProfileProperty.CREDENTIAL_DAEMON + ". A credential name is 1 to 64 " + "characters from A-Z, a-z, 0-9, '.', '_' and '-', and does not start with '.'.", null); } @@ -200,7 +200,7 @@ private Optional daemonProfileCredentialsProvider() { if (properties.containsKey(ProfileProperty.WEB_IDENTITY_TOKEN_FILE)) { throw CredentialDaemonUtils.error( CredentialDaemonException.INVALID_CONFIG, - "Profile '" + name + "' has two credential sources, " + ProfileProperty.DAEMON_CREDENTIAL + " and " + "Profile '" + name + "' has two credential sources, " + ProfileProperty.CREDENTIAL_DAEMON + " and " + ProfileProperty.WEB_IDENTITY_TOKEN_FILE + ". Remove one of them.", null); } @@ -208,7 +208,7 @@ private Optional daemonProfileCredentialsProvider() { if (properties.containsKey(ProfileProperty.ROLE_ARN)) { throw CredentialDaemonUtils.error( CredentialDaemonException.INVALID_CONFIG, - "Profile '" + name + "' sets both " + ProfileProperty.DAEMON_CREDENTIAL + " and " + ProfileProperty.ROLE_ARN + "Profile '" + name + "' sets both " + ProfileProperty.CREDENTIAL_DAEMON + " and " + ProfileProperty.ROLE_ARN + ". Move " + ProfileProperty.ROLE_ARN + " into its own profile that sets " + ProfileProperty.SOURCE_PROFILE + " = " + name + ".", null); diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/daemon/CredentialDaemonClient.java b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/daemon/CredentialDaemonClient.java index 48015e477656..d3c6bfa083e6 100644 --- a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/daemon/CredentialDaemonClient.java +++ b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/daemon/CredentialDaemonClient.java @@ -53,6 +53,7 @@ import software.amazon.awssdk.protocols.jsoncore.JsonNode; import software.amazon.awssdk.protocols.jsoncore.JsonNodeParser; import software.amazon.awssdk.utils.IoUtils; +import software.amazon.awssdk.utils.SystemSetting; import software.amazon.awssdk.utils.ThreadFactoryBuilder; import software.amazon.awssdk.utils.internal.SystemSettingUtils; @@ -69,6 +70,7 @@ @SdkInternalApi public final class CredentialDaemonClient { static final int MAX_LINE = 64_000; + static final String SOCKET_SYSTEM_PROPERTY = "aws.credentialDaemonSocket"; static final String SOCKET_ENVIRONMENT_VARIABLE = "AWS_CREDENTIAL_DAEMON_SOCKET"; static final String LINK_LOCATION = "$HOME/.aws/credential-daemon.sock"; @@ -76,6 +78,8 @@ public final class CredentialDaemonClient { private static final JsonNodeParser PARSER = JsonNodeParser.builder().removeErrorLocations(true).build(); private final CredentialDaemonPlatform platform; + private final Path socketPath; + private final Function> systemProperties; private final Function> environment; private final Duration connectTimeout; private final Duration callTimeout; @@ -89,7 +93,21 @@ public final class CredentialDaemonClient { Duration callTimeout, ChannelOpener channelOpener, String providerName) { + this(platform, null, k -> Optional.empty(), environment, connectTimeout, callTimeout, channelOpener, providerName); + } + + @SdkTestInternalApi + CredentialDaemonClient(CredentialDaemonPlatform platform, + Path socketPath, + Function> systemProperties, + Function> environment, + Duration connectTimeout, + Duration callTimeout, + ChannelOpener channelOpener, + String providerName) { this.platform = platform; + this.socketPath = socketPath; + this.systemProperties = systemProperties; this.environment = environment; this.connectTimeout = connectTimeout; this.callTimeout = callTimeout; @@ -98,11 +116,14 @@ public final class CredentialDaemonClient { } /** - * Creates a client for this platform. The provider name is put on the credentials the daemon returns. + * Creates a client for this platform. The socket path, if not null, is the first location looked up. The provider name is + * put on the credentials the daemon returns. */ - public static CredentialDaemonClient create(Duration connectTimeout, Duration callTimeout, String providerName) { + public static CredentialDaemonClient create(Path socketPath, Duration connectTimeout, Duration callTimeout, + String providerName) { CredentialDaemonPlatform platform = CredentialDaemonPlatform.current(); - return new CredentialDaemonClient(platform, SystemSettingUtils::resolveEnvironmentVariable, + return new CredentialDaemonClient(platform, socketPath, CredentialDaemonClient::systemProperty, + SystemSettingUtils::resolveEnvironmentVariable, connectTimeout, callTimeout, platform::openChannel, providerName); } @@ -121,13 +142,21 @@ public CredentialDaemonResponse fetch(CredentialDaemonRequest request) { } /** - * Returns the one socket path the client dials: {@code AWS_CREDENTIAL_DAEMON_SOCKET} when it holds an absolute path, - * and otherwise {@code $HOME/.aws/credential-daemon.sock} when anything is there. + * Returns the one socket path the client dials, from the first location that applies: the socket path given in code, the + * {@code aws.credentialDaemonSocket} system property and {@code AWS_CREDENTIAL_DAEMON_SOCKET}, each when it holds an + * absolute path, and otherwise {@code $HOME/.aws/credential-daemon.sock} when anything is there. * * @throws CredentialDaemonException with {@link CredentialDaemonException#NOT_RUNNING} when no location applies, or when * the link at {@code $HOME/.aws/credential-daemon.sock} points to a target that is missing. */ Path locate() { + if (socketPath != null && socketPath.isAbsolute()) { + return socketPath; + } + Path fromSystemProperty = absolutePath(systemProperties.apply(SOCKET_SYSTEM_PROPERTY).orElse(null)); + if (fromSystemProperty != null) { + return fromSystemProperty; + } Path fromEnvironment = absolutePath(env(SOCKET_ENVIRONMENT_VARIABLE)); if (fromEnvironment != null) { return fromEnvironment; @@ -421,6 +450,30 @@ private String env(String name) { return environment.apply(name).orElse(null); } + /** + * Reads a system property on its own, without its environment variable, so that an empty or relative value moves on to + * the environment variable instead of hiding it. + */ + private static Optional systemProperty(String name) { + SystemSetting property = new SystemSetting() { + @Override + public String property() { + return name; + } + + @Override + public String environmentVariable() { + return null; + } + + @Override + public String defaultValue() { + return null; + } + }; + return property.getNonDefaultStringValue(); + } + private static Path absolutePath(String value) { if (value == null || value.isEmpty()) { return null; @@ -454,8 +507,9 @@ private static CredentialDaemonException connectFailure(Path path, Exception e) private static CredentialDaemonException noLocation(String reason) { return CredentialDaemonUtils.error(CredentialDaemonException.NOT_RUNNING, - "No credential daemon socket was found: " + SOCKET_ENVIRONMENT_VARIABLE - + " is not set to an absolute path, and " + reason + ". Install the credential " + "No credential daemon socket was found: neither the " + + SOCKET_SYSTEM_PROPERTY + " system property nor " + SOCKET_ENVIRONMENT_VARIABLE + + " is set to an absolute path, and " + reason + ". Install the credential " + "daemon or link its socket to " + LINK_LOCATION + ", or set " + SOCKET_ENVIRONMENT_VARIABLE + ". See " + CredentialDaemonUtils.CREDENTIAL_DAEMON_DOC + ".", diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/daemon/CredentialDaemonUtils.java b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/daemon/CredentialDaemonUtils.java index ee6ab57bd5eb..1fd8a2a73295 100644 --- a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/daemon/CredentialDaemonUtils.java +++ b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/daemon/CredentialDaemonUtils.java @@ -33,7 +33,7 @@ @SdkInternalApi public final class CredentialDaemonUtils { - static final String CREDENTIAL_DAEMON_DOC = "https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-credential-daemon.html"; + static final String CREDENTIAL_DAEMON_DOC = "https://docs.aws.amazon.com/cli/latest/userguide/cli-authentication-credsd.html"; static final String START_HINT = "Start the credential daemon and sign in; see " + CREDENTIAL_DAEMON_DOC + "."; @@ -99,7 +99,7 @@ public static boolean daemonHoldsSsoSession(Profile profile) { return false; } Map properties = profile.properties(); - return properties.containsKey(ProfileProperty.DAEMON_CREDENTIAL) + return properties.containsKey(ProfileProperty.CREDENTIAL_DAEMON) && properties.containsKey(ProfileProperty.SSO_ACCOUNT_ID) && properties.containsKey(ProfileProperty.SSO_ROLE_NAME); } @@ -110,7 +110,7 @@ public static boolean daemonHoldsSsoSession(Profile profile) { */ public static String bearerTokenUnavailableMessage(String profileName) { return "Profile " + profileName + " does not have a usable sso_session: its SSO session is held in the credential " - + "daemon (daemon_credential). Services that use bearer tokens need an SSO session stored in files; configure a " + + "daemon (credential_daemon). Services that use bearer tokens need an SSO session stored in files; configure a " + "profile with sso_session and sign in with a file-based SSO login."; } diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/CredentialDaemonChainTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/CredentialDaemonChainTest.java index 9febce6c6984..303fb984b08a 100644 --- a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/CredentialDaemonChainTest.java +++ b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/CredentialDaemonChainTest.java @@ -76,7 +76,7 @@ private void config(String content) throws Exception { @Test void resolveCredentials_whenConfigProfileSetsDaemonCredential_returnsDaemonCredentials() throws Exception { - config("[profile dev]\ndaemon_credential = dev\n"); + config("[profile dev]\ncredential_daemon = dev\n"); AwsCredentials credentials = DefaultCredentialsProvider.builder().build().resolveCredentials(); @@ -89,7 +89,7 @@ void resolveCredentials_whenConfigProfileSetsDaemonCredential_returnsDaemonCrede @Test void resolveCredentials_whenEnvironmentHasCredentials_doesNotCallDaemon() throws Exception { - config("[profile dev]\ndaemon_credential = dev\n"); + config("[profile dev]\ncredential_daemon = dev\n"); env.set("AWS_ACCESS_KEY_ID", "akid"); env.set("AWS_SECRET_ACCESS_KEY", "skid"); @@ -101,7 +101,7 @@ void resolveCredentials_whenEnvironmentHasCredentials_doesNotCallDaemon() throws @Test void resolveCredentials_whenWebIdentityEnvironmentAndDaemonProfile_returnsDaemonCredentials() throws Exception { - config("[profile dev]\ndaemon_credential = dev\n"); + config("[profile dev]\ncredential_daemon = dev\n"); env.set("AWS_ROLE_ARN", "arn:aws:iam::123456789012:role/r"); env.set("AWS_WEB_IDENTITY_TOKEN_FILE", "/nonexistent/aws-web-identity-token"); @@ -113,7 +113,7 @@ void resolveCredentials_whenWebIdentityEnvironmentAndDaemonProfile_returnsDaemon @Test void resolveCredentials_whenDaemonNotRunning_movesOnAndReportsDaemonFailureInChainAggregate() throws Exception { - config("[profile dev]\ndaemon_credential = dev\n"); + config("[profile dev]\ncredential_daemon = dev\n"); Path missing = configDirectory.resolve("missing.sock"); env.set("AWS_CREDENTIAL_DAEMON_SOCKET", missing.toString()); @@ -126,12 +126,12 @@ void resolveCredentials_whenDaemonNotRunning_movesOnAndReportsDaemonFailureInCha @Test void resolveCredentials_whenProfileNameInvalid_raisesInvalidConfig() throws Exception { - config("[profile dev]\ndaemon_credential = .dev\naws_access_key_id = akid\naws_secret_access_key = skid\n"); + config("[profile dev]\ncredential_daemon = .dev\naws_access_key_id = akid\naws_secret_access_key = skid\n"); assertThatThrownBy(() -> DefaultCredentialsProvider.builder().build().resolveCredentials()) .isInstanceOf(SdkClientException.class) .hasMessageContaining("any of the providers in the chain") - .hasMessageContaining("daemon_credential"); + .hasMessageContaining("credential_daemon"); assertThat(daemon.requests()).isEmpty(); } @@ -139,7 +139,7 @@ void resolveCredentials_whenProfileNameInvalid_raisesInvalidConfig() throws Exce void resolveCredentials_whenDaemonCredentialOnlyInCredentialsFile_ignoresIt() throws Exception { config("[profile other]\nregion = us-west-2\n"); Path credentialsFile = configDirectory.resolve("credentials"); - Files.write(credentialsFile, ("[dev]\ndaemon_credential = dev\naws_access_key_id = akid\n" + Files.write(credentialsFile, ("[dev]\ncredential_daemon = dev\naws_access_key_id = akid\n" + "aws_secret_access_key = skid\n").getBytes(StandardCharsets.UTF_8)); env.set("AWS_SHARED_CREDENTIALS_FILE", credentialsFile.toString()); diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/CredentialDaemonCredentialsProviderTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/CredentialDaemonCredentialsProviderTest.java index c61e14df7f2f..cd70c71a0152 100644 --- a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/CredentialDaemonCredentialsProviderTest.java +++ b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/CredentialDaemonCredentialsProviderTest.java @@ -22,6 +22,7 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; +import java.nio.file.Paths; import java.time.Clock; import java.time.Duration; import java.time.Instant; @@ -36,11 +37,12 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import org.junit.jupiter.params.provider.ValueSource; import software.amazon.awssdk.core.exception.AbortedException; import software.amazon.awssdk.testutils.EnvironmentVariableHelper; class CredentialDaemonCredentialsProviderTest { - private static final String DOC = "https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-credential-daemon.html"; + private static final String DOC = "https://docs.aws.amazon.com/cli/latest/userguide/cli-authentication-credsd.html"; private static final String START_HINT = "Start the credential daemon and sign in; see " + DOC + "."; private static final String HEAD = "{\"jsonrpc\":\"2.0\",\"id\":1,"; @@ -54,6 +56,8 @@ class CredentialDaemonCredentialsProviderTest { */ private static final Duration IN_PREFETCH_WINDOW = Duration.ofMinutes(13).plusSeconds(30); + private static final String SOCKET_PROPERTY = "aws.credentialDaemonSocket"; + private final EnvironmentVariableHelper env = new EnvironmentVariableHelper(); private final List closeables = new ArrayList<>(); private FakeCredentialDaemon daemon; @@ -68,6 +72,7 @@ void setup() throws Exception { @AfterEach void teardown() throws Exception { env.reset(); + System.clearProperty(SOCKET_PROPERTY); for (AutoCloseable closeable : closeables) { closeable.close(); } @@ -219,6 +224,103 @@ void resolveCredentials_whenSocketIsStale_raisesConnectionRefused() throws Excep assertThat(e.getMessage()).contains("Connection refused").contains(stale.toString()); } + /** + * Returns the path of a socket in a new temporary folder that nothing listens on. + */ + private Path missingSocket() throws Exception { + Path directory = FakeCredentialDaemon.newSocketDirectory(); + closeables.add(() -> Files.deleteIfExists(directory)); + return directory.resolve("missing.sock"); + } + + @Test + void resolveCredentials_withSystemProperty_dialsItBeforeTheEnvironmentVariableAndTheLink() throws Exception { + Files.createSymbolicLink(linkLocation(), daemon.socketPath()); + env.set("AWS_CREDENTIAL_DAEMON_SOCKET", daemon.socketPath().toString()); + FakeCredentialDaemon fromProperty = startDaemon(FakeCredentialDaemon.successReply("ASIAPROPERTY", inMinutes(15))); + System.setProperty(SOCKET_PROPERTY, fromProperty.socketPath().toString()); + + assertThat(provider().resolveCredentials().accessKeyId()).isEqualTo("ASIAPROPERTY"); + assertThat(fromProperty.requests()).hasSize(1); + assertThat(daemon.requests()).isEmpty(); + } + + @Test + void resolveCredentials_withSystemPropertyNotListening_raisesNotRunningWithoutTryingTheEnvironmentVariable() + throws Exception { + Path missing = missingSocket(); + System.setProperty(SOCKET_PROPERTY, missing.toString()); + + CredentialDaemonException e = failure(); + + assertThat(e.errorCode()).isEqualTo(CredentialDaemonException.NOT_RUNNING); + assertThat(e.getMessage()).contains(missing.toString()); + assertThat(daemon.requests()).isEmpty(); + } + + @ParameterizedTest + @ValueSource(strings = {"", "relative/daemon.sock"}) + void resolveCredentials_withEmptyOrRelativeSystemProperty_dialsTheEnvironmentVariable(String value) { + System.setProperty(SOCKET_PROPERTY, value); + + assertThat(provider().resolveCredentials().accessKeyId()).isEqualTo("ASIADAEMON"); + assertThat(daemon.requests()).hasSize(1); + } + + @Test + void resolveCredentials_withSocketPath_dialsItBeforeTheSystemPropertyAndTheEnvironmentVariable() throws Exception { + FakeCredentialDaemon fromProperty = startDaemon(FakeCredentialDaemon.successReply("ASIAPROPERTY", inMinutes(15))); + System.setProperty(SOCKET_PROPERTY, fromProperty.socketPath().toString()); + FakeCredentialDaemon fromCode = startDaemon(FakeCredentialDaemon.successReply("ASIACODE", inMinutes(15))); + + CredentialDaemonCredentialsProvider provider = + provider(CredentialDaemonCredentialsProvider.builder().credentialName("dev").socketPath(fromCode.socketPath())); + + assertThat(provider.resolveCredentials().accessKeyId()).isEqualTo("ASIACODE"); + assertThat(fromProperty.requests()).isEmpty(); + assertThat(daemon.requests()).isEmpty(); + } + + @Test + void resolveCredentials_withSocketPathNotListening_raisesNotRunningWithoutTryingTheSystemProperty() throws Exception { + FakeCredentialDaemon fromProperty = startDaemon(FakeCredentialDaemon.successReply("ASIAPROPERTY", inMinutes(15))); + System.setProperty(SOCKET_PROPERTY, fromProperty.socketPath().toString()); + Path missing = missingSocket(); + + CredentialDaemonCredentialsProvider provider = + provider(CredentialDaemonCredentialsProvider.builder().credentialName("dev").socketPath(missing)); + + assertThatThrownBy(provider::resolveCredentials) + .isInstanceOfSatisfying(CredentialDaemonException.class, e -> { + assertThat(e.errorCode()).isEqualTo(CredentialDaemonException.NOT_RUNNING); + assertThat(e.getMessage()).contains(missing.toString()); + }); + assertThat(fromProperty.requests()).isEmpty(); + assertThat(daemon.requests()).isEmpty(); + } + + @ParameterizedTest + @ValueSource(strings = {"", "relative/daemon.sock"}) + void resolveCredentials_withRelativeSocketPath_dialsTheSystemProperty(String value) throws Exception { + FakeCredentialDaemon fromProperty = startDaemon(FakeCredentialDaemon.successReply("ASIAPROPERTY", inMinutes(15))); + System.setProperty(SOCKET_PROPERTY, fromProperty.socketPath().toString()); + + CredentialDaemonCredentialsProvider provider = + provider(CredentialDaemonCredentialsProvider.builder().credentialName("dev").socketPath(Paths.get(value))); + + assertThat(provider.resolveCredentials().accessKeyId()).isEqualTo("ASIAPROPERTY"); + assertThat(daemon.requests()).isEmpty(); + } + + @Test + void toBuilder_keepsTheSocketPath() throws Exception { + FakeCredentialDaemon fromCode = startDaemon(FakeCredentialDaemon.successReply("ASIACODE", inMinutes(15))); + CredentialDaemonCredentialsProvider original = + provider(CredentialDaemonCredentialsProvider.builder().credentialName("dev").socketPath(fromCode.socketPath())); + + assertThat(provider(original.toBuilder()).resolveCredentials().accessKeyId()).isEqualTo("ASIACODE"); + } + /** * Sets {@code HOME} to a new temporary folder, unsets {@code AWS_CREDENTIAL_DAEMON_SOCKET}, and returns the path of * {@code $HOME/.aws/credential-daemon.sock}, whose folder exists. diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/ProfileCredentialsUtilsDaemonTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/ProfileCredentialsUtilsDaemonTest.java index 2d4daa816736..ec5c088adcfb 100644 --- a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/ProfileCredentialsUtilsDaemonTest.java +++ b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/ProfileCredentialsUtilsDaemonTest.java @@ -83,14 +83,14 @@ private static CredentialDaemonException invalidConfig(String content) { @ParameterizedTest @ValueSource(strings = {".x", "a b", "ΓΌ", "a/b", "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"}) void credentialsProvider_withInvalidName_raisesInvalidConfig(String name) { - CredentialDaemonException e = invalidConfig("[profile dev]\ndaemon_credential = " + name + "\n"); + CredentialDaemonException e = invalidConfig("[profile dev]\ncredential_daemon = " + name + "\n"); - assertThat(e.getMessage()).contains("daemon_credential").contains("'dev'"); + assertThat(e.getMessage()).contains("credential_daemon").contains("'dev'"); } @Test void credentialsProvider_withEmptyName_raisesInvalidConfig() { - invalidConfig("[profile dev]\ndaemon_credential =\n"); + invalidConfig("[profile dev]\ncredential_daemon =\n"); } @Test @@ -98,7 +98,7 @@ void credentialsProvider_with64CharacterMixedCaseName_requestsNameUnchanged() { String name = "Ab-_.0123456789012345678901234567890123456789012345678901234567Z"; assertThat(name).hasSize(64); - AwsCredentialsProvider provider = provider("[profile dev]\ndaemon_credential = " + name + "\n", "dev").get(); + AwsCredentialsProvider provider = provider("[profile dev]\ncredential_daemon = " + name + "\n", "dev").get(); provider.resolveCredentials(); assertThat(provider).isInstanceOf(CredentialDaemonCredentialsProvider.class); @@ -108,7 +108,7 @@ void credentialsProvider_with64CharacterMixedCaseName_requestsNameUnchanged() { @Test void credentialsProvider_withKeysAndProcessAndDaemon_usesDaemon() { String content = "[profile dev]\n" - + "daemon_credential = dev\n" + + "credential_daemon = dev\n" + "aws_access_key_id = akid\n" + "aws_secret_access_key = skid\n" + "credential_process = /bin/false\n" @@ -125,7 +125,7 @@ void credentialsProvider_withKeysAndDaemonNotRunning_doesNotFallBack() throws Ex Path directory = FakeCredentialDaemon.newSocketDirectory(); env.set("AWS_CREDENTIAL_DAEMON_SOCKET", directory.resolve("missing.sock").toString()); String content = "[profile dev]\n" - + "daemon_credential = dev\n" + + "credential_daemon = dev\n" + "aws_access_key_id = akid\n" + "aws_secret_access_key = skid\n"; try { @@ -141,18 +141,18 @@ void credentialsProvider_withKeysAndDaemonNotRunning_doesNotFallBack() throws Ex @Test void credentialsProvider_withRoleArn_raisesInvalidConfigWithSourceProfileHint() { - CredentialDaemonException e = invalidConfig("[profile dev]\ndaemon_credential = dev\n" + CredentialDaemonException e = invalidConfig("[profile dev]\ncredential_daemon = dev\n" + "role_arn = arn:aws:iam::123456789012:role/r\n" + "source_profile = other\n"); - assertThat(e.getMessage()).contains("Profile 'dev' sets both daemon_credential and role_arn") + assertThat(e.getMessage()).contains("Profile 'dev' sets both credential_daemon and role_arn") .contains("Move role_arn into its own profile that sets source_profile = dev."); assertThat(daemon.requests()).isEmpty(); } @Test void credentialsProvider_withWebIdentityTokenFile_raisesInvalidConfigNamingTwoSources() { - CredentialDaemonException e = invalidConfig("[profile dev]\ndaemon_credential = dev\n" + CredentialDaemonException e = invalidConfig("[profile dev]\ncredential_daemon = dev\n" + "web_identity_token_file = /tmp/token\n"); assertWebIdentityConflictMessage(e); @@ -161,7 +161,7 @@ void credentialsProvider_withWebIdentityTokenFile_raisesInvalidConfigNamingTwoSo @Test void credentialsProvider_withRoleArnAndWebIdentityTokenFile_raisesWebIdentityConflict() { - CredentialDaemonException e = invalidConfig("[profile dev]\ndaemon_credential = dev\n" + CredentialDaemonException e = invalidConfig("[profile dev]\ncredential_daemon = dev\n" + "role_arn = arn:aws:iam::123456789012:role/r\n" + "web_identity_token_file = /tmp/token\n"); @@ -171,7 +171,7 @@ void credentialsProvider_withRoleArnAndWebIdentityTokenFile_raisesWebIdentityCon private static void assertWebIdentityConflictMessage(CredentialDaemonException e) { assertThat(e.getMessage()).contains("Profile 'dev' has two credential sources") - .contains("daemon_credential") + .contains("credential_daemon") .contains("web_identity_token_file") .contains("Remove one") .doesNotContain("source_profile"); @@ -183,7 +183,7 @@ void credentialsProvider_whenRoleSourcesDaemonProfile_needsSts() { + "role_arn = arn:aws:iam::123456789012:role/r\n" + "source_profile = dev\n" + "[profile dev]\n" - + "daemon_credential = dev\n"; + + "credential_daemon = dev\n"; assertThatThrownBy(() -> provider(content, "role")) .isInstanceOf(IllegalStateException.class) @@ -196,7 +196,7 @@ void credentialsProvider_whenSourceProfileHasInvalidDaemonName_raisesInvalidConf + "role_arn = arn:aws:iam::123456789012:role/r\n" + "source_profile = dev\n" + "[profile dev]\n" - + "daemon_credential = .bad\n"; + + "credential_daemon = .bad\n"; assertThatThrownBy(() -> provider(content, "role")) .isInstanceOfSatisfying(CredentialDaemonException.class, @@ -206,7 +206,7 @@ void credentialsProvider_whenSourceProfileHasInvalidDaemonName_raisesInvalidConf @Test void credentialsProvider_withSsoProfileAndBothKeys_sendsAccountAndRole() { String content = "[profile dev]\n" - + "daemon_credential = dev\n" + + "credential_daemon = dev\n" + "sso_session = s\n" + "sso_account_id = 123456789012\n" + "sso_role_name = Admin\n" @@ -223,7 +223,7 @@ void credentialsProvider_withSsoProfileAndBothKeys_sendsAccountAndRole() { @Test void credentialsProvider_withSsoProfileAndOneKey_raisesMissingPropertyWithoutCallingDaemon() { String content = "[profile dev]\n" - + "daemon_credential = dev\n" + + "credential_daemon = dev\n" + "sso_start_url = https://example.awsapps.com/start\n" + "sso_account_id = 123456789012\n"; @@ -236,7 +236,7 @@ void credentialsProvider_withSsoProfileAndOneKey_raisesMissingPropertyWithoutCal @Test void credentialsProvider_withSsoProfileAndNeitherKey_resolvesAsIfDaemonAbsent() { String content = "[profile dev]\n" - + "daemon_credential = .not-checked\n" + + "credential_daemon = .not-checked\n" + "sso_session = s\n"; assertThatThrownBy(() -> provider(content, "dev")) @@ -245,10 +245,24 @@ void credentialsProvider_withSsoProfileAndNeitherKey_resolvesAsIfDaemonAbsent() assertThat(daemon.requests()).isEmpty(); } + @Test + void credentialsProvider_withOldDaemonCredentialKey_isNotADaemonProfile() { + String content = "[profile dev]\n" + + "daemon_credential = dev\n" + + "aws_access_key_id = akid\n" + + "aws_secret_access_key = skid\n"; + + AwsCredentialsProvider provider = provider(content, "dev").get(); + + assertThat(provider).isNotInstanceOf(CredentialDaemonCredentialsProvider.class); + assertThat(provider.resolveCredentials().accessKeyId()).isEqualTo("akid"); + assertThat(daemon.requests()).isEmpty(); + } + @Test void credentialsProvider_withoutSsoSettings_doesNotSendAccountAndRole() { String content = "[profile dev]\n" - + "daemon_credential = dev\n"; + + "credential_daemon = dev\n"; provider(content, "dev").get().resolveCredentials(); diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/daemon/CredentialDaemonClientLocateTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/daemon/CredentialDaemonClientLocateTest.java index 93ee2d0d4f1b..0f406b6770a6 100644 --- a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/daemon/CredentialDaemonClientLocateTest.java +++ b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/daemon/CredentialDaemonClientLocateTest.java @@ -49,9 +49,11 @@ class CredentialDaemonClientLocateTest { new CredentialDaemonPlatform("Mac OS X", "OpenJDK 64-Bit Server VM", "Amazon.com Inc.", "java.net.UnixDomainSocketAddress"); private static final String INSTALL_HINT = "Install the credential daemon or link its socket to " + "$HOME/.aws/credential-daemon.sock, or set AWS_CREDENTIAL_DAEMON_SOCKET"; - private static final String DOC = "https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-credential-daemon.html"; + private static final String DOC = "https://docs.aws.amazon.com/cli/latest/userguide/cli-authentication-credsd.html"; private final Map env = new HashMap<>(); + private final Map systemProperties = new HashMap<>(); + private Path socketPath; private final List closeables = new ArrayList<>(); private Path home; private Path location; @@ -77,7 +79,8 @@ void teardown() throws Exception { } private CredentialDaemonClient client(CredentialDaemonPlatform platform) { - return new CredentialDaemonClient(platform, k -> Optional.ofNullable(env.get(k)), Duration.ofSeconds(1), + return new CredentialDaemonClient(platform, socketPath, k -> Optional.ofNullable(systemProperties.get(k)), + k -> Optional.ofNullable(env.get(k)), Duration.ofSeconds(1), Duration.ofSeconds(5), platform::openChannel, "Aq"); } @@ -111,6 +114,67 @@ void locate_env_returnsItBeforeTheLink() throws IOException { assertLocates(Paths.get("/some/where/d.sock")); } + @Test + void locate_socketPath_returnsItBeforeTheSystemPropertyAndTheEnvironmentVariable() { + socketPath = Paths.get("/some/where/code.sock"); + systemProperties.put("aws.credentialDaemonSocket", "/some/where/property.sock"); + env.put("AWS_CREDENTIAL_DAEMON_SOCKET", "/some/where/env.sock"); + + assertLocates(socketPath); + } + + @Test + void locate_withRelativeSocketPath_skipsIt() { + socketPath = Paths.get("relative/code.sock"); + systemProperties.put("aws.credentialDaemonSocket", "/some/where/property.sock"); + + assertLocates(Paths.get("/some/where/property.sock")); + + socketPath = Paths.get(""); + assertLocates(Paths.get("/some/where/property.sock")); + } + + @Test + void locate_systemProperty_returnsItBeforeTheEnvironmentVariableAndTheLink() throws IOException { + systemProperties.put("aws.credentialDaemonSocket", "/some/where/property.sock"); + env.put("AWS_CREDENTIAL_DAEMON_SOCKET", "/some/where/env.sock"); + env.put("HOME", home.toString()); + Files.createSymbolicLink(location, bindSocket(home.resolve("real.sock"))); + + assertLocates(Paths.get("/some/where/property.sock")); + } + + @Test + void locate_withEmptyOrRelativeSystemProperty_skipsIt() { + env.put("AWS_CREDENTIAL_DAEMON_SOCKET", "/some/where/env.sock"); + + systemProperties.put("aws.credentialDaemonSocket", ""); + assertLocates(Paths.get("/some/where/env.sock")); + + systemProperties.put("aws.credentialDaemonSocket", "relative/property.sock"); + assertLocates(Paths.get("/some/where/env.sock")); + } + + @Test + void locate_withEmptyOrRelativeSystemPropertyAndNoEnvironmentVariable_usesTheLink() throws IOException { + env.put("HOME", home.toString()); + Files.createSymbolicLink(location, bindSocket(home.resolve("real.sock"))); + + systemProperties.put("aws.credentialDaemonSocket", ""); + assertLocates(location); + + systemProperties.put("aws.credentialDaemonSocket", "relative/property.sock"); + assertLocates(location); + } + + @Test + void locate_noLocation_namesTheSystemPropertyAndTheEnvironmentVariable() { + env.put("HOME", home.toString()); + + assertNoLocation("neither the aws.credentialDaemonSocket system property nor AWS_CREDENTIAL_DAEMON_SOCKET is set to " + + "an absolute path"); + } + @Test void locate_envFile_returnsItWithoutCheckingWhatIsThere() throws IOException { Path file = Files.createFile(home.resolve("env-file.sock")); diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/daemon/CredentialDaemonPlatformTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/daemon/CredentialDaemonPlatformTest.java index 2870ff570f53..593f15239c75 100644 --- a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/daemon/CredentialDaemonPlatformTest.java +++ b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/daemon/CredentialDaemonPlatformTest.java @@ -29,7 +29,7 @@ class CredentialDaemonPlatformTest { private static final String ADDRESS_CLASS = "java.net.UnixDomainSocketAddress"; - private static final String DOC = "https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-credential-daemon.html"; + private static final String DOC = "https://docs.aws.amazon.com/cli/latest/userguide/cli-authentication-credsd.html"; static Stream unsupportedPlatforms() { return Stream.of( diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/token/credentials/ProfileTokenProviderTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/token/credentials/ProfileTokenProviderTest.java index cbd218039f6b..d064a8a6d37b 100644 --- a/core/auth/src/test/java/software/amazon/awssdk/auth/token/credentials/ProfileTokenProviderTest.java +++ b/core/auth/src/test/java/software/amazon/awssdk/auth/token/credentials/ProfileTokenProviderTest.java @@ -77,7 +77,7 @@ void compatibleProfileSettings_callsLoader() { @Test void resolveToken_whenDaemonHoldsSsoSession_raisesBearerTokenError() { ProfileFile file = profileFile("[profile dev]\n" - + "daemon_credential = dev\n" + + "credential_daemon = dev\n" + "sso_session = s\n" + "sso_account_id = 123456789012\n" + "sso_role_name = Admin\n" @@ -91,7 +91,7 @@ void resolveToken_whenDaemonHoldsSsoSession_raisesBearerTokenError() { assertThatThrownBy(provider::resolveToken) .isInstanceOf(IllegalArgumentException.class) .hasMessage("Profile dev does not have a usable sso_session: its SSO session is held in the credential daemon " - + "(daemon_credential). Services that use bearer tokens need an SSO session stored in files; configure " + + "(credential_daemon). Services that use bearer tokens need an SSO session stored in files; configure " + "a profile with sso_session and sign in with a file-based SSO login."); } diff --git a/core/profiles/src/main/java/software/amazon/awssdk/profiles/ProfileProperty.java b/core/profiles/src/main/java/software/amazon/awssdk/profiles/ProfileProperty.java index e85504121357..ae3caf1fec46 100644 --- a/core/profiles/src/main/java/software/amazon/awssdk/profiles/ProfileProperty.java +++ b/core/profiles/src/main/java/software/amazon/awssdk/profiles/ProfileProperty.java @@ -222,7 +222,7 @@ public final class ProfileProperty { /** * The name of a credential held by a local credential daemon. Read only from the shared config file. */ - public static final String DAEMON_CREDENTIAL = "daemon_credential"; + public static final String CREDENTIAL_DAEMON = "credential_daemon"; private ProfileProperty() { } diff --git a/core/profiles/src/main/java/software/amazon/awssdk/profiles/internal/ProfileFileReader.java b/core/profiles/src/main/java/software/amazon/awssdk/profiles/internal/ProfileFileReader.java index 1df924064727..ae66206fd6c6 100644 --- a/core/profiles/src/main/java/software/amazon/awssdk/profiles/internal/ProfileFileReader.java +++ b/core/profiles/src/main/java/software/amazon/awssdk/profiles/internal/ProfileFileReader.java @@ -139,7 +139,7 @@ private static void readPropertyDefinitionLine(ParserState state, String line) { Pair property = propertyDefinition.get(); - if (state.fileType == ProfileFile.Type.CREDENTIALS && ProfileProperty.DAEMON_CREDENTIAL.equals(property.left())) { + if (state.fileType == ProfileFile.Type.CREDENTIALS && ProfileProperty.CREDENTIAL_DAEMON.equals(property.left())) { int lineNumber = state.currentLineNumber; log.warn(() -> "Ignoring property '" + property.left() + "' on line " + lineNumber + " of the shared " + "credentials file; it is read only from the shared config file."); diff --git a/core/profiles/src/test/java/software/amazon/awssdk/profiles/ProfileFileTest.java b/core/profiles/src/test/java/software/amazon/awssdk/profiles/ProfileFileTest.java index 3eb578fcfe79..1f5e861861e6 100644 --- a/core/profiles/src/test/java/software/amazon/awssdk/profiles/ProfileFileTest.java +++ b/core/profiles/src/test/java/software/amazon/awssdk/profiles/ProfileFileTest.java @@ -811,14 +811,14 @@ public void builderValidatesContentRequired() { @Test public void daemonCredential_inConfigFile_isKept() { assertThat(configFileProfiles("[profile dev]\n" - + "daemon_credential = dev\n")) - .isEqualTo(profiles(profile("dev", property("daemon_credential", "dev")))); + + "credential_daemon = dev\n")) + .isEqualTo(profiles(profile("dev", property("credential_daemon", "dev")))); } @Test public void daemonCredential_inCredentialsFile_isDroppedWithContinuations() { assertThat(credentialFileProfiles("[dev]\n" - + "daemon_credential =\n" + + "credential_daemon =\n" + " sub = value\n" + "aws_access_key_id = akid\n" + "region = us-west-2\n" @@ -833,7 +833,7 @@ public void daemonCredential_inCredentialsFileOnly_isAbsentAfterAggregation() { assertThat(aggregateFileProfiles("[profile dev]\n" + "region = us-west-2\n", "[dev]\n" - + "daemon_credential = dev\n")) + + "credential_daemon = dev\n")) .isEqualTo(profiles(profile("dev", property("region", "us-west-2")))); } diff --git a/services/ssooidc/src/main/java/software/amazon/awssdk/services/ssooidc/SsoOidcProfileTokenProviderFactory.java b/services/ssooidc/src/main/java/software/amazon/awssdk/services/ssooidc/SsoOidcProfileTokenProviderFactory.java index fb41f8e20a87..2a02d9db2012 100644 --- a/services/ssooidc/src/main/java/software/amazon/awssdk/services/ssooidc/SsoOidcProfileTokenProviderFactory.java +++ b/services/ssooidc/src/main/java/software/amazon/awssdk/services/ssooidc/SsoOidcProfileTokenProviderFactory.java @@ -106,12 +106,12 @@ private static final class SsoOidcProfileTokenProvider implements SdkTokenProvid private final SsoOidcTokenProvider sdkTokenProvider; private SsoOidcProfileTokenProvider(ProfileFile profileFile, Profile profile) { - if (profile.property(ProfileProperty.DAEMON_CREDENTIAL).isPresent() + if (profile.property(ProfileProperty.CREDENTIAL_DAEMON).isPresent() && profile.property(ProfileProperty.SSO_ACCOUNT_ID).isPresent() && profile.property(ProfileProperty.SSO_ROLE_NAME).isPresent()) { throw new IllegalArgumentException( "Profile " + profile.name() + " does not have a usable sso_session: its SSO session is held in the " - + "credential daemon (daemon_credential). Services that use bearer tokens need an SSO session stored in " + + "credential daemon (credential_daemon). Services that use bearer tokens need an SSO session stored in " + "files; configure a profile with sso_session and sign in with a file-based SSO login."); } diff --git a/services/ssooidc/src/test/java/software/amazon/awssdk/services/ssooidc/internal/SsoOidcProfileTokenProviderFactoryTest.java b/services/ssooidc/src/test/java/software/amazon/awssdk/services/ssooidc/internal/SsoOidcProfileTokenProviderFactoryTest.java index 79f2de373de6..033923126919 100644 --- a/services/ssooidc/src/test/java/software/amazon/awssdk/services/ssooidc/internal/SsoOidcProfileTokenProviderFactoryTest.java +++ b/services/ssooidc/src/test/java/software/amazon/awssdk/services/ssooidc/internal/SsoOidcProfileTokenProviderFactoryTest.java @@ -80,7 +80,7 @@ void create_throwsExceptionIfStartUrlNotPassed() { @Test void create_whenDaemonHoldsSsoSession_throwsBearerTokenError() { String profileContent = "[profile dev]\n" + - "daemon_credential=dev\n" + + "credential_daemon=dev\n" + "sso_session=admin\n" + "sso_account_id=123456789012\n" + "sso_role_name=Admin\n" + @@ -96,7 +96,7 @@ void create_whenDaemonHoldsSsoSession_throwsBearerTokenError() { profiles.profile("dev").get())) .isInstanceOf(IllegalArgumentException.class) .hasMessage("Profile dev does not have a usable sso_session: its SSO session is held in the credential " - + "daemon (daemon_credential). Services that use bearer tokens need an SSO session stored in " + + "daemon (credential_daemon). Services that use bearer tokens need an SSO session stored in " + "files; configure a profile with sso_session and sign in with a file-based SSO login."); } diff --git a/services/sts/src/test/java/software/amazon/awssdk/services/sts/internal/CredentialDaemonClientCallTest.java b/services/sts/src/test/java/software/amazon/awssdk/services/sts/internal/CredentialDaemonClientCallTest.java index 725f6e4c133e..292a97a959ac 100644 --- a/services/sts/src/test/java/software/amazon/awssdk/services/sts/internal/CredentialDaemonClientCallTest.java +++ b/services/sts/src/test/java/software/amazon/awssdk/services/sts/internal/CredentialDaemonClientCallTest.java @@ -80,7 +80,7 @@ class CredentialDaemonClientCallTest { + "arn:aws:sts::123456789012:assumed-role/r/sAROA:s" + ""; private static final String CONFIG = "[profile dev]\n" - + "daemon_credential = dev\n" + + "credential_daemon = dev\n" + "[profile role]\n" + "region = us-west-2\n" + "role_arn = arn:aws:iam::123456789012:role/r\n"