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

Fixes authtoken endpoint #4628

Merged
merged 3 commits into from
Aug 9, 2024
Merged

Fixes authtoken endpoint #4628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
808fe31
Fixes authtoken endpoint
DarshitChanpura Aug 8, 2024
5ab017a
Removes commented code
DarshitChanpura Aug 8, 2024
cc26b94
Fixes timeout param for certificates api and add tests
DarshitChanpura Aug 9, 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
11 changes: 11 additions & 0 deletions src/integrationTest/java/org/opensearch/security/api/CertificatesRestApiIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,17 @@ public void availableForRestAdmin() throws Exception {
withUser(REST_API_ADMIN_SSL_INFO, this::verifySSLCertsInfo);
}

@Test
public void timeoutTest() throws Exception {
withUser(REST_ADMIN_USER, this::verifyTimeoutRequest);
}

private void verifyTimeoutRequest(final TestRestClient client) throws Exception {
TestRestClient.HttpResponse response = ok(() -> client.get(sslCertsPath() + "?timeout=0"));
final var body = response.bodyAsJsonNode();
assertThat(body.get("nodes").size(), is(0));
}

private void verifySSLCertsInfo(final TestRestClient client) throws Exception {
assertSSLCertsInfo(
localCluster.nodes(),
Expand Down
12 changes: 12 additions & 0 deletions ...integrationTest/java/org/opensearch/security/api/InternalUsersRestApiIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,18 @@ void assertFilterByUsers(final HttpResponse response, final boolean hasServiceUs
assertThat(response.getBody(), response.bodyAsJsonNode().has(NEW_USER), is(hasInternalUser));
}

@Test
public void verifyPOSTOnlyForAuthTokenEndpoint() throws Exception {
withUser(ADMIN_USER_NAME, client -> {
badRequest(() -> client.post(apiPath(ADMIN_USER_NAME, "authtoken")));
ok(() -> client.post(apiPath(SERVICE_ACCOUNT_USER, "authtoken")));
/*
should be notImplement but the call doesn't reach {@link org.opensearch.security.dlic.rest.api.InternalUsersApiAction#withAuthTokenPath(RestRequest)}
*/
methodNotAllowed(() -> client.post(apiPath("randomPath")));
});
}

@Test
public void userApiWithDotsInName() throws Exception {
withUser(ADMIN_USER_NAME, client -> {
Expand Down
1 change: 1 addition & 0 deletions src/main/java/org/opensearch/security/dlic/rest/api/CertificatesApiAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
protected void consumeParameters(RestRequest request) {
request.param("nodeId");
request.param("cert_type");
request.param("timeout");

Check warning on line 74 in src/main/java/org/opensearch/security/dlic/rest/api/CertificatesApiAction.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/org/opensearch/security/dlic/rest/api/CertificatesApiAction.java#L74 

Added line #L74 was not covered by tests
}

private void securitySSLCertsRequestHandlers(RequestHandler.RequestHandlersBuilder requestHandlersBuilder) {
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/opensearch/security/dlic/rest/api/InternalUsersApiAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,10 +160,10 @@ protected final UserFilterType filterParam(final RestRequest request) {
ValidationResult<String> withAuthTokenPath(final RestRequest request) throws IOException {
return endpointValidator.withRequiredEntityName(nameParam(request)).map(username -> {
// Handle auth token fetching
if (!(request.uri().contains("/internalusers/" + username + "/authtoken") && request.uri().endsWith("/authtoken"))) {
return ValidationResult.error(RestStatus.NOT_IMPLEMENTED, methodNotImplementedMessage(request.method()));
if (request.uri().contains("/internalusers/" + username + "/authtoken") && request.uri().endsWith("/authtoken")) {
DarshitChanpura marked this conversation as resolved.
Show resolved Hide resolved
return ValidationResult.success(username);
}
return ValidationResult.success(username);
return ValidationResult.error(RestStatus.NOT_IMPLEMENTED, methodNotImplementedMessage(request.method()));
});
}

Expand Down
19 changes: 6 additions & 13 deletions src/main/java/org/opensearch/security/user/UserService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import com.google.common.collect.ImmutableList;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
Expand Down Expand Up @@ -243,14 +242,8 @@
CharacterRule lowercaseCharacterRule = new CharacterRule(EnglishCharacterData.LowerCase, 1);
CharacterRule uppercaseCharacterRule = new CharacterRule(EnglishCharacterData.UpperCase, 1);
CharacterRule numericCharacterRule = new CharacterRule(EnglishCharacterData.Digit, 1);
CharacterRule specialCharacterRule = new CharacterRule(EnglishCharacterData.Special, 1);
willyborankin marked this conversation as resolved.
Show resolved Hide resolved

List<CharacterRule> rules = Arrays.asList(
lowercaseCharacterRule,
uppercaseCharacterRule,
numericCharacterRule,
specialCharacterRule
);
List<CharacterRule> rules = Arrays.asList(lowercaseCharacterRule, uppercaseCharacterRule, numericCharacterRule);
PasswordGenerator passwordGenerator = new PasswordGenerator();

Random random = Randomness.get();
Expand All @@ -275,17 +268,17 @@

String authToken = null;
try {
final ObjectMapper mapper = DefaultObjectMapper.objectMapper;
JsonNode accountDetails = mapper.readTree(internalUsersConfiguration.getCEntry(accountName).toString());
final var accountEntry = DefaultObjectMapper.writeValueAsString(internalUsersConfiguration.getCEntry(accountName), false);
JsonNode accountDetails = DefaultObjectMapper.readTree(accountEntry);

Check warning on line 272 in src/main/java/org/opensearch/security/user/UserService.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/org/opensearch/security/user/UserService.java#L271-L272 

Added lines #L271 - L272 were not covered by tests
final ObjectNode contentAsNode = (ObjectNode) accountDetails;
SecurityJsonNode securityJsonNode = new SecurityJsonNode(contentAsNode);

Optional.ofNullable(securityJsonNode.get("service"))
Optional.ofNullable(securityJsonNode.get("attributes").get("service"))

Check warning on line 276 in src/main/java/org/opensearch/security/user/UserService.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/org/opensearch/security/user/UserService.java#L276 

Added line #L276 was not covered by tests
.map(SecurityJsonNode::asString)
.filter("true"::equalsIgnoreCase)
.orElseThrow(() -> new UserServiceException(AUTH_TOKEN_GENERATION_MESSAGE));

Optional.ofNullable(securityJsonNode.get("enabled"))
Optional.ofNullable(securityJsonNode.get("attributes").get("enabled"))

Check warning on line 281 in src/main/java/org/opensearch/security/user/UserService.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/org/opensearch/security/user/UserService.java#L281 

Added line #L281 was not covered by tests
.map(SecurityJsonNode::asString)
.filter("true"::equalsIgnoreCase)
.orElseThrow(() -> new UserServiceException(AUTH_TOKEN_GENERATION_MESSAGE));
Expand All @@ -306,7 +299,7 @@
saveAndUpdateConfigs(getUserConfigName().toString(), client, CType.INTERNALUSERS, internalUsersConfiguration);

authToken = Base64.getUrlEncoder().encodeToString((accountName + ":" + plainTextPassword).getBytes(StandardCharsets.UTF_8));
return new BasicAuthToken(authToken);
return new BasicAuthToken("Basic " + authToken);

Check warning on line 302 in src/main/java/org/opensearch/security/user/UserService.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/org/opensearch/security/user/UserService.java#L302 

Added line #L302 was not covered by tests

} catch (JsonProcessingException ex) {
throw new UserServiceException(FAILED_ACCOUNT_RETRIEVAL_MESSAGE);
Expand Down
Loading