Skip to content

Commit 5109891

Browse files
dclimclintropolis
authored andcommitted
Use PasswordProvider for basic HTTP escalator (#6650) (#6700)
1 parent 46251e0 commit 5109891

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

docs/content/development/extensions-core/druid-basic-security.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ druid.escalator.authorizerName=MyBasicAuthorizer
9393
|Property|Description|Default|required|
9494
|--------|-----------|-------|--------|
9595
|`druid.escalator.internalClientUsername`|The escalator will use this username for requests made as the internal systerm user.|n/a|Yes|
96-
|`druid.escalator.internalClientPassword`|The escalator will use this password for requests made as the internal system user.|n/a|Yes|
96+
|`druid.escalator.internalClientPassword`|The escalator will use this [Password Provider](../../operations/password-provider.html) for requests made as the internal system user.|n/a|Yes|
9797
|`druid.escalator.authorizerName`|Authorizer that requests should be directed to.|n/a|Yes|
9898

9999

extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/BasicHTTPEscalator.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,22 @@
2525
import org.apache.druid.java.util.http.client.CredentialedHttpClient;
2626
import org.apache.druid.java.util.http.client.HttpClient;
2727
import org.apache.druid.java.util.http.client.auth.BasicCredentials;
28+
import org.apache.druid.metadata.PasswordProvider;
2829
import org.apache.druid.server.security.AuthenticationResult;
2930
import org.apache.druid.server.security.Escalator;
3031

3132
@JsonTypeName("basic")
3233
public class BasicHTTPEscalator implements Escalator
3334
{
3435
private final String internalClientUsername;
35-
private final String internalClientPassword;
36+
private final PasswordProvider internalClientPassword;
3637
private final String authorizerName;
3738

3839
@JsonCreator
3940
public BasicHTTPEscalator(
4041
@JsonProperty("authorizerName") String authorizerName,
4142
@JsonProperty("internalClientUsername") String internalClientUsername,
42-
@JsonProperty("internalClientPassword") String internalClientPassword
43+
@JsonProperty("internalClientPassword") PasswordProvider internalClientPassword
4344
)
4445
{
4546
this.authorizerName = authorizerName;
@@ -51,7 +52,7 @@ public BasicHTTPEscalator(
5152
public HttpClient createEscalatedClient(HttpClient baseClient)
5253
{
5354
return new CredentialedHttpClient(
54-
new BasicCredentials(internalClientUsername, internalClientPassword),
55+
new BasicCredentials(internalClientUsername, internalClientPassword.getPassword()),
5556
baseClient
5657
);
5758
}

0 commit comments

Comments
 (0)