Skip to content

Improved the handling of SCIM resource endpoints for the case where t… #3

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
baffelli wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Improved the handling of SCIM resource endpoints for the case where t… #3

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
51 changes: 38 additions & 13 deletions common/src/main/java/com/evolveum/polygon/scimrest/impl/scim/ScimContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,21 +111,46 @@ public void initialize() {
* @return
*/
private String relativeEndpoint(URI endpoint) {
return relativeEndpoint(endpoint.toString());
}
private String relativeEndpoint(String endpointStr) {
// Drop HTTP // HTTPS prefix from both
endpointStr = removeProtocol(endpointStr);
var baseUrl = removeProtocol(configuration.getScimBaseUrl());
if (endpoint == null) {
throw new IllegalArgumentException("endpoint is null");
}
//Get the base URI from configuration
URI base = URI.create(configuration.getScimBaseUrl().trim());
// Fail early if base URL is missing path
String basePath = base.getPath();
if (basePath == null || basePath.isEmpty()) {
throw new IllegalArgumentException("Base URL is missing");
}
if (!basePath.endsWith("/")) {
basePath = basePath + "/";
}

if (endpointStr.startsWith(baseUrl)) {
return endpointStr.substring(baseUrl.length());
//1) Endpoint is returned relative to base URL (conforming to the RFC: https://datatracker.ietf.org/doc/html/rfc7643#section-6)
if (!endpoint.isAbsolute() && endpoint.getHost() == null) {
String path = endpoint.getPath();
if (path == null || path.isBlank() || path.equals("/")) {
throw new IllegalArgumentException("Endpoint is blank or root: " + endpoint);
}
return path.startsWith("/") ? path : "/" + path;
}
throw new IllegalArgumentException("Can not relativize endpoint.");
}

private String removeProtocol(String endpointStr) {
return endpointStr.replaceFirst("^https?://", "");
//2) Endpoint is absolute URL; verify it is under base URL
String epPath = endpoint.getPath();
if (epPath == null || epPath.isEmpty()) {
throw new IllegalArgumentException("Absolute endpoint has empty path: " + endpoint);
}

if (!epPath.startsWith(basePath)) {
throw new IllegalArgumentException(
"Endpoint path: " + epPath + "not under basePath=" + basePath
);
}

String rel = epPath.substring(basePath.length()); // e.g. "Users"
if (rel.isEmpty()) {
return "/";
}
return rel.startsWith("/") ? rel : "/" + rel;
}

public void contributeToSchema(RestSchemaBuilder schemaBuilder) {
Expand Down Expand Up @@ -169,7 +194,7 @@ public ScimResourceContext resourceForObjectClass(ObjectClass objectClass) {
}

public ObjectClass objectClassFromUri(String ref) {
var uri = relativeEndpoint(ref);
var uri = relativeEndpoint(URI.create(ref));
for (var resource : resources.values()) {
if (uri.startsWith(resource.relativeEndpoint())) {
var objectClass = resourceToObjectClass.get(resource.resource().getName());
Expand Down