Update to enable vault namespace support

HashiCraft · Sep 3, 2023 · 7ab1247 · 7ab1247
1 parent c20d794
commit 7ab1247
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 6 deletions.
diff --git a/src/main/java/com/hashicorp/hashicraft/block/entity/VaultDispenserEntity.java b/src/main/java/com/hashicorp/hashicraft/block/entity/VaultDispenserEntity.java
@@ -23,12 +23,14 @@
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
+import java.net.http.HttpRequest.Builder;
 import java.net.http.HttpResponse.BodyHandlers;
 import java.util.Base64;
 
 public class VaultDispenserEntity extends StatefulBlockEntity {
   public static final String vaultAddress = System.getenv().getOrDefault("VAULT_ADDR", "http://localhost:8200");
   public static final String vaultToken = System.getenv().getOrDefault("VAULT_TOKEN", "root");
+  public static final String vaultNamespace = System.getenv().getOrDefault("VAULT_NAMESPACE", "");
 
   @Syncable
   // userpass could contain a variable substitution like ${env.userpass}
@@ -69,11 +71,17 @@ public Login login(PlayerEntity player) {
           """, password);
 
       HttpClient client = HttpClient.newHttpClient();
-      HttpRequest request = HttpRequest.newBuilder()
+      Builder builder = HttpRequest.newBuilder()
           .uri(URI.create(vaultAddress + "/v1/auth/" + resolveUserpass() + "/login/" + username))
           .header("Accept", "application/json")
-          .header("X-Vault-Token", vaultToken)
-          .POST(HttpRequest.BodyPublishers.ofString(payload))
+          .header("X-Vault-Token", vaultToken);
+
+      // if a namespace is set, use it
+      if (vaultNamespace != "") {
+        builder = builder.header("X-Vault-Namespace", vaultNamespace);
+      }
+
+      HttpRequest request = builder.POST(HttpRequest.BodyPublishers.ofString(payload))
           .build();
 
       HttpResponse<String> response = client.send(request, BodyHandlers.ofString());

diff --git a/src/main/java/com/hashicorp/hashicraft/block/entity/VaultLockEntity.java b/src/main/java/com/hashicorp/hashicraft/block/entity/VaultLockEntity.java
@@ -17,12 +17,14 @@
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
+import java.net.http.HttpRequest.Builder;
 import java.net.http.HttpResponse.BodyHandlers;
 import java.util.Base64;
 
 public class VaultLockEntity extends StatefulBlockEntity {
   public static final String vaultAddress = System.getenv().getOrDefault("VAULT_ADDR", "http://localhost:8200");
   public static final String vaultToken = System.getenv().getOrDefault("VAULT_TOKEN", "root");
+  public static final String vaultNamespace = System.getenv().getOrDefault("VAULT_NAMESPACE", "");
 
   @Syncable
   // the path of the Vault secret
@@ -87,13 +89,24 @@ public VaultLockEntity(BlockPos pos, BlockState state, Block parent) {
   public boolean checkAccess(String token, String policy) {
     try {
       HttpClient client = HttpClient.newHttpClient();
-      HttpRequest request = HttpRequest.newBuilder()
+      Builder builder = HttpRequest.newBuilder()
           .uri(URI.create(vaultAddress + "/v1/" + resolvePath()))
           .header("Accept", "application/json")
-          .header("X-Vault-Token", token)
-          .GET()
+          .header("X-Vault-Token", token);
+
+      // if a namespace is set, use it
+      if (vaultNamespace != "") {
+        builder = builder.header("X-Vault-Namespace", vaultNamespace);
+      }
+
+      HttpRequest request = builder.GET()
           .build();
 
+      // if a namespace is set, use it
+      if (vaultNamespace != "") {
+        builder = builder.header("X-Vault-Namespace", vaultNamespace);
+      }
+
       HttpResponse<String> response = client.send(request, BodyHandlers.ofString());
       if (response.statusCode() >= 400) {
         Mod.LOGGER.warn(response.body());