spiffe
/
java-spiffe
mirror of https://github.com/spiffe/java-spiffe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update gradle version to 8.0.2 (#104) 

Update gradle version to 8.0.2

Signed-off-by: Max Lambrecht <max.lambrecht@hpe.com>
This commit is contained in:
Max Lambrecht 2023-04-12 13:16:22 -05:00 committed by GitHub
parent 0d0aae967f
commit e5600c3f4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 109 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build.gradle
View File

@ -16,10 +16,11 @@ subprojects {
ext { ext {
grpcVersion = '1.54.0' grpcVersion = '1.54.0'
jupiterVersion = '5.7.0' jupiterVersion = '5.9.2'
mockitoVersion = '3.5.15' mockitoVersion = '3.12.4'
lombokVersion = '1.18.20' lombokVersion = '1.18.20'
nimbusVersion = '9.31' nimbusVersion = '9.31'
shadowVersion = '8.1.1'
//IMPORTANT: This must be in sync with the shaded netty version in gRPC //IMPORTANT: This must be in sync with the shaded netty version in gRPC
nettyVersion = '4.1.91.Final' nettyVersion = '4.1.91.Final'
@ -107,6 +108,9 @@ subprojects {
testCompileOnly group: 'org.mockito', name: 'mockito-core', version: "${mockitoVersion}" testCompileOnly group: 'org.mockito', name: 'mockito-core', version: "${mockitoVersion}"
testRuntimeOnly group: 'org.mockito', name: 'mockito-junit-jupiter', version: "${mockitoVersion}" testRuntimeOnly group: 'org.mockito', name: 'mockito-junit-jupiter', version: "${mockitoVersion}"
testRuntimeOnly group: 'org.mockito', name: 'mockito-inline', version: "${mockitoVersion}"
testImplementation group: 'uk.org.webcompere', name: 'system-stubs-core', version: '2.0.2'
// Project Lombok dependency // Project Lombok dependency
compileOnly group: 'org.projectlombok', name: 'lombok', version: "${lombokVersion}" compileOnly group: 'org.projectlombok', name: 'lombok', version: "${lombokVersion}"
@ -145,8 +149,8 @@ task jacocoTestReport(type: JacocoReport) {
} }
reports { reports {
xml.enabled true xml.required = true
html.enabled true html.required = true
} }
} }

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip

4
java-spiffe-core/build.gradle
View File

@ -4,7 +4,7 @@ buildscript {
} }
dependencies { dependencies {
classpath group: 'com.google.protobuf', name: 'protobuf-gradle-plugin', version: '0.8.13' classpath group: 'com.google.protobuf', name: 'protobuf-gradle-plugin', version: '0.9.2'
} }
} }
@ -31,6 +31,8 @@ sourceSets {
} }
} }
sourcesJar.duplicatesStrategy = DuplicatesStrategy.INCLUDE
configurations { configurations {
integrationTestImplementation.extendsFrom testImplementation integrationTestImplementation.extendsFrom testImplementation
integrationTestCompile.extendsFrom testCompile integrationTestCompile.extendsFrom testCompile

26
java-spiffe-core/src/test/java/io/spiffe/workloadapi/AddressTest.java
View File

@ -6,6 +6,7 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource; import org.junit.jupiter.params.provider.MethodSource;
import uk.org.webcompere.systemstubs.environment.EnvironmentVariables;
import java.net.URI; import java.net.URI;
import java.util.stream.Stream; import java.util.stream.Stream;
@ -74,19 +75,24 @@ public class AddressTest {
@Test @Test
void getDefaultAddress() throws Exception { void getDefaultAddress() throws Exception {
TestUtils.setEnvironmentVariable(Address.SOCKET_ENV_VARIABLE, "unix:/tmp/test" ); new EnvironmentVariables(Address.SOCKET_ENV_VARIABLE, "unix:/tmp/test").execute(() -> {
String defaultAddress = Address.getDefaultAddress(); String defaultAddress = Address.getDefaultAddress();
assertEquals("unix:/tmp/test", defaultAddress); assertEquals("unix:/tmp/test", defaultAddress);
});
} }
@Test @Test
void getDefaultAddress_isBlankThrowsException() throws Exception { void getDefaultAddress_isBlankThrowsException() throws Exception {
TestUtils.setEnvironmentVariable(Address.SOCKET_ENV_VARIABLE, ""); new EnvironmentVariables(Address.SOCKET_ENV_VARIABLE, "").execute(() -> {
try { try {
Address.getDefaultAddress(); Address.getDefaultAddress();
fail(); fail();
} catch (Exception e) { } catch (Exception e) {
assertEquals("Endpoint Socket Address Environment Variable is not set: SPIFFE_ENDPOINT_SOCKET", e.getMessage()); assertEquals("Endpoint Socket Address Environment Variable is not set: SPIFFE_ENDPOINT_SOCKET", e.getMessage());
} }
});
new EnvironmentVariables(Address.SOCKET_ENV_VARIABLE, "").execute(() -> {
});
} }
} }

41
java-spiffe-core/src/test/java/io/spiffe/workloadapi/CachedJwtSourceTest.java
View File

@ -9,11 +9,11 @@ import io.spiffe.exception.SocketEndpointAddressException;
import io.spiffe.spiffeid.SpiffeId; import io.spiffe.spiffeid.SpiffeId;
import io.spiffe.spiffeid.TrustDomain; import io.spiffe.spiffeid.TrustDomain;
import io.spiffe.svid.jwtsvid.JwtSvid; import io.spiffe.svid.jwtsvid.JwtSvid;
import io.spiffe.utils.TestUtils;
import lombok.val; import lombok.val;
import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import uk.org.webcompere.systemstubs.environment.EnvironmentVariables;
import java.io.IOException; import java.io.IOException;
import java.time.Clock; import java.time.Clock;
@ -495,28 +495,29 @@ class CachedJwtSourceTest {
@Test @Test
void newSource_DefaultSocketAddress() throws Exception { void newSource_DefaultSocketAddress() throws Exception {
try { new EnvironmentVariables(Address.SOCKET_ENV_VARIABLE, "unix:/tmp/test").execute(() -> {
TestUtils.setEnvironmentVariable(Address.SOCKET_ENV_VARIABLE, "unix:/tmp/test"); try {
CachedJwtSource.newSource(); CachedJwtSource.newSource();
fail(); fail();
} catch (JwtSourceException e) { } catch (JwtSourceException e) {
assertEquals("Error creating JWT source", e.getMessage()); assertEquals("Error creating JWT source", e.getMessage());
} catch (SocketEndpointAddressException e) { } catch (SocketEndpointAddressException e) {
fail(); fail();
} }
});
} }
@Test @Test
void newSource_noSocketAddress() throws Exception { void newSource_noSocketAddress() throws Exception {
try { new EnvironmentVariables(Address.SOCKET_ENV_VARIABLE, "").execute(() -> {
// just in case it's defined in the environment try {
TestUtils.setEnvironmentVariable(Address.SOCKET_ENV_VARIABLE, ""); CachedJwtSource.newSource();
CachedJwtSource.newSource(); fail();
fail(); } catch (SocketEndpointAddressException e) {
} catch (SocketEndpointAddressException e) { fail();
fail(); } catch (IllegalStateException e) {
} catch (IllegalStateException e) { assertEquals("Endpoint Socket Address Environment Variable is not set: SPIFFE_ENDPOINT_SOCKET", e.getMessage());
assertEquals("Endpoint Socket Address Environment Variable is not set: SPIFFE_ENDPOINT_SOCKET", e.getMessage()); }
} });
} }
} }

