Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 16 additions & 17 deletions encryption-service-jasypt/gradle.lockfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.auth0:java-jwt:4.6.0=testRuntimeClasspath
com.auth0:java-jwt:4.6.1=testRuntimeClasspath
com.datadoghq:dd-trace-api:1.38.0=testRuntimeClasspath
com.fasterxml.jackson.core:jackson-annotations:2.22=testRuntimeClasspath
com.fasterxml.jackson.core:jackson-core:2.22.0=testRuntimeClasspath
com.fasterxml.jackson.core:jackson-databind:2.22.0=testRuntimeClasspath
com.fasterxml.jackson:jackson-bom:2.22.0=testRuntimeClasspath
com.fasterxml.jackson.core:jackson-core:2.22.3=testRuntimeClasspath
com.fasterxml.jackson.core:jackson-databind:2.22.3=testRuntimeClasspath
com.fasterxml.jackson:jackson-bom:2.22.3=testRuntimeClasspath
com.github.oowekyala.ooxml:nice-xml-messages:3.1=pmd
com.github.rholder:guava-retrying:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.github.spotbugs:spotbugs-annotations:4.10.2=annotationProcessor,testAnnotationProcessor
com.github.spotbugs:spotbugs-annotations:4.10.3=compileClasspath,spotbugs,testCompileClasspath
com.github.spotbugs:spotbugs:4.10.3=spotbugs
com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs,testCompileClasspath
com.github.spotbugs:spotbugs:4.10.4=spotbugs
com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs
com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,runtimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
com.google.code.gson:gson:2.13.2=pmd
Expand All @@ -26,13 +26,13 @@ com.google.guava:guava:33.6.0-jre=checkstyle
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.google.j2objc:j2objc-annotations:2.8=compileClasspath,testCompileClasspath
com.google.j2objc:j2objc-annotations:3.1=checkstyle
com.mx.path-core:common:8.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:context:8.0.0=testRuntimeClasspath
com.mx.path-core:gateway:8.0.0=testRuntimeClasspath
com.mx.path-core:messaging:8.0.0=testRuntimeClasspath
com.mx.path-core:platform:8.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:testing:8.0.0=testCompileClasspath,testRuntimeClasspath
com.mx.path-core:utilities:8.0.0=testRuntimeClasspath
com.mx.path-core:common:8.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:context:8.0.1=testRuntimeClasspath
com.mx.path-core:gateway:8.0.1=testRuntimeClasspath
com.mx.path-core:messaging:8.0.1=testRuntimeClasspath
com.mx.path-core:platform:8.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:testing:8.0.1=testCompileClasspath,testRuntimeClasspath
com.mx.path-core:utilities:8.0.1=testRuntimeClasspath
com.puppycrawl.tools:checkstyle:13.7.0=checkstyle
com.sun.istack:istack-commons-runtime:4.1.2=testRuntimeClasspath
commons-beanutils:commons-beanutils:1.11.0=checkstyle
Expand Down Expand Up @@ -106,8 +106,7 @@ org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntime
org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath
org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath
org.junit:junit-bom:6.1.0=annotationProcessor,testAnnotationProcessor
org.junit:junit-bom:6.1.2=spotbugs
org.mockito:mockito-core:5.23.0=testCompileClasspath,testRuntimeClasspath
org.mockito:mockito-core:5.24.0=testCompileClasspath,testRuntimeClasspath
org.objenesis:objenesis:3.3=runtimeClasspath,testRuntimeClasspath
org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
org.ow2.asm:asm-analysis:9.10.1=spotbugs
Expand All @@ -120,7 +119,7 @@ org.ow2.asm:asm:9.10.1=spotbugs
org.ow2.asm:asm:9.9=jacocoAnt
org.ow2.asm:asm:9.9.1=pmd
org.pcollections:pcollections:4.0.2=pmd
org.projectlombok:lombok:1.18.44=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath
org.projectlombok:lombok:1.18.48=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath
org.reflections:reflections:0.10.2=checkstyle,testRuntimeClasspath
org.slf4j:jul-to-slf4j:1.7.36=pmd
org.slf4j:slf4j-api:1.7.30=compileClasspath,runtimeClasspath,testCompileClasspath
Expand All @@ -134,4 +133,4 @@ org.spockframework:spock-bom:2.4-groovy-4.0=testCompileClasspath,testRuntimeClas
org.spockframework:spock-core:2.4-groovy-4.0=testCompileClasspath,testRuntimeClasspath
org.xmlresolver:xmlresolver:5.3.3=checkstyle,pmd,spotbugs
org.yaml:snakeyaml:2.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
empty=signatures,spotbugsPlugins
empty=spotbugsPlugins
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ class JasyptEncryptionServiceTest extends Specification implements WithMockery {
plaintext == value

where:
value | _
null | _
"" | _
value | _
null | _
"" | _
"some unencrypted junk" | _
}

