jcshepherd commented on code in PR #4427:
URL: https://github.com/apache/cassandra/pull/4427#discussion_r2984686288
##########
src/java/org/apache/cassandra/auth/CassandraRoleManager.java:
##########
@@ -171,17 +173,16 @@ public CassandraRoleManager()
public CassandraRoleManager(Map<String, String> parameters)
{
- Set<Option> allowedOptions = DatabaseDescriptor.getAuthenticator()
instanceof PasswordAuthenticator
- ? EnumSet.of(Option.LOGIN,
Option.SUPERUSER, Option.PASSWORD, Option.HASHED_PASSWORD,
Option.GENERATED_PASSWORD, Option.GENERATED_NAME)
- : EnumSet.of(Option.LOGIN,
Option.SUPERUSER);
+ Set<Option> allowedOptions =
Stream.concat(DEFAULT_SUPPORTED_ROLE_OPTIONS.stream(),
DatabaseDescriptor.getAuthenticator().getSupportedRoleOptions().stream())
+ .collect(Collectors.toSet());
if (Guardrails.roleNamePolicy.getGenerator() != NoOpGenerator.INSTANCE)
allowedOptions.add(Option.OPTIONS);
- supportedOptions = ImmutableSet.copyOf(allowedOptions);
- alterableOptions = DatabaseDescriptor.getAuthenticator() instanceof
PasswordAuthenticator
- ? ImmutableSet.of(Option.PASSWORD,
Option.HASHED_PASSWORD, Option.GENERATED_PASSWORD)
- : ImmutableSet.<Option>of();
+ supportedOptions = Set.copyOf(allowedOptions);
+
+ alterableOptions =
Stream.concat(DEFAULT_ALTERABLE_ROLE_OPTIONS.stream(),
DatabaseDescriptor.getAuthenticator().getAlterableRoleOptions().stream())
Review Comment:
That's the reason. I realize at this point it's not adding much value, and I
can't predict the future, but I think establishing the pattern now will make it
safer to modify in the future.
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