40
java-spiffe-core/src/test/java/io/spiffe/workloadapi/DefaultJwtSourceTest.java
View File

@ -14,6 +14,7 @@ import lombok.val;
import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import uk.org.webcompere.systemstubs.environment.EnvironmentVariables;
import java.io.IOException; import java.io.IOException;
import java.time.Duration; import java.time.Duration;
@ -257,28 +258,29 @@ class DefaultJwtSourceTest {
@Test @Test
void newSource_DefaultSocketAddress() throws Exception { void newSource_DefaultSocketAddress() throws Exception {
try { new EnvironmentVariables(Address.SOCKET_ENV_VARIABLE, "unix:/tmp/test").execute(() -> {
TestUtils.setEnvironmentVariable(Address.SOCKET_ENV_VARIABLE, "unix:/tmp/test"); try {
DefaultJwtSource.newSource(); DefaultJwtSource.newSource();
fail(); fail();
} catch (JwtSourceException e) { } catch (JwtSourceException e) {
assertEquals("Error creating JWT source", e.getMessage()); assertEquals("Error creating JWT source", e.getMessage());
} catch (SocketEndpointAddressException e) { } catch (SocketEndpointAddressException e) {
fail(); fail();
} }
});
} }
@Test @Test
void newSource_noSocketAddress() throws Exception { void newSource_noSocketAddress() throws Exception {
try { new EnvironmentVariables(Address.SOCKET_ENV_VARIABLE, "").execute(() -> {
// just in case it's defined in the environment try {
TestUtils.setEnvironmentVariable(Address.SOCKET_ENV_VARIABLE, ""); DefaultJwtSource.newSource();
DefaultJwtSource.newSource(); fail();
fail(); } catch (SocketEndpointAddressException e) {
} catch (SocketEndpointAddressException e) { fail();
fail(); } catch (IllegalStateException e) {
} catch (IllegalStateException e) { assertEquals("Endpoint Socket Address Environment Variable is not set: SPIFFE_ENDPOINT_SOCKET", e.getMessage());
assertEquals("Endpoint Socket Address Environment Variable is not set: SPIFFE_ENDPOINT_SOCKET", e.getMessage()); }
} });
} }
} }

