You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@geode.apache.org by GitBox <gi...@apache.org> on 2021/12/03 14:21:18 UTC
[GitHub] [geode] jdeppe-pivotal opened a new pull request #7162: GEODE-9563: Close Radish connections when AuthenticationExpiredException is caught
jdeppe-pivotal opened a new pull request #7162:
URL: https://github.com/apache/geode/pull/7162
- If connections are closed during command execution, both Jedis and
Lettuce will re-attempt and re-establish new connections. Other
clients may not be as resilient but since the user has expired, the
connection is essentially useless and subsequent commands will
continue to fail.
<!-- Thank you for submitting a contribution to Apache Geode. -->
<!-- In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:
-->
### For all changes:
- [ ] Is there a JIRA ticket associated with this PR? Is it referenced in the commit message?
- [ ] Has your PR been rebased against the latest commit within the target branch (typically `develop`)?
- [ ] Is your initial contribution a single, squashed commit?
- [ ] Does `gradlew build` run cleanly?
- [ ] Have you written or updated unit tests to verify your changes?
- [ ] If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under [ASF 2.0](http://www.apache.org/legal/resolved.html#category-a)?
<!-- Note:
Please ensure that once the PR is submitted, check Concourse for build issues and
submit an update to your PR as soon as possible. If you need help, please send an
email to dev@geode.apache.org.
-->
--
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
[GitHub] [geode] jdeppe-pivotal closed pull request #7162: GEODE-9563: Close Radish connections when AuthenticationExpiredException is caught
Posted by GitBox <gi...@apache.org>.
jdeppe-pivotal closed pull request #7162:
URL: https://github.com/apache/geode/pull/7162
--
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
[GitHub] [geode] DonalEvans commented on a change in pull request #7162: GEODE-9563: Close Radish connections when AuthenticationExpiredException is caught
Posted by GitBox <gi...@apache.org>.
DonalEvans commented on a change in pull request #7162:
URL: https://github.com/apache/geode/pull/7162#discussion_r762190760
##########
File path: geode-for-redis/src/distributedTest/java/org/apache/geode/redis/UserExpirationDUnitTest.java
##########
@@ -0,0 +1,114 @@
+/*
+ * 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 static org.apache.geode.test.dunit.rules.RedisClusterStartupRule.BIND_ADDRESS;
+import static org.apache.geode.test.dunit.rules.RedisClusterStartupRule.REDIS_CLIENT_TIMEOUT;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.lettuce.core.cluster.RedisClusterClient;
+import io.lettuce.core.cluster.api.sync.RedisClusterCommands;
+import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
+import org.junit.After;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import redis.clients.jedis.BinaryJedisCluster;
+import redis.clients.jedis.HostAndPort;
+import redis.clients.jedis.JedisCluster;
+
+import org.apache.geode.test.dunit.rules.MemberVM;
+import org.apache.geode.test.dunit.rules.RedisClusterStartupRule;
+import org.apache.geode.test.dunit.rules.SerializableFunction;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
+
+public class UserExpirationDUnitTest {
+
+ @ClassRule
+ public static RedisClusterStartupRule cluster = new RedisClusterStartupRule();
+
+ private static MemberVM server1;
+ private static MemberVM server2;
+ private static JedisCluster jedis;
+ private static final String USER = "data";
+ private static int redisPort;
+
+ @BeforeClass
+ public static void setup() throws Exception {
Review comment:
`Exception` is never thrown from this method, so this can be removed.
--
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
[GitHub] [geode] jdeppe-pivotal commented on pull request #7162: GEODE-9563: Close Radish connections when AuthenticationExpiredException is caught
Posted by GitBox <gi...@apache.org>.
jdeppe-pivotal commented on pull request #7162:
URL: https://github.com/apache/geode/pull/7162#issuecomment-985833589
@dschneider-pivotal: Regarding the question about `SUBSCRIBE` - yes I think we might need to call authorize for every message we send to a subscriber. We can discuss some more, but I'd also prefer to put that into a separate PR.
--
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
[GitHub] [geode] jdeppe-pivotal commented on a change in pull request #7162: GEODE-9563: Close Radish connections when AuthenticationExpiredException is caught
Posted by GitBox <gi...@apache.org>.
jdeppe-pivotal commented on a change in pull request #7162:
URL: https://github.com/apache/geode/pull/7162#discussion_r762273896
##########
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:
Good points. I think I had the `&& ...` bits left over from some reworking. All cleaned up.
--
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
[GitHub] [geode] jdeppe-pivotal commented on pull request #7162: GEODE-9563: Close Radish connections when AuthenticationExpiredException is caught
Posted by GitBox <gi...@apache.org>.
jdeppe-pivotal commented on pull request #7162:
URL: https://github.com/apache/geode/pull/7162#issuecomment-988097595
I'm closing this since I had repurposed the original Jira. Now I'm creating a new Jira for this change.
--
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
[GitHub] [geode] dschneider-pivotal commented on a change in pull request #7162: GEODE-9563: Close Radish connections when AuthenticationExpiredException is caught
Posted by 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
[GitHub] [geode] jdeppe-pivotal commented on a change in pull request #7162: GEODE-9563: Close Radish connections when AuthenticationExpiredException is caught
Posted by GitBox <gi...@apache.org>.
jdeppe-pivotal commented on a change in pull request #7162:
URL: https://github.com/apache/geode/pull/7162#discussion_r762274143
##########
File path: geode-for-redis/src/distributedTest/java/org/apache/geode/redis/UserExpirationDUnitTest.java
##########
@@ -0,0 +1,114 @@
+/*
+ * 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 static org.apache.geode.test.dunit.rules.RedisClusterStartupRule.BIND_ADDRESS;
+import static org.apache.geode.test.dunit.rules.RedisClusterStartupRule.REDIS_CLIENT_TIMEOUT;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.lettuce.core.cluster.RedisClusterClient;
+import io.lettuce.core.cluster.api.sync.RedisClusterCommands;
+import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
+import org.junit.After;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import redis.clients.jedis.BinaryJedisCluster;
+import redis.clients.jedis.HostAndPort;
+import redis.clients.jedis.JedisCluster;
+
+import org.apache.geode.test.dunit.rules.MemberVM;
+import org.apache.geode.test.dunit.rules.RedisClusterStartupRule;
+import org.apache.geode.test.dunit.rules.SerializableFunction;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
+
+public class UserExpirationDUnitTest {
+
+ @ClassRule
+ public static RedisClusterStartupRule cluster = new RedisClusterStartupRule();
+
+ private static MemberVM server1;
+ private static MemberVM server2;
+ private static JedisCluster jedis;
+ private static final String USER = "data";
+ private static int redisPort;
+
+ @BeforeClass
+ public static void setup() throws Exception {
Review comment:
Done
--
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