Skip to content

Adding method Constraint test to improve test coverage #15588

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

Open
joakime wants to merge 1 commit into
base: jetty-12.1.x
Choose a base branch
from
Open

Adding method Constraint test to improve test coverage #15588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 20 additions & 0 deletions ...ty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/security/ConstraintTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.CsvSource;
import org.junit.jupiter.params.provider.MethodSource;
import org.junit.jupiter.params.provider.ValueSource;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -2580,6 +2581,25 @@ public void testJakartaSpecCombinedConstraintsExamples(String httpMethod, String
}
}

@ParameterizedTest
@CsvSource(textBlock = """
PROPPATCH, PATCH
PATCH, PATCHED
""")
public void testSubstringMethod(String methodConstraint, String methodRequest) throws Exception
{
ConstraintMapping forbiddenMapping = new ConstraintMapping();
forbiddenMapping.setPathSpec("/test/*");
forbiddenMapping.setMethod(methodConstraint);
forbiddenMapping.setConstraint(Constraint.FORBIDDEN);
_security.setConstraintMappings(List.of(forbiddenMapping));
_server.start();

String requestPath = "/test/foo";
Constraint constraint = _security.getConstraint(requestPath, methodRequest);
assertThat("%s %s constraint not covered".formatted(methodRequest, requestPath), constraint, nullValue());
}

public static Stream<Arguments> singleForbiddenMethodOmissionCases()
{
return Stream.of(
Expand Down
20 changes: 20 additions & 0 deletions ...ty-ee11-servlet/src/test/java/org/eclipse/jetty/ee11/servlet/security/ConstraintTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.CsvSource;
import org.junit.jupiter.params.provider.MethodSource;
import org.junit.jupiter.params.provider.ValueSource;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -2580,6 +2581,25 @@ public void testJakartaSpecCombinedConstraintsExamples(String httpMethod, String
}
}

@ParameterizedTest
@CsvSource(textBlock = """
PROPPATCH, PATCH
PATCH, PATCHED
""")
public void testSubstringMethod(String methodConstraint, String methodRequest) throws Exception
{
ConstraintMapping forbiddenMapping = new ConstraintMapping();
forbiddenMapping.setPathSpec("/test/*");
forbiddenMapping.setMethod(methodConstraint);
forbiddenMapping.setConstraint(Constraint.FORBIDDEN);
_security.setConstraintMappings(List.of(forbiddenMapping));
_server.start();

String requestPath = "/test/foo";
Constraint constraint = _security.getConstraint(requestPath, methodRequest);
assertThat("%s %s constraint not covered".formatted(methodRequest, requestPath), constraint, nullValue());
}

public static Stream<Arguments> singleForbiddenMethodOmissionCases()
{
return Stream.of(
Expand Down
24 changes: 24 additions & 0 deletions ...y-ee9/jetty-ee9-security/src/test/java/org/eclipse/jetty/ee9/security/ConstraintTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.CsvSource;
import org.junit.jupiter.params.provider.MethodSource;
import org.junit.jupiter.params.provider.ValueSource;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -2560,6 +2561,29 @@ public void testServletSpecCombinedConstraintsExamples(String httpMethod, String
}
}

@ParameterizedTest
@CsvSource(textBlock = """
PROPPATCH, PATCH
PATCH, PATCHED
""")
public void testSubstringMethod(String methodConstraint, String methodRequest) throws Exception
{
ServletConstraint forbidConstraint = new ServletConstraint();
forbidConstraint.setAuthenticate(true);
forbidConstraint.setName("forbid");
ConstraintMapping forbiddenMapping = new ConstraintMapping();
forbiddenMapping.setPathSpec("/test/*");
forbiddenMapping.setMethod(methodConstraint);
forbiddenMapping.setConstraint(forbidConstraint);
_security.setConstraintMappings(List.of(forbiddenMapping));
_server.start();

String requestPath = "/test/foo";
RoleInfo roleInfo = _security.prepareConstraintInfo(requestPath, methodRequest);
assertThat("%s %s roleInfo isChecked".formatted(methodRequest, requestPath), roleInfo.isChecked(), is(false));
assertThat("%s %s roleInfo forbidden".formatted(methodRequest, requestPath), roleInfo.isForbidden(), is(false));
}

public static Stream<Arguments> singleForbiddenMethodOmissionCases()
{
return Stream.of(
Expand Down
Loading