Skip to content

Support patch filters such as [primary EQ "True"] #1213

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
raphj wants to merge 1 commit into
base: develop
Choose a base branch
from
+69 −9
Open

Support patch filters such as [primary EQ "True"] #1213

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
42 changes: 42 additions & 0 deletions scim-core/src/test/java/org/apache/directory/scim/core/repository/PatchHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,48 @@ public void applyRemoveItemWithFilter() {
assertThat(updatedUser.getAddresses().get(0).getPostalCode()).isEqualTo("43210");
}

@Test
public void applyPrimaryString() {
ScimUser user = user().setAddresses(List.of(
new Address()
.setType("work")
.setStreetAddress("101 Main Street")
.setRegion("Springfield")
.setPostalCode("01234")
.setPrimary(true),
new Address()
.setType("home")
.setStreetAddress("202 Maple Street")
.setRegion("Otherton")
.setPostalCode("43210")
.setPrimary(false)
));

PatchOperation op = patchOperation(REPLACE, "addresses[primary EQ true].postalCode", "32140");
ScimUser updatedUser = patchHandler.apply(user, List.of(op));
assertThat(updatedUser.getAddresses().size()).isEqualTo(2);
assertThat(updatedUser.getAddresses().get(0).getPostalCode()).isEqualTo("32140");
assertThat(updatedUser.getAddresses().get(1).getPostalCode()).isEqualTo("43210");

op = patchOperation(REPLACE, "addresses[primary EQ \"True\"].postalCode", "42");
updatedUser = patchHandler.apply(user, List.of(op));
assertThat(updatedUser.getAddresses().size()).isEqualTo(2);
assertThat(updatedUser.getAddresses().get(0).getPostalCode()).isEqualTo("42");
assertThat(updatedUser.getAddresses().get(1).getPostalCode()).isEqualTo("43210");

op = patchOperation(REPLACE, "addresses[primary EQ false].postalCode", "1337");
updatedUser = patchHandler.apply(user, List.of(op));
assertThat(updatedUser.getAddresses().size()).isEqualTo(2);
assertThat(updatedUser.getAddresses().get(0).getPostalCode()).isEqualTo("01234");
assertThat(updatedUser.getAddresses().get(1).getPostalCode()).isEqualTo("1337");

op = patchOperation(REPLACE, "addresses[primary EQ \"False\"].postalCode", "7331");
updatedUser = patchHandler.apply(user, List.of(op));
assertThat(updatedUser.getAddresses().size()).isEqualTo(2);
assertThat(updatedUser.getAddresses().get(0).getPostalCode()).isEqualTo("01234");
assertThat(updatedUser.getAddresses().get(1).getPostalCode()).isEqualTo("7331");
}

@Test
public void applyRemoveAttributeWithFilter() {
Address workAddress = new Address()
Expand Down
36 changes: 27 additions & 9 deletions ...schema/src/main/java/org/apache/directory/scim/spec/filter/InMemoryScimFilterMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

import java.util.Collection;
import java.util.Comparator;
import java.util.Locale;
import java.util.function.Predicate;

class InMemoryScimFilterMatcher<R> extends BaseFilterExpressionMapper<Predicate<R>> {
Expand Down Expand Up @@ -181,17 +182,10 @@ protected boolean test(Schema.Attribute attribute, Object actualValue) {
Object compareValue = expression.getCompareValue();

if (op == CompareOperator.EQ) {

if (isStringExpression(attribute, compareValue) && !attribute.isCaseExact()) {
return actualValue.toString().equalsIgnoreCase(compareValue.toString());
}
return compareValue.equals(actualValue);
return eq(attribute, actualValue, compareValue);
}
if (op == CompareOperator.NE) {
if (isStringExpression(attribute, compareValue) && !attribute.isCaseExact()) {
return !actualValue.toString().equalsIgnoreCase(compareValue.toString());
}
return !compareValue.equals(actualValue);
return !eq(attribute, actualValue, compareValue);
}
if (op == CompareOperator.SW) {
return isStringExpression(attribute, compareValue)
Expand All @@ -213,6 +207,30 @@ protected boolean test(Schema.Attribute attribute, Object actualValue) {

throw new ScimResourceInvalidException("Unsupported operation in filter: " + op.name());
}

private boolean eq(Schema.Attribute attribute, Object actualValue, Object compareValue)
{
if (isBooleanStringComparison(attribute, compareValue) || (isStringExpression(attribute, compareValue) && !attribute.isCaseExact())) {
return actualValue.toString().equalsIgnoreCase(compareValue.toString());
}
return compareValue.equals(actualValue);
}

private boolean isBooleanStringComparison(Schema.Attribute attribute, Object compareValue)
{
// Microsoft's SCIM Validator at https://scimvalidator.microsoft.com/ has patch operations
// with expressions like [primary EQ "True"]...
if (!attribute.getType().equals(Schema.Attribute.Type.BOOLEAN)) {
return false;
}

if (compareValue instanceof String compareValueString) {
String lowerCaseCompareValueString = compareValueString.toLowerCase(Locale.ROOT);
return "true".equals(lowerCaseCompareValueString) || "false".equals(lowerCaseCompareValueString);
}

return false;
}
}

private static class CompareOperatorPredicate<T> implements Predicate<T> {
Expand Down