-
Notifications
You must be signed in to change notification settings - Fork 24.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
HLRC: Add ability to put user with a password hash (#35844)
Update PutUserRequest to support password_hash (see: #35242) This also updates the documentation to bring it in line with our more recent approach to HLRC docs.
- Loading branch information
Showing
4 changed files
with
250 additions
and
39 deletions.
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
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
101 changes: 101 additions & 0 deletions
101
.../rest-high-level/src/test/java/org/elasticsearch/client/security/PutUserRequestTests.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,101 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.elasticsearch.client.security; | ||
|
|
||
| import org.elasticsearch.client.security.user.User; | ||
| import org.elasticsearch.common.Strings; | ||
| import org.elasticsearch.common.xcontent.XContentHelper; | ||
| import org.elasticsearch.common.xcontent.XContentType; | ||
| import org.elasticsearch.test.ESTestCase; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| import static org.hamcrest.Matchers.containsInAnyOrder; | ||
| import static org.hamcrest.Matchers.instanceOf; | ||
| import static org.hamcrest.Matchers.is; | ||
|
|
||
| public class PutUserRequestTests extends ESTestCase { | ||
|
|
||
| public void testBuildRequestWithPassword() throws Exception { | ||
| final User user = new User("hawkeye", Arrays.asList("kibana_user", "avengers"), | ||
| Collections.singletonMap("status", "active"), "Clinton Barton", null); | ||
| final char[] password = "f@rmb0y".toCharArray(); | ||
| final PutUserRequest request = PutUserRequest.withPassword(user, password, true, RefreshPolicy.IMMEDIATE); | ||
| String json = Strings.toString(request); | ||
| final Map<String, Object> requestAsMap = XContentHelper.convertToMap(XContentType.JSON.xContent(), json, false); | ||
| assertThat(requestAsMap.get("username"), is("hawkeye")); | ||
| assertThat(requestAsMap.get("roles"), instanceOf(List.class)); | ||
| assertThat((List<?>) requestAsMap.get("roles"), containsInAnyOrder("kibana_user", "avengers")); | ||
| assertThat(requestAsMap.get("password"), is("f@rmb0y")); | ||
| assertThat(requestAsMap.containsKey("password_hash"), is(false)); | ||
| assertThat(requestAsMap.get("full_name"), is("Clinton Barton")); | ||
| assertThat(requestAsMap.containsKey("email"), is(false)); | ||
| assertThat(requestAsMap.get("enabled"), is(true)); | ||
| assertThat(requestAsMap.get("metadata"), instanceOf(Map.class)); | ||
| final Map<?, ?> metadata = (Map<?, ?>) requestAsMap.get("metadata"); | ||
| assertThat(metadata.size(), is(1)); | ||
| assertThat(metadata.get("status"), is("active")); | ||
| } | ||
|
|
||
| public void testBuildRequestWithPasswordHash() throws Exception { | ||
| final User user = new User("hawkeye", Arrays.asList("kibana_user", "avengers"), | ||
| Collections.singletonMap("status", "active"), "Clinton Barton", null); | ||
| final char[] passwordHash = "$2a$04$iu1G4x3ZKVDNi6egZIjkFuIPja6elQXiBF1LdRVauV4TGog6FYOpi".toCharArray(); | ||
| final PutUserRequest request = PutUserRequest.withPasswordHash(user, passwordHash, true, RefreshPolicy.IMMEDIATE); | ||
| String json = Strings.toString(request); | ||
| final Map<String, Object> requestAsMap = XContentHelper.convertToMap(XContentType.JSON.xContent(), json, false); | ||
| assertThat(requestAsMap.get("username"), is("hawkeye")); | ||
| assertThat(requestAsMap.get("roles"), instanceOf(List.class)); | ||
| assertThat((List<?>) requestAsMap.get("roles"), containsInAnyOrder("kibana_user", "avengers")); | ||
| assertThat(requestAsMap.get("password_hash"), is("$2a$04$iu1G4x3ZKVDNi6egZIjkFuIPja6elQXiBF1LdRVauV4TGog6FYOpi")); | ||
| assertThat(requestAsMap.containsKey("password"), is(false)); | ||
| assertThat(requestAsMap.get("full_name"), is("Clinton Barton")); | ||
| assertThat(requestAsMap.containsKey("email"), is(false)); | ||
| assertThat(requestAsMap.get("enabled"), is(true)); | ||
| assertThat(requestAsMap.get("metadata"), instanceOf(Map.class)); | ||
| final Map<?, ?> metadata = (Map<?, ?>) requestAsMap.get("metadata"); | ||
| assertThat(metadata.size(), is(1)); | ||
| assertThat(metadata.get("status"), is("active")); | ||
| } | ||
|
|
||
| public void testBuildRequestForUpdateOnly() throws Exception { | ||
| final User user = new User("hawkeye", Arrays.asList("kibana_user", "avengers"), | ||
| Collections.singletonMap("status", "active"), "Clinton Barton", null); | ||
| final char[] passwordHash = "$2a$04$iu1G4x3ZKVDNi6egZIjkFuIPja6elQXiBF1LdRVauV4TGog6FYOpi".toCharArray(); | ||
| final PutUserRequest request = PutUserRequest.updateUser(user, true, RefreshPolicy.IMMEDIATE); | ||
| String json = Strings.toString(request); | ||
| final Map<String, Object> requestAsMap = XContentHelper.convertToMap(XContentType.JSON.xContent(), json, false); | ||
| assertThat(requestAsMap.get("username"), is("hawkeye")); | ||
| assertThat(requestAsMap.get("roles"), instanceOf(List.class)); | ||
| assertThat((List<?>) requestAsMap.get("roles"), containsInAnyOrder("kibana_user", "avengers")); | ||
| assertThat(requestAsMap.containsKey("password"), is(false)); | ||
| assertThat(requestAsMap.containsKey("password_hash"), is(false)); | ||
| assertThat(requestAsMap.get("full_name"), is("Clinton Barton")); | ||
| assertThat(requestAsMap.containsKey("email"), is(false)); | ||
| assertThat(requestAsMap.get("enabled"), is(true)); | ||
| assertThat(requestAsMap.get("metadata"), instanceOf(Map.class)); | ||
| final Map<?, ?> metadata = (Map<?, ?>) requestAsMap.get("metadata"); | ||
| assertThat(metadata.size(), is(1)); | ||
| assertThat(metadata.get("status"), is("active")); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.