diff --git a/manage-gui/pom.xml b/manage-gui/pom.xml index 9ea4fbb6..f27bcf1b 100644 --- a/manage-gui/pom.xml +++ b/manage-gui/pom.xml @@ -5,7 +5,7 @@ org.openconext manage - 7.4.3 + 7.4.4 ../pom.xml diff --git a/manage-server/pom.xml b/manage-server/pom.xml index c8de742e..f4db1325 100644 --- a/manage-server/pom.xml +++ b/manage-server/pom.xml @@ -6,7 +6,7 @@ org.openconext manage - 7.4.3 + 7.4.4 ../pom.xml diff --git a/manage-server/src/main/java/manage/control/MetaDataController.java b/manage-server/src/main/java/manage/control/MetaDataController.java index a58266ad..2498f1a9 100644 --- a/manage-server/src/main/java/manage/control/MetaDataController.java +++ b/manage-server/src/main/java/manage/control/MetaDataController.java @@ -424,7 +424,13 @@ public List searchEntities(@PathVariable("type") String type, @GetMapping({"/client/rawSearch/{type}", "/internal/rawSearch/{type}"}) public List rawSearch(@PathVariable("type") String type, @RequestParam("query") String query) throws UnsupportedEncodingException { + return metaDataService.retrieveRawSearch(type, query); + } + @PreAuthorize("hasAnyRole('ADMIN', 'READ')") + @PostMapping({"/client/rawSearch/{type}", "/internal/rawSearch/{type}"}) + public List rawSearchPost(@PathVariable("type") String type, @RequestBody String query) + throws UnsupportedEncodingException { return metaDataService.retrieveRawSearch(type, query); } diff --git a/manage-server/src/test/java/manage/control/MetaDataControllerTest.java b/manage-server/src/test/java/manage/control/MetaDataControllerTest.java index 667e7df5..af2011ee 100644 --- a/manage-server/src/test/java/manage/control/MetaDataControllerTest.java +++ b/manage-server/src/test/java/manage/control/MetaDataControllerTest.java @@ -651,6 +651,23 @@ public void rawSearchEncoded() throws UnsupportedEncodingException { .body("size()", is(5)); } + @Test + public void rawSearchPost() { + String query = "{$and: [{$or:[{\"data.allowedEntities.name\": {$in: [\"http://mock-idp\"]}}, {\"data" + + ".allowedall\": true}]}, {\"data.state\":\"prodaccepted\"}]}"; + given() + .auth() + .preemptive() + .basic("sp-portal", "secret") + .when() + .header("Content-type", "application/json") + .body(query) + .post("manage/api/internal/rawSearch/saml20_sp") + .then() + .statusCode(SC_OK) + .body("size()", is(5)); + } + private void doUpdate(EntityType type, String id, String revisionNote) { MetaData metaData = given() .when() diff --git a/pom.xml b/pom.xml index 02e7768a..38cdec25 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.openconext manage - 7.4.3 + 7.4.4 pom manage