Skip to content

Support for new test certificates #175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 8, 2025
Merged

Support for new test certificates #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7fddcab
Support for new test certificates
thburnett Sep 3, 2025
be3dee1
Support for new test certificates
thburnett Sep 3, 2025
8d1c5df
Support for new test certificates
thburnett Sep 3, 2025
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
7 changes: 6 additions & 1 deletion .nais/ebms-async-dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,10 @@ spec:
rules:
- application: smtp-transport
env:
- name: KEYSTORE_FILE
- name: KEYSTORE_FILE_SIGN_2022
value: /var/run/secrets/ebms-keystore-signering/signering-key.p12
- name: KEYSTORE_FILE_SIGN_2025
value: /var/run/secrets/ebms-keystore-2025/nav_signing_test.p12
- name: EMOTTAK_LOGGING_LEVEL
value: DEBUG
- name: MAX_CONNECTION_POOL_SIZE_FOR_USER
Expand Down Expand Up @@ -100,6 +102,9 @@ spec:
value: http://emottak-event-manager
envFrom:
- secret: ebms-payload-secret
- secret: ebms-keystore-pwd-2025
filesFrom:
- secret: ebms-keystore-signering
mountPath: /var/run/secrets/ebms-keystore-signering
- secret: ebms-keystore-2025
mountPath: /var/run/secrets/ebms-keystore-2025
11 changes: 9 additions & 2 deletions .nais/ebms-payload-dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,23 @@ spec:
webproxy: true
envFrom:
- secret: ebms-payload-secret
- secret: ebms-keystore-pwd-2025
filesFrom:
- secret: ebms-payload-sign-keystore
mountPath: /var/run/secrets/ebms-signing-keystore
- secret: ebms-payload-enc-keystore
mountPath: /var/run/secrets/ebms-encryption-keystore
- secret: ebms-keystore-2025
mountPath: /var/run/secrets/ebms-keystore-2025
env:
- name: KEYSTORE_FILE_DEKRYPT
- name: KEYSTORE_FILE_DEKRYPT_2022
value: /var/run/secrets/ebms-encryption-keystore/nav_encryption_test.p12
- name: KEYSTORE_FILE_SIGN
- name: KEYSTORE_FILE_SIGN_2022
value: /var/run/secrets/ebms-signing-keystore/nav_signing_test.p12
- name: KEYSTORE_FILE_DEKRYPT_2025
value: /var/run/secrets/ebms-keystore-2025/nav_encryption_test.p12
- name: KEYSTORE_FILE_SIGN_2025
value: /var/run/secrets/ebms-keystore-2025/nav_signing_test.p12
- name: EMOTTAK_LOGGING_LEVEL
value: DEBUG
- name: TRUSTSTORE_PATH
Expand Down
7 changes: 6 additions & 1 deletion .nais/ebms-provider-dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,10 @@ spec:
- application: ebms-payload
- application: ebms-send-in
env:
- name: KEYSTORE_FILE
- name: KEYSTORE_FILE_SIGN_2022
value: /var/run/secrets/ebms-keystore-signering/signering-key.p12
- name: KEYSTORE_FILE_SIGN_2025
value: /var/run/secrets/ebms-keystore-2025/nav_signing_test.p12
- name: EMOTTAK_LOGGING_LEVEL
value: DEBUG
- name: CPA_REPO_URL
Expand All @@ -77,6 +79,9 @@ spec:
value: http://smtp-transport
envFrom:
- secret: ebms-payload-secret
- secret: ebms-keystore-pwd-2025
filesFrom:
- secret: ebms-keystore-signering
mountPath: /var/run/secrets/ebms-keystore-signering
- secret: ebms-keystore-2025
mountPath: /var/run/secrets/ebms-keystore-2025
7 changes: 6 additions & 1 deletion ebms-payload/src/main/kotlin/no/nav/emottak/payload/crypto/Dekryptering.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,14 @@ private fun dekrypteringConfig() =
// Fixme burde egentlig hente fra dev vault context for å matche prod oppførsel
listOf(
FileKeyStoreConfig(
keyStoreFilePath = getEnvVar("KEYSTORE_FILE_DEKRYPT"),
keyStoreFilePath = getEnvVar("KEYSTORE_FILE_DEKRYPT_2022"),
keyStorePass = getEnvVar("KEYSTORE_PWD").toCharArray(),
keyStoreType = getEnvVar("KEYSTORE_TYPE", "PKCS12")
),
FileKeyStoreConfig(
keyStoreFilePath = getEnvVar("KEYSTORE_FILE_DEKRYPT_2025"),
keyStorePass = getEnvVar("KEYSTORE_PWD_2025").toCharArray(),
keyStoreType = getEnvVar("KEYSTORE_TYPE", "PKCS12")
)
)
"prod-fss" ->
Expand Down
7 changes: 6 additions & 1 deletion ebms-payload/src/main/kotlin/no/nav/emottak/payload/crypto/PayloadSignering.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,14 @@ fun payloadSigneringConfig() =
// Fixme burde egentlig hente fra dev vault context for å matche prod oppførsel
listOf(
FileKeyStoreConfig(
keyStoreFilePath = getEnvVar("KEYSTORE_FILE_SIGN"),
keyStoreFilePath = getEnvVar("KEYSTORE_FILE_SIGN_2022"),
keyStorePass = getEnvVar("KEYSTORE_PWD").toCharArray(),
keyStoreType = getEnvVar("KEYSTORE_TYPE", "PKCS12")
),
FileKeyStoreConfig(
keyStoreFilePath = getEnvVar("KEYSTORE_FILE_SIGN_2025"),
keyStorePass = getEnvVar("KEYSTORE_PWD_2025").toCharArray(),
keyStoreType = getEnvVar("KEYSTORE_TYPE", "PKCS12")
)
)
"prod-fss" ->
Expand Down
7 changes: 6 additions & 1 deletion ebms-provider/src/main/kotlin/no/nav/emottak/ebms/xml/EbMSSigning.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,14 @@ fun signeringConfig() =
// Fixme burde egentlig hente fra dev vault context for å matche prod oppførsel
listOf(
FileKeyStoreConfig(
keyStoreFilePath = getEnvVar("KEYSTORE_FILE"),
keyStoreFilePath = getEnvVar("KEYSTORE_FILE_SIGN_2022"),
keyStorePass = getEnvVar("KEYSTORE_PWD").toCharArray(),
keyStoreType = getEnvVar("KEYSTORE_TYPE", "PKCS12")
),
FileKeyStoreConfig(
keyStoreFilePath = getEnvVar("KEYSTORE_FILE_SIGN_2025"),
keyStorePass = getEnvVar("KEYSTORE_PWD_2025").toCharArray(),
keyStoreType = getEnvVar("KEYSTORE_TYPE", "PKCS12")
)
)
"prod-fss" ->
Expand Down