-
Notifications
You must be signed in to change notification settings - Fork 55
HTTP-145 SQL explain drives rest flow to OIDC endpoint. #146
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
153 changes: 153 additions & 0 deletions
153
...getindata/connectors/http/internal/table/lookup/JavaNetHttpPollingClientWithWireTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,153 @@ | ||
| package com.getindata.connectors.http.internal.table.lookup; | ||
|
|
||
| import java.io.File; | ||
| import java.net.URI; | ||
| import java.net.http.HttpRequest; | ||
| import java.time.Duration; | ||
|
|
||
| import com.github.tomakehurst.wiremock.WireMockServer; | ||
| import com.github.tomakehurst.wiremock.core.WireMockConfiguration; | ||
| import com.github.tomakehurst.wiremock.stubbing.StubMapping; | ||
| import org.apache.flink.api.common.RuntimeExecutionMode; | ||
| import org.apache.flink.api.common.restartstrategy.RestartStrategies; | ||
| import org.apache.flink.configuration.Configuration; | ||
| import org.apache.flink.configuration.ExecutionOptions; | ||
| import org.apache.flink.streaming.api.CheckpointingMode; | ||
| import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; | ||
| import org.junit.jupiter.api.AfterEach; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
| import static com.github.tomakehurst.wiremock.client.WireMock.*; | ||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| import com.getindata.connectors.http.internal.HeaderPreprocessor; | ||
| import com.getindata.connectors.http.internal.utils.HttpHeaderUtils; | ||
| import static com.getindata.connectors.http.TestHelper.readTestFile; | ||
| import static com.getindata.connectors.http.internal.table.lookup.HttpLookupConnectorOptions.*; | ||
|
|
||
| public class JavaNetHttpPollingClientWithWireTest { | ||
| private static final String BASE_URL = "http://localhost.com"; | ||
|
|
||
| private static final String SAMPLES_FOLDER = "/auth/"; | ||
| private static final int SERVER_PORT = 9090; | ||
|
|
||
| private static final int HTTPS_SERVER_PORT = 8443; | ||
|
|
||
| private static final String SERVER_KEYSTORE_PATH = | ||
| "src/test/resources/security/certs/serverKeyStore.jks"; | ||
|
|
||
| private static final String SERVER_TRUSTSTORE_PATH = | ||
| "src/test/resources/security/certs/serverTrustStore.jks"; | ||
|
|
||
| private static final String ENDPOINT = "/auth"; | ||
| private static final String BEARER_REQUEST = "Bearer Dummy"; | ||
|
|
||
| private WireMockServer wireMockServer; | ||
| @SuppressWarnings("unchecked") | ||
| @BeforeEach | ||
| public void setup() { | ||
|
|
||
| File keyStoreFile = new File(SERVER_KEYSTORE_PATH); | ||
| File trustStoreFile = new File(SERVER_TRUSTSTORE_PATH); | ||
|
|
||
| wireMockServer = new WireMockServer( | ||
| WireMockConfiguration.wireMockConfig() | ||
| .port(SERVER_PORT) | ||
| .httpsPort(HTTPS_SERVER_PORT) | ||
| .keystorePath(keyStoreFile.getAbsolutePath()) | ||
| .keystorePassword("password") | ||
| .keyManagerPassword("password") | ||
| .needClientAuth(true) | ||
| .trustStorePath(trustStoreFile.getAbsolutePath()) | ||
| .trustStorePassword("password") | ||
| .extensions(JsonTransform.class) | ||
| ); | ||
| wireMockServer.start(); | ||
|
|
||
| StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment(); | ||
| env.setRestartStrategy(RestartStrategies.noRestart()); | ||
| Configuration config = new Configuration(); | ||
| config.set(ExecutionOptions.RUNTIME_MODE, RuntimeExecutionMode.STREAMING); | ||
| env.configure(config, getClass().getClassLoader()); | ||
| env.enableCheckpointing(1000, CheckpointingMode.EXACTLY_ONCE); | ||
| } | ||
|
|
||
| @AfterEach | ||
| public void tearDown() { | ||
| wireMockServer.stop(); | ||
| } | ||
|
|
||
|
|
||
| @Test | ||
| public void shouldUpdateHttpRequestIfRequiredGet() { | ||
| HttpRequest httpRequest = HttpRequest.newBuilder() | ||
| .GET() | ||
| .uri(URI.create(BASE_URL)) | ||
| .timeout(Duration.ofSeconds(1)) | ||
| .setHeader("Origin","*") | ||
| .setHeader("X-Content-Type-Options","nosniff") | ||
| .setHeader("Content-Type","application/json") | ||
| .build(); | ||
| shouldUpdateHttpRequestIfRequired(httpRequest); | ||
| } | ||
| @Test | ||
| public void shouldUpdateHttpRequestIfRequiredPut() { | ||
| HttpRequest httpRequest = HttpRequest.newBuilder() | ||
| .PUT( HttpRequest.BodyPublishers.ofString("foo")) | ||
| .uri(URI.create(BASE_URL)) | ||
| .timeout(Duration.ofSeconds(1)) | ||
| .setHeader("Origin","*") | ||
| .setHeader("X-Content-Type-Options","nosniff") | ||
| .setHeader("Content-Type","application/json") | ||
| .build(); | ||
| shouldUpdateHttpRequestIfRequired(httpRequest); | ||
| } | ||
| private void shouldUpdateHttpRequestIfRequired(HttpRequest httpRequest) { | ||
| setUpServerBodyStub(); | ||
| JavaNetHttpPollingClient client = new JavaNetHttpPollingClient(null, | ||
| null, | ||
| HttpLookupConfig.builder().url(BASE_URL).build(), | ||
| null); | ||
| LookupQueryInfo lookupQueryInfo = null; | ||
| HttpLookupSourceRequestEntry request = | ||
| new HttpLookupSourceRequestEntry(httpRequest, lookupQueryInfo); | ||
|
|
||
| Configuration configuration = new Configuration(); | ||
| HeaderPreprocessor oidcHeaderPreProcessor = | ||
| HttpHeaderUtils.createOIDCHeaderPreprocessor(configuration); | ||
| HttpRequest newHttpRequest = client.updateHttpRequestIfRequired(request, | ||
| oidcHeaderPreProcessor); | ||
| assertThat(httpRequest).isEqualTo(newHttpRequest); | ||
| configuration.setString(SOURCE_LOOKUP_OIDC_AUTH_TOKEN_ENDPOINT_URL.key(),"http://localhost:9090/auth"); | ||
| configuration.setString(SOURCE_LOOKUP_OIDC_AUTH_TOKEN_REQUEST, BEARER_REQUEST); | ||
| configuration.set(SOURCE_LOOKUP_OIDC_AUTH_TOKEN_EXPIRY_REDUCTION, | ||
| Duration.ofSeconds(1L)); | ||
| client = new JavaNetHttpPollingClient(null, | ||
| null, | ||
| HttpLookupConfig.builder().url(BASE_URL).readableConfig(configuration).build(), | ||
| null); | ||
| oidcHeaderPreProcessor = | ||
| HttpHeaderUtils.createOIDCHeaderPreprocessor(configuration); | ||
| // change oidcHeaderPreProcessor to use the mock http client for the authentication flow | ||
| newHttpRequest = client.updateHttpRequestIfRequired(request, | ||
| oidcHeaderPreProcessor); | ||
| assertThat(httpRequest).isNotEqualTo(newHttpRequest); | ||
| assertThat(httpRequest.headers().map().keySet().size()).isEqualTo(3); | ||
| assertThat(newHttpRequest.headers().map().keySet().size()).isEqualTo(4); | ||
| assertThat(httpRequest.headers().map().get("Content-Type")) | ||
| .isEqualTo(newHttpRequest.headers().map().get("Content-Type")); | ||
| } | ||
|
|
||
| private StubMapping setUpServerBodyStub() { | ||
| return wireMockServer.stubFor( | ||
| post(urlEqualTo(ENDPOINT)) | ||
| .withHeader("Content-Type", equalTo("application/x-www-form-urlencoded")) | ||
| .withRequestBody(equalTo(BEARER_REQUEST)) | ||
| .willReturn( | ||
| aResponse() | ||
| .withStatus(200) | ||
| .withBody(readTestFile(SAMPLES_FOLDER + "AuthResult.json")) | ||
| ) | ||
| ); | ||
| } | ||
| } | ||
27 changes: 27 additions & 0 deletions
27
src/test/java/com/getindata/connectors/http/internal/utils/HttpHeaderUtilsTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| package com.getindata.connectors.http.internal.utils; | ||
| import java.time.Duration; | ||
|
|
||
| import org.apache.flink.configuration.Configuration; | ||
| import org.junit.jupiter.api.Test; | ||
| import static org.assertj.core.api.AssertionsForClassTypes.assertThat; | ||
|
|
||
| import com.getindata.connectors.http.internal.HeaderPreprocessor; | ||
| import static com.getindata.connectors.http.internal.table.lookup.HttpLookupConnectorOptions.*; | ||
|
|
||
|
|
||
|
|
||
| public class HttpHeaderUtilsTest { | ||
| @Test | ||
| void shouldCreateOIDCHeaderPreprocessorTest() { | ||
| Configuration configuration = new Configuration(); | ||
| HeaderPreprocessor headerPreprocessor | ||
| = HttpHeaderUtils.createOIDCHeaderPreprocessor(configuration); | ||
| assertThat(headerPreprocessor).isNull(); | ||
| configuration.setString(SOURCE_LOOKUP_OIDC_AUTH_TOKEN_ENDPOINT_URL.key(), "http://aaa"); | ||
| configuration.setString(SOURCE_LOOKUP_OIDC_AUTH_TOKEN_REQUEST.key(), "ccc"); | ||
| configuration.set(SOURCE_LOOKUP_OIDC_AUTH_TOKEN_EXPIRY_REDUCTION, Duration.ofSeconds(1)); | ||
| headerPreprocessor | ||
| = HttpHeaderUtils.createOIDCHeaderPreprocessor(configuration); | ||
| assertThat(headerPreprocessor).isNotNull(); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| { | ||
| "access_token": "test", | ||
| "expires_in": 1 | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.