Skip to content

Commit

Permalink
AAE-19071 disable CSRF protection for public URLs (#1298)
Browse files Browse the repository at this point in the history
* AAE-19071 disable CSRF for public URLs, unit test.

* AAE-19071 fix other tests

* AAE-19071 sonarqube issues
  • Loading branch information
tom-dal authored Dec 20, 2023
1 parent e188e17 commit 1ab2a4f
Show file tree
Hide file tree
Showing 3 changed files with 93 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import jakarta.annotation.PostConstruct;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.function.Consumer;
Expand Down Expand Up @@ -75,10 +76,22 @@ public void configure(HttpSecurity http) throws Exception {
List<SecurityConstraint> orderedSecurityConstraints = getOrderedList(
authorizationProperties.getSecurityConstraints()
);
List<String> publicUrls = new ArrayList<>();
for (SecurityConstraint securityConstraint : orderedSecurityConstraints) {
String[] roles = securityConstraint.getAuthRoles();
if (roles.length == 0) {
List<String> patterns = Arrays
.stream(securityConstraint.getSecurityCollections())
.flatMap(s -> Arrays.stream(getPatterns(s.getPatterns())))
.toList();
publicUrls.addAll(patterns);
}
configureAuthorization(http, roles, securityConstraint.getSecurityCollections());
}
if (!publicUrls.isEmpty()) {
LOGGER.debug("Disabling CSRF protection for public URLs: {}", publicUrls);
http.csrf(csrf -> csrf.ignoringRequestMatchers(new CsrfIgnoreMatcher(publicUrls)));
}
http.anonymous(withDefaults());
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/*
* Copyright 2017-2020 Alfresco Software, Ltd.
*
* Licensed 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.activiti.cloud.security.authorization;

import jakarta.servlet.http.HttpServletRequest;
import java.util.List;
import org.springframework.security.web.util.matcher.RequestMatcher;
import org.springframework.util.AntPathMatcher;
import org.springframework.util.PathMatcher;

public class CsrfIgnoreMatcher implements RequestMatcher {

private final List<String> publicUrls;

private final PathMatcher matcher;

public CsrfIgnoreMatcher(List<String> publicUrls) {
this.publicUrls = publicUrls;
this.matcher = new AntPathMatcher();
}

@Override
public boolean matches(HttpServletRequest request) {
return publicUrls.stream().anyMatch(url -> matcher.match(url, request.getRequestURI()));
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/*
* Copyright 2017-2020 Alfresco Software, Ltd.
*
* Licensed 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.activiti.cloud.security.authorization;

import static java.util.Arrays.asList;
import static org.assertj.core.api.Assertions.assertThat;

import java.util.List;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;

class CsrfIgnoreMatcherTest {

private final List<String> publicUrlsPatterns = asList("/public", "/public/**");
private final List<String> nonPublicUrlsPatterns = asList("/non-public", "/non-public/**");
private final CsrfIgnoreMatcher matcher = new CsrfIgnoreMatcher(publicUrlsPatterns);

@Test
void should_matchPublicURLsPatterns() {
nonPublicUrlsPatterns.forEach(url -> assertThat(matcher.matches(new MockHttpServletRequest("", url))).isFalse()
);
}

@Test
void should_not_matchNonPublicURLsPatterns() {
publicUrlsPatterns.forEach(url -> assertThat(matcher.matches(new MockHttpServletRequest("", url))).isTrue());
}
}

0 comments on commit 1ab2a4f

Please sign in to comment.