m1a2st commented on code in PR #18641:
URL: https://github.com/apache/kafka/pull/18641#discussion_r1944150081
##########
core/src/main/scala/kafka/server/metadata/ClientQuotaMetadataManager.scala:
##########
@@ -145,27 +149,42 @@ class ClientQuotaMetadataManager(private[metadata] val
quotaManagers: QuotaManag
}
// Convert entity into Options with sanitized values for QuotaManagers
- val (sanitizedUser, sanitizedClientId) = quotaEntity match {
- case UserEntity(user) => (Some(Sanitizer.sanitize(user)), None)
- case DefaultUserEntity => (Some(ZooKeeperInternals.DEFAULT_STRING), None)
- case ClientIdEntity(clientId) => (None,
Some(Sanitizer.sanitize(clientId)))
- case DefaultClientIdEntity => (None,
Some(ZooKeeperInternals.DEFAULT_STRING))
- case ExplicitUserExplicitClientIdEntity(user, clientId) =>
(Some(Sanitizer.sanitize(user)), Some(Sanitizer.sanitize(clientId)))
- case ExplicitUserDefaultClientIdEntity(user) =>
(Some(Sanitizer.sanitize(user)), Some(ZooKeeperInternals.DEFAULT_STRING))
- case DefaultUserExplicitClientIdEntity(clientId) =>
(Some(ZooKeeperInternals.DEFAULT_STRING), Some(Sanitizer.sanitize(clientId)))
- case DefaultUserDefaultClientIdEntity =>
(Some(ZooKeeperInternals.DEFAULT_STRING),
Some(ZooKeeperInternals.DEFAULT_STRING))
- case IpEntity(_) | DefaultIpEntity => throw new
IllegalStateException("Should not see IP quota entities here")
- }
+ val (userEntity, sanitizedClientEntity) =
transferToClientQuotaEntity(quotaEntity)
val quotaValue = newValue.map(new Quota(_, true))
try {
manager.updateQuota(
- sanitizedUser = sanitizedUser,
- clientId = sanitizedClientId.map(Sanitizer.desanitize),
- sanitizedClientId = sanitizedClientId,
- quota = quotaValue)
+ userEntity = userEntity,
+ sanitizedClientEntity = sanitizedClientEntity,
+ quota = quotaValue
+ )
} catch {
case t: Throwable => error(s"Failed to update user-client quota
$quotaEntity", t)
}
}
}
+
+object ClientQuotaMetadataManager {
+
+ def transferToClientQuotaEntity(quotaEntity: QuotaEntity):
(Option[BaseUserEntity], Option[ClientQuotaConfigEntity]) = {
+ quotaEntity match {
+ case UserEntity(user) =>
+ (Some(ClientQuotaManager.UserEntity(Sanitizer.sanitize(user))), None)
+ case DefaultUserEntity =>
+ (Some(ClientQuotaManager.DefaultUserEntity), None)
+ case ClientIdEntity(clientId) =>
+ (None,
Some(ClientQuotaManager.ClientIdEntity(Sanitizer.sanitize(clientId))))
Review Comment:
After under discussion, We should remove this `sanitize`, it is unused in
this path.
--
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.
To unsubscribe, e-mail: jira-unsubscr...@kafka.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
