mohammadjkhan commented on a change in pull request #6972: Support LDAP
authentication/authorization
URL: https://github.com/apache/incubator-druid/pull/6972#discussion_r307897732
##########
File path:
extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/BasicHTTPEscalator.java
##########
@@ -19,49 +19,143 @@
package org.apache.druid.security.basic.authentication;
+import com.fasterxml.jackson.annotation.JacksonInject;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.google.inject.Provider;
+import org.apache.druid.java.util.common.logger.Logger;
import org.apache.druid.java.util.http.client.CredentialedHttpClient;
import org.apache.druid.java.util.http.client.HttpClient;
-import org.apache.druid.java.util.http.client.auth.BasicCredentials;
+import org.apache.druid.java.util.http.client.Request;
+import org.apache.druid.java.util.http.client.auth.Credentials;
import org.apache.druid.metadata.PasswordProvider;
+import org.apache.druid.security.basic.BasicAuthDBConfig;
+import
org.apache.druid.security.basic.escalator.db.cache.BasicEscalatorCacheManager;
+import
org.apache.druid.security.basic.escalator.entity.BasicEscalatorCredential;
import org.apache.druid.server.security.AuthenticationResult;
import org.apache.druid.server.security.Escalator;
+import java.util.concurrent.atomic.AtomicReference;
+
@JsonTypeName("basic")
public class BasicHTTPEscalator implements Escalator
{
- private final String internalClientUsername;
- private final PasswordProvider internalClientPassword;
+ private static final Logger LOG = new Logger(BasicHTTPEscalator.class);
+ public static final int DEFAULT_INTERNAL_CLIENT_CREDENTIAL_POLL_SECONDS = 10;
+
+ private final Provider<BasicEscalatorCacheManager> cacheManager;
private final String authorizerName;
+ private final BasicAuthDBConfig dbConfig;
+ private final AtomicReference<BasicEscalatorCredential>
cachedEscalatorCredential;
+ private final AtomicReference<Long> lastVerified;
+ private final int internalClientCredentialPoll;
@JsonCreator
public BasicHTTPEscalator(
+ @JacksonInject Provider<BasicEscalatorCacheManager> cacheManager,
@JsonProperty("authorizerName") String authorizerName,
@JsonProperty("internalClientUsername") String internalClientUsername,
- @JsonProperty("internalClientPassword") PasswordProvider
internalClientPassword
+ @JsonProperty("internalClientPassword") PasswordProvider
internalClientPassword,
+ @JsonProperty("enableCacheNotifications") Boolean
enableCacheNotifications,
+ @JsonProperty("cacheNotificationTimeout") Long cacheNotificationTimeout,
+ @JsonProperty("internalClientCredentialPoll") Integer
internalClientCredentialPoll
)
{
+ this.cacheManager = cacheManager;
this.authorizerName = authorizerName;
- this.internalClientUsername = internalClientUsername;
- this.internalClientPassword = internalClientPassword;
+ this.cachedEscalatorCredential = new AtomicReference<>(
+ new BasicEscalatorCredential(internalClientUsername,
internalClientPassword.getPassword())
+ );
+ this.dbConfig = new BasicAuthDBConfig(
Review comment:
Fixed, cleaned up dbConfig usage inside escalator
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
