Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

KAFKA-12590: Remove deprecated kafka.security.auth.Authorizer, SimpleAclAuthorizer and related classes in 3.0 #10450

Merged
merged 9 commits into from
Apr 3, 2021
Merged

KAFKA-12590: Remove deprecated kafka.security.auth.Authorizer, SimpleAclAuthorizer and related classes in 3.0 #10450

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fb89986
KAFKA-12590: Remove deprecated SimpleAclAuthorizer
ijuma Mar 31, 2021
b93ed2e
Move `AuthorizerUtils.validateAclBinding` to `AclAuthorizer`
ijuma Mar 31, 2021
8ab8234
Update AuthorizerIntegrationTest
ijuma Mar 31, 2021
243c23c
Update config
ijuma Mar 31, 2021
a62660d
Update system tests
ijuma Mar 31, 2021
ef72463
Add upgrade note
ijuma Mar 31, 2021
0dfd0bf
Merge branch 'trunk' into kafka-12590-remove-deprecated-simple-acl-au…
ijuma Apr 2, 2021
d2a9052
No need to pass authorizer class name as a parameter
ijuma Apr 2, 2021
57b00dc
Remove extraneous <code>
ijuma Apr 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Move AuthorizerUtils.validateAclBinding to AclAuthorizer 
Also convert a `toList` to `toBuffer`
  • Loading branch information
@ijuma
ijuma committed Mar 31, 2021
commit b93ed2edb82699bbfc9617ebbc1ab63c0ec73a97
12 changes: 9 additions & 3 deletions core/src/main/scala/kafka/security/authorizer/AclAuthorizer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import java.util.concurrent.{CompletableFuture, CompletionStage}

import com.typesafe.scalalogging.Logger
import kafka.api.KAFKA_2_0_IV1
import kafka.security.authorizer.AclAuthorizer.{AclSeqs, ResourceOrdering, VersionedAcls}
import kafka.security.authorizer.AclEntry.ResourceSeparator
import kafka.server.{KafkaConfig, KafkaServer}
import kafka.utils._
Expand Down Expand Up @@ -118,9 +117,16 @@ object AclAuthorizer {
zkClientConfig
}
}

private def validateAclBinding(aclBinding: AclBinding): Unit = {
if (aclBinding.isUnknown)
throw new IllegalArgumentException("ACL binding contains unknown elements")
}
}

class AclAuthorizer extends Authorizer with Logging {
import kafka.security.authorizer.AclAuthorizer._

private[security] val authorizerLogger = Logger("kafka.authorizer.logger")
private var superUsers = Set.empty[KafkaPrincipal]
private var shouldAllowEveryoneIfNoAclIsFound = false
Expand Down Expand Up @@ -200,7 +206,7 @@ class AclAuthorizer extends Authorizer with Logging {
throw new UnsupportedVersionException(s"Adding ACLs on prefixed resource patterns requires " +
s"${KafkaConfig.InterBrokerProtocolVersionProp} of $KAFKA_2_0_IV1 or greater")
}
AuthorizerUtils.validateAclBinding(aclBinding)
validateAclBinding(aclBinding)
true
} catch {
case e: Throwable =>
Expand All @@ -225,7 +231,7 @@ class AclAuthorizer extends Authorizer with Logging {
}
}
}
results.toList.map(CompletableFuture.completedFuture[AclCreateResult]).asJava
results.toBuffer.map(CompletableFuture.completedFuture[AclCreateResult]).asJava
}

/**
Expand Down
6 changes: 0 additions & 6 deletions core/src/main/scala/kafka/security/authorizer/AuthorizerUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ package kafka.security.authorizer
import java.net.InetAddress

import kafka.network.RequestChannel.Session
import org.apache.kafka.common.acl._
import org.apache.kafka.common.resource.Resource
import org.apache.kafka.common.security.auth.{KafkaPrincipal, SecurityProtocol}
import org.apache.kafka.common.utils.Utils
Expand All @@ -29,11 +28,6 @@ import org.apache.kafka.server.authorizer.{AuthorizableRequestContext, Authorize

object AuthorizerUtils {


def validateAclBinding(aclBinding: AclBinding): Unit = {
if (aclBinding.isUnknown)
throw new IllegalArgumentException("ACL binding contains unknown elements")
}
def createAuthorizer(className: String): Authorizer = Utils.newInstance(className, classOf[Authorizer])

def isClusterResource(name: String): Boolean = name.equals(Resource.CLUSTER_NAME)
Expand Down