Skip to content
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.

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

Add opa container host #150

Merged
merged 1 commit into from
Sep 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,10 @@
public class TestOpaSecurity
{
private final HttpClient httpClient;
private final int containerPort;
private final S3Client s3Client;
private final S3Client storageClient;
private final String opaContainerHost;
private final int opaContainerPort;

public static class Filter
implements BuilderFilter
Expand All @@ -79,13 +80,15 @@ public TestingTrinoAwsProxyServer.Builder filter(TestingTrinoAwsProxyServer.Buil
public static class TestingOpaS3SecurityFacade
implements OpaS3SecurityFacade
{
private final int containerPort;
private final OpaClient opaClient;
private final String opaContainerHost;
private final int opaContainerPort;

@Inject
public TestingOpaS3SecurityFacade(OpaContainer container, OpaClient opaClient)
{
containerPort = container.getPort();
opaContainerHost = container.getHost();
opaContainerPort = container.getPort();
this.opaClient = requireNonNull(opaClient, "opaClient is null");
}

Expand All @@ -99,7 +102,7 @@ public SecurityResponse apply(ParsedS3Request request, Optional<String> lowercas
if (request.keyInBucket().equals("default-deny")) {
return SecurityResponse.FAILURE;
}
URI uri = UriBuilder.fromUri(opaServerBaseUri).port(containerPort).path("test").path("allow").build();
URI uri = UriBuilder.fromUri(opaServerBaseUri).host(opaContainerHost).port(opaContainerPort).path("test").path("allow").build();
return opaClient.getSecurityResponse(new OpaRequest(uri, ImmutableMap.of("table", request.keyInBucket())));
}
}
Expand All @@ -115,19 +118,20 @@ public SecurityResponse apply(ParsedS3Request request, Optional<String> lowercas
""";

@Inject
public TestOpaSecurity(@ForOpa HttpClient httpClient, OpaContainer container, S3Client s3Client, @ForS3Container S3Client storageClient)
public TestOpaSecurity(@ForOpa HttpClient httpClient, S3Client s3Client, @ForS3Container S3Client storageClient, OpaContainer container)
{
this.httpClient = requireNonNull(httpClient, "httpClient is null");
containerPort = container.getPort();
this.s3Client = requireNonNull(s3Client, "s3Client is null");
this.storageClient = requireNonNull(storageClient, "storageClient is null");
opaContainerHost = container.getHost();
opaContainerPort = container.getPort();
}

@BeforeAll
public void setup()
{
Request request = preparePut()
.setUri(URI.create("http://localhost:%s/v1/policies/test".formatted(containerPort)))
.setUri(UriBuilder.newInstance().scheme("http").host(opaContainerHost).port(opaContainerPort).path("v1/policies/test").build())
.setBodyGenerator(createStaticBodyGenerator(POLICY, StandardCharsets.UTF_8))
.build();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ public int getPort()
return container.getFirstMappedPort();
}

public String getHost()
{
return container.getHost();
}

@PreDestroy
public void shutdown()
{
Expand Down
Loading