Skip to content
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 @@ -12,6 +12,7 @@
import io.quarkiverse.openapi.generator.providers.ApiKeyAuthenticationProvider;
import io.quarkiverse.openapi.generator.providers.ApiKeyIn;
import io.quarkiverse.openapi.generator.providers.AuthProvider;
import io.quarkiverse.openapi.generator.providers.ConfigCredentialsProvider;

@Priority(Priorities.AUTHENTICATION)
public class DummyApiKeyAuthenticationProvider implements ClientRequestFilter {
Expand All @@ -21,7 +22,7 @@ public class DummyApiKeyAuthenticationProvider implements ClientRequestFilter {
@PostConstruct
public void init() {
authProvider = new ApiKeyAuthenticationProvider("open_weather_custom_security_yaml", "app_id", ApiKeyIn.query, "appid",
List.of());
List.of(), new ConfigCredentialsProvider());
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

import io.quarkiverse.openapi.generator.providers.AbstractAuthProvider;
import io.quarkiverse.openapi.generator.providers.AuthUtils;
import io.quarkiverse.openapi.generator.providers.ConfigCredentialsProvider;
import io.quarkiverse.openapi.generator.providers.CredentialsProvider;
import io.quarkiverse.openapi.generator.providers.OperationAuthInfo;

Expand All @@ -31,11 +30,6 @@ public OAuth2AuthenticationProvider(String name,
validateConfig();
}

public OAuth2AuthenticationProvider(String name,
String openApiSpecId, OidcClientRequestFilterDelegate delegate, List<OperationAuthInfo> operations) {
this(name, openApiSpecId, delegate, operations, new ConfigCredentialsProvider());
}

@Override
public void filter(ClientRequestContext requestContext) throws IOException {
String bearerToken;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

import io.quarkiverse.openapi.generator.AuthConfig;
import io.quarkiverse.openapi.generator.oidc.providers.OAuth2AuthenticationProvider;
import io.quarkiverse.openapi.generator.providers.ConfigCredentialsProvider;
import io.quarkus.oidc.client.Tokens;

@ExtendWith(MockitoExtension.class)
Expand Down Expand Up @@ -70,7 +71,8 @@ void setUp() {
}

private OAuth2AuthenticationProvider createClassicProvider() {
return new OAuth2AuthenticationProvider(AUTH_SCHEME_NAME, OPEN_API_FILE_SPEC_ID, classicDelegate, List.of());
return new OAuth2AuthenticationProvider(AUTH_SCHEME_NAME, OPEN_API_FILE_SPEC_ID, classicDelegate, List.of(),
new ConfigCredentialsProvider());
}

private void assertHeader(MultivaluedMap<String, Object> headers, String headerName, String value) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@

import io.quarkiverse.openapi.generator.AuthConfig;
import io.quarkiverse.openapi.generator.oidc.providers.OAuth2AuthenticationProvider;
import io.quarkiverse.openapi.generator.providers.ConfigCredentialsProvider;
import io.quarkus.oidc.client.Tokens;
import io.smallrye.mutiny.Uni;

Expand Down Expand Up @@ -79,7 +80,8 @@ void setUp() {
}

protected OAuth2AuthenticationProvider createReactiveProvider() {
return new OAuth2AuthenticationProvider(AUTH_SCHEME_NAME, OPEN_API_FILE_SPEC_ID, reactiveDelegate, List.of());
return new OAuth2AuthenticationProvider(AUTH_SCHEME_NAME, OPEN_API_FILE_SPEC_ID, reactiveDelegate, List.of(),
new ConfigCredentialsProvider());
}

protected void assertHeader(MultivaluedMap<String, Object> headers, String headerName, String value) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@ public ApiKeyAuthenticationProvider(final String openApiSpecId, final String nam
validateConfig();
}

public ApiKeyAuthenticationProvider(final String openApiSpecId, final String name, final ApiKeyIn apiKeyIn,
final String apiKeyName, List<OperationAuthInfo> operations) {
this(openApiSpecId, name, apiKeyIn, apiKeyName, operations, new ConfigCredentialsProvider());
}

@Override
public void filter(ClientRequestContext requestContext) throws IOException {
switch (apiKeyIn) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@ public BasicAuthenticationProvider(final String openApiSpecId, String name, List
super(name, openApiSpecId, operations, credentialsProvider);
}

public BasicAuthenticationProvider(final String openApiSpecId, String name, List<OperationAuthInfo> operations) {
this(openApiSpecId, name, operations, new ConfigCredentialsProvider());
}

private String getUsername(ClientRequestContext requestContext) {
return credentialsProvider.getBasicUsername(CredentialsProvider.CredentialsContext.builder()
.requestContext(requestContext)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@ public BearerAuthenticationProvider(final String openApiSpecId, final String nam
this.scheme = scheme;
}

public BearerAuthenticationProvider(final String openApiSpecId, final String name, final String scheme,
List<OperationAuthInfo> operations) {
this(openApiSpecId, name, scheme, operations, new ConfigCredentialsProvider());
}

@Override
public void filter(ClientRequestContext requestContext) throws IOException {
String bearerToken = getBearerToken(requestContext);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class ApiKeyOpenApiSpecProviderTest extends AbstractOpenApiSpecProviderTest<ApiK
@Override
protected ApiKeyAuthenticationProvider createProvider() {
return new ApiKeyAuthenticationProvider(OPEN_API_FILE_SPEC_ID, AUTH_SCHEME_NAME, ApiKeyIn.header, API_KEY_NAME,
List.of());
List.of(), new ConfigCredentialsProvider());
}

@Test
Expand Down Expand Up @@ -88,7 +88,7 @@ void filterHeaderCase() throws IOException {
void filterQueryCase() throws IOException {
doReturn(INVOKED_URI).when(requestContext).getUri();
provider = new ApiKeyAuthenticationProvider(OPEN_API_FILE_SPEC_ID, AUTH_SCHEME_NAME, ApiKeyIn.query, API_KEY_NAME,
List.of());
List.of(), new ConfigCredentialsProvider());
provider.filter(requestContext);
verify(requestContext).setUri(uriCaptor.capture());
assertThat(uriCaptor.getValue()).isNotNull().hasParameter(API_KEY_NAME, API_KEY_VALUE);
Expand All @@ -99,7 +99,7 @@ void filterCookieCaseEmpty() throws IOException {
final MultivaluedMap<String, Object> headers = new MultivaluedTreeMap<>();
doReturn(headers).when(requestContext).getHeaders();
provider = new ApiKeyAuthenticationProvider(OPEN_API_FILE_SPEC_ID, AUTH_SCHEME_NAME, ApiKeyIn.cookie, API_KEY_NAME,
List.of());
List.of(), new ConfigCredentialsProvider());
provider.filter(requestContext);
final List<Object> cookies = headers.get(HttpHeaders.COOKIE);
assertThat(cookies).singleElement().satisfies(cookie -> assertCookie(cookie, API_KEY_NAME, API_KEY_VALUE));
Expand All @@ -114,7 +114,7 @@ void filterCookieCaseExisting() throws IOException {
headers.add(HttpHeaders.COOKIE, existingCookie);
doReturn(headers).when(requestContext).getHeaders();
provider = new ApiKeyAuthenticationProvider(OPEN_API_FILE_SPEC_ID, AUTH_SCHEME_NAME, ApiKeyIn.cookie, API_KEY_NAME,
List.of());
List.of(), new ConfigCredentialsProvider());
provider.filter(requestContext);
final List<Object> cookies = headers.get(HttpHeaders.COOKIE);
assertThat(cookies).satisfiesExactlyInAnyOrder(cookie -> assertCookie(cookie, existingCookieName, existingCookieValue),
Expand All @@ -130,7 +130,8 @@ void tokenPropagationNotSupported() {
Boolean.class)).thenReturn(Optional.of(true));

assertThatThrownBy(() -> new ApiKeyAuthenticationProvider(OPEN_API_FILE_SPEC_ID, AUTH_SCHEME_NAME, ApiKeyIn.header,
API_KEY_NAME, List.of())).hasMessageContaining("quarkus.openapi-generator.%s.auth.%s.token-propagation",
API_KEY_NAME, List.of(), new ConfigCredentialsProvider()))
.hasMessageContaining("quarkus.openapi-generator.%s.auth.%s.token-propagation",
OPEN_API_FILE_SPEC_ID, AUTH_SCHEME_NAME);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ class BasicOpenApiSpecProviderTest extends AbstractOpenApiSpecProviderTest<Basic

@Override
protected BasicAuthenticationProvider createProvider() {
return new BasicAuthenticationProvider(OPEN_API_FILE_SPEC_ID, AUTH_SCHEME_NAME, List.of());
return new BasicAuthenticationProvider(OPEN_API_FILE_SPEC_ID, AUTH_SCHEME_NAME, List.of(),
new ConfigCredentialsProvider());
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ static Stream<Arguments> filterWithPropagationTestValues() {
@Override
protected BearerAuthenticationProvider createProvider() {
return new BearerAuthenticationProvider(OPEN_API_FILE_SPEC_ID, AUTH_SCHEME_NAME, null,
List.of());
List.of(), new ConfigCredentialsProvider());
}

@Test
Expand All @@ -64,7 +64,7 @@ void filterCustomSchemaCase() throws IOException {

private void filter(String bearerScheme, String expectedAuthorizationHeader) throws IOException {
provider = new BearerAuthenticationProvider(OPEN_API_FILE_SPEC_ID, AUTH_SCHEME_NAME, bearerScheme,
List.of());
List.of(), new ConfigCredentialsProvider());
provider.filter(requestContext);
assertHeader(headers, HttpHeaders.AUTHORIZATION, expectedAuthorizationHeader);
}
Expand Down