root
/
kafka
mirror of https://github.com/apache/kafka.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

MINOR: Use SecurityProtocol in AuthenticationContext 

Since we removed the unused `TRACE` option from `SecurityProtocol`, it now seems safer to expose it from `AuthenticationContext`. Additionally this patch exposes javadocs under security.auth and relocates the `Login` and `AuthCallbackHandler` to a non-public package.

Author: Jason Gustafson <jason@confluent.io>

Reviewers: Rajini Sivaram <rajinisivaram@googlemail.com>, Manikumar Reddy <manikumar.reddy@gmail.com>, Ismael Juma <ismael@juma.me.uk>

Closes #3863 from hachikuji/use-security-protocol-in-auth-context
This commit is contained in:
Jason Gustafson 2017-10-04 09:20:21 -07:00
parent 198302feec
commit 5383f9bed0
90 changed files with 116 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.gradle
View File

@ -834,6 +834,7 @@ project(':clients') {
include "**/org/apache/kafka/common/resource/*"
include "**/org/apache/kafka/common/serialization/*"
include "**/org/apache/kafka/common/config/*"
include "**/org/apache/kafka/common/security/auth/*"
include "**/org/apache/kafka/server/policy/*"
}
}

2
clients/src/main/java/org/apache/kafka/clients/ClientUtils.java
View File

@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicReference;
import org.apache.kafka.common.config.AbstractConfig;
import org.apache.kafka.common.network.ChannelBuilders;
import org.apache.kafka.common.security.JaasContext;
import org.apache.kafka.common.protocol.SecurityProtocol;
import org.apache.kafka.common.security.auth.SecurityProtocol;
import org.apache.kafka.common.network.ChannelBuilder;
import org.apache.kafka.common.config.ConfigException;
import org.apache.kafka.common.config.SaslConfigs;

2
clients/src/main/java/org/apache/kafka/clients/CommonClientConfigs.java
View File

@ -17,7 +17,7 @@
package org.apache.kafka.clients;
import org.apache.kafka.common.config.AbstractConfig;
import org.apache.kafka.common.protocol.SecurityProtocol;
import org.apache.kafka.common.security.auth.SecurityProtocol;
import org.apache.kafka.common.utils.Utils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
clients/src/main/java/org/apache/kafka/common/network/ChannelBuilders.java
View File

@ -20,7 +20,7 @@ import org.apache.kafka.common.Configurable;
import org.apache.kafka.common.config.AbstractConfig;
import org.apache.kafka.common.config.internals.BrokerSecurityConfigs;
import org.apache.kafka.common.errors.InvalidConfigurationException;
import org.apache.kafka.common.protocol.SecurityProtocol;
import org.apache.kafka.common.security.auth.SecurityProtocol;
import org.apache.kafka.common.security.JaasContext;
import org.apache.kafka.common.security.authenticator.DefaultKafkaPrincipalBuilder;
import org.apache.kafka.common.security.auth.DefaultPrincipalBuilder;

2
clients/src/main/java/org/apache/kafka/common/network/ListenerName.java
View File

@ -16,7 +16,7 @@
*/
package org.apache.kafka.common.network;
import org.apache.kafka.common.protocol.SecurityProtocol;
import org.apache.kafka.common.security.auth.SecurityProtocol;
import java.util.Locale;
import java.util.Objects;

2
clients/src/main/java/org/apache/kafka/common/network/SaslChannelBuilder.java
View File

@ -20,7 +20,7 @@ import org.apache.kafka.common.KafkaException;
import org.apache.kafka.common.config.SaslConfigs;
import org.apache.kafka.common.config.internals.BrokerSecurityConfigs;
import org.apache.kafka.common.memory.MemoryPool;
import org.apache.kafka.common.protocol.SecurityProtocol;
import org.apache.kafka.common.security.auth.SecurityProtocol;
import org.apache.kafka.common.security.JaasContext;
import org.apache.kafka.common.security.authenticator.CredentialCache;
import org.apache.kafka.common.security.authenticator.LoginManager;

2
clients/src/main/java/org/apache/kafka/common/requests/RequestContext.java
View File

@ -20,9 +20,9 @@ import org.apache.kafka.common.errors.InvalidRequestException;
import org.apache.kafka.common.network.ListenerName;
import org.apache.kafka.common.network.Send;
import org.apache.kafka.common.protocol.ApiKeys;
import org.apache.kafka.common.protocol.SecurityProtocol;
import org.apache.kafka.common.protocol.types.Struct;
import org.apache.kafka.common.security.auth.KafkaPrincipal;
import org.apache.kafka.common.security.auth.SecurityProtocol;
import java.net.InetAddress;
import java.nio.ByteBuffer;

2
clients/src/main/java/org/apache/kafka/common/requests/UpdateMetadataRequest.java
View File

@ -21,11 +21,11 @@ import org.apache.kafka.common.errors.UnsupportedVersionException;
import org.apache.kafka.common.network.ListenerName;
import org.apache.kafka.common.protocol.ApiKeys;
import org.apache.kafka.common.protocol.Errors;
import org.apache.kafka.common.protocol.SecurityProtocol;
import org.apache.kafka.common.protocol.types.ArrayOf;
import org.apache.kafka.common.protocol.types.Field;
import org.apache.kafka.common.protocol.types.Schema;
import org.apache.kafka.common.protocol.types.Struct;
import org.apache.kafka.common.security.auth.SecurityProtocol;
import org.apache.kafka.common.utils.Utils;
import java.nio.ByteBuffer;

3
clients/src/main/java/org/apache/kafka/common/security/auth/AuthenticationContext.java
View File

