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.

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

Ensure that challenge response contains body #4233

Merged
merged 2 commits into from
Apr 18, 2024
Merged

Ensure that challenge response contains body #4233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6539160
Ensure that challenge response contains body
cwperks Apr 11, 2024
a05a28c
Only return status code in resource-focused tests
cwperks Apr 16, 2024
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: 7 additions & 3 deletions src/integrationTest/java/org/opensearch/security/ResourceFocusedTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@
import org.opensearch.test.framework.cluster.LocalCluster;
import org.opensearch.test.framework.cluster.TestRestClient;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.opensearch.action.support.WriteRequest.RefreshPolicy.IMMEDIATE;
import static org.opensearch.test.framework.TestSecurityConfig.AuthcDomain.AUTHC_HTTPBASIC_INTERNAL;
import static org.opensearch.test.framework.TestSecurityConfig.Role.ALL_ACCESS;
Expand Down Expand Up @@ -127,11 +129,13 @@ private void runResourceTest(
final var requests = AsyncActions.generate(() -> {
final HttpPost post = new HttpPost(client.getHttpServerUri() + requestPath);
post.setEntity(new ByteArrayEntity(compressedRequestBody, ContentType.APPLICATION_JSON));
return client.executeRequest(post);
TestRestClient.HttpResponse response = client.executeRequest(post);
return response.getStatusCode();
}, parrallelism, totalNumberOfRequests);

AsyncActions.getAll(requests, 2, TimeUnit.MINUTES)
.forEach((response) -> { response.assertStatusCode(HttpStatus.SC_UNAUTHORIZED); });
AsyncActions.getAll(requests, 2, TimeUnit.MINUTES).forEach((responseCode) -> {
assertThat(responseCode, equalTo(HttpStatus.SC_UNAUTHORIZED));
});
}
}

Expand Down
13 changes: 13 additions & 0 deletions src/integrationTest/java/org/opensearch/security/http/BasicAuthTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,19 @@ public void testBrowserShouldRequestForCredentials() {
}
}

@Test
public void shouldRespondWithChallengeWhenNoCredentialsArePresent() {
try (TestRestClient client = cluster.getRestClient()) {
HttpResponse response = client.getAuthInfo();

assertThat(response, is(notNullValue()));
response.assertStatusCode(SC_UNAUTHORIZED);
assertThat(response.getHeader("WWW-Authenticate"), is(notNullValue()));
assertThat(response.getHeader("WWW-Authenticate").getValue(), equalTo("Basic realm=\"OpenSearch Security\""));
assertThat(response.getBody(), equalTo("Unauthorized"));
}
}

@Test
public void testUserShouldNotHaveAssignedCustomAttributes() {
try (TestRestClient client = cluster.getRestClient(TEST_USER)) {
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/org/opensearch/security/http/HTTPBasicAuthenticator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,11 @@ public AuthCredentials extractCredentials(final SecurityRequest request, final T
@Override
public Optional<SecurityResponse> reRequestAuthentication(final SecurityRequest request, AuthCredentials creds) {
return Optional.of(
new SecurityResponse(HttpStatus.SC_UNAUTHORIZED, Map.of("WWW-Authenticate", "Basic realm=\"OpenSearch Security\""), "")
peternied marked this conversation as resolved.
Show resolved Hide resolved
new SecurityResponse(
HttpStatus.SC_UNAUTHORIZED,
Map.of("WWW-Authenticate", "Basic realm=\"OpenSearch Security\""),
"Unauthorized"
)
);
}

Expand Down
Loading