Expand Down
33 changes: 16 additions & 17 deletions encryption-service-vault/gradle.lockfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.auth0:java-jwt:4.6.0=testRuntimeClasspath
com.auth0:java-jwt:4.6.1=testRuntimeClasspath
com.bettercloud:vault-java-driver:5.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.datadoghq:dd-trace-api:1.38.0=testRuntimeClasspath
com.fasterxml.jackson.core:jackson-annotations:2.22=testRuntimeClasspath
com.fasterxml.jackson.core:jackson-core:2.22.0=testRuntimeClasspath
com.fasterxml.jackson.core:jackson-databind:2.22.0=testRuntimeClasspath
com.fasterxml.jackson:jackson-bom:2.22.0=testRuntimeClasspath
com.fasterxml.jackson.core:jackson-core:2.22.3=testRuntimeClasspath
com.fasterxml.jackson.core:jackson-databind:2.22.3=testRuntimeClasspath
com.fasterxml.jackson:jackson-bom:2.22.3=testRuntimeClasspath
com.github.oowekyala.ooxml:nice-xml-messages:3.1=pmd
com.github.rholder:guava-retrying:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.github.spotbugs:spotbugs-annotations:4.10.2=annotationProcessor,testAnnotationProcessor
com.github.spotbugs:spotbugs-annotations:4.10.3=compileClasspath,spotbugs,testCompileClasspath
com.github.spotbugs:spotbugs:4.10.3=spotbugs
com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs,testCompileClasspath
com.github.spotbugs:spotbugs:4.10.4=spotbugs
com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs
com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,runtimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
com.google.code.gson:gson:2.13.2=pmd
Expand All @@ -27,13 +27,13 @@ com.google.guava:guava:33.6.0-jre=checkstyle
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.google.j2objc:j2objc-annotations:2.8=compileClasspath,testCompileClasspath
com.google.j2objc:j2objc-annotations:3.1=checkstyle
com.mx.path-core:common:8.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:context:8.0.0=testRuntimeClasspath
com.mx.path-core:gateway:8.0.0=testRuntimeClasspath
com.mx.path-core:messaging:8.0.0=testRuntimeClasspath
com.mx.path-core:platform:8.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:testing:8.0.0=testCompileClasspath,testRuntimeClasspath
com.mx.path-core:utilities:8.0.0=testRuntimeClasspath
com.mx.path-core:common:8.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:context:8.0.1=testRuntimeClasspath
com.mx.path-core:gateway:8.0.1=testRuntimeClasspath
com.mx.path-core:messaging:8.0.1=testRuntimeClasspath
com.mx.path-core:platform:8.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:testing:8.0.1=testCompileClasspath,testRuntimeClasspath
com.mx.path-core:utilities:8.0.1=testRuntimeClasspath
com.puppycrawl.tools:checkstyle:13.7.0=checkstyle
com.sun.istack:istack-commons-runtime:4.1.2=testRuntimeClasspath
commons-beanutils:commons-beanutils:1.11.0=checkstyle
Expand Down Expand Up @@ -106,8 +106,7 @@ org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntime
org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath
org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath
org.junit:junit-bom:6.1.0=annotationProcessor,testAnnotationProcessor
org.junit:junit-bom:6.1.2=spotbugs
org.mockito:mockito-core:5.23.0=testCompileClasspath,testRuntimeClasspath
org.mockito:mockito-core:5.24.0=testCompileClasspath,testRuntimeClasspath
org.objenesis:objenesis:3.3=runtimeClasspath,testRuntimeClasspath
org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
org.ow2.asm:asm-analysis:9.10.1=spotbugs
Expand All @@ -120,7 +119,7 @@ org.ow2.asm:asm:9.10.1=spotbugs
org.ow2.asm:asm:9.9=jacocoAnt
org.ow2.asm:asm:9.9.1=pmd
org.pcollections:pcollections:4.0.2=pmd
org.projectlombok:lombok:1.18.44=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath
org.projectlombok:lombok:1.18.48=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath
org.reflections:reflections:0.10.2=checkstyle,testRuntimeClasspath
org.slf4j:jul-to-slf4j:1.7.36=pmd
org.slf4j:slf4j-api:1.7.30=compileClasspath,runtimeClasspath,testCompileClasspath
Expand All @@ -134,4 +133,4 @@ org.spockframework:spock-bom:2.4-groovy-4.0=testCompileClasspath,testRuntimeClas
org.spockframework:spock-core:2.4-groovy-4.0=testCompileClasspath,testRuntimeClasspath
org.xmlresolver:xmlresolver:5.3.3=checkstyle,pmd,spotbugs
org.yaml:snakeyaml:2.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
empty=signatures,spotbugsPlugins
empty=spotbugsPlugins
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,11 @@ class VaultEncryptionServiceTest extends Specification {
driver.getClass() == Vault

where:
config | _
configWithAppId() | _
configWithToken() | _
configWithAppRole() | _
configWithAppRoleSSL() | _
config | _
configWithAppId() | _
configWithToken() | _
configWithAppRole() | _
configWithAppRoleSSL() | _
}

