KAFKA-6726: Fine Grained ACL for CreateTopics (KIP-277) #4795
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,6 +17,7 @@ import java.util | |
| import java.util.concurrent.ExecutionException | ||
| import java.util.regex.Pattern | ||
| import java.util.{ArrayList, Collections, Properties} | ||
| import java.time.Duration | ||
|
|
||
| import kafka.admin.AdminClient | ||
| import kafka.admin.ConsumerGroupCommand.{ConsumerGroupCommandOptions, KafkaConsumerGroupService} | ||
|
|
@@ -73,6 +74,7 @@ class AuthorizerIntegrationTest extends BaseRequestTest { | |
| val groupResource = new Resource(Group, group) | ||
| val deleteTopicResource = new Resource(Topic, deleteTopic) | ||
| val transactionalIdResource = new Resource(TransactionalId, transactionalId) | ||
| val createTopicResource = new Resource(Topic, createTopic) | ||
|
|
||
| val groupReadAcl = Map(groupResource -> Set(new Acl(userPrincipal, Allow, Acl.WildCardHost, Read))) | ||
| val groupDescribeAcl = Map(groupResource -> Set(new Acl(userPrincipal, Allow, Acl.WildCardHost, Describe))) | ||
|
|
@@ -82,6 +84,7 @@ class AuthorizerIntegrationTest extends BaseRequestTest { | |
| val clusterAlterAcl = Map(Resource.ClusterResource -> Set(new Acl(userPrincipal, Allow, Acl.WildCardHost, Alter))) | ||
| val clusterDescribeAcl = Map(Resource.ClusterResource -> Set(new Acl(userPrincipal, Allow, Acl.WildCardHost, Describe))) | ||
| val clusterIdempotentWriteAcl = Map(Resource.ClusterResource -> Set(new Acl(userPrincipal, Allow, Acl.WildCardHost, IdempotentWrite))) | ||
| val topicCreateAcl = Map(createTopicResource -> Set(new Acl(userPrincipal, Allow, Acl.WildCardHost, Create))) | ||
| val topicReadAcl = Map(topicResource -> Set(new Acl(userPrincipal, Allow, Acl.WildCardHost, Read))) | ||
| val topicWriteAcl = Map(topicResource -> Set(new Acl(userPrincipal, Allow, Acl.WildCardHost, Write))) | ||
| val topicDescribeAcl = Map(topicResource -> Set(new Acl(userPrincipal, Allow, Acl.WildCardHost, Describe))) | ||
|
|
@@ -207,7 +210,7 @@ class AuthorizerIntegrationTest extends BaseRequestTest { | |
| ApiKeys.LEADER_AND_ISR -> clusterAcl, | ||
| ApiKeys.STOP_REPLICA -> clusterAcl, | ||
| ApiKeys.CONTROLLED_SHUTDOWN -> clusterAcl, | ||
| ApiKeys.CREATE_TOPICS -> topicCreateAcl, | ||
| ApiKeys.DELETE_TOPICS -> topicDeleteAcl, | ||
| ApiKeys.DELETE_RECORDS -> topicDeleteAcl, | ||
| ApiKeys.OFFSET_FOR_LEADER_EPOCH -> clusterAcl, | ||
|
|
@@ -492,6 +495,18 @@ class AuthorizerIntegrationTest extends BaseRequestTest { | |
| } | ||
| } | ||
|
|
||
| @Test | ||
| def testCreateTopicAuthorizationWithClusterCreate() { | ||
| removeAllAcls() | ||
| val resources = Set[ResourceType](Topic) | ||
|
|
||
| sendRequestAndVerifyResponseError(ApiKeys.CREATE_TOPICS, createTopicsRequest, resources, isAuthorized = false) | ||
|
|
||
| for ((resource, acls) <- clusterCreateAcl) | ||
| addAndVerifyAcls(acls, resource) | ||
| sendRequestAndVerifyResponseError(ApiKeys.CREATE_TOPICS, createTopicsRequest, resources, isAuthorized = true) | ||
| } | ||
|
|
||
| @Test | ||
| def testFetchFollowerRequest() { | ||
| val key = ApiKeys.FETCH | ||
|
|
@@ -551,18 +566,30 @@ class AuthorizerIntegrationTest extends BaseRequestTest { | |
| } | ||
|
|
||
| @Test | ||
| def testCreatePermissionOnTopicToWriteToNonExistentTopic() { | ||
| testCreatePermissionNeededToWriteToNonExistentTopic(Topic) | ||
| } | ||
|
|
||
| @Test | ||
| def testCreatePermissionOnClusterToWriteToNonExistentTopic() { | ||
| testCreatePermissionNeededToWriteToNonExistentTopic(Cluster) | ||
| } | ||
|
|
||
| private def testCreatePermissionNeededToWriteToNonExistentTopic(resType: ResourceType) { | ||
| val topicPartition = new TopicPartition(createTopic, 0) | ||
| val newTopicResource = new Resource(Topic, createTopic) | ||
| addAndVerifyAcls(Set(new Acl(userPrincipal, Allow, Acl.WildCardHost, Write)), newTopicResource) | ||
| try { | ||
| sendRecords(numRecords, topicPartition) | ||
| Assert.fail("should have thrown exception") | ||
| } catch { | ||
| case e: TopicAuthorizationException => | ||
| assertEquals(Collections.singleton(createTopic), e.unauthorizedTopics()) | ||
| } | ||
|
|
||
| val resource = if (resType == Topic) newTopicResource else Resource.ClusterResource | ||
| addAndVerifyAcls(Set(new Acl(userPrincipal, Allow, Acl.WildCardHost, Create)), resource) | ||
|
|
||
| sendRecords(numRecords, topicPartition) | ||
| } | ||
|
|
||
|
|
@@ -800,27 +827,41 @@ class AuthorizerIntegrationTest extends BaseRequestTest { | |
| } | ||
|
|
||
| @Test | ||
| def testCreatePermissionOnTopicToReadFromNonExistentTopic() { | ||
| testCreatePermissionNeededToReadFromNonExistentTopic("newTopic", | ||
| Set(new Acl(userPrincipal, Allow, Acl.WildCardHost, Create)), | ||
| Topic) | ||
| } | ||
|
|
||
| @Test | ||
| def testCreatePermissionOnClusterToReadFromNonExistentTopic() { | ||
| testCreatePermissionNeededToReadFromNonExistentTopic("newTopic", | ||
| Set(new Acl(userPrincipal, Allow, Acl.WildCardHost, Create)), | ||
| Cluster) | ||
| } | ||
|
|
||
| private def testCreatePermissionNeededToReadFromNonExistentTopic(newTopic: String, acls: Set[Acl], resType: ResourceType) { | ||
| val topicPartition = new TopicPartition(newTopic, 0) | ||
| val newTopicResource = new Resource(Topic, newTopic) | ||
| addAndVerifyAcls(Set(new Acl(userPrincipal, Allow, Acl.WildCardHost, Read)), newTopicResource) | ||
| addAndVerifyAcls(groupReadAcl(groupResource), groupResource) | ||
| this.consumers.head.assign(List(topicPartition).asJava) | ||
| try { | ||
| this.consumers.head.poll(Duration.ofMillis(50L)); | ||
|
Member
There was a problem hiding this comment. Why did we replace
Contributor
Author
There was a problem hiding this comment. We modified the method to avoid producing any records - to avoid adding write permission which made the test more complicated than it needed to be. So we need to pass
Member
There was a problem hiding this comment. We want to be generous with the timeout then. Any reason why it's so low?
Contributor
Author
There was a problem hiding this comment. the default timeout was fine for the first call (when we expect it always to throw) it's the second one that caused issues - see https://issues.apache.org/jira/browse/KAFKA-6994 - but that IMHO is unrelated to the changes in this PR. if the second timeout is low - even without adding the required acl the test passed - that's the bug 6994. if the second timeout is large the test takes longer, that's why we kept relatively short
Contributor
Author
There was a problem hiding this comment. yep - replied there - it's the same with the old
Member
There was a problem hiding this comment. Even then,
Contributor
Author
There was a problem hiding this comment. good point - we can use |
||
| Assert.fail("should have thrown Authorization Exception") | ||
| } catch { | ||
| case e: TopicAuthorizationException => | ||
| assertEquals(Collections.singleton(newTopic), e.unauthorizedTopics()) | ||
| } | ||
|
|
||
| val resource = if (resType == Topic) newTopicResource else Resource.ClusterResource | ||
| addAndVerifyAcls(acls, resource) | ||
|
|
||
| // need to retry to avoid using a long timeout | ||
| TestUtils.waitUntilTrue(() => { | ||
| this.consumers.head.poll(Duration.ofMillis(50L)) | ||
| this.zkClient.topicExists(newTopic) | ||
| }, "Expected topic was not created") | ||
| } | ||
|
|
||
| @Test(expected = classOf[AuthorizationException]) | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why did we rename this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the new name though longer and not pretty matches the what the set of topics actually is in terms of authorizations
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But then later we still have things like
unauthorizedForCreateTopicMetadata. I think we should just keep this variable as it was since there is no actual change here. I'll push a minor commit.