Skip to content

Commit

Permalink
feat: #18 apply external validations for searches
Browse files Browse the repository at this point in the history
  • Loading branch information
@jgomer2001
jgomer2001 committed Jul 29, 2021
1 parent 26b82e5 commit 427f545
Show file tree
Hide file tree
Showing 3 changed files with 155 additions and 135 deletions.
100 changes: 52 additions & 48 deletions scim-rest/src/main/java/org/gluu/oxtrust/ws/rs/scim2/Fido2DeviceWebService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import static org.gluu.oxtrust.model.scim2.Constants.UTF8_CHARSET_FRAGMENT;

import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
Expand Down Expand Up @@ -52,6 +53,7 @@
import org.gluu.persist.model.PagedResult;
import org.gluu.persist.model.SortOrder;
import org.gluu.search.filter.Filter;
import org.gluu.util.Pair;

/**
* Implementation of /Fido2Devices endpoint. Methods here are intercepted.
Expand Down Expand Up @@ -86,6 +88,45 @@ private Response validateExistenceOfDevice(String userId, String id) {
return response;

}

private Response doSearchDevices(String userId, String filter, Integer startIndex,
Integer count, String sortBy, String sortOrder, String attrsList, String excludedAttrsList,
String method) {

Response response;
try {
Pair<String, Response> checkOutput = externalContraintsService.applySearchCheck(
httpHeaders, uriInfo, HttpMethod.GET, fido2ResourceType);
if (checkOutput.getSecond() != null) return checkOutput.getSecond();

SearchRequest searchReq = new SearchRequest();
response = prepareSearchRequest(searchReq.getSchemas(), filter, checkOutput.getFirst(),
sortBy, sortOrder, startIndex, count, attrsList, excludedAttrsList,
searchReq);
if (response != null) return response;

response = validateExistenceOfUser(userId);
if (response != null) return response;

PagedResult<BaseScimResource> resources = searchDevices(userId, searchReq.getFilter(),
translateSortByAttribute(Fido2DeviceResource.class, searchReq.getSortBy()),
SortOrder.getByValue(searchReq.getSortOrder()), searchReq.getStartIndex(),
searchReq.getCount());

String json = getListResponseSerialized(resources.getTotalEntriesCount(),
searchReq.getStartIndex(), resources.getEntries(), searchReq.getAttributesStr(),
searchReq.getExcludedAttributesStr(), searchReq.getCount() == 0);
response = Response.ok(json).location(new URI(endpointUrl)).build();
} catch (SCIMException e) {
log.error(e.getMessage(), e);
response = getErrorResponse(Response.Status.BAD_REQUEST, ErrorScimType.INVALID_FILTER, e.getMessage());
} catch (Exception e){
log.error("Failure at searchF2Devices method", e);
response = getErrorResponse(Response.Status.INTERNAL_SERVER_ERROR, "Unexpected error: " + e.getMessage());
}
return response;

}

@POST
@Consumes({MEDIA_TYPE_SCIM_JSON, MediaType.APPLICATION_JSON})
Expand Down Expand Up @@ -242,36 +283,9 @@ public Response searchF2Devices(
@QueryParam(QUERY_PARAM_ATTRIBUTES) String attrsList,
@QueryParam(QUERY_PARAM_EXCLUDED_ATTRS) String excludedAttrsList) {

Response response;
try {
log.debug("Executing web service method. searchDevices");

SearchRequest searchReq = new SearchRequest();
response = prepareSearchRequest(searchReq.getSchemas(), filter, null, sortBy, sortOrder, startIndex, count,
attrsList, excludedAttrsList, searchReq);

if (response != null) return response;

response = validateExistenceOfUser(userId);
if (response != null) return response;

PagedResult<BaseScimResource> resources = searchDevices(userId, searchReq.getFilter(),
translateSortByAttribute(Fido2DeviceResource.class, searchReq.getSortBy()),
SortOrder.getByValue(searchReq.getSortOrder()), searchReq.getStartIndex(),
searchReq.getCount(), endpointUrl);

String json = getListResponseSerialized(resources.getTotalEntriesCount(),
searchReq.getStartIndex(), resources.getEntries(), searchReq.getAttributesStr(),
searchReq.getExcludedAttributesStr(), searchReq.getCount() == 0);
response = Response.ok(json).location(new URI(endpointUrl)).build();
} catch (SCIMException e) {
log.error(e.getMessage(), e);
response = getErrorResponse(Response.Status.BAD_REQUEST, ErrorScimType.INVALID_FILTER, e.getMessage());
} catch (Exception e){
log.error("Failure at searchF2Devices method", e);
response = getErrorResponse(Response.Status.INTERNAL_SERVER_ERROR, "Unexpected error: " + e.getMessage());
}
return response;
log.debug("Executing web service method. searchDevices");
return doSearchDevices(userId, filter, startIndex, count, sortBy, sortOrder,
attrsList, excludedAttrsList, HttpMethod.GET);

}

Expand All @@ -285,25 +299,15 @@ public Response searchF2Devices(
public Response searchF2DevicesPost(SearchRequest searchRequest, @QueryParam("userId") String userId) {

log.debug("Executing web service method. searchDevicesPost");
Response response = doSearchDevices(userId, searchRequest.getFilter(), searchRequest.getStartIndex(),
searchRequest.getCount(), searchRequest.getSortBy(), searchRequest.getSortOrder(),
searchRequest.getAttributesStr(), searchRequest.getExcludedAttributesStr(),
HttpMethod.POST);

SearchRequest searchReq = new SearchRequest();
Response response = prepareSearchRequest(searchRequest.getSchemas(), searchRequest.getFilter(), null, searchRequest.getSortBy(),
searchRequest.getSortOrder(), searchRequest.getStartIndex(), searchRequest.getCount(),
searchRequest.getAttributesStr(), searchRequest.getExcludedAttributesStr(), searchReq);

if (response != null) return response;

response = validateExistenceOfUser(userId);
if (response != null) return response;

URI uri=null;
response = searchF2Devices(userId, searchReq.getFilter(), searchReq.getStartIndex(),
searchReq.getCount(), searchReq.getSortBy(), searchReq.getSortOrder(),
searchRequest.getAttributesStr(), searchRequest.getExcludedAttributesStr());

URI uri = null;
try {
uri = new URI(endpointUrl + "/" + SEARCH_SUFFIX);
} catch (Exception e) {
} catch (URISyntaxException e) {
log.error(e.getMessage(), e);
}
return Response.fromResponse(response).location(uri).build();
Expand Down Expand Up @@ -344,7 +348,7 @@ private void transferAttributesToDevice(Fido2DeviceResource res, GluuFido2Device
}

private PagedResult<BaseScimResource> searchDevices(String userId, String filter, String sortBy, SortOrder sortOrder, int startIndex,
int count, String url) throws Exception {
int count) throws Exception {

Filter ldapFilter=scimFilterParserService.createFilter(filter, Filter.createPresenceFilter("oxId"), Fido2DeviceResource.class);
log.info("Executing search for fido devices using: ldapfilter '{}', sortBy '{}', sortOrder '{}', startIndex '{}', count '{}', userId '{}'",
Expand All @@ -370,7 +374,7 @@ private PagedResult<BaseScimResource> searchDevices(String userId, String filter

for (GluuFido2Device device : list.getEntries()){
Fido2DeviceResource scimDev=new Fido2DeviceResource();
transferAttributesToFido2Resource(device, scimDev, url, getUserInumFromDN(device.getDn()));
transferAttributesToFido2Resource(device, scimDev, endpointUrl, getUserInumFromDN(device.getDn()));
resources.add(scimDev);
}
log.info ("Found {} matching entries - returning {}", list.getTotalEntriesCount(), list.getEntries().size());
Expand Down
99 changes: 53 additions & 46 deletions scim-rest/src/main/java/org/gluu/oxtrust/ws/rs/scim2/FidoDeviceWebService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import static org.gluu.oxtrust.model.scim2.Constants.UTF8_CHARSET_FRAGMENT;

import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.List;

Expand Down Expand Up @@ -53,6 +54,7 @@
import org.gluu.persist.model.PagedResult;
import org.gluu.persist.model.SortOrder;
import org.gluu.search.filter.Filter;
import org.gluu.util.Pair;

/**
* Implementation of /FidoDevices endpoint. Methods here are intercepted.
Expand Down Expand Up @@ -89,7 +91,48 @@ private Response validateExistenceOfDevice(String userId, String id) {
return response;

}

private Response doSearchDevices(String userId, String filter, Integer startIndex,
Integer count, String sortBy, String sortOrder, String attrsList, String excludedAttrsList,
String method) {

Response response;
try {
Pair<String, Response> checkOutput = externalContraintsService.applySearchCheck(
httpHeaders, uriInfo, method, fidoResourceType);
if (checkOutput.getSecond() != null) return checkOutput.getSecond();

SearchRequest searchReq = new SearchRequest();
response = prepareSearchRequest(searchReq.getSchemas(), filter, checkOutput.getFirst(),
sortBy, sortOrder, startIndex, count, attrsList, excludedAttrsList,
searchReq);
if (response != null) return response;

response = validateExistenceOfUser(userId);
if (response != null) return response;

PagedResult<BaseScimResource> resources = searchDevices(userId, searchReq.getFilter(),
translateSortByAttribute(FidoDeviceResource.class, searchReq.getSortBy()),
SortOrder.getByValue(searchReq.getSortOrder()), searchReq.getStartIndex(),
searchReq.getCount());

String json = getListResponseSerialized(resources.getTotalEntriesCount(),
searchReq.getStartIndex(), resources.getEntries(), searchReq.getAttributesStr(),
searchReq.getExcludedAttributesStr(), searchReq.getCount() == 0);
response = Response.ok(json).location(new URI(endpointUrl)).build();
} catch (SCIMException e){
log.error(e.getMessage(), e);
response = getErrorResponse(Response.Status.BAD_REQUEST, ErrorScimType.INVALID_FILTER,
e.getMessage());
} catch (Exception e){
log.error("Failure at searchDevices method", e);
response = getErrorResponse(Response.Status.INTERNAL_SERVER_ERROR,
"Unexpected error: " + e.getMessage());
}
return response;

}

@POST
@Consumes({MEDIA_TYPE_SCIM_JSON, MediaType.APPLICATION_JSON})
@Produces({MEDIA_TYPE_SCIM_JSON + UTF8_CHARSET_FRAGMENT, MediaType.APPLICATION_JSON + UTF8_CHARSET_FRAGMENT})
Expand Down Expand Up @@ -244,35 +287,9 @@ public Response searchDevices(
@QueryParam(QUERY_PARAM_ATTRIBUTES) String attrsList,
@QueryParam(QUERY_PARAM_EXCLUDED_ATTRS) String excludedAttrsList) {

Response response;
try {
log.debug("Executing web service method. searchDevices");

SearchRequest searchReq = new SearchRequest();
response = prepareSearchRequest(searchReq.getSchemas(), filter, null, sortBy, sortOrder, startIndex, count,
attrsList, excludedAttrsList, searchReq);
if (response != null) return response;

response = validateExistenceOfUser(userId);
if (response != null) return response;

PagedResult<BaseScimResource> resources = searchDevices(userId, searchReq.getFilter(),
translateSortByAttribute(FidoDeviceResource.class, searchReq.getSortBy()),
SortOrder.getByValue(searchReq.getSortOrder()), searchReq.getStartIndex(),
searchReq.getCount(), endpointUrl);

String json = getListResponseSerialized(resources.getTotalEntriesCount(),
searchReq.getStartIndex(), resources.getEntries(), searchReq.getAttributesStr(),
searchReq.getExcludedAttributesStr(), searchReq.getCount() == 0);
response = Response.ok(json).location(new URI(endpointUrl)).build();
} catch (SCIMException e){
log.error(e.getMessage(), e);
response = getErrorResponse(Response.Status.BAD_REQUEST, ErrorScimType.INVALID_FILTER, e.getMessage());
} catch (Exception e){
log.error("Failure at searchDevices method", e);
response = getErrorResponse(Response.Status.INTERNAL_SERVER_ERROR, "Unexpected error: " + e.getMessage());
}
return response;
log.debug("Executing web service method. searchDevices");
return doSearchDevices(userId, filter, startIndex, count, sortBy, sortOrder,
attrsList, excludedAttrsList, HttpMethod.GET);

}

Expand All @@ -286,25 +303,15 @@ public Response searchDevices(
public Response searchDevicesPost(SearchRequest searchRequest, @QueryParam("userId") String userId) {

log.debug("Executing web service method. searchDevicesPost");

SearchRequest searchReq = new SearchRequest();
Response response = prepareSearchRequest(searchRequest.getSchemas(), searchRequest.getFilter(), null, searchRequest.getSortBy(),
searchRequest.getSortOrder(), searchRequest.getStartIndex(), searchRequest.getCount(),
searchRequest.getAttributesStr(), searchRequest.getExcludedAttributesStr(), searchReq);

if (response != null) return response;

response = validateExistenceOfUser(userId);
if (response != null) return response;
Response response = doSearchDevices(userId, searchRequest.getFilter(), searchRequest.getStartIndex(),
searchRequest.getCount(), searchRequest.getSortBy(), searchRequest.getSortOrder(),
searchRequest.getAttributesStr(), searchRequest.getExcludedAttributesStr(),
HttpMethod.POST);

URI uri = null;
response = searchDevices(userId, searchReq.getFilter(), searchReq.getStartIndex(),
searchReq.getCount(), searchReq.getSortBy(), searchReq.getSortOrder(),
searchReq.getAttributesStr(), searchReq.getExcludedAttributesStr());

try {
uri = new URI(endpointUrl + "/" + SEARCH_SUFFIX);
} catch (Exception e){
} catch (URISyntaxException e){
log.error(e.getMessage(), e);
}
return Response.fromResponse(response).location(uri).build();
Expand Down Expand Up @@ -382,7 +389,7 @@ private void transferAttributesToDevice(FidoDeviceResource res, GluuCustomFidoDe
}

private PagedResult<BaseScimResource> searchDevices(String userId, String filter, String sortBy, SortOrder sortOrder, int startIndex,
int count, String url) throws Exception {
int count) throws Exception {

Filter ldapFilter=scimFilterParserService.createFilter(filter, Filter.createPresenceFilter("oxId"), FidoDeviceResource.class);
log.info("Executing search for fido devices using: ldapfilter '{}', sortBy '{}', sortOrder '{}', startIndex '{}', count '{}', userId '{}'",
Expand All @@ -408,7 +415,7 @@ private PagedResult<BaseScimResource> searchDevices(String userId, String filter

for (GluuCustomFidoDevice device : list.getEntries()){
FidoDeviceResource scimDev=new FidoDeviceResource();
transferAttributesToFidoResource(device, scimDev, url, getUserInumFromDN(device.getDn()));
transferAttributesToFidoResource(device, scimDev, endpointUrl, getUserInumFromDN(device.getDn()));
resources.add(scimDev);
}
log.info ("Found {} matching entries - returning {}", list.getTotalEntriesCount(), list.getEntries().size());
Expand Down
Loading

0 comments on commit 427f545

Please sign in to comment.