16
java-spiffe-core/src/test/java/io/spiffe/workloadapi/DefaultWorkloadApiClientTest.java
View File

@ -20,6 +20,7 @@ import org.junit.Rule;
import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import uk.org.webcompere.systemstubs.environment.EnvironmentVariables;
import java.io.IOException; import java.io.IOException;
import java.security.KeyPair; import java.security.KeyPair;
@ -54,13 +55,14 @@ class DefaultWorkloadApiClientTest {
@Test @Test
void testNewClient_defaultOptions() throws Exception { void testNewClient_defaultOptions() throws Exception {
try { new EnvironmentVariables(Address.SOCKET_ENV_VARIABLE, "unix:/tmp/agent.sock").execute(() -> {
TestUtils.setEnvironmentVariable(Address.SOCKET_ENV_VARIABLE, "unix:/tmp/agent.sock"); try {
WorkloadApiClient client = DefaultWorkloadApiClient.newClient(); WorkloadApiClient client = DefaultWorkloadApiClient.newClient();
assertNotNull(client); assertNotNull(client);
} catch (SocketEndpointAddressException e) { } catch (SocketEndpointAddressException e) {
fail(e); fail(e);
} }
});
} }
@Test @Test

22
java-spiffe-core/src/test/java/io/spiffe/workloadapi/DefaultX509SourceTest.java
View File

@ -7,11 +7,11 @@ import io.spiffe.exception.X509SourceException;
import io.spiffe.spiffeid.SpiffeId; import io.spiffe.spiffeid.SpiffeId;
import io.spiffe.spiffeid.TrustDomain; import io.spiffe.spiffeid.TrustDomain;
import io.spiffe.svid.x509svid.X509Svid; import io.spiffe.svid.x509svid.X509Svid;
import io.spiffe.utils.TestUtils;
import lombok.val; import lombok.val;
import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import uk.org.webcompere.systemstubs.environment.EnvironmentVariables;
import java.time.Duration; import java.time.Duration;
@ -162,15 +162,15 @@ class DefaultX509SourceTest {
@Test @Test
void newSource_noSocketAddress() throws Exception { void newSource_noSocketAddress() throws Exception {
try { new EnvironmentVariables(Address.SOCKET_ENV_VARIABLE, "").execute(() -> {
// just in case the variable is defined in the environment try {
TestUtils.setEnvironmentVariable(Address.SOCKET_ENV_VARIABLE, ""); DefaultX509Source.newSource();
DefaultX509Source.newSource(); fail();
fail(); } catch (X509SourceException | SocketEndpointAddressException e) {
} catch (X509SourceException | SocketEndpointAddressException e) { fail();
fail(); } catch (IllegalStateException e) {
} catch (IllegalStateException e) { assertEquals("Endpoint Socket Address Environment Variable is not set: SPIFFE_ENDPOINT_SOCKET", e.getMessage());
assertEquals("Endpoint Socket Address Environment Variable is not set: SPIFFE_ENDPOINT_SOCKET", e.getMessage()); }
} });
} }
} }

31
java-spiffe-core/src/testFixtures/java/io/spiffe/utils/TestUtils.java
View File

