diff --git a/scm-core/src/main/java/sonia/scm/web/filter/BasicAuthenticationFilter.java b/scm-core/src/main/java/sonia/scm/web/filter/BasicAuthenticationFilter.java index 342da39d0a..db33f7f53c 100644 --- a/scm-core/src/main/java/sonia/scm/web/filter/BasicAuthenticationFilter.java +++ b/scm-core/src/main/java/sonia/scm/web/filter/BasicAuthenticationFilter.java @@ -120,16 +120,15 @@ public class BasicAuthenticationFilter extends HttpFilter User user = null; String authentication = request.getHeader(HEADER_AUTHORIZATION); - if (securityContext.isAuthenticated()) - { - user = securityContext.getUser(); - } - else if (Util.isNotEmpty(authentication) - && authentication.toUpperCase().startsWith( - AUTHORIZATION_BASIC_PREFIX)) + if (Util.isNotEmpty(authentication) + && authentication.toUpperCase().startsWith(AUTHORIZATION_BASIC_PREFIX)) { user = authenticate(request, response, securityContext, authentication); } + else if (securityContext.isAuthenticated()) + { + user = securityContext.getUser(); + } if (user == null) { diff --git a/scm-webapp/src/test/java/sonia/scm/it/AnonymousAccessITCase.java b/scm-webapp/src/test/java/sonia/scm/it/AnonymousAccessITCase.java index 23eb058cf8..e2ba8023d8 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/AnonymousAccessITCase.java +++ b/scm-webapp/src/test/java/sonia/scm/it/AnonymousAccessITCase.java @@ -182,7 +182,6 @@ public class AnonymousAccessITCase * @throws RepositoryClientException */ @Test - @Ignore public void testSimpleAdminPush() throws RepositoryClientException, IOException {