[GitHub] [geode] dschneider-pivotal commented on a change in pull request #7162: GEODE-9563: Close Radish connections when AuthenticationExpiredException is caught

[GitBox <gi...@apache.org>]

dschneider-pivotal commented on a change in pull request #7162:
URL: https://github.com/apache/geode/pull/7162#discussion_r762115613



##########
File path: geode-for-redis/src/distributedTest/java/org/apache/geode/redis/ExpiringSecurityManager.java
##########
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package org.apache.geode.redis;
+
+import java.util.HashSet;
+import java.util.Properties;
+import java.util.Set;
+
+import org.apache.geode.examples.SimpleSecurityManager;
+import org.apache.geode.security.AuthenticationExpiredException;
+import org.apache.geode.security.AuthenticationFailedException;
+import org.apache.geode.security.ResourcePermission;
+
+public class ExpiringSecurityManager extends SimpleSecurityManager {
+  private final Set<String> expiredUsers = new HashSet<>();
+
+  @Override
+  public Object authenticate(final Properties credentials) throws AuthenticationFailedException {
+    String user = (String) super.authenticate(credentials);
+    if (expiredUsers.remove(user)) {
+      throw new AuthenticationExpiredException("User has expired.");
+    }
+
+    return user;
+  }
+
+  @Override
+  public boolean authorize(Object principal, ResourcePermission permission) {
+    String user = (String) principal;
+    boolean authorized = super.authorize(principal, permission) && !expiredUsers.contains(user);

Review comment:
       what is the point of adding "&& !expiredUsers.contains(user)" here? The next line will throw an exception if expiredUsers.contains(user) (i.e. remove returns true) In which case authorized will not even be used. So I think this can be simplified to just the super call.
   Also, if it is okay to give precedence to the expiration check over super.authorize, you could just the the expiration check first and if you get past that just do "return super.authorize..."




-- 
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: notifications-unsubscribe@geode.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org