Not encoding the Api Key in Enrollment token (#74510)

No need for base64 encode the API key before we put it as a value in the token, as the token itself will be Base64 encoded A follow up PR for: #73573
elastic · Jun 23, 2021 · 00a1ae1 · 00a1ae1
1 parent 7aaf209
commit 00a1ae1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...rity/src/main/java/org/elasticsearch/xpack/security/enrollment/CreateEnrollmentToken.java b/...rity/src/main/java/org/elasticsearch/xpack/security/enrollment/CreateEnrollmentToken.java
@@ -169,7 +169,7 @@ protected String getApiKeyCredentials(String user, SecureString password, String
         if (Strings.isNullOrEmpty(apiKey) || Strings.isNullOrEmpty(apiId)) {
             throw new IllegalStateException("Could not create an api key.");
         }
-        return Base64.getEncoder().encodeToString((apiId + ":" + apiKey).getBytes(StandardCharsets.UTF_8));
+        return apiId + ":" + apiKey;
     }
 
     protected Tuple<List<String>, String> getNodeInfo(String user, SecureString password) throws Exception {

diff --git a/...src/test/java/org/elasticsearch/xpack/security/enrollment/CreateEnrollmentTokenTests.java b/...src/test/java/org/elasticsearch/xpack/security/enrollment/CreateEnrollmentTokenTests.java
@@ -129,15 +129,15 @@ public void testCreateSuccess() throws Exception {
         assertEquals("8.0.0", infoNode.get("ver"));
         assertEquals("[192.168.0.1:9201, 172.16.254.1:9202, [2001:db8:0:1234:0:567:8:1]:9203]", infoNode.get("adr"));
         assertEquals("598a35cd831ee6bb90e79aa80d6b073cda88b41d", infoNode.get("fgr"));
-        assertEquals("RFI2Q3pYa0JEZjhhbVZfNDh5WVg6eDNZcVVfcnFRd20tRVNya0V4Y25PZw==", infoNode.get("key"));
+        assertEquals("DR6CzXkBDf8amV_48yYX:x3YqU_rqQwm-ESrkExcnOg", infoNode.get("key"));
 
         final String tokenKibana = createEnrollmentToken.createNodeEnrollmentToken("elastic", new SecureString("elastic"));
 
         Map<String, String> infoKibana = getDecoded(tokenKibana);
         assertEquals("8.0.0", infoKibana.get("ver"));
         assertEquals("[192.168.0.1:9201, 172.16.254.1:9202, [2001:db8:0:1234:0:567:8:1]:9203]", infoKibana.get("adr"));
         assertEquals("598a35cd831ee6bb90e79aa80d6b073cda88b41d", infoKibana.get("fgr"));
-        assertEquals("RFI2Q3pYa0JEZjhhbVZfNDh5WVg6eDNZcVVfcnFRd20tRVNya0V4Y25PZw==", infoKibana.get("key"));
+        assertEquals("DR6CzXkBDf8amV_48yYX:x3YqU_rqQwm-ESrkExcnOg", infoKibana.get("key"));
     }
 
     public void testFailedCreateApiKey() throws Exception {