Compare commits
2 Commits
main
...
experiment
Author | SHA1 | Date | |
---|---|---|---|
62cc4de690
|
|||
6a813b2541
|
6
.github/workflows/ci-it.yml
vendored
6
.github/workflows/ci-it.yml
vendored
@ -14,11 +14,11 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
jdk: [ 11, 17, 21 ]
|
jdk: [ 17, 21 ]
|
||||||
vault: [ '1.2.0', '1.19.5' ]
|
vault: [ '1.2.0', '1.19.0' ]
|
||||||
include:
|
include:
|
||||||
- jdk: 21
|
- jdk: 21
|
||||||
vault: '1.19.5'
|
vault: '1.19.0'
|
||||||
analysis: true
|
analysis: true
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
|
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
@ -15,7 +15,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
jdk: [ 11, 17, 21 ]
|
jdk: [ 17, 21 ]
|
||||||
include:
|
include:
|
||||||
- jdk: 21
|
- jdk: 21
|
||||||
analysis: true
|
analysis: true
|
||||||
|
12
CHANGELOG.md
12
CHANGELOG.md
@ -1,10 +1,11 @@
|
|||||||
## 1.5.1 (2025-06-02)
|
## unreleased
|
||||||
|
|
||||||
### Improvements
|
### Breaking
|
||||||
* Use `lookup-self` for token check instead of `lookup` (#98) (#99)
|
* Requires Java 17 or later
|
||||||
|
* Required Jackson 3
|
||||||
|
|
||||||
### Dependencies
|
### Dependencies
|
||||||
* Updated Jackson to 2.19.0 (#97)
|
* Updated Jackson to 3.0.0
|
||||||
|
|
||||||
|
|
||||||
## 1.5.0 (2025-04-13)
|
## 1.5.0 (2025-04-13)
|
||||||
@ -22,9 +23,6 @@
|
|||||||
### Fix
|
### Fix
|
||||||
* Fix initialization from environment without explicit port
|
* Fix initialization from environment without explicit port
|
||||||
|
|
||||||
### Dependencies
|
|
||||||
* Updated Jackson to 2.18.3 (#90)
|
|
||||||
|
|
||||||
### Test
|
### Test
|
||||||
* Tested against Vault 1.2 to 1.19
|
* Tested against Vault 1.2 to 1.19
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ Java Vault Connector is a connector library for [Vault](https://www.vaultproject
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>de.stklcode.jvault</groupId>
|
<groupId>de.stklcode.jvault</groupId>
|
||||||
<artifactId>jvault-connector</artifactId>
|
<artifactId>jvault-connector</artifactId>
|
||||||
<version>1.5.1</version>
|
<version>1.5.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
```
|
```
|
||||||
|
|
||||||
|
27
pom.xml
27
pom.xml
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
<groupId>de.stklcode.jvault</groupId>
|
<groupId>de.stklcode.jvault</groupId>
|
||||||
<artifactId>jvault-connector</artifactId>
|
<artifactId>jvault-connector</artifactId>
|
||||||
<version>1.5.2-SNAPSHOT</version>
|
<version>1.5.1-SNAPSHOT</version>
|
||||||
|
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
@ -43,31 +43,26 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<argLine />
|
<argLine></argLine>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.core</groupId>
|
<groupId>tools.jackson.core</groupId>
|
||||||
<artifactId>jackson-databind</artifactId>
|
<artifactId>jackson-databind</artifactId>
|
||||||
<version>2.19.0</version>
|
<version>3.0.0-rc5</version>
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.fasterxml.jackson.datatype</groupId>
|
|
||||||
<artifactId>jackson-datatype-jsr310</artifactId>
|
|
||||||
<version>2.19.0</version>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.junit.jupiter</groupId>
|
<groupId>org.junit.jupiter</groupId>
|
||||||
<artifactId>junit-jupiter</artifactId>
|
<artifactId>junit-jupiter</artifactId>
|
||||||
<version>5.13.0</version>
|
<version>5.12.1</version>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.mockito</groupId>
|
<groupId>org.mockito</groupId>
|
||||||
<artifactId>mockito-core</artifactId>
|
<artifactId>mockito-core</artifactId>
|
||||||
<version>5.18.0</version>
|
<version>5.17.0</version>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
@ -91,7 +86,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>nl.jqno.equalsverifier</groupId>
|
<groupId>nl.jqno.equalsverifier</groupId>
|
||||||
<artifactId>equalsverifier</artifactId>
|
<artifactId>equalsverifier</artifactId>
|
||||||
<version>3.19.4</version>
|
<version>3.19.3</version>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
@ -110,7 +105,7 @@
|
|||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
<version>3.14.0</version>
|
<version>3.14.0</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<release>11</release>
|
<release>17</release>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
@ -130,7 +125,7 @@
|
|||||||
<configuration>
|
<configuration>
|
||||||
<argLine>
|
<argLine>
|
||||||
@{argLine}
|
@{argLine}
|
||||||
--add-opens de.stklcode.jvault.connector/de.stklcode.jvault.connector.test=com.fasterxml.jackson.databind
|
--add-opens de.stklcode.jvault.connector/de.stklcode.jvault.connector.test=tools.jackson.databind
|
||||||
</argLine>
|
</argLine>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
@ -207,7 +202,7 @@
|
|||||||
<version>[3.6.3,)</version>
|
<version>[3.6.3,)</version>
|
||||||
</requireMavenVersion>
|
</requireMavenVersion>
|
||||||
<requireJavaVersion>
|
<requireJavaVersion>
|
||||||
<version>[11,)</version>
|
<version>[17,)</version>
|
||||||
</requireJavaVersion>
|
</requireJavaVersion>
|
||||||
</rules>
|
</rules>
|
||||||
</configuration>
|
</configuration>
|
||||||
@ -253,7 +248,7 @@
|
|||||||
<artifactId>maven-javadoc-plugin</artifactId>
|
<artifactId>maven-javadoc-plugin</artifactId>
|
||||||
<version>3.11.2</version>
|
<version>3.11.2</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<source>11</source>
|
<source>17</source>
|
||||||
</configuration>
|
</configuration>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
|
@ -54,7 +54,6 @@ public class HTTPVaultConnector implements VaultConnector {
|
|||||||
private static final String PATH_AUTH = "auth";
|
private static final String PATH_AUTH = "auth";
|
||||||
private static final String PATH_AUTH_TOKEN = PATH_AUTH + "/token";
|
private static final String PATH_AUTH_TOKEN = PATH_AUTH + "/token";
|
||||||
private static final String PATH_LOOKUP = "/lookup";
|
private static final String PATH_LOOKUP = "/lookup";
|
||||||
private static final String PATH_LOOKUP_SELF = "/lookup-self";
|
|
||||||
private static final String PATH_CREATE = "/create";
|
private static final String PATH_CREATE = "/create";
|
||||||
private static final String PATH_ROLES = "/roles";
|
private static final String PATH_ROLES = "/roles";
|
||||||
private static final String PATH_CREATE_ORPHAN = "/create-orphan";
|
private static final String PATH_CREATE_ORPHAN = "/create-orphan";
|
||||||
@ -192,7 +191,7 @@ public class HTTPVaultConnector implements VaultConnector {
|
|||||||
/* set token */
|
/* set token */
|
||||||
this.token = token;
|
this.token = token;
|
||||||
this.tokenTTL = 0;
|
this.tokenTTL = 0;
|
||||||
TokenResponse res = request.get(PATH_AUTH_TOKEN + PATH_LOOKUP_SELF, emptyMap(), token, TokenResponse.class);
|
TokenResponse res = request.post(PATH_AUTH_TOKEN + PATH_LOOKUP, emptyMap(), token, TokenResponse.class);
|
||||||
authorized = true;
|
authorized = true;
|
||||||
|
|
||||||
return res;
|
return res;
|
||||||
|
@ -1,12 +1,11 @@
|
|||||||
package de.stklcode.jvault.connector.internal;
|
package de.stklcode.jvault.connector.internal;
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
import tools.jackson.core.JacksonException;
|
||||||
import com.fasterxml.jackson.databind.DeserializationFeature;
|
|
||||||
import com.fasterxml.jackson.databind.SerializationFeature;
|
|
||||||
import com.fasterxml.jackson.databind.json.JsonMapper;
|
|
||||||
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
|
|
||||||
import de.stklcode.jvault.connector.exception.*;
|
import de.stklcode.jvault.connector.exception.*;
|
||||||
import de.stklcode.jvault.connector.model.response.ErrorResponse;
|
import de.stklcode.jvault.connector.model.response.ErrorResponse;
|
||||||
|
import tools.jackson.databind.cfg.DateTimeFeature;
|
||||||
|
import tools.jackson.databind.json.JsonMapper;
|
||||||
|
|
||||||
import javax.net.ssl.SSLContext;
|
import javax.net.ssl.SSLContext;
|
||||||
import javax.net.ssl.TrustManagerFactory;
|
import javax.net.ssl.TrustManagerFactory;
|
||||||
@ -66,9 +65,8 @@ public final class RequestHelper implements Serializable {
|
|||||||
this.tlsVersion = tlsVersion;
|
this.tlsVersion = tlsVersion;
|
||||||
this.trustedCaCert = trustedCaCert;
|
this.trustedCaCert = trustedCaCert;
|
||||||
this.jsonMapper = JsonMapper.builder()
|
this.jsonMapper = JsonMapper.builder()
|
||||||
.addModule(new JavaTimeModule())
|
.enable(DateTimeFeature.WRITE_DATES_AS_TIMESTAMPS)
|
||||||
.enable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
|
.disable(DateTimeFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE)
|
||||||
.disable(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE)
|
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -89,7 +87,7 @@ public final class RequestHelper implements Serializable {
|
|||||||
// Generate JSON from payload.
|
// Generate JSON from payload.
|
||||||
try {
|
try {
|
||||||
req.POST(HttpRequest.BodyPublishers.ofString(jsonMapper.writeValueAsString(payload), UTF_8));
|
req.POST(HttpRequest.BodyPublishers.ofString(jsonMapper.writeValueAsString(payload), UTF_8));
|
||||||
} catch (JsonProcessingException e) {
|
} catch (JacksonException e) {
|
||||||
throw new InvalidRequestException(Error.PARSE_RESPONSE, e);
|
throw new InvalidRequestException(Error.PARSE_RESPONSE, e);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -120,7 +118,7 @@ public final class RequestHelper implements Serializable {
|
|||||||
try {
|
try {
|
||||||
String response = post(path, payload, token);
|
String response = post(path, payload, token);
|
||||||
return jsonMapper.readValue(response, target);
|
return jsonMapper.readValue(response, target);
|
||||||
} catch (IOException e) {
|
} catch (JacksonException e) {
|
||||||
throw new InvalidResponseException(Error.PARSE_RESPONSE, e);
|
throw new InvalidResponseException(Error.PARSE_RESPONSE, e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -159,7 +157,7 @@ public final class RequestHelper implements Serializable {
|
|||||||
// Generate JSON from payload.
|
// Generate JSON from payload.
|
||||||
try {
|
try {
|
||||||
req.PUT(HttpRequest.BodyPublishers.ofString(jsonMapper.writeValueAsString(payload), UTF_8));
|
req.PUT(HttpRequest.BodyPublishers.ofString(jsonMapper.writeValueAsString(payload), UTF_8));
|
||||||
} catch (JsonProcessingException e) {
|
} catch (JacksonException e) {
|
||||||
throw new InvalidRequestException("Payload serialization failed", e);
|
throw new InvalidRequestException("Payload serialization failed", e);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -190,7 +188,7 @@ public final class RequestHelper implements Serializable {
|
|||||||
try {
|
try {
|
||||||
String response = put(path, payload, token);
|
String response = put(path, payload, token);
|
||||||
return jsonMapper.readValue(response, target);
|
return jsonMapper.readValue(response, target);
|
||||||
} catch (IOException e) {
|
} catch (JacksonException e) {
|
||||||
throw new InvalidResponseException(Error.PARSE_RESPONSE, e);
|
throw new InvalidResponseException(Error.PARSE_RESPONSE, e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -302,7 +300,7 @@ public final class RequestHelper implements Serializable {
|
|||||||
try {
|
try {
|
||||||
String response = get(path, payload, token);
|
String response = get(path, payload, token);
|
||||||
return jsonMapper.readValue(response, target);
|
return jsonMapper.readValue(response, target);
|
||||||
} catch (IOException e) {
|
} catch (JacksonException e) {
|
||||||
throw new InvalidResponseException(Error.PARSE_RESPONSE, e);
|
throw new InvalidResponseException(Error.PARSE_RESPONSE, e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -443,7 +441,7 @@ public final class RequestHelper implements Serializable {
|
|||||||
throw new InvalidResponseException(Error.RESPONSE_CODE, response.statusCode(), er.toString());
|
throw new InvalidResponseException(Error.RESPONSE_CODE, response.statusCode(), er.toString());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (IOException ignored) {
|
} catch (IOException | JacksonException ignored) {
|
||||||
// Exception ignored.
|
// Exception ignored.
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -17,14 +17,12 @@
|
|||||||
package de.stklcode.jvault.connector.model.response;
|
package de.stklcode.jvault.connector.model.response;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
import com.fasterxml.jackson.databind.DeserializationFeature;
|
|
||||||
import com.fasterxml.jackson.databind.SerializationFeature;
|
|
||||||
import com.fasterxml.jackson.databind.json.JsonMapper;
|
|
||||||
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
|
|
||||||
import de.stklcode.jvault.connector.exception.InvalidResponseException;
|
import de.stklcode.jvault.connector.exception.InvalidResponseException;
|
||||||
import de.stklcode.jvault.connector.model.response.embedded.VersionMetadata;
|
import de.stklcode.jvault.connector.model.response.embedded.VersionMetadata;
|
||||||
|
import tools.jackson.core.JacksonException;
|
||||||
|
import tools.jackson.databind.cfg.DateTimeFeature;
|
||||||
|
import tools.jackson.databind.json.JsonMapper;
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
@ -86,9 +84,8 @@ public abstract class SecretResponse extends VaultDataResponse {
|
|||||||
return type.cast(rawValue);
|
return type.cast(rawValue);
|
||||||
} else {
|
} else {
|
||||||
var om = JsonMapper.builder()
|
var om = JsonMapper.builder()
|
||||||
.addModule(new JavaTimeModule())
|
.enable(DateTimeFeature.WRITE_DATES_AS_TIMESTAMPS)
|
||||||
.enable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
|
.disable(DateTimeFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE)
|
||||||
.disable(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE)
|
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
if (rawValue instanceof String) {
|
if (rawValue instanceof String) {
|
||||||
@ -97,7 +94,7 @@ public abstract class SecretResponse extends VaultDataResponse {
|
|||||||
return om.readValue(om.writeValueAsString(rawValue), type);
|
return om.readValue(om.writeValueAsString(rawValue), type);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (IOException e) {
|
} catch (JacksonException e) {
|
||||||
throw new InvalidResponseException("Unable to parse response payload: " + e.getMessage());
|
throw new InvalidResponseException("Unable to parse response payload: " + e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -26,12 +26,11 @@ module de.stklcode.jvault.connector {
|
|||||||
exports de.stklcode.jvault.connector.model.response;
|
exports de.stklcode.jvault.connector.model.response;
|
||||||
exports de.stklcode.jvault.connector.model.response.embedded;
|
exports de.stklcode.jvault.connector.model.response.embedded;
|
||||||
|
|
||||||
opens de.stklcode.jvault.connector.model to com.fasterxml.jackson.databind;
|
opens de.stklcode.jvault.connector.model to tools.jackson.databind;
|
||||||
opens de.stklcode.jvault.connector.model.response to com.fasterxml.jackson.databind;
|
opens de.stklcode.jvault.connector.model.response to tools.jackson.databind;
|
||||||
opens de.stklcode.jvault.connector.model.response.embedded to com.fasterxml.jackson.databind;
|
opens de.stklcode.jvault.connector.model.response.embedded to tools.jackson.databind;
|
||||||
|
|
||||||
requires java.net.http;
|
requires java.net.http;
|
||||||
requires com.fasterxml.jackson.annotation;
|
requires com.fasterxml.jackson.annotation;
|
||||||
requires com.fasterxml.jackson.databind;
|
requires tools.jackson.databind;
|
||||||
requires com.fasterxml.jackson.datatype.jsr310;
|
|
||||||
}
|
}
|
||||||
|
@ -52,7 +52,7 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue;
|
|||||||
* @since 0.1
|
* @since 0.1
|
||||||
*/
|
*/
|
||||||
class HTTPVaultConnectorIT {
|
class HTTPVaultConnectorIT {
|
||||||
private static String VAULT_VERSION = "1.19.5"; // The vault version this test is supposed to run against.
|
private static String VAULT_VERSION = "1.19.0"; // The vault version this test is supposed to run against.
|
||||||
private static final String KEY1 = "E38bkCm0VhUvpdCKGQpcohhD9XmcHJ/2hreOSY019Lho";
|
private static final String KEY1 = "E38bkCm0VhUvpdCKGQpcohhD9XmcHJ/2hreOSY019Lho";
|
||||||
private static final String KEY2 = "O5OHwDleY3IiPdgw61cgHlhsrEm6tVJkrxhF6QAnILd1";
|
private static final String KEY2 = "O5OHwDleY3IiPdgw61cgHlhsrEm6tVJkrxhF6QAnILd1";
|
||||||
private static final String KEY3 = "mw7Bm3nbt/UWa/juDjjL2EPQ04kiJ0saC5JEXwJvXYsB";
|
private static final String KEY3 = "mw7Bm3nbt/UWa/juDjjL2EPQ04kiJ0saC5JEXwJvXYsB";
|
||||||
|
Reference in New Issue
Block a user