Repository: incubator-ranger Updated Branches: refs/heads/ranger-0.5 262da5a45 -> 0b73cdfbb
RANGER-777 Kafka plugin builds against released version of kafka jars that have authorization support Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/0b73cdfb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/0b73cdfb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/0b73cdfb Branch: refs/heads/ranger-0.5 Commit: 0b73cdfbbe3130eb881d8516ae7d92e0e237c541 Parents: 262da5a Author: Alok Lal <[email protected]> Authored: Wed Dec 9 18:30:07 2015 -0800 Committer: Alok Lal <[email protected]> Committed: Mon Dec 14 20:45:52 2015 -0800 ---------------------------------------------------------------------- .../kafka/authorizer/RangerKafkaAuthorizer.java | 6 ++++-- pom.xml | 10 ++++------ 2 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0b73cdfb/plugin-kafka/src/main/java/org/apache/ranger/authorization/kafka/authorizer/RangerKafkaAuthorizer.java ---------------------------------------------------------------------- diff --git a/plugin-kafka/src/main/java/org/apache/ranger/authorization/kafka/authorizer/RangerKafkaAuthorizer.java b/plugin-kafka/src/main/java/org/apache/ranger/authorization/kafka/authorizer/RangerKafkaAuthorizer.java index 2adf5d5..bb6a337 100644 --- a/plugin-kafka/src/main/java/org/apache/ranger/authorization/kafka/authorizer/RangerKafkaAuthorizer.java +++ b/plugin-kafka/src/main/java/org/apache/ranger/authorization/kafka/authorizer/RangerKafkaAuthorizer.java @@ -27,17 +27,18 @@ import javax.security.auth.Subject; import kafka.security.auth.Acl; import kafka.security.auth.Authorizer; +import org.apache.kafka.common.network.LoginType; import org.apache.kafka.common.security.auth.KafkaPrincipal; import kafka.security.auth.*; import kafka.server.KafkaConfig; -import kafka.common.security.LoginManager; import kafka.network.RequestChannel.Session; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.security.UserGroupInformation; +import org.apache.kafka.common.security.kerberos.LoginManager; import org.apache.ranger.audit.provider.MiscUtil; import org.apache.ranger.authorization.utils.StringUtil; import org.apache.ranger.plugin.audit.RangerDefaultAuditHandler; @@ -81,7 +82,8 @@ public class RangerKafkaAuthorizer implements Authorizer { public void configure(Map<String, ?> configs) { if (rangerPlugin == null) { try { - Subject subject = LoginManager.subject(); + LoginManager loginManager = org.apache.kafka.common.security.kerberos.LoginManager.acquireLoginManager(LoginType.SERVER, configs); + Subject subject = loginManager.subject(); UserGroupInformation ugi = MiscUtil .createUGIFromSubject(subject); if (ugi != null) { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0b73cdfb/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 356c9cd..cccdb0c 100644 --- a/pom.xml +++ b/pom.xml @@ -89,6 +89,7 @@ <module>plugin-yarn</module> <module>ranger_solrj</module> <module>security-admin</module> + <module>plugin-kafka</module> <module>plugin-solr</module> <module>ugsync</module> <module>ugsync/ldapconfigchecktool/ldapconfigcheck</module> @@ -103,6 +104,7 @@ <module>ranger-knox-plugin-shim</module> <module>ranger-yarn-plugin-shim</module> <module>ranger-storm-plugin-shim</module> + <module>ranger-kafka-plugin-shim</module> <module>ranger-examples</module> </modules> <properties> @@ -157,8 +159,7 @@ <jersey-bundle.version>1.17.1</jersey-bundle.version> <jersey-client.version>2.6</jersey-client.version> <junit.version>4.11</junit.version> - <kafka.version>0.8.2.0</kafka.version> - <!-- <kafka.version>0.8.2.2.3.4.0-3288</kafka.version> --> + <kafka.version>0.9.0.0</kafka.version> <mockito.version>1.8.4</mockito.version> <hamcrest-version>1.3</hamcrest-version> <knox.gateway.version>0.6.0</knox.gateway.version> @@ -229,11 +230,8 @@ </modules> </profile> <profile> + <!-- This is now a no-op profile since kafka plugin now builds against default profile. It is help here temporarily for backward compatability. --> <id>kafka-security</id> - <modules> - <module>plugin-kafka</module> - <module>ranger-kafka-plugin-shim</module> - </modules> </profile> </profiles> <distributionManagement>
