-
Notifications
You must be signed in to change notification settings - Fork 16
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
Fix to return 401 instead of 500 #715
Merged
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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 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
16 changes: 16 additions & 0 deletions
16
src/test/java/io/stargate/sgv2/jsonapi/service/cqldriver/InvalidCredentialsProfile.java
This file contains 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,16 @@ | ||
| package io.stargate.sgv2.jsonapi.service.cqldriver; | ||
|
|
||
| import io.quarkus.test.junit.QuarkusTestProfile; | ||
| import java.util.Map; | ||
| import org.testcontainers.shaded.com.google.common.collect.ImmutableMap; | ||
|
|
||
| public class InvalidCredentialsProfile implements QuarkusTestProfile { | ||
|
|
||
| @Override | ||
| public Map<String, String> getConfigOverrides() { | ||
| return ImmutableMap.<String, String>builder() | ||
| .put("stargate.jsonapi.operations.database-config.fixed-token", "test-token") | ||
| .put("stargate.jsonapi.operations.database-config.password", "invalid-password") | ||
| .build(); | ||
| } | ||
| } |
111 changes: 111 additions & 0 deletions
111
src/test/java/io/stargate/sgv2/jsonapi/service/cqldriver/InvalidCredentialsTests.java
This file contains 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,111 @@ | ||
| package io.stargate.sgv2.jsonapi.service.cqldriver; | ||
|
|
||
| import static org.assertj.core.api.AssertionsForClassTypes.assertThat; | ||
| import static org.assertj.core.api.AssertionsForClassTypes.catchThrowable; | ||
| import static org.mockito.Mockito.mock; | ||
| import static org.mockito.Mockito.when; | ||
|
|
||
| import com.datastax.oss.driver.api.core.AllNodesFailedException; | ||
| import com.datastax.oss.driver.api.core.CqlSession; | ||
| import io.micrometer.core.instrument.FunctionCounter; | ||
| import io.micrometer.core.instrument.Gauge; | ||
| import io.micrometer.core.instrument.MeterRegistry; | ||
| import io.micrometer.core.instrument.simple.SimpleMeterRegistry; | ||
| import io.quarkus.test.junit.QuarkusTest; | ||
| import io.quarkus.test.junit.TestProfile; | ||
| import io.stargate.sgv2.api.common.StargateRequestInfo; | ||
| import io.stargate.sgv2.jsonapi.api.model.command.CommandResult; | ||
| import io.stargate.sgv2.jsonapi.config.OperationsConfig; | ||
| import io.stargate.sgv2.jsonapi.exception.mappers.ThrowableToErrorMapper; | ||
| import jakarta.inject.Inject; | ||
| import jakarta.ws.rs.core.Response; | ||
| import java.lang.reflect.Field; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Optional; | ||
| import org.junit.jupiter.api.AfterEach; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| @QuarkusTest | ||
| @TestProfile(InvalidCredentialsProfile.class) | ||
| public class InvalidCredentialsTests { | ||
|
|
||
| private static final String TENANT_ID_FOR_TEST = "test_tenant"; | ||
|
|
||
| @Inject OperationsConfig operationsConfig; | ||
|
|
||
| private MeterRegistry meterRegistry; | ||
|
|
||
| /** | ||
| * List of sessions created in the tests. This is used to close the sessions after each test. This | ||
| * is needed because, though the sessions evicted from the cache are closed, the sessions left | ||
| * active on the cache are not closed, so we have to close them explicitly. | ||
| */ | ||
| private List<CqlSession> sessionsCreatedInTests; | ||
|
|
||
| @BeforeEach | ||
| public void tearUpEachTest() { | ||
| meterRegistry = new SimpleMeterRegistry(); | ||
| sessionsCreatedInTests = new ArrayList<>(); | ||
| } | ||
|
|
||
| @AfterEach | ||
| public void tearDownEachTest() { | ||
| sessionsCreatedInTests.forEach(CqlSession::close); | ||
| } | ||
|
|
||
| @Test | ||
| public void testOSSCxCQLSessionCacheWithInvalidCredentials() | ||
| throws NoSuchFieldException, IllegalAccessException { | ||
| // set request info | ||
| StargateRequestInfo stargateRequestInfo = mock(StargateRequestInfo.class); | ||
| when(stargateRequestInfo.getTenantId()).thenReturn(Optional.of(TENANT_ID_FOR_TEST)); | ||
| when(stargateRequestInfo.getCassandraToken()) | ||
| .thenReturn(operationsConfig.databaseConfig().fixedToken()); | ||
| CQLSessionCache cqlSessionCacheForTest = new CQLSessionCache(operationsConfig, meterRegistry); | ||
| Field stargateRequestInfoField = | ||
| cqlSessionCacheForTest.getClass().getDeclaredField("stargateRequestInfo"); | ||
| stargateRequestInfoField.setAccessible(true); | ||
| stargateRequestInfoField.set(cqlSessionCacheForTest, stargateRequestInfo); | ||
| // set operation config | ||
| Field operationsConfigField = | ||
| cqlSessionCacheForTest.getClass().getDeclaredField("operationsConfig"); | ||
| operationsConfigField.setAccessible(true); | ||
| operationsConfigField.set(cqlSessionCacheForTest, operationsConfig); | ||
| // Throwable | ||
| Throwable t = catchThrowable(cqlSessionCacheForTest::getSession); | ||
| assertThat(t).isInstanceOf(AllNodesFailedException.class); | ||
| CommandResult.Error error = | ||
| ThrowableToErrorMapper.getMapperWithMessageFunction().apply(t, t.getMessage()); | ||
| assertThat(error).isNotNull(); | ||
| assertThat(error.message()).contains("UNAUTHENTICATED: Invalid token"); | ||
| assertThat(error.status()).isEqualTo(Response.Status.UNAUTHORIZED); | ||
| assertThat(cqlSessionCacheForTest.cacheSize()).isEqualTo(0); | ||
| // metrics test | ||
| Gauge cacheSizeMetric = | ||
| meterRegistry.find("cache.size").tag("cache", "cql_sessions_cache").gauge(); | ||
| assertThat(cacheSizeMetric).isNotNull(); | ||
| assertThat(cacheSizeMetric.value()).isEqualTo(0); | ||
| FunctionCounter cachePutMetric = | ||
| meterRegistry.find("cache.puts").tag("cache", "cql_sessions_cache").functionCounter(); | ||
| assertThat(cachePutMetric).isNotNull(); | ||
| assertThat(cachePutMetric.count()).isEqualTo(1); | ||
| FunctionCounter cacheLoadSuccessMetric = | ||
| meterRegistry | ||
| .find("cache.load") | ||
| .tag("cache", "cql_sessions_cache") | ||
| .tag("result", "success") | ||
| .functionCounter(); | ||
| assertThat(cacheLoadSuccessMetric).isNotNull(); | ||
| assertThat(cacheLoadSuccessMetric.count()).isEqualTo(0); | ||
| FunctionCounter cacheLoadFailureMetric = | ||
| meterRegistry | ||
| .find("cache.load") | ||
| .tag("cache", "cql_sessions_cache") | ||
| .tag("result", "failure") | ||
| .functionCounter(); | ||
| assertThat(cacheLoadFailureMetric).isNotNull(); | ||
| assertThat(cacheLoadFailureMetric.count()).isEqualTo(1); | ||
| } | ||
| } |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, So IllegalArgumentException is the issue.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, correct.