@Unroll
Expand Down Expand Up @@ -166,15 +166,17 @@ class VaultEncryptionServiceTest extends Specification {
plaintext == null

where:
config | _
configWithAppId() | _
configWithToken() | _
config | _
configWithAppId() | _
configWithToken() | _
configWithAppRole() | _
}

def "decrypt() returns input when not enabled"() {
given:
subject = new VaultEncryptionService(new VaultEncryptionServiceConfiguration().tap { setEnabled(false) })
subject = new VaultEncryptionService(new VaultEncryptionServiceConfiguration().tap {
setEnabled(false)
})

when:
def plaintext = subject.decrypt("vault-12345")
Expand Down Expand Up @@ -212,15 +214,17 @@ class VaultEncryptionServiceTest extends Specification {
plaintext == null

where:
config | _
configWithAppId() | _
configWithToken() | _
config | _
configWithAppId() | _
configWithToken() | _
configWithAppRole() | _
}

def "encrypt() returns input when not enabled"() {
given:
subject = new VaultEncryptionService(new VaultEncryptionServiceConfiguration().tap { setEnabled(false) })
subject = new VaultEncryptionService(new VaultEncryptionServiceConfiguration().tap {
setEnabled(false)
})

when:
def ciphertext = subject.encrypt("plaintext")
Expand All @@ -240,9 +244,9 @@ class VaultEncryptionServiceTest extends Specification {
subject.isEncrypted("vault-1231827361")

where:
config | _
configWithAppId() | _
configWithToken() | _
config | _
configWithAppId() | _
configWithToken() | _
configWithAppRole() | _
}

Expand All @@ -265,9 +269,9 @@ class VaultEncryptionServiceTest extends Specification {
verify(subject).resetDriver() || true

where:
config | _
configWithAppId() | _
configWithToken() | _
config | _
configWithAppId() | _
configWithToken() | _
configWithAppRole() | _
}

Expand Down Expand Up @@ -344,9 +348,9 @@ class VaultEncryptionServiceTest extends Specification {
verify(subject).resetDriver() || true

where:
config | _
configWithAppId() | _
configWithToken() | _
config | _
configWithAppId() | _
configWithToken() | _
configWithAppRole() | _
}

Expand Down Expand Up @@ -417,9 +421,9 @@ class VaultEncryptionServiceTest extends Specification {
true

where:
config | _
configWithAppId() | _
configWithToken() | _
config | _
configWithAppId() | _
configWithToken() | _
configWithAppRole() | _
}

Expand All @@ -439,9 +443,9 @@ class VaultEncryptionServiceTest extends Specification {
noExceptionThrown()

where:
config | _
configWithAppId() | _
configWithToken() | _
config | _
configWithAppId() | _
configWithToken() | _
configWithAppRole() | _
}

Expand All @@ -461,11 +465,11 @@ class VaultEncryptionServiceTest extends Specification {
when(authResponse.getAuthClientToken()).thenReturn("token12345")

def key = VaultTransitKey.builder().keys([
"1": 123,
"2": 456,
"3": 789,
"4": 1123,
"5": 1456
"1": 123,
"2": 456,
"3": 789,
"4": 1123,
"5": 1456
]).build()

doReturn(vaultDriver).when(subject).buildVaultDriver(any())
Expand All @@ -475,16 +479,16 @@ class VaultEncryptionServiceTest extends Specification {
subject.rotateKeys()
verify(logicalDriver).write("transit/keys/" + config.getKeyName() + "/rotate", null)
verify(logicalDriver).write("transit/keys/" + config.getKeyName() + "/config", ImmutableMap.of(
"min_decryption_version", 3,
"min_encryption_version", 3))
"min_decryption_version", 3,
"min_encryption_version", 3))

then:
true

where:
config | _
configWithAppId() | _
configWithToken() | _
config | _
configWithAppId() | _
configWithToken() | _
configWithAppRole() | _
}

Expand Down Expand Up @@ -522,16 +526,16 @@ class VaultEncryptionServiceTest extends Specification {

subject.setMinVersion(12)
verify(logicalDriver).write("transit/keys/" + config.getKeyName() + "/config", ImmutableMap.of(
"min_decryption_version", 12,
"min_encryption_version", 12))
"min_decryption_version", 12,
"min_encryption_version", 12))

