Replace usage of expire time for cache expiration check

src/main/java/com/premiumminds/datagrip/vault/LeaseRequest.java

@@ -0,0 +1,14 @@
+package com.premiumminds.datagrip.vault;
+
+public class LeaseRequest {
+
+    private String leaseId;
+
+    public String getLeaseId() {
+        return leaseId;
+    }
+
+    public void setLeaseId(String leaseId) {
+        this.leaseId = leaseId;
+    }
+}

src/main/java/com/premiumminds/datagrip/vault/LeaseResponse.java

@@ -0,0 +1,107 @@
+package com.premiumminds.datagrip.vault;
+
+public class LeaseResponse {
+
+    public static class Data {
+        private String expireTime;
+        private String id;
+        private String issueTime;
+        private String lastRenewal;
+        private Boolean renewable;
+        private Long ttl;
+
+        public String getExpireTime() {
+            return expireTime;
+        }
+
+        public void setExpireTime(String expireTime) {
+            this.expireTime = expireTime;
+        }
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public String getIssueTime() {
+            return issueTime;
+        }
+
+        public void setIssueTime(String issueTime) {
+            this.issueTime = issueTime;
+        }
+
+        public String getLastRenewal() {
+            return lastRenewal;
+        }
+
+        public void setLastRenewal(String lastRenewal) {
+            this.lastRenewal = lastRenewal;
+        }
+
+        public Boolean getRenewable() {
+            return renewable;
+        }
+
+        public void setRenewable(Boolean renewable) {
+            this.renewable = renewable;
+        }
+
+        public Long getTtl() {
+            return ttl;
+        }
+
+        public void setTtl(Long ttl) {
+            this.ttl = ttl;
+        }
+    }
+
+    private String requestId;
+    private String leaseId;
+    private Boolean renewable;
+    private Long leaseDuration;
+    private Data data;
+
+    public String getRequestId() {
+        return requestId;
+    }
+
+    public void setRequestId(String requestId) {
+        this.requestId = requestId;
+    }
+
+    public String getLeaseId() {
+        return leaseId;
+    }
+
+    public void setLeaseId(String leaseId) {
+        this.leaseId = leaseId;
+    }
+
+    public Boolean getRenewable() {
+        return renewable;
+    }
+
+    public void setRenewable(Boolean renewable) {
+        this.renewable = renewable;
+    }
+
+    public Long getLeaseDuration() {
+        return leaseDuration;
+    }
+
+    public void setLeaseDuration(Long leaseDuration) {
+        this.leaseDuration = leaseDuration;
+    }
+
+    public Data getData() {
+        return data;
+    }
+
+    public void setData(Data data) {
+        this.data = data;
+    }
+}

src/main/java/com/premiumminds/datagrip/vault/VaultDatabaseAuthProvider.java

