-
Notifications
You must be signed in to change notification settings - Fork 895
Atlas-5063: [Backend] Fix for improving logout mechanism in Atlas Backend code base #397
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
aditya-gupta36
wants to merge
1
commit into
apache:master
Choose a base branch
from
aditya-gupta36:Atlas-5063
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
webapp/src/main/java/org/apache/atlas/web/security/AtlasSecurityCommonConfig.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| /* | ||
| * 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.atlas.web.security; | ||
|
|
||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.Configuration; | ||
|
|
||
| @Configuration | ||
| public class AtlasSecurityCommonConfig { | ||
| @Bean | ||
| public ObjectMapper objectMapper() { | ||
| return new ObjectMapper(); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 70 additions & 0 deletions
70
webapp/src/main/java/org/apache/atlas/web/security/CustomLogoutSuccessHandler.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| /* | ||
| * 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.atlas.web.security; | ||
|
|
||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
| import org.apache.atlas.web.filters.HeadersUtil; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
| import org.springframework.security.core.Authentication; | ||
| import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; | ||
| import org.springframework.security.web.authentication.logout.SimpleUrlLogoutSuccessHandler; | ||
| import org.springframework.stereotype.Component; | ||
|
|
||
| import javax.inject.Inject; | ||
| import javax.servlet.http.HttpServletRequest; | ||
| import javax.servlet.http.HttpServletResponse; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| @Component | ||
| public class CustomLogoutSuccessHandler extends SimpleUrlLogoutSuccessHandler implements LogoutSuccessHandler { | ||
| private final ObjectMapper mapper; | ||
| private static final Logger LOG = LoggerFactory.getLogger(CustomLogoutSuccessHandler.class); | ||
|
|
||
| @Inject | ||
| public CustomLogoutSuccessHandler(ObjectMapper mapper) { | ||
| this.mapper = mapper; | ||
| } | ||
|
|
||
| @Override | ||
| public void onLogoutSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) { | ||
| request.getServletContext().removeAttribute(request.getRequestedSessionId()); | ||
| response.setContentType("application/json;charset=UTF-8"); | ||
| response.setHeader(HeadersUtil.CACHE_CONTROL, HeadersUtil.CACHE_CONTROL_VAL); | ||
| response.setHeader(HeadersUtil.X_FRAME_OPTIONS_KEY, HeadersUtil.X_FRAME_OPTIONS_VAL); | ||
|
|
||
| try { | ||
| Map<String, Object> responseMap = new HashMap<>(); | ||
| responseMap.put("statusCode", HttpServletResponse.SC_OK); | ||
| responseMap.put("msgDesc", "Logout Successful"); | ||
| String jsonStr = mapper.writeValueAsString(responseMap); | ||
|
|
||
| response.setStatus(HttpServletResponse.SC_OK); | ||
| response.getWriter().write(jsonStr); | ||
|
|
||
| LOG.debug("Log-out Successfully done. Returning Json : {}", jsonStr); | ||
| } catch (IOException e) { | ||
| LOG.debug("Error while writing JSON in HttpServletResponse"); | ||
| } | ||
| } | ||
| } | ||
105 changes: 105 additions & 0 deletions
105
webapp/src/test/java/org/apache/atlas/web/filters/AtlasKnoxSSOAuthenticationFilterTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| /* | ||
| * 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.atlas.web.filters; | ||
|
|
||
| import org.apache.atlas.web.resources.AdminResource; | ||
| import org.mockito.InjectMocks; | ||
| import org.mockito.Mock; | ||
| import org.mockito.MockitoAnnotations; | ||
| import org.springframework.mock.web.MockHttpServletRequest; | ||
| import org.springframework.mock.web.MockHttpServletResponse; | ||
| import org.springframework.mock.web.MockHttpSession; | ||
| import org.testng.annotations.BeforeMethod; | ||
| import org.testng.annotations.Test; | ||
|
|
||
| import javax.servlet.FilterChain; | ||
| import javax.servlet.ServletException; | ||
| import javax.servlet.http.Cookie; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Arrays; | ||
|
|
||
| import static org.mockito.Mockito.verify; | ||
| import static org.testng.Assert.assertEquals; | ||
| import static org.testng.Assert.assertNotNull; | ||
| import static org.testng.Assert.assertNull; | ||
| import static org.testng.Assert.assertTrue; | ||
|
|
||
| public class AtlasKnoxSSOAuthenticationFilterTest { | ||
| @Mock | ||
| private FilterChain filterChain; | ||
|
|
||
| @InjectMocks | ||
| private AtlasKnoxSSOAuthenticationFilter filter; | ||
|
|
||
| private MockHttpServletRequest request; | ||
| private MockHttpServletResponse response; | ||
| private MockHttpSession session; | ||
|
|
||
| @InjectMocks | ||
| AdminResource adminResource; | ||
|
|
||
| @BeforeMethod | ||
| public void testSetup() { | ||
| MockitoAnnotations.openMocks(this); | ||
| request = new MockHttpServletRequest(); | ||
| response = new MockHttpServletResponse(); | ||
| session = new MockHttpSession(); | ||
| request.setSession(session); | ||
|
|
||
| request.setRequestURI("/api/atlas/admin/checksso"); | ||
| request.addHeader("User-Agent", "Chrome"); | ||
| } | ||
|
|
||
aditya-gupta36 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| @Test | ||
| public void testDoFilter_withoutJwt_setsSsoDisabled() throws IOException, ServletException { | ||
| request.setCookies(); // clear cookies for this test | ||
| filter.doFilter(request, response, filterChain); | ||
|
|
||
| assertNull(filter.getJWTFromCookie(request)); | ||
|
|
||
| verify(filterChain).doFilter(request, response); | ||
| } | ||
|
|
||
| @Test | ||
| public void testDoFilter_withJwt_setsSsoEnabledTrue() throws IOException, ServletException { | ||
| request.setCookies(new Cookie("hadoop-jwt", "dummy-jwt-token")); | ||
| filter.doFilter(request, response, filterChain); | ||
|
|
||
| assertNotNull(filter.getJWTFromCookie(request)); | ||
| assertNotNull(request.getCookies()); | ||
| assertTrue(Arrays.stream(request.getCookies()) | ||
| .anyMatch(cookie -> cookie.getValue().equals("dummy-jwt-token"))); | ||
|
|
||
| verify(filterChain).doFilter(request, response); | ||
| } | ||
|
|
||
| @Test | ||
| public void test_CheckSSO_API_true() { | ||
| request.setAttribute("ssoEnabled", true); | ||
| String result = adminResource.checkSSO(request); | ||
| assertEquals(result, "true"); | ||
| } | ||
|
|
||
| @Test | ||
| public void test_CheckSSO_API_false() { | ||
| request.setAttribute("ssoEnabled", false); | ||
| String result = adminResource.checkSSO(request); | ||
| assertEquals(result, "false"); | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.