@ -107,38 +107,7 @@ public class TestUtils {
.build(); .build();
} }
public static void setEnvironmentVariable(String variableName, String value) throws Exception {
Class<?> processEnvironment = Class.forName("java.lang.ProcessEnvironment");
Field unmodifiableMapField = getField(processEnvironment, "theUnmodifiableEnvironment");
Object unmodifiableMap = unmodifiableMapField.get(null);
injectIntoUnmodifiableMap(variableName, value, unmodifiableMap);
Field mapField = getField(processEnvironment, "theEnvironment");
Map<String, String> map = (Map<String, String>) mapField.get(null);
map.put(variableName, value);
}
public static Object invokeMethod(Class<?> clazz, String methodName, Object... args) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
Method method = clazz.getDeclaredMethod(methodName);
method.setAccessible(true);
return method.invoke(args);
}
public static Field getField(Class<?> clazz, String fieldName) throws NoSuchFieldException {
Field field = clazz.getDeclaredField(fieldName);
field.setAccessible(true);
return field;
}
public static URI toUri(String path) throws URISyntaxException { public static URI toUri(String path) throws URISyntaxException {
return Thread.currentThread().getContextClassLoader().getResource(path).toURI(); return Thread.currentThread().getContextClassLoader().getResource(path).toURI();
} }
private static void injectIntoUnmodifiableMap(String key, String value, Object map) throws ReflectiveOperationException {
Class unmodifiableMap = Class.forName("java.util.Collections$UnmodifiableMap");
Field field = getField(unmodifiableMap, "m");
Object obj = field.get(map);
((Map<String, String>) obj).put(key, value);
}
} }

2
java-spiffe-helper/build.gradle
View File

@ -1,5 +1,5 @@
plugins { plugins {
id "com.github.johnrengelman.shadow" version "5.2.0" id "com.github.johnrengelman.shadow" version "${shadowVersion}"
} }
description = "Java SPIFFE Library Helper module to store X.509 SVIDs and Bundles in a Java KeyStore in disk" description = "Java SPIFFE Library Helper module to store X.509 SVIDs and Bundles in a Java KeyStore in disk"

16
java-spiffe-helper/src/test/java/io/spiffe/helper/keystore/KeyStoreHelperTest.java
View File

@ -13,6 +13,7 @@ import org.apache.commons.lang3.RandomStringUtils;
import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import uk.org.webcompere.systemstubs.environment.EnvironmentVariables;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
@ -190,13 +191,14 @@ class KeyStoreHelperTest {
@Test @Test
void testCreateKeyStoreHelper_createNewClient() throws Exception { void testCreateKeyStoreHelper_createNewClient() throws Exception {
TestUtils.setEnvironmentVariable(Address.SOCKET_ENV_VARIABLE, "unix:/tmp/test"); new EnvironmentVariables(Address.SOCKET_ENV_VARIABLE, "unix:/tmp/test").execute(() -> {
val options = getKeyStoreValidOptions(null); val options = getKeyStoreValidOptions(null);
try { try {
KeyStoreHelper.create(options); KeyStoreHelper.create(options);
} catch (KeyStoreHelperException e) { } catch (KeyStoreHelperException e) {
fail(); fail();
} }
});
} }
@Test @Test

2
java-spiffe-provider/build.gradle
View File

@ -1,5 +1,5 @@
plugins { plugins {
id "com.github.johnrengelman.shadow" version "5.2.0" id "com.github.johnrengelman.shadow" version "${shadowVersion}"
} }
description = "Java Security Provider implementation supporting X.509-SVIDs and methods for " + description = "Java Security Provider implementation supporting X.509-SVIDs and methods for " +

14
java-spiffe-provider/src/test/java/io/spiffe/provider/X509SourceManagerTest.java
View File

@ -4,6 +4,7 @@ import io.spiffe.utils.TestUtils;
import io.spiffe.workloadapi.Address; import io.spiffe.workloadapi.Address;
import io.spiffe.workloadapi.X509Source; import io.spiffe.workloadapi.X509Source;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import uk.org.webcompere.systemstubs.environment.EnvironmentVariables;
import java.lang.reflect.Field; import java.lang.reflect.Field;
@ -24,11 +25,12 @@ class X509SourceManagerTest {
@Test @Test
void getX509Source_defaultAddressNotSet() throws Exception { void getX509Source_defaultAddressNotSet() throws Exception {
TestUtils.setEnvironmentVariable(Address.SOCKET_ENV_VARIABLE, "" ); new EnvironmentVariables(Address.SOCKET_ENV_VARIABLE, "").execute(() -> {
try { try {
X509SourceManager.getX509Source(); X509SourceManager.getX509Source();
} catch (IllegalStateException e) { } catch (IllegalStateException e) {
assertEquals("Endpoint Socket Address Environment Variable is not set: SPIFFE_ENDPOINT_SOCKET", e.getMessage()); assertEquals("Endpoint Socket Address Environment Variable is not set: SPIFFE_ENDPOINT_SOCKET", e.getMessage());
} }
});
} }
} }