then:
true

where:
config | _
configWithAppId() | _
configWithToken() | _
config | _
configWithAppId() | _
configWithToken() | _
configWithAppRole() | _
}

Expand All @@ -541,7 +545,7 @@ class VaultEncryptionServiceTest extends Specification {
subject = new VaultEncryptionService(config)
subject.setDriver(vaultDriver)

def responseBody = "" +
def responseBody = "" +
"{" +
"'data' : {" +
"'type' : 'aes256-gcm96'," +
Expand Down Expand Up @@ -577,9 +581,9 @@ class VaultEncryptionServiceTest extends Specification {
key.getClass() == VaultTransitKey

where:
config | _
configWithAppId() | _
configWithToken() | _
config | _
configWithAppId() | _
configWithToken() | _
configWithAppRole() | _
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class VaultTransitKeyTest extends Specification {

def "fromJsonObject sets all properties"() {
given:
def body = "{" +
def body = "{" +
"'data' : {" +
"'type' : 'aes256-gcm96'," +
"'deletion_allowed' : false," +
Expand Down Expand Up @@ -61,7 +61,7 @@ class VaultTransitKeyTest extends Specification {

def "fromJsonObject works with blanks"() {
given:
String body = "" +
String body = "" +
"{" +
"'data' : {" +
"'keys' : {" +
Expand Down
5 changes: 2 additions & 3 deletions exception-reporter-honeybadger/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ dependencies {

constraints {
// Transitive dependency of io.honeybadger:honeybadger-java:2.1.2
api("com.fasterxml.jackson.core:jackson-core:2.21.1") {
because "Fixes High Severity vulnerabilities: SNYK-JAVA-COMFASTERXMLJACKSONCORE-10500754, " +
"SNYK-JAVA-COMFASTERXMLJACKSONCORE-15365924, and SNYK-JAVA-COMFASTERXMLJACKSONCORE-7569538"
api("com.fasterxml.jackson.core:jackson-core:2.22.3") {
because "Fixes High Severity vulnerabilities"
}
}
}
Loading
Loading