This is an automated email from the ASF dual-hosted git repository.
jensdeppe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new bd523c3 GEODE-3951: PULSE Logout exception when using the defaults.
(#1041)
bd523c3 is described below
commit bd523c34790e3e84aa672be02c586f0293d0ad59
Author: Juan José Ramos <[email protected]>
AuthorDate: Tue Nov 14 06:52:48 2017 -0800
GEODE-3951: PULSE Logout exception when using the defaults. (#1041)
* GEODE-3951: PULSE Logout exception when using the defaults.
. Added JUnit tests.
. Removed unnecessary logging in LogoutHandler.
. Removed unnecessary downcasting in LogoutHandler.
* GEODE-3951: PULSE Logout exception when using the defaults.
. Minor fix in JUnit test.
---
.../pulse/internal/security/LogoutHandler.java | 11 +--
.../internal/security/LogoutHandlerUnitTest.java | 103 +++++++++++++++++++++
2 files changed, 108 insertions(+), 6 deletions(-)
diff --git
a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/security/LogoutHandler.java
b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/security/LogoutHandler.java
index 5fec88e..a1fa3ce 100644
---
a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/security/LogoutHandler.java
+++
b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/security/LogoutHandler.java
@@ -41,13 +41,12 @@ public class LogoutHandler extends
SimpleUrlLogoutSuccessHandler implements Logo
public void onLogoutSuccess(HttpServletRequest request, HttpServletResponse
response,
Authentication authentication) throws IOException, ServletException {
- logger.debug("Invoked #LogoutHandler ...");
- GemFireAuthentication gemauthentication = (GemFireAuthentication)
authentication;
- if (gemauthentication != null) {
- Repository.get().logoutUser(gemauthentication.getName());
- logger.info("#LogoutHandler : Closing GemFireAuthentication JMX
Connection...");
+
+ if (authentication != null) {
+ Repository.get().logoutUser(authentication.getName());
+ logger.info("#LogoutHandler: GemFireAuthentication JMX Connection
Closed.");
}
+
super.onLogoutSuccess(request, response, authentication);
}
-
}
diff --git
a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/internal/security/LogoutHandlerUnitTest.java
b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/internal/security/LogoutHandlerUnitTest.java
new file mode 100644
index 0000000..b1b4a80
--- /dev/null
+++
b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/internal/security/LogoutHandlerUnitTest.java
@@ -0,0 +1,103 @@
+/*
+ * 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.tools.pulse.internal.security;
+
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.powermock.api.mockito.PowerMockito.spy;
+import static org.powermock.api.mockito.PowerMockito.when;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.mockito.Mockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+import org.powermock.modules.junit4.PowerMockRunnerDelegate;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+import org.springframework.security.core.Authentication;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.apache.geode.tools.pulse.internal.data.Cluster;
+import org.apache.geode.tools.pulse.internal.data.Repository;
+
+@Category(UnitTest.class)
+@RunWith(PowerMockRunner.class)
+@PrepareForTest(Repository.class)
+@PowerMockRunnerDelegate(Parameterized.class)
+@PowerMockIgnore({"javax.management.*", "javax.security.*", "*.UnitTest"})
+public class LogoutHandlerUnitTest {
+ private Repository repository;
+ private LogoutHandler handler;
+ private static String mockUser = "admin";
+
+ @Parameterized.Parameter
+ public static Authentication authentication;
+
+ @Parameterized.Parameters(name = "{0}")
+ public static Collection<Authentication> authentications() throws Exception {
+ Authentication defaultAuthentication = mock(Authentication.class, "Default
Authentication");
+ when(defaultAuthentication.getName()).thenReturn(mockUser);
+
+ GemFireAuthentication gemfireAuthentication =
+ mock(GemFireAuthentication.class, "GemFire Authentication");
+ when(gemfireAuthentication.getName()).thenReturn(mockUser);
+
+ return Arrays.asList(new Authentication[] {defaultAuthentication,
gemfireAuthentication});
+ }
+
+ @Before
+ public void setup() throws Exception {
+ Cluster cluster = Mockito.spy(Cluster.class);
+ repository = Mockito.spy(Repository.class);
+ spy(Repository.class);
+ when(Repository.class, "get").thenReturn(repository);
+ doReturn(cluster).when(repository).getCluster();
+ handler = new LogoutHandler("/defaultTargetUrl");
+ }
+
+ @Test
+ public void testNullAuthentication() throws Exception {
+ MockHttpServletRequest request = new MockHttpServletRequest();
+ MockHttpServletResponse response = new MockHttpServletResponse();
+
+ handler.onLogoutSuccess(request, response, null);
+
+ assertThat(response.getStatus()).isEqualTo(302);
+ assertThat(response.getHeader("Location")).isEqualTo("/defaultTargetUrl");
+ }
+
+ @Test
+ public void testNotNullAuthentication() throws Exception {
+ MockHttpServletRequest request = new MockHttpServletRequest();
+ MockHttpServletResponse response = new MockHttpServletResponse();
+
+ handler.onLogoutSuccess(request, response, authentication);
+
+ assertThat(response.getStatus()).isEqualTo(302);
+ assertThat(response.getHeader("Location")).isEqualTo("/defaultTargetUrl");
+ verify(repository, Mockito.times(1)).logoutUser(mockUser);
+ }
+}
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