@@ -14,8 +14,8 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.time.Duration;
-import java.time.Instant;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ConcurrentHashMap;
@@ -36,7 +36,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class VaultDatabaseAuthProvider implements DatabaseAuthProvider {
 
     private static final Logger logger = Logger.getInstance(VaultDatabaseAuthProvider.class);
 
@@ -57,25 +57,25 @@
             .connectTimeout(Duration.ofSeconds(10))
             .build();
 
-    private static final Map<DynamicSecretKey, DynamicSecretValue> secretsCache = new ConcurrentHashMap<>();
+    private static final Map<DynamicSecretKey, DynamicSecretResponse> secretsCache = new ConcurrentHashMap<>();
 
     @Override
     public @NonNls @NotNull String getId() {
         return "vault";
     }
 
     @Override
     public @Nls @NotNull String getDisplayName() {
         return "Vault";
     }
 
     @Override
     public boolean isApplicable(@NotNull LocalDataSource dataSource, @NotNull ApplicabilityLevel level) {
         return true;
     }
 
     @Override
     public @Nullable CompletionStage<@NotNull ProtoConnection> intercept(@NotNull ProtoConnection protoConnection, boolean b) {
 
         try {
             final var address = getAddress(protoConnection);
@@ -85,18 +85,27 @@
             logger.info("Secret used: " + secret);
 
             DynamicSecretKey key = new DynamicSecretKey(address, secret);
-            DynamicSecretValue value = secretsCache.get(key);
+            DynamicSecretResponse value = secretsCache.get(key);
 
-            if (value == null || value.getExpireTime().isBefore(Instant.now())) {
+            if (value == null){
                 final var response = getCredentialsFromVault(protoConnection, address, secret);
-                value = new DynamicSecretValue(Instant.now(), response);
+                value = response;
                 secretsCache.put(key, value);
+            } else {
+                final var lease = getLeaseFromVault(protoConnection, address, value.getLeaseId());
+                if (!lease.isPresent()) {
+
+                    final var response = getCredentialsFromVault(protoConnection, address, secret);
+
+                    value = response;
+                    secretsCache.put(key, value);
+                }
             }
 
-            logger.info("Username used " + value.getResponse().getData().getUsername());
+            logger.info("Username used " + value.getData().getUsername());
 
-            protoConnection.getConnectionProperties().put("user", value.getResponse().getData().getUsername());
-            protoConnection.getConnectionProperties().put("password", value.getResponse().getData().getPassword());
+            protoConnection.getConnectionProperties().put("user", value.getData().getUsername());
+            protoConnection.getConnectionProperties().put("password", value.getData().getPassword());
 
         } catch (IOException | InterruptedException e) {
             throw new RuntimeException("Problem connecting to Vault: " + e.getMessage(), e);
@@ -106,12 +115,46 @@
     }
 
     @Override
     public @Nullable AuthWidget createWidget(@Nullable Project project, @NotNull DatabaseCredentials credentials, @NotNull DatabaseConnectionConfig config) {
         return new VaultWidget();
     }
 
+
+    private Optional<LeaseResponse> getLeaseFromVault(
+            ProtoConnection protoConnection,
+            final String address,
+            final String leaseId)
+            throws IOException, InterruptedException
+    {
+        final var token = getToken(protoConnection, address);
+
+        final var uri = URI.create(address).resolve("/v1/sys/leases/lookup");
+
+        final var gson = new GsonBuilder()
+                .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES)
+                .create();
+
+        final var leaseRequest = new LeaseRequest();
+        leaseRequest.setLeaseId(leaseId);
+
+        final var request = HttpRequest.newBuilder()
+                .POST(HttpRequest.BodyPublishers.ofString(gson.toJson(leaseRequest)))
+                .header("X-Vault-Token", token)
+                .uri(uri)
+                .build();
+
+        final var response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+
+        if (response.statusCode() != HttpURLConnection.HTTP_OK) {
+            logger.info("No lease found for " + leaseId);
+            return Optional.empty();
+        }
+
+        return Optional.of(gson.fromJson(response.body(), LeaseResponse.class));
+    }
+
     private DynamicSecretResponse getCredentialsFromVault(
             ProtoConnection protoConnection,
             final String address,
             final String secret)
             throws IOException, InterruptedException
@@ -138,8 +181,8 @@
         return gson.fromJson(response.body(), DynamicSecretResponse.class);
     }
 
     private String getAddress(ProtoConnection protoConnection) {
         final var definedAddress = protoConnection.getConnectionPoint().getAdditionalProperty(PROP_ADDRESS);
         if (definedAddress != null && !definedAddress.isBlank()) {
             return definedAddress;
         } else {
@@ -155,8 +198,8 @@
         throw new RuntimeException(ERROR_VAULT_ADDRESS_NOT_DEFINED);
     }
 
     private String getSecret(ProtoConnection protoConnection) {
         final var secret = protoConnection.getConnectionPoint().getAdditionalProperty(PROP_SECRET);
         if (secret != null && !secret.isBlank()) {
             return secret;
         }
@@ -164,9 +207,9 @@
     }
 
 
     private String getToken(ProtoConnection protoConnection, String vaultAddress) throws IOException, InterruptedException {
 
         final var tokenFile = protoConnection.getConnectionPoint().getAdditionalProperty(PROP_TOKEN_FILE);
         if (tokenFile != null && !tokenFile.isBlank()) {
             final var path = Paths.get(tokenFile);
             if (path.toFile().exists()){