@ -25,9 +25,8 @@ import java.net.InetAddress;
public interface AuthenticationContext {
/**
* Underlying security protocol of the authentication session.
* @return The name of the security protocol (i.e. PLAINTEXT, SASL_PLAINTEXT, SASL_SSL, SSL)
*/
String securityProtocolName();
SecurityProtocol securityProtocol();
/**
* Address of the authenticated client

6
clients/src/main/java/org/apache/kafka/common/security/auth/PlaintextAuthenticationContext.java
View File

@ -16,8 +16,6 @@
*/
package org.apache.kafka.common.security.auth;
import org.apache.kafka.common.protocol.SecurityProtocol;
import java.net.InetAddress;
public class PlaintextAuthenticationContext implements AuthenticationContext {
@ -28,8 +26,8 @@ public class PlaintextAuthenticationContext implements AuthenticationContext {
}
@Override
public String securityProtocolName() {
return SecurityProtocol.PLAINTEXT.name;
public SecurityProtocol securityProtocol() {
return SecurityProtocol.PLAINTEXT;
}
@Override

6
clients/src/main/java/org/apache/kafka/common/security/auth/SaslAuthenticationContext.java
View File

@ -16,8 +16,6 @@
*/
package org.apache.kafka.common.security.auth;
import org.apache.kafka.common.protocol.SecurityProtocol;
import javax.security.sasl.SaslServer;
import java.net.InetAddress;
@ -37,8 +35,8 @@ public class SaslAuthenticationContext implements AuthenticationContext {
}
@Override
public String securityProtocolName() {
return securityProtocol.name;
public SecurityProtocol securityProtocol() {
return securityProtocol;
}
@Override

2
clients/src/main/java/org/apache/kafka/common/protocol/SecurityProtocol.java → clients/src/main/java/org/apache/kafka/common/security/auth/SecurityProtocol.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.kafka.common.protocol;
package org.apache.kafka.common.security.auth;
import java.util.ArrayList;
import java.util.Collections;

6
clients/src/main/java/org/apache/kafka/common/security/auth/SslAuthenticationContext.java
View File

@ -16,8 +16,6 @@
*/
package org.apache.kafka.common.security.auth;
import org.apache.kafka.common.protocol.SecurityProtocol;
import javax.net.ssl.SSLSession;
import java.net.InetAddress;
@ -35,8 +33,8 @@ public class SslAuthenticationContext implements AuthenticationContext {
}
@Override
public String securityProtocolName() {
return SecurityProtocol.SSL.name;
public SecurityProtocol securityProtocol() {
return SecurityProtocol.SSL;
}
@Override

1
clients/src/main/java/org/apache/kafka/common/security/authenticator/AbstractLogin.java
View File

@ -27,7 +27,6 @@ import javax.security.auth.callback.UnsupportedCallbackException;
import javax.security.auth.Subject;
import org.apache.kafka.common.security.JaasContext;
import org.apache.kafka.common.security.auth.Login;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
clients/src/main/java/org/apache/kafka/common/security/auth/AuthCallbackHandler.java → clients/src/main/java/org/apache/kafka/common/security/authenticator/AuthCallbackHandler.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.kafka.common.security.auth;
package org.apache.kafka.common.security.authenticator;
import java.util.Map;

2
clients/src/main/java/org/apache/kafka/common/security/auth/Login.java → clients/src/main/java/org/apache/kafka/common/security/authenticator/Login.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.kafka.common.security.auth;
package org.apache.kafka.common.security.authenticator;
import org.apache.kafka.common.security.JaasContext;

1
clients/src/main/java/org/apache/kafka/common/security/authenticator/LoginManager.java
View File

@ -27,7 +27,6 @@ import java.util.Map;
import org.apache.kafka.common.config.SaslConfigs;
import org.apache.kafka.common.config.types.Password;
import org.apache.kafka.common.security.JaasContext;
import org.apache.kafka.common.security.auth.Login;
import org.apache.kafka.common.security.kerberos.KerberosLogin;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

1
clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslClientAuthenticator.java
View File

@ -41,7 +41,6 @@ import org.apache.kafka.common.requests.SaslAuthenticateRequest;
import org.apache.kafka.common.requests.SaslAuthenticateResponse;
import org.apache.kafka.common.requests.SaslHandshakeRequest;
import org.apache.kafka.common.requests.SaslHandshakeResponse;
import org.apache.kafka.common.security.auth.AuthCallbackHandler;
import org.apache.kafka.common.security.auth.KafkaPrincipal;
import org.apache.kafka.common.utils.Utils;
import org.slf4j.Logger;

1
clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslClientCallbackHandler.java
View File

@ -28,7 +28,6 @@ import javax.security.sasl.RealmCallback;
import org.apache.kafka.common.config.SaslConfigs;
import org.apache.kafka.common.network.Mode;
import org.apache.kafka.common.security.auth.AuthCallbackHandler;
/**
* Callback handler for Sasl clients. The callbacks required for the SASL mechanism

3
clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslServerAuthenticator.java
View File

@ -34,7 +34,7 @@ import org.apache.kafka.common.network.Send;
import org.apache.kafka.common.network.TransportLayer;
import org.apache.kafka.common.protocol.ApiKeys;
import org.apache.kafka.common.protocol.Errors;
import org.apache.kafka.common.protocol.SecurityProtocol;
import org.apache.kafka.common.security.auth.SecurityProtocol;
import org.apache.kafka.common.requests.AbstractResponse;
import org.apache.kafka.common.requests.ApiVersionsRequest;
import org.apache.kafka.common.requests.ApiVersionsResponse;
@ -46,7 +46,6 @@ import org.apache.kafka.common.requests.SaslAuthenticateResponse;
import org.apache.kafka.common.requests.SaslHandshakeRequest;
import org.apache.kafka.common.requests.SaslHandshakeResponse;
import org.apache.kafka.common.security.JaasContext;
import org.apache.kafka.common.security.auth.AuthCallbackHandler;
import org.apache.kafka.common.security.auth.KafkaPrincipal;
import org.apache.kafka.common.security.auth.KafkaPrincipalBuilder;
import org.apache.kafka.common.security.auth.SaslAuthenticationContext;

1
clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslServerCallbackHandler.java
View File

@ -20,7 +20,6 @@ import java.io.IOException;
import java.util.Map;
import org.apache.kafka.common.security.JaasContext;
import org.apache.kafka.common.security.auth.AuthCallbackHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
clients/src/main/java/org/apache/kafka/common/security/scram/ScramServerCallbackHandler.java
View File

@ -25,7 +25,7 @@ import javax.security.auth.callback.NameCallback;
import javax.security.auth.callback.UnsupportedCallbackException;
import org.apache.kafka.common.network.Mode;
import org.apache.kafka.common.security.auth.AuthCallbackHandler;
import org.apache.kafka.common.security.authenticator.AuthCallbackHandler;
import org.apache.kafka.common.security.authenticator.CredentialCache;
public class ScramServerCallbackHandler implements AuthCallbackHandler {

2
clients/src/test/java/org/apache/kafka/common/network/EchoServer.java
View File

@ -16,7 +16,7 @@
*/
package org.apache.kafka.common.network;
import org.apache.kafka.common.protocol.SecurityProtocol;
import org.apache.kafka.common.security.auth.SecurityProtocol;
import org.apache.kafka.common.security.ssl.SslFactory;
import javax.net.ssl.SSLContext;

2
clients/src/test/java/org/apache/kafka/common/network/NetworkTestUtils.java
View File

@ -24,7 +24,7 @@ import static org.junit.Assert.assertTrue;
import org.apache.kafka.common.config.AbstractConfig;
import org.apache.kafka.common.metrics.Metrics;
import org.apache.kafka.common.protocol.SecurityProtocol;
import org.apache.kafka.common.security.auth.SecurityProtocol;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.security.authenticator.CredentialCache;
import org.apache.kafka.common.utils.MockTime;

2
clients/src/test/java/org/apache/kafka/common/network/NioEchoServer.java
View File

@ -22,7 +22,7 @@ import org.apache.kafka.common.MetricName;
import org.apache.kafka.common.config.AbstractConfig;
import org.apache.kafka.common.metrics.KafkaMetric;
import org.apache.kafka.common.metrics.Metrics;
import org.apache.kafka.common.protocol.SecurityProtocol;
import org.apache.kafka.common.security.auth.SecurityProtocol;
import org.apache.kafka.common.security.authenticator.CredentialCache;
import org.apache.kafka.common.security.scram.ScramCredentialUtils;
import org.apache.kafka.common.security.scram.ScramMechanism;

2
clients/src/test/java/org/apache/kafka/common/network/SaslChannelBuilderTest.java
View File

@ -18,7 +18,7 @@ package org.apache.kafka.common.network;
import org.apache.kafka.common.KafkaException;
import org.apache.kafka.common.config.SslConfigs;
import org.apache.kafka.common.protocol.SecurityProtocol;
import org.apache.kafka.common.security.auth.SecurityProtocol;
import org.apache.kafka.common.security.JaasContext;
import org.apache.kafka.common.security.authenticator.TestJaasConfig;
import org.apache.kafka.common.security.plain.PlainLoginModule;

2
clients/src/test/java/org/apache/kafka/common/network/SelectorTest.java
View File

@ -20,7 +20,7 @@ import org.apache.kafka.common.KafkaException;
import org.apache.kafka.common.memory.MemoryPool;
import org.apache.kafka.common.memory.SimpleMemoryPool;
import org.apache.kafka.common.metrics.Metrics;
import org.apache.kafka.common.protocol.SecurityProtocol;
import org.apache.kafka.common.security.auth.SecurityProtocol;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.MockTime;
import org.apache.kafka.common.utils.Time;

2
clients/src/test/java/org/apache/kafka/common/network/SslSelectorTest.java
View File

@ -19,7 +19,7 @@ package org.apache.kafka.common.network;
import org.apache.kafka.common.memory.MemoryPool;
import org.apache.kafka.common.memory.SimpleMemoryPool;
import org.apache.kafka.common.metrics.Metrics;
import org.apache.kafka.common.protocol.SecurityProtocol;
import org.apache.kafka.common.security.auth.SecurityProtocol;
import org.apache.kafka.common.security.ssl.SslFactory;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.MockTime;

2
clients/src/test/java/org/apache/kafka/common/network/SslTransportLayerTest.java
View File

@ -22,7 +22,7 @@ import org.apache.kafka.common.config.internals.BrokerSecurityConfigs;
import org.apache.kafka.common.config.types.Password;
import org.apache.kafka.common.memory.MemoryPool;
import org.apache.kafka.common.metrics.Metrics;
import org.apache.kafka.common.protocol.SecurityProtocol;
import org.apache.kafka.common.security.auth.SecurityProtocol;
import org.apache.kafka.common.security.TestSecurityConfig;
import org.apache.kafka.common.security.ssl.SslFactory;
import org.apache.kafka.common.utils.LogContext;

2
clients/src/test/java/org/apache/kafka/common/requests/RequestContextTest.java
View File

@ -20,7 +20,7 @@ import org.apache.kafka.common.network.ListenerName;
import org.apache.kafka.common.network.Send;
import org.apache.kafka.common.protocol.ApiKeys;
import org.apache.kafka.common.protocol.Errors;
import org.apache.kafka.common.protocol.SecurityProtocol;
import org.apache.kafka.common.security.auth.SecurityProtocol;
import org.apache.kafka.common.protocol.types.Struct;
import org.apache.kafka.common.security.auth.KafkaPrincipal;
import org.junit.Test;

2
clients/src/test/java/org/apache/kafka/common/requests/RequestResponseTest.java
View File

@ -36,7 +36,7 @@ import org.apache.kafka.common.network.ListenerName;
import org.apache.kafka.common.network.Send;
import org.apache.kafka.common.protocol.ApiKeys;
import org.apache.kafka.common.protocol.Errors;
import org.apache.kafka.common.protocol.SecurityProtocol;
import org.apache.kafka.common.security.auth.SecurityProtocol;
import org.apache.kafka.common.protocol.types.Struct;
import org.apache.kafka.common.record.CompressionType;
import org.apache.kafka.common.record.MemoryRecords;

1
clients/src/test/java/org/apache/kafka/common/security/auth/DefaultKafkaPrincipalBuilderTest.java
View File

@ -19,7 +19,6 @@ package org.apache.kafka.common.security.auth;
import org.apache.kafka.common.config.SaslConfigs;
import org.apache.kafka.common.network.Authenticator;
import org.apache.kafka.common.network.TransportLayer;
import org.apache.kafka.common.protocol.SecurityProtocol;
import org.apache.kafka.common.security.authenticator.DefaultKafkaPrincipalBuilder;
import org.apache.kafka.common.security.kerberos.KerberosName;
import org.apache.kafka.common.security.kerberos.KerberosShortNamer;

2
clients/src/test/java/org/apache/kafka/common/security/authenticator/ClientAuthenticationFailureTest.java
View File

@ -30,8 +30,8 @@ import org.apache.kafka.common.errors.SaslAuthenticationException;
import org.apache.kafka.common.network.ListenerName;
import org.apache.kafka.common.network.NetworkTestUtils;
import org.apache.kafka.common.network.NioEchoServer;
import org.apache.kafka.common.protocol.SecurityProtocol;
import org.apache.kafka.common.security.TestSecurityConfig;
import org.apache.kafka.common.security.auth.SecurityProtocol;
import org.apache.kafka.common.serialization.StringDeserializer;
import org.apache.kafka.common.serialization.StringSerializer;
import org.junit.After;

2
clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorTest.java
View File

@ -36,7 +36,7 @@ import org.apache.kafka.common.network.Send;
import org.apache.kafka.common.network.TransportLayer;
import org.apache.kafka.common.protocol.ApiKeys;
import org.apache.kafka.common.protocol.Errors;
import org.apache.kafka.common.protocol.SecurityProtocol;
import org.apache.kafka.common.security.auth.SecurityProtocol;
import org.apache.kafka.common.requests.AbstractRequest;
import org.apache.kafka.common.requests.AbstractResponse;
import org.apache.kafka.common.requests.ApiVersionsRequest;

2
clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslServerAuthenticatorTest.java
View File

@ -22,7 +22,7 @@ import org.apache.kafka.common.network.InvalidReceiveException;
import org.apache.kafka.common.network.ListenerName;
import org.apache.kafka.common.network.TransportLayer;
import org.apache.kafka.common.protocol.ApiKeys;
import org.apache.kafka.common.protocol.SecurityProtocol;
import org.apache.kafka.common.security.auth.SecurityProtocol;
import org.apache.kafka.common.protocol.types.Struct;
import org.apache.kafka.common.requests.RequestHeader;
import org.apache.kafka.common.security.JaasContext;

3
core/src/main/scala/kafka/admin/ConsumerGroupCommand.scala
View File

@ -35,8 +35,9 @@ import org.apache.kafka.common.errors.BrokerNotAvailableException
import org.apache.kafka.common.{KafkaException, Node, TopicPartition}
import org.apache.kafka.common.internals.Topic
import org.apache.kafka.common.network.ListenerName
import org.apache.kafka.common.protocol.{Errors, SecurityProtocol}
import org.apache.kafka.common.protocol.Errors
import org.apache.kafka.common.security.JaasUtils
import org.apache.kafka.common.security.auth.SecurityProtocol
import org.apache.kafka.common.serialization.StringDeserializer
import org.apache.kafka.common.utils.Utils

4
core/src/main/scala/kafka/client/ClientUtils.scala
View File

@ -16,7 +16,7 @@
*/
package kafka.client
import org.apache.kafka.common.protocol.{Errors, SecurityProtocol}
import org.apache.kafka.common.protocol.Errors
import scala.collection._
import kafka.cluster._
@ -31,6 +31,8 @@ import kafka.network.BlockingChannel
import kafka.utils.ZkUtils
import java.io.IOException
import org.apache.kafka.common.security.auth.SecurityProtocol
/**
* Helper functions common to clients (producer, consumer, or admin)
*/

2
core/src/main/scala/kafka/cluster/Broker.scala
View File

@ -21,7 +21,7 @@ import kafka.common.{BrokerEndPointNotAvailableException, BrokerNotAvailableExce
import kafka.utils.Json
import org.apache.kafka.common.Node
import org.apache.kafka.common.network.ListenerName
import org.apache.kafka.common.protocol.SecurityProtocol
import org.apache.kafka.common.security.auth.SecurityProtocol
import org.apache.kafka.common.utils.Time
/**

2
core/src/main/scala/kafka/cluster/EndPoint.scala
View File

@ -19,7 +19,7 @@ package kafka.cluster
import kafka.common.KafkaException
import org.apache.kafka.common.network.ListenerName
import org.apache.kafka.common.protocol.SecurityProtocol
import org.apache.kafka.common.security.auth.SecurityProtocol
import org.apache.kafka.common.utils.Utils
import scala.collection.Map

3
core/src/main/scala/kafka/controller/ControllerChannelManager.scala
View File

@ -29,10 +29,11 @@ import kafka.utils._
import org.apache.kafka.clients._
import org.apache.kafka.common.metrics.Metrics
import org.apache.kafka.common.network._
import org.apache.kafka.common.protocol.{ApiKeys, SecurityProtocol}
import org.apache.kafka.common.protocol.ApiKeys
import org.apache.kafka.common.requests.UpdateMetadataRequest.EndPoint
import org.apache.kafka.common.requests._
import org.apache.kafka.common.security.JaasContext
import org.apache.kafka.common.security.auth.SecurityProtocol
import org.apache.kafka.common.utils.{LogContext, Time}
import org.apache.kafka.common.{Node, TopicPartition}

2
core/src/main/scala/kafka/network/SocketServer.scala
View File

@ -35,8 +35,8 @@ import org.apache.kafka.common.memory.{MemoryPool, SimpleMemoryPool}
import org.apache.kafka.common.metrics._
import org.apache.kafka.common.metrics.stats.Meter
import org.apache.kafka.common.network.{ChannelBuilder, ChannelBuilders, KafkaChannel, ListenerName, Selectable, Send, Selector => KSelector}
import org.apache.kafka.common.protocol.SecurityProtocol
import org.apache.kafka.common.requests.{RequestContext, RequestHeader}
import org.apache.kafka.common.security.auth.SecurityProtocol
import org.apache.kafka.common.utils.{KafkaThread, LogContext, Time}
import scala.collection._

2
core/src/main/scala/kafka/server/KafkaConfig.scala
View File

@ -33,8 +33,8 @@ import org.apache.kafka.common.config.internals.BrokerSecurityConfigs
import org.apache.kafka.common.config.{AbstractConfig, ConfigDef, ConfigException, SaslConfigs, SslConfigs, TopicConfig}
import org.apache.kafka.common.metrics.Sensor
import org.apache.kafka.common.network.ListenerName
import org.apache.kafka.common.protocol.SecurityProtocol
import org.apache.kafka.common.record.TimestampType
import org.apache.kafka.common.security.auth.SecurityProtocol
import scala.collection.JavaConverters._
import scala.collection.Map

2
core/src/main/scala/kafka/server/KafkaHealthcheck.scala
View File

@ -27,7 +27,7 @@ import kafka.metrics.KafkaMetricsGroup
import kafka.utils._
import com.yammer.metrics.core.Gauge
import org.I0Itec.zkclient.IZkStateListener
import org.apache.kafka.common.protocol.SecurityProtocol
import org.apache.kafka.common.security.auth.SecurityProtocol
import org.apache.zookeeper.Watcher.Event.KeeperState
import scala.collection.mutable.Set

2
core/src/main/scala/kafka/tools/UpdateOffsetsInZK.scala
View File

@ -22,8 +22,8 @@ import kafka.api.{OffsetRequest, PartitionOffsetRequestInfo}
import kafka.common.{KafkaException, TopicAndPartition}
import kafka.utils.{Exit, Logging, ZKGroupTopicDirs, ZkUtils}
import org.apache.kafka.common.network.ListenerName
import org.apache.kafka.common.protocol.SecurityProtocol
import org.apache.kafka.common.security.JaasUtils
import org.apache.kafka.common.security.auth.SecurityProtocol
import org.apache.kafka.common.utils.Utils
/**

3
core/src/main/scala/kafka/utils/CoreUtils.scala
View File

@ -25,12 +25,11 @@ import java.lang.management._
import java.util.{Properties, UUID}
import javax.management._
import org.apache.kafka.common.protocol.SecurityProtocol
import scala.collection._
import scala.collection.mutable
import kafka.cluster.EndPoint
import org.apache.kafka.common.network.ListenerName
import org.apache.kafka.common.security.auth.SecurityProtocol
import org.apache.kafka.common.utils.{Base64, KafkaThread, Utils}
/**

7
core/src/test/scala/integration/kafka/api/AuthorizerIntegrationTest.scala
View File

@ -28,7 +28,6 @@ import kafka.network.SocketServer
import kafka.security.auth._
import kafka.server.{BaseRequestTest, KafkaConfig}
import kafka.utils.TestUtils
import org.apache.kafka.clients.consumer.OffsetAndMetadata
import org.apache.kafka.clients.consumer.internals.NoOpConsumerRebalanceListener
import org.apache.kafka.clients.consumer._
@ -36,15 +35,15 @@ import org.apache.kafka.clients.producer._
import org.apache.kafka.common.errors._
import org.apache.kafka.common.internals.Topic.GROUP_METADATA_TOPIC_NAME
import org.apache.kafka.common.KafkaException
import org.apache.kafka.common.protocol.{ApiKeys, Errors, SecurityProtocol}
import org.apache.kafka.common.protocol.{ApiKeys, Errors}
import org.apache.kafka.common.requests.{Resource => RResource, ResourceType => RResourceType, _}
import org.apache.kafka.common.acl.{AccessControlEntry, AccessControlEntryFilter, AclBinding, AclBindingFilter, AclOperation, AclPermissionType}
import org.apache.kafka.common.network.ListenerName
import org.apache.kafka.common.record.{CompressionType, MemoryRecords, RecordBatch, SimpleRecord}
import org.apache.kafka.common.record.{CompressionType, MemoryRecords, SimpleRecord}
import org.apache.kafka.common.requests.CreateAclsRequest.AclCreation
import org.apache.kafka.common.requests.CreateTopicsRequest.TopicDetails
import org.apache.kafka.common.resource.{ResourceFilter, Resource => AdminResource, ResourceType => AdminResourceType}
import org.apache.kafka.common.security.auth.KafkaPrincipal
import org.apache.kafka.common.security.auth.{KafkaPrincipal, SecurityProtocol}
import org.apache.kafka.common.{Node, TopicPartition, requests}
import org.junit.Assert._
import org.junit.{After, Assert, Before, Test}

2
core/src/test/scala/integration/kafka/api/BaseProducerSendTest.scala
View File

@ -30,8 +30,8 @@ import kafka.utils.TestUtils
import org.apache.kafka.clients.consumer.{ConsumerRecord, KafkaConsumer}
import org.apache.kafka.clients.producer._
import org.apache.kafka.common.{KafkaException, TopicPartition}
import org.apache.kafka.common.protocol.SecurityProtocol
import org.apache.kafka.common.record.TimestampType
import org.apache.kafka.common.security.auth.SecurityProtocol
import org.junit.Assert._
import org.junit.{After, Before, Test}

16
core/src/test/scala/integration/kafka/api/EndToEndClusterIdTest.scala
View File

@ -19,7 +19,7 @@ package kafka.api
import java.util.concurrent.ExecutionException
import java.util.concurrent.atomic.AtomicReference
import java.util.{Properties}
import java.util.Properties
import kafka.common.TopicAndPartition
import kafka.integration.KafkaServerTestHarness
@ -100,8 +100,8 @@ class EndToEndClusterIdTest extends KafkaServerTestHarness {
val topic = "e2etopic"
val part = 0
val tp = new TopicPartition(topic, part)
val topicAndPartition = new TopicAndPartition(topic, part)
this.serverConfig.setProperty(KafkaConfig.MetricReporterClassesProp, "kafka.api.EndToEndClusterIdTest$MockBrokerMetricsReporter")
val topicAndPartition = TopicAndPartition(topic, part)
this.serverConfig.setProperty(KafkaConfig.MetricReporterClassesProp, classOf[MockBrokerMetricsReporter].getName)
override def generateConfigs = {
val cfgs = TestUtils.createBrokerConfigs(serverCount, zkConnect, interBrokerSecurityProtocol = Some(securityProtocol),
@ -112,7 +112,7 @@ class EndToEndClusterIdTest extends KafkaServerTestHarness {
@Before
override def setUp() {
super.setUp
super.setUp()
MockDeserializer.resetStaticVariables
// create the consumer offset topic
TestUtils.createTopic(this.zkUtils, topic, 2, serverCount, this.servers)
@ -129,9 +129,9 @@ class EndToEndClusterIdTest extends KafkaServerTestHarness {
val producerProps = new Properties()
producerProps.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, brokerList)
producerProps.put(ProducerConfig.INTERCEPTOR_CLASSES_CONFIG, "org.apache.kafka.test.MockProducerInterceptor")
producerProps.put(ProducerConfig.INTERCEPTOR_CLASSES_CONFIG, classOf[MockProducerInterceptor].getName)
producerProps.put("mock.interceptor.append", appendStr)
producerProps.put(ProducerConfig.METRIC_REPORTER_CLASSES_CONFIG, "kafka.api.EndToEndClusterIdTest$MockProducerMetricsReporter")
producerProps.put(ProducerConfig.METRIC_REPORTER_CLASSES_CONFIG, classOf[MockProducerMetricsReporter].getName)
val testProducer = new KafkaProducer(producerProps, new MockSerializer, new MockSerializer)
// Send one record and make sure clusterId is set after send and before onAcknowledgement
@ -150,8 +150,8 @@ class EndToEndClusterIdTest extends KafkaServerTestHarness {
isValidClusterId(MockProducerMetricsReporter.CLUSTER_META.get.clusterId)
this.consumerConfig.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, brokerList)
this.consumerConfig.setProperty(ConsumerConfig.INTERCEPTOR_CLASSES_CONFIG, "org.apache.kafka.test.MockConsumerInterceptor")
this.consumerConfig.put(ConsumerConfig.METRIC_REPORTER_CLASSES_CONFIG, "kafka.api.EndToEndClusterIdTest$MockConsumerMetricsReporter")
this.consumerConfig.setProperty(ConsumerConfig.INTERCEPTOR_CLASSES_CONFIG, classOf[MockConsumerInterceptor].getName)
this.consumerConfig.put(ConsumerConfig.METRIC_REPORTER_CLASSES_CONFIG, classOf[MockConsumerMetricsReporter].getName)
val testConsumer = new KafkaConsumer(this.consumerConfig, new MockDeserializer, new MockDeserializer)
testConsumer.assign(List(tp).asJava)
testConsumer.seek(tp, 0)

2
core/src/test/scala/integration/kafka/api/GroupCoordinatorIntegrationTest.scala
View File

@ -18,7 +18,6 @@ import kafka.server.KafkaConfig
import kafka.utils.TestUtils
import org.apache.kafka.clients.consumer.OffsetAndMetadata
import org.apache.kafka.common.TopicPartition
import org.apache.kafka.common.protocol.SecurityProtocol
import org.junit.Test
import org.junit.Assert._
@ -27,6 +26,7 @@ import java.util.Properties
import org.apache.kafka.common.internals.Topic
import org.apache.kafka.common.record.CompressionType
import org.apache.kafka.common.security.auth.SecurityProtocol
class GroupCoordinatorIntegrationTest extends KafkaServerTestHarness {
val offsetsTopicCompressionCodec = CompressionType.GZIP

3
core/src/test/scala/integration/kafka/api/MetricsTest.scala
View File

@ -15,7 +15,6 @@ package kafka.api
import java.util.{Locale, Properties}
import kafka.log.LogConfig
import kafka.network.RequestMetrics
import kafka.server.{KafkaConfig, KafkaServer}
import kafka.utils.{JaasTestUtils, TestUtils}
import com.yammer.metrics.Metrics
@ -25,7 +24,7 @@ import org.apache.kafka.common.{Metric, MetricName, TopicPartition}
import org.apache.kafka.common.config.SaslConfigs
import org.apache.kafka.common.errors.InvalidTopicException
import org.apache.kafka.common.network.ListenerName
import org.apache.kafka.common.protocol.SecurityProtocol
import org.apache.kafka.common.security.auth.SecurityProtocol
import org.junit.{After, Before, Test}
import org.junit.Assert._

2
core/src/test/scala/integration/kafka/api/PlaintextConsumerTest.scala
View File

@ -21,7 +21,7 @@ import kafka.server.KafkaConfig
import kafka.utils.TestUtils
import org.apache.kafka.clients.consumer._
import org.apache.kafka.clients.producer.{KafkaProducer, ProducerConfig, ProducerRecord}
import org.apache.kafka.common.{Metric, MetricName, TopicPartition}
import org.apache.kafka.common.{MetricName, TopicPartition}
import org.apache.kafka.common.errors.InvalidTopicException
import org.apache.kafka.common.header.Headers
import org.apache.kafka.common.record.{CompressionType, TimestampType}

3
core/src/test/scala/integration/kafka/api/PlaintextEndToEndAuthorizationTest.scala
View File

@ -18,8 +18,7 @@ package kafka.api
import org.apache.kafka.common.config.internals.BrokerSecurityConfigs
import org.apache.kafka.common.network.ListenerName
import org.apache.kafka.common.protocol.SecurityProtocol
import org.apache.kafka.common.security.auth.{AuthenticationContext, KafkaPrincipal, KafkaPrincipalBuilder, PlaintextAuthenticationContext}
import org.apache.kafka.common.security.auth._
import org.junit.Before
// This test case uses a separate listener for client and inter-broker communication, from

4
core/src/test/scala/integration/kafka/api/ProducerCompressionTest.scala
View File

@ -18,8 +18,8 @@
package kafka.api.test
import java.util.{Collection, Collections, Properties}
import scala.collection.JavaConverters._
import scala.collection.JavaConverters._
import org.junit.runners.Parameterized
import org.junit.runner.RunWith
import org.junit.runners.Parameterized.Parameters
@ -30,7 +30,7 @@ import kafka.server.{KafkaConfig, KafkaServer}
import kafka.zk.ZooKeeperTestHarness
import kafka.utils.TestUtils
import org.apache.kafka.common.TopicPartition
import org.apache.kafka.common.protocol.SecurityProtocol
import org.apache.kafka.common.security.auth.SecurityProtocol
import org.apache.kafka.common.serialization.ByteArraySerializer
@RunWith(value = classOf[Parameterized])

11
core/src/test/scala/integration/kafka/api/SaslClientsWithInvalidCredentialsTest.scala
View File

@ -14,22 +14,21 @@ package kafka.api
import java.io.FileOutputStream
import java.util.Collections
import java.util.concurrent.{ExecutionException, Future, TimeUnit}
import scala.collection.JavaConverters._
import java.util.concurrent.{ExecutionException, TimeUnit}
import scala.collection.JavaConverters._
import org.apache.kafka.clients.admin.{AdminClient, AdminClientConfig}
import org.apache.kafka.clients.consumer.{KafkaConsumer, ConsumerConfig}
import org.apache.kafka.clients.producer.{KafkaProducer, ProducerConfig, ProducerRecord, RecordMetadata}
import org.apache.kafka.clients.consumer.{ConsumerConfig, KafkaConsumer}
import org.apache.kafka.clients.producer.{KafkaProducer, ProducerConfig, ProducerRecord}
import org.apache.kafka.common.{KafkaException, TopicPartition}
import org.apache.kafka.common.errors.SaslAuthenticationException
import org.apache.kafka.common.protocol.SecurityProtocol
import org.apache.kafka.common.serialization.ByteArrayDeserializer
import org.junit.{After, Before, Test}
import org.junit.Assert._
import kafka.admin.ConsumerGroupCommand.{ConsumerGroupCommandOptions, KafkaConsumerGroupService}
import kafka.server.KafkaConfig
import kafka.utils.{JaasTestUtils, TestUtils, ZkUtils}
import org.apache.kafka.common.security.auth.SecurityProtocol
class SaslClientsWithInvalidCredentialsTest extends IntegrationTestHarness with SaslSetup {
private val kafkaClientSaslMechanism = "SCRAM-SHA-256"

2
core/src/test/scala/integration/kafka/api/SaslEndToEndAuthorizationTest.scala
View File

@ -20,9 +20,9 @@ import java.util.Properties
import kafka.utils.TestUtils
import kafka.utils.Implicits._
import org.apache.kafka.common.protocol.SecurityProtocol
import org.apache.kafka.common.config.SaslConfigs
import org.apache.kafka.common.errors.GroupAuthorizationException
import org.apache.kafka.common.security.auth.SecurityProtocol
import org.junit.{Before, Test}
import scala.collection.immutable.List

2
core/src/test/scala/integration/kafka/api/SaslMultiMechanismConsumerTest.scala
View File

@ -14,10 +14,10 @@ package kafka.api
import java.io.File
import org.apache.kafka.common.protocol.SecurityProtocol
import kafka.server.KafkaConfig
import org.junit.{After, Before, Test}
import kafka.utils.{JaasTestUtils, TestUtils}
import org.apache.kafka.common.security.auth.SecurityProtocol
import scala.collection.JavaConverters._

2
core/src/test/scala/integration/kafka/api/SaslPlainPlaintextConsumerTest.scala
View File

@ -15,10 +15,10 @@ package kafka.api
import java.io.File
import java.util.Locale
import org.apache.kafka.common.protocol.SecurityProtocol
import kafka.server.KafkaConfig
import kafka.utils.{JaasTestUtils, TestUtils}
import org.apache.kafka.common.network.ListenerName
import org.apache.kafka.common.security.auth.SecurityProtocol
import org.junit.{After, Before, Test}
class SaslPlainPlaintextConsumerTest extends BaseConsumerTest with SaslSetup {

2
core/src/test/scala/integration/kafka/api/SaslPlaintextConsumerTest.scala
View File

@ -13,7 +13,7 @@
package kafka.api
import kafka.utils.JaasTestUtils
import org.apache.kafka.common.protocol.SecurityProtocol
import org.apache.kafka.common.security.auth.SecurityProtocol
import org.junit.{After, Before}
class SaslPlaintextConsumerTest extends BaseConsumerTest with SaslSetup {

1
core/src/test/scala/integration/kafka/api/SaslScramSslEndToEndAuthorizationTest.scala
View File

@ -18,7 +18,6 @@ package kafka.api
import org.apache.kafka.common.security.scram.ScramMechanism
import kafka.utils.JaasTestUtils
import kafka.admin.ConfigCommand
import kafka.utils.ZkUtils
import scala.collection.JavaConverters._
import org.junit.Before

3
core/src/test/scala/integration/kafka/api/SaslSslAdminClientIntegrationTest.scala
View File

@ -15,14 +15,13 @@ package kafka.api
import java.io.File
import kafka.security.auth.{All, Allow, Alter, AlterConfigs, Authorizer, ClusterAction, Create, Delete, Deny, Describe, Operation, PermissionType, SimpleAclAuthorizer, Topic, Acl => AuthAcl, Resource => AuthResource}
import org.apache.kafka.common.protocol.SecurityProtocol
import kafka.server.KafkaConfig
import kafka.utils.{CoreUtils, JaasTestUtils, TestUtils}
import org.apache.kafka.clients.admin.{AdminClient, CreateAclsOptions, DeleteAclsOptions}
import org.apache.kafka.common.acl.{AccessControlEntry, AccessControlEntryFilter, AclBinding, AclBindingFilter, AclOperation, AclPermissionType}
import org.apache.kafka.common.errors.{ClusterAuthorizationException, InvalidRequestException}
import org.apache.kafka.common.resource.{Resource, ResourceFilter, ResourceType}
import org.apache.kafka.common.security.auth.KafkaPrincipal
import org.apache.kafka.common.security.auth.{KafkaPrincipal, SecurityProtocol}
import org.junit.Assert.assertEquals
import org.junit.{After, Assert, Before, Test}

2
core/src/test/scala/integration/kafka/api/SaslSslConsumerTest.scala
View File

@ -14,9 +14,9 @@ package kafka.api
import java.io.File
import org.apache.kafka.common.protocol.SecurityProtocol
import kafka.server.KafkaConfig
import kafka.utils.JaasTestUtils
import org.apache.kafka.common.security.auth.SecurityProtocol
import org.junit.{After, Before}
class SaslSslConsumerTest extends BaseConsumerTest with SaslSetup {

2
core/src/test/scala/integration/kafka/api/SslConsumerTest.scala
View File

@ -14,7 +14,7 @@ package kafka.api
import java.io.File
import org.apache.kafka.common.protocol.SecurityProtocol
import org.apache.kafka.common.security.auth.SecurityProtocol
class SslConsumerTest extends BaseConsumerTest {
override protected def securityProtocol = SecurityProtocol.SSL

3
core/src/test/scala/integration/kafka/api/SslEndToEndAuthorizationTest.scala
View File

@ -18,8 +18,7 @@
package kafka.api
import org.apache.kafka.common.config.internals.BrokerSecurityConfigs
import org.apache.kafka.common.protocol.SecurityProtocol
import org.apache.kafka.common.security.auth.{AuthenticationContext, KafkaPrincipal, KafkaPrincipalBuilder, SslAuthenticationContext}
import org.apache.kafka.common.security.auth._
import org.junit.Before
object SslEndToEndAuthorizationTest {

2
core/src/test/scala/integration/kafka/api/SslProducerSendTest.scala
View File

@ -19,7 +19,7 @@ package kafka.api
import java.io.File
import org.apache.kafka.common.protocol.SecurityProtocol
import org.apache.kafka.common.security.auth.SecurityProtocol
class SslProducerSendTest extends BaseProducerSendTest {
override protected def securityProtocol = SecurityProtocol.SSL

5
core/src/test/scala/integration/kafka/api/TransactionsBounceTest.scala
View File

@ -25,12 +25,11 @@ import kafka.utils.{ShutdownableThread, TestUtils}
import org.apache.kafka.clients.consumer.ConsumerConfig
import org.apache.kafka.clients.producer.internals.ErrorLoggingCallback
import org.apache.kafka.common.TopicPartition
import org.apache.kafka.common.protocol.SecurityProtocol
import org.apache.kafka.common.security.auth.SecurityProtocol
import org.junit.Assert._
import org.junit.Test
import scala.collection.JavaConverters._
import org.junit.Assert._
import scala.collection.mutable

2
core/src/test/scala/integration/kafka/api/TransactionsTest.scala
View File

@ -29,7 +29,7 @@ import org.apache.kafka.clients.consumer.{ConsumerConfig, KafkaConsumer, OffsetA
import org.apache.kafka.clients.producer.{KafkaProducer, ProducerRecord}
import org.apache.kafka.common.TopicPartition
import org.apache.kafka.common.errors.ProducerFencedException
import org.apache.kafka.common.protocol.SecurityProtocol
import org.apache.kafka.common.security.auth.SecurityProtocol
import org.junit.{After, Before, Test}
import org.junit.Assert._

4
core/src/test/scala/integration/kafka/api/UserClientIdQuotaTest.scala
View File

@ -18,10 +18,8 @@ import java.io.File
import java.util.Properties
import kafka.admin.AdminUtils
import kafka.server._
import org.apache.kafka.common.protocol.SecurityProtocol
import org.apache.kafka.common.security.auth.SecurityProtocol
import org.junit.Before
import org.apache.kafka.common.metrics.Sanitizer

2
core/src/test/scala/integration/kafka/api/UserQuotaTest.scala
View File

@ -20,7 +20,7 @@ import java.util.Properties
import kafka.admin.AdminUtils
import kafka.server.{ConfigEntityName, KafkaConfig, QuotaId}
import kafka.utils.JaasTestUtils
import org.apache.kafka.common.protocol.SecurityProtocol
import org.apache.kafka.common.security.auth.SecurityProtocol
import org.junit.{After, Before}
import org.apache.kafka.common.metrics.Sanitizer

2
core/src/test/scala/unit/kafka/admin/AddPartitionsTest.scala
View File

@ -19,7 +19,6 @@ package kafka.admin
import kafka.api.TopicMetadata
import org.junit.Assert._
import org.apache.kafka.common.protocol.SecurityProtocol
import kafka.zk.ZooKeeperTestHarness
import kafka.utils.TestUtils._
import kafka.utils.TestUtils
@ -28,6 +27,7 @@ import kafka.client.ClientUtils
import kafka.server.{KafkaConfig, KafkaServer}
import org.apache.kafka.common.errors.InvalidReplicaAssignmentException
import org.apache.kafka.common.network.ListenerName
import org.apache.kafka.common.security.auth.SecurityProtocol
import org.junit.{After, Before, Test}
class AddPartitionsTest extends ZooKeeperTestHarness {

2
core/src/test/scala/unit/kafka/admin/ConfigCommandTest.scala
View File

@ -20,7 +20,7 @@ import java.util.Properties
import kafka.admin.ConfigCommand.ConfigCommandOptions
import kafka.common.InvalidConfigException
import kafka.server.{ConfigEntityName, QuotaId}
import kafka.server.ConfigEntityName
import kafka.utils.{Logging, ZkUtils}
import kafka.zk.ZooKeeperTestHarness

3
core/src/test/scala/unit/kafka/api/RequestResponseSerializationTest.scala
View File

@ -26,7 +26,8 @@ import TestUtils.createBroker
import java.nio.ByteBuffer
import org.apache.kafka.common.network.ListenerName
import org.apache.kafka.common.protocol.{Errors, SecurityProtocol}
import org.apache.kafka.common.protocol.Errors
import org.apache.kafka.common.security.auth.SecurityProtocol
import org.apache.kafka.common.utils.Time
import org.junit._
import org.scalatest.junit.JUnitSuite

2
core/src/test/scala/unit/kafka/cluster/BrokerEndPointTest.scala
View File

@ -19,7 +19,7 @@ package kafka.cluster
import kafka.utils.TestUtils
import org.apache.kafka.common.network.ListenerName
import org.apache.kafka.common.protocol.SecurityProtocol
import org.apache.kafka.common.security.auth.SecurityProtocol
import org.junit.Assert.{assertEquals, assertNotEquals, assertNull}
import org.junit.Test

3
core/src/test/scala/unit/kafka/integration/KafkaServerTestHarness.scala
View File

@ -24,8 +24,7 @@ import kafka.common.KafkaException
import kafka.server._
import kafka.utils.TestUtils
import kafka.zk.ZooKeeperTestHarness
import org.apache.kafka.common.protocol.SecurityProtocol
import org.apache.kafka.common.security.auth.KafkaPrincipal
import org.apache.kafka.common.security.auth.{KafkaPrincipal, SecurityProtocol}
import org.junit.{After, Before}
import scala.collection.mutable.{ArrayBuffer, Buffer}

1
core/src/test/scala/unit/kafka/log/LogSegmentTest.scala
View File

@ -17,7 +17,6 @@
package kafka.log
import java.io.File
import java.util.concurrent.ConcurrentLinkedDeque
import kafka.utils.TestUtils
import kafka.utils.TestUtils.checkEquals

6
core/src/test/scala/unit/kafka/network/SocketServerTest.scala
View File

@ -34,10 +34,10 @@ import org.apache.kafka.common.TopicPartition
import org.apache.kafka.common.memory.MemoryPool
import org.apache.kafka.common.metrics.Metrics
import org.apache.kafka.common.network.{ChannelBuilder, ChannelState, KafkaChannel, ListenerName, NetworkReceive, NetworkSend, Selector, Send}
import org.apache.kafka.common.protocol.{ApiKeys, SecurityProtocol}
import org.apache.kafka.common.record.{MemoryRecords, RecordBatch}
import org.apache.kafka.common.protocol.ApiKeys
import org.apache.kafka.common.record.MemoryRecords
import org.apache.kafka.common.requests.{AbstractRequest, ProduceRequest, RequestHeader}
import org.apache.kafka.common.security.auth.KafkaPrincipal
import org.apache.kafka.common.security.auth.{KafkaPrincipal, SecurityProtocol}
import org.apache.kafka.common.utils.{LogContext, MockTime, Time}
import org.junit.Assert._
import org.junit._

3
core/src/test/scala/unit/kafka/producer/AsyncProducerTest.scala
View File

@ -20,7 +20,7 @@ package kafka.producer
import java.util.Properties
import java.util.concurrent.LinkedBlockingQueue
import org.apache.kafka.common.protocol.{Errors, SecurityProtocol}
import org.apache.kafka.common.protocol.Errors
import org.junit.Assert.{assertEquals, assertTrue}
import org.easymock.EasyMock
import org.junit.Test
@ -36,6 +36,7 @@ import kafka.utils.TestUtils._
import scala.collection.Map
import scala.collection.mutable.ArrayBuffer
import kafka.utils._
import org.apache.kafka.common.security.auth.SecurityProtocol
import org.apache.kafka.common.utils.Time
@deprecated("This test has been deprecated and it will be removed in a future release.", "0.10.0.0")

2
core/src/test/scala/unit/kafka/server/AdvertiseBrokerTest.scala
View File

@ -20,7 +20,7 @@ package kafka.server
import org.junit.Assert._
import kafka.utils.TestUtils
import kafka.zk.ZooKeeperTestHarness
import org.apache.kafka.common.protocol.SecurityProtocol
import org.apache.kafka.common.security.auth.SecurityProtocol
import org.junit.{After, Test}
import scala.collection.mutable.ArrayBuffer

3
core/src/test/scala/unit/kafka/server/BaseRequestTest.scala
View File

@ -27,8 +27,9 @@ import kafka.network.SocketServer
import kafka.utils._
import org.apache.kafka.common.network.ListenerName
import org.apache.kafka.common.protocol.types.Struct
import org.apache.kafka.common.protocol.{ApiKeys, SecurityProtocol}
import org.apache.kafka.common.protocol.ApiKeys
import org.apache.kafka.common.requests.{AbstractRequest, AbstractRequestResponse, RequestHeader, ResponseHeader}
import org.apache.kafka.common.security.auth.SecurityProtocol
abstract class BaseRequestTest extends KafkaServerTestHarness {
private var correlationId = 0

1
core/src/test/scala/unit/kafka/server/ClientQuotaManagerTest.scala
View File

@ -22,7 +22,6 @@ import org.apache.kafka.common.metrics.{MetricConfig, Metrics, Quota, Sanitizer}
import org.apache.kafka.common.utils.MockTime
import org.junit.Assert.{assertEquals, assertTrue}
import org.junit.{Before, Test}
import kafka.admin.ConfigCommand
class ClientQuotaManagerTest {
private val time = new MockTime

5
core/src/test/scala/unit/kafka/server/EdgeCaseRequestTest.scala
View File

@ -27,9 +27,10 @@ import kafka.utils._
import org.apache.kafka.common.TopicPartition
import org.apache.kafka.common.network.ListenerName
import org.apache.kafka.common.protocol.types.Type
import org.apache.kafka.common.protocol.{ApiKeys, Errors, SecurityProtocol}
import org.apache.kafka.common.record.{CompressionType, SimpleRecord, RecordBatch, MemoryRecords}
import org.apache.kafka.common.protocol.{ApiKeys, Errors}
import org.apache.kafka.common.record.{CompressionType, MemoryRecords, SimpleRecord}
import org.apache.kafka.common.requests.{ProduceRequest, ProduceResponse, ResponseHeader}
import org.apache.kafka.common.security.auth.SecurityProtocol
import org.junit.Assert._
import org.junit.Test

4
core/src/test/scala/unit/kafka/server/KafkaApisTest.scala
View File

@ -37,12 +37,12 @@ import org.apache.kafka.common.errors.UnsupportedVersionException
import org.apache.kafka.common.memory.MemoryPool
import org.apache.kafka.common.metrics.Metrics
import org.apache.kafka.common.network.ListenerName
import org.apache.kafka.common.protocol.{ApiKeys, Errors, SecurityProtocol}
import org.apache.kafka.common.protocol.{ApiKeys, Errors}
import org.apache.kafka.common.record.RecordBatch
import org.apache.kafka.common.requests.ProduceResponse.PartitionResponse
import org.apache.kafka.common.requests.WriteTxnMarkersRequest.TxnMarkerEntry
import org.apache.kafka.common.requests._
import org.apache.kafka.common.security.auth.KafkaPrincipal
import org.apache.kafka.common.security.auth.{KafkaPrincipal, SecurityProtocol}
import org.apache.kafka.common.utils.Utils
import org.easymock.{Capture, EasyMock, IAnswer}
import org.junit.Assert.{assertEquals, assertTrue}

2
core/src/test/scala/unit/kafka/server/KafkaConfigTest.scala
View File

@ -26,7 +26,7 @@ import kafka.utils.{CoreUtils, TestUtils}
import org.apache.kafka.common.config.ConfigException
import org.apache.kafka.common.metrics.Sensor
import org.apache.kafka.common.network.ListenerName
import org.apache.kafka.common.protocol.SecurityProtocol
import org.apache.kafka.common.security.auth.SecurityProtocol
import org.junit.Assert._
import org.junit.Test
import org.scalatest.Assertions.intercept

3
core/src/test/scala/unit/kafka/server/LeaderElectionTest.scala
View File

@ -30,7 +30,8 @@ import kafka.utils.TestUtils._
import kafka.zk.ZooKeeperTestHarness
import org.apache.kafka.common.metrics.Metrics
import org.apache.kafka.common.network.ListenerName
import org.apache.kafka.common.protocol.{ApiKeys, Errors, SecurityProtocol}
import org.apache.kafka.common.protocol.{ApiKeys, Errors}
import org.apache.kafka.common.security.auth.SecurityProtocol
import org.apache.kafka.common.utils.Time
import org.junit.{After, Before, Test}

3
core/src/test/scala/unit/kafka/server/MetadataCacheTest.scala
View File

@ -22,9 +22,10 @@ import util.Arrays.asList
import kafka.common.BrokerEndPointNotAvailableException
import org.apache.kafka.common.TopicPartition
import org.apache.kafka.common.network.ListenerName
import org.apache.kafka.common.protocol.{ApiKeys, Errors, SecurityProtocol}
import org.apache.kafka.common.protocol.{ApiKeys, Errors}
import org.apache.kafka.common.requests.UpdateMetadataRequest
import org.apache.kafka.common.requests.UpdateMetadataRequest.{Broker, EndPoint}
import org.apache.kafka.common.security.auth.SecurityProtocol
import org.junit.Test
import org.junit.Assert._

2
core/src/test/scala/unit/kafka/server/ProduceRequestTest.scala
View File

@ -20,7 +20,7 @@ package kafka.server
import kafka.utils.TestUtils
import org.apache.kafka.common.TopicPartition
import org.apache.kafka.common.protocol.{ApiKeys, Errors}
import org.apache.kafka.common.record.{CompressionType, DefaultRecordBatch, MemoryRecords, RecordBatch, SimpleRecord}
import org.apache.kafka.common.record.{CompressionType, DefaultRecordBatch, MemoryRecords, SimpleRecord}
import org.apache.kafka.common.requests.{ProduceRequest, ProduceResponse}
import org.junit.Assert._
import org.junit.Test

4
core/src/test/scala/unit/kafka/server/RequestQuotaTest.scala
View File

@ -30,12 +30,12 @@ import org.apache.kafka.common.resource.{ResourceFilter, Resource => AdminResour
import org.apache.kafka.common.{Node, TopicPartition}
import org.apache.kafka.common.metrics.{KafkaMetric, Quota, Sensor}
import org.apache.kafka.common.network.ListenerName
import org.apache.kafka.common.protocol.{ApiKeys, SecurityProtocol}
import org.apache.kafka.common.protocol.ApiKeys
import org.apache.kafka.common.protocol.types.Struct
import org.apache.kafka.common.record._
import org.apache.kafka.common.requests.CreateAclsRequest.AclCreation
import org.apache.kafka.common.requests.{Resource => RResource, ResourceType => RResourceType, _}
import org.apache.kafka.common.security.auth.{AuthenticationContext, KafkaPrincipal, KafkaPrincipalBuilder}
import org.apache.kafka.common.security.auth.{AuthenticationContext, KafkaPrincipal, KafkaPrincipalBuilder, SecurityProtocol}
import org.junit.Assert._
import org.junit.{After, Before, Test}

3
core/src/test/scala/unit/kafka/server/SaslApiVersionsRequestTest.scala
View File

@ -19,7 +19,7 @@ package kafka.server
import java.net.Socket
import java.util.Collections
import org.apache.kafka.common.protocol.{ApiKeys, Errors, SecurityProtocol}
import org.apache.kafka.common.protocol.{ApiKeys, Errors}
import org.apache.kafka.common.requests.{ApiVersionsRequest, ApiVersionsResponse}
import org.apache.kafka.common.requests.SaslHandshakeRequest
import org.apache.kafka.common.requests.SaslHandshakeResponse
@ -27,6 +27,7 @@ import org.junit.{After, Before, Test}
import org.junit.Assert._
import kafka.api.{KafkaSasl, SaslSetup}
import kafka.utils.JaasTestUtils
import org.apache.kafka.common.security.auth.SecurityProtocol
class SaslApiVersionsRequestTest extends BaseRequestTest with SaslSetup {
override protected def securityProtocol = SecurityProtocol.SASL_PLAINTEXT

2
core/src/test/scala/unit/kafka/utils/TestUtils.scala
View File

@ -47,8 +47,8 @@ import org.apache.kafka.common.TopicPartition
import org.apache.kafka.common.header.Header
import org.apache.kafka.common.internals.Topic
import org.apache.kafka.common.network.{ListenerName, Mode}
import org.apache.kafka.common.protocol.SecurityProtocol
import org.apache.kafka.common.record._
import org.apache.kafka.common.security.auth.SecurityProtocol
import org.apache.kafka.common.serialization.{ByteArraySerializer, Serializer}
import org.apache.kafka.common.utils.Time
import org.apache.kafka.common.utils.Utils._

2
docs/upgrade.html
View File

@ -81,6 +81,8 @@
metric named <code>records-consumed-total</code>.</li>
<li>Mx4j will only be enabled if the system property <code>kafka_mx4jenable</code> is set to <code>true</code>. Due to a logic
inversion bug, it was previously enabled by default and disabled if <code>kafka_mx4jenable</code> was set to <code>true</code>.</li>
<li>The package <code>org.apache.kafka.common.security.auth</code> in the clients jar has been made public and added to the javadocs.
Internal classes which had previously been located in this package have been moved elsewhere.</li>
</ul>
<h5><a id="upgrade_100_new_protocols" href="#upgrade_100_new_protocols">New Protocol Versions</a></h5>

2
tools/src/main/java/org/apache/kafka/tools/VerifiableLog4jAppender.java
View File

@ -20,7 +20,7 @@ import net.sourceforge.argparse4j.ArgumentParsers;
import net.sourceforge.argparse4j.inf.ArgumentParser;
import net.sourceforge.argparse4j.inf.ArgumentParserException;
import net.sourceforge.argparse4j.inf.Namespace;
import org.apache.kafka.common.protocol.SecurityProtocol;
import org.apache.kafka.common.security.auth.SecurityProtocol;
import org.apache.kafka.common.utils.Exit;
import org.apache.log4j.Logger;
import org.apache.log4j.PropertyConfigurator;