Skip to content

[AMBARI-22837] AmbariAuthorizationFilterTest.testDoFilter_userNoPermissionsAccess fails unexpectedly #176

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.

Sign up for GitHub

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

Merged
rlevas merged 4 commits into from
Feb 14, 2018
Merged

[AMBARI-22837] AmbariAuthorizationFilterTest.testDoFilter_userNoPermissionsAccess fails unexpectedly #176

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2610b02
Fixed dependent test: AmbariAuthorizationFilterTest.testDoFilter_user…
ReedOei Jan 23, 2018
fd11db6
Merge remote-tracking branch 'upstream/trunk' into trunk
ReedOei Jan 23, 2018
e226334
Merge remote-tracking branch 'upstream/trunk' into trunk
ReedOei Jan 26, 2018
95aad2f
AMBARI-22837. Remove mocked SecurityContext in AmbariAuthorizationFil…
ReedOei Jan 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions ...t/java/org/apache/ambari/server/security/authorization/AmbariAuthorizationFilterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
import org.junit.After;
import org.junit.Test;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContext;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.crypto.password.PasswordEncoder;

Expand Down Expand Up @@ -356,7 +355,7 @@ protected void configure() {
* @throws Exception if an exception occurs
*/
private void performGeneralDoFilterTest(Authentication authentication, Table<String, String, Boolean> urlTests, boolean expectRedirect) throws Exception {
final SecurityContext securityContext = createNiceMock(SecurityContext.class);
SecurityContextHolder.getContext().setAuthentication(authentication);
final FilterConfig filterConfig = createNiceMock(FilterConfig.class);

final Configuration configuration = EasyMock.createMock(Configuration.class);
Expand All @@ -379,12 +378,11 @@ private void performGeneralDoFilterTest(Authentication authentication, Table<Str

expect(filterConfig.getInitParameter("realm")).andReturn("AuthFilter").anyTimes();

expect(filter.getSecurityContext()).andReturn(securityContext).anyTimes();
expect(filter.getSecurityContext()).andReturn(SecurityContextHolder.getContext()).anyTimes();
expect(filter.getViewRegistry()).andReturn(viewRegistry).anyTimes();
expect(securityContext.getAuthentication()).andReturn(authentication).anyTimes();
expect(viewRegistry.checkPermission(EasyMock.eq("DeniedView"), EasyMock.anyObject(), EasyMock.anyObject(), EasyMock.anyBoolean())).andReturn(false).anyTimes();

replay(filterConfig, filter, securityContext, viewRegistry, configuration, auditLogger);
replay(filterConfig, filter, viewRegistry, configuration, auditLogger);

for (final Cell<String, String, Boolean> urlTest: urlTests.cellSet()) {
final FilterChain chain = EasyMock.createStrictMock(FilterChain.class);
Expand Down