Skip to content

test for pr #547

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

test for pr #547

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
10 changes: 5 additions & 5 deletions src/main/java/org/breedinginsight/brapi/v2/BrAPIV2Controller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,10 @@ private void setBrAPIServerInfo(BrAPIServerInfo serverInfo) {
serverInfo.setDocumentationURL("https://brapi.org/specification");
}

// Explicit match for /seasons GET endpoint, to allow Experimental Collaborator access.
// Explicit match for the /seasons GET pass-through endpoint.
@Get("/${micronaut.bi.api.version}/programs/{programId}" + BrapiVersion.BRAPI_V2 + "/seasons{?queryParams}")
@Produces(MediaType.APPLICATION_JSON)
@ProgramSecured(roles = {ProgramSecuredRole.SYSTEM_ADMIN, ProgramSecuredRole.PROGRAM_ADMIN, ProgramSecuredRole.READ_ONLY, ProgramSecuredRole.EXPERIMENTAL_COLLABORATOR})
@ProgramSecured(roles = {ProgramSecuredRole.SYSTEM_ADMIN})
public HttpResponse<?> getSeasons(@PathVariable("programId") UUID programId, HttpRequest<String> request, @PathVariable Optional<String> queryParams) {
String path = "seasons";
if (queryParams.isPresent()) {
Expand All @@ -181,15 +181,15 @@ public HttpResponse<?> getSeasons(@PathVariable("programId") UUID programId, Htt

@Get("/${micronaut.bi.api.version}/programs/{programId}" + BrapiVersion.BRAPI_V2 + "/{+path}")
@Produces(MediaType.APPLICATION_JSON)
@ProgramSecured(roleGroups = {ProgramSecuredRoleGroup.PROGRAM_SCOPED_ROLES})
@ProgramSecured(roles = {ProgramSecuredRole.SYSTEM_ADMIN})
public HttpResponse<?> getCatchall(@PathVariable("path") String path, @PathVariable("programId") UUID programId, HttpRequest<String> request) {
return executeRequest(path, programId, request, "GET");
}

@Post("/${micronaut.bi.api.version}/programs/{programId}" + BrapiVersion.BRAPI_V2 + "/{+path}")
@Consumes(MediaType.ALL)
@Produces(MediaType.APPLICATION_JSON)
@ProgramSecured(roleGroups = {ProgramSecuredRoleGroup.PROGRAM_SCOPED_ROLES})
@ProgramSecured(roles = {ProgramSecuredRole.SYSTEM_ADMIN})
public HttpResponse<String> postCatchall(@PathVariable("path") String path, @PathVariable("programId") UUID programId, HttpRequest<byte[]> request,
@Header("Content-Type") String contentType) {
return executeByteRequest(path, programId, request, contentType, "POST");
Expand All @@ -198,7 +198,7 @@ public HttpResponse<String> postCatchall(@PathVariable("path") String path, @Pat
@Put("/${micronaut.bi.api.version}/programs/{programId}" + BrapiVersion.BRAPI_V2 + "/{+path}")
@Consumes(MediaType.ALL)
@Produces(MediaType.APPLICATION_JSON)
@ProgramSecured(roleGroups = {ProgramSecuredRoleGroup.PROGRAM_SCOPED_ROLES})
@ProgramSecured(roles = {ProgramSecuredRole.SYSTEM_ADMIN})
public HttpResponse<String> putCatchall(@PathVariable("path") String path, @PathVariable("programId") UUID programId, HttpRequest<byte[]> request,
@Header("Content-Type") String contentType) {
return executeByteRequest(path, programId, request, contentType, "PUT");
Expand Down
35 changes: 30 additions & 5 deletions src/test/java/org/breedinginsight/brapi/v2/BrAPIV2ControllerIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import io.micronaut.http.HttpResponse;
import io.micronaut.http.HttpStatus;
import io.micronaut.http.MediaType;
import io.micronaut.http.MutableHttpRequest;
import io.micronaut.http.client.RxHttpClient;
import io.micronaut.http.client.annotation.Client;
import io.micronaut.http.client.exceptions.HttpClientResponseException;
Expand Down Expand Up @@ -51,6 +52,7 @@

import static io.micronaut.http.HttpRequest.GET;
import static io.micronaut.http.HttpRequest.POST;
import static io.micronaut.http.HttpRequest.PUT;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;

Expand Down Expand Up @@ -171,20 +173,43 @@ public void testPostVariablesNotFound() {
public void testPutVariablesNotFound() {
BrAPIObservationVariable variable = generateVariable();

Flowable<HttpResponse<String>> postCall = biClient.exchange(
POST(String.format("%s/programs/%s/brapi/v2/variables",
biApiVersion,
validProgram.getId().toString()), Arrays.asList(variable))
Flowable<HttpResponse<String>> putCall = biClient.exchange(
PUT(String.format("%s/programs/%s/brapi/v2/variables",
biApiVersion,
validProgram.getId().toString()), Arrays.asList(variable))
.contentType(MediaType.APPLICATION_JSON)
.bearerAuth("test-registered-user"), String.class
);

HttpClientResponseException e = Assertions.assertThrows(HttpClientResponseException.class, () -> {
HttpResponse<String> response = postCall.blockingFirst();
HttpResponse<String> response = putCall.blockingFirst();
});
assertEquals(HttpStatus.NOT_FOUND, e.getStatus());
}

@Test
public void testProgramUserCannotAccessPassThroughEndpoints() {
String brapiBaseUrl = String.format("%s/programs/%s/brapi/v2",
biApiVersion,
validProgram.getId());

assertProgramUserForbidden(GET(brapiBaseUrl + "/seasons"));
assertProgramUserForbidden(GET(brapiBaseUrl + "/unimplemented-get"));
assertProgramUserForbidden(POST(brapiBaseUrl + "/unimplemented-post", "{}")
.contentType(MediaType.APPLICATION_JSON));
assertProgramUserForbidden(PUT(brapiBaseUrl + "/unimplemented-put", "{}")
.contentType(MediaType.APPLICATION_JSON));
}

private void assertProgramUserForbidden(MutableHttpRequest<?> request) {
Flowable<HttpResponse<String>> call = biClient.exchange(
request.bearerAuth("other-registered-user"), String.class);

HttpClientResponseException exception = Assertions.assertThrows(
HttpClientResponseException.class, call::blockingFirst);
assertEquals(HttpStatus.FORBIDDEN, exception.getStatus());
}



private BrAPIObservationVariable generateVariable() {
Expand Down
Loading