Skip to content

Commit af63ab7

Browse files
nutgaardnutgaard
authored
Merge pull request #9 from navikt/vault
Vault
2 parents cea8f76 + 83f1130 commit af63ab7

File tree

11 files changed

+77
-15
lines changed

11 files changed

+77
-15
lines changed

‎consumer/src/main/java/no/nav/sbl/dialogarena/modiabrukerdialog/consumer/config/endpoint/v1/norg/NorgEndpointFelles.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@
1010
import java.util.Map;
1111

1212
public class NorgEndpointFelles {
13+
public static final String KJERNEINFO_TJENESTEBUSS_USERNAME = "SRV_KJERNEINFO_TJENESTEBUSS_USERNAME";
14+
public static final String KJERNEINFO_TJENESTEBUSS_PASSWORD = "SRV_KJERNEINFO_TJENESTEBUSS_PASSWORD";
15+
1316
public static Map<String, Object> getSecurityProps() {
14-
final String user = EnvironmentUtils.getRequiredProperty("ctjenestebuss.username", "SRV_KJERNEINFO_TJENESTEBUSS_USERNAME");
15-
final String password = EnvironmentUtils.getRequiredProperty("ctjenestebuss.password", "SRV_KJERNEINFO_TJENESTEBUSS_PASSWORD");
17+
final String user = EnvironmentUtils.getRequiredProperty("ctjenestebuss.username", KJERNEINFO_TJENESTEBUSS_USERNAME);
18+
final String password = EnvironmentUtils.getRequiredProperty("ctjenestebuss.password", KJERNEINFO_TJENESTEBUSS_PASSWORD);
1619

1720
Map<String, Object> props = new HashMap<>();
1821
props.put(WSHandlerConstants.ACTION, WSHandlerConstants.USERNAME_TOKEN);

‎consumer/src/main/java/no/nav/sbl/dialogarena/modiabrukerdialog/consumer/service/ldap/LdapContextProvider.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,15 @@ public class LdapContextProvider {
1313
@SuppressWarnings("PMD")
1414
private static Hashtable<String, String> env = new Hashtable<>();
1515

16+
public static final String LDAP_USERNAME = "LDAP_USERNAME";
17+
public static final String LDAP_PASSWORD = "LDAP_PASSWORD";
18+
1619
static {
1720
env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");
1821
env.put(Context.SECURITY_AUTHENTICATION, "simple");
1922
env.put(Context.PROVIDER_URL, EnvironmentUtils.getRequiredProperty("LDAP_URL"));
20-
env.put(Context.SECURITY_PRINCIPAL, EnvironmentUtils.getRequiredProperty("LDAP_USERNAME"));
21-
env.put(Context.SECURITY_CREDENTIALS, EnvironmentUtils.getRequiredProperty("LDAP_PASSWORD"));
23+
env.put(Context.SECURITY_PRINCIPAL, EnvironmentUtils.getRequiredProperty(LDAP_USERNAME));
24+
env.put(Context.SECURITY_CREDENTIALS, EnvironmentUtils.getRequiredProperty(LDAP_PASSWORD));
2225
}
2326

2427
public LdapContext getInitialLdapContext() {

‎deploy/naiserator-q0.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,13 @@ spec:
3939
max: 4
4040
cpuThresholdPercentage: 60
4141
vault:
42-
enabled: true
42+
enabled: true
43+
paths:
44+
- kvPath: /kv/preprod/fss/modiapersonoversikt-api/q0
45+
mountPath: /var/run/secrets/nais.io/vault
46+
- kvPath: /serviceuser/data/dev/srvmodiabrukerdialog
47+
mountPath: /var/run/secrets/nais.io/service_user
48+
- kvPath: /serviceuser/data/dev/srvssolinux
49+
mountPath: /var/run/secrets/nais.io/ldap_user
50+
- kvPath: /serviceuser/data/dev/srvgosys
51+
mountPath: /var/run/secrets/nais.io/gosys_user

‎deploy/naiserator-q1.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,13 @@ spec:
3939
max: 2
4040
cpuThresholdPercentage: 60
4141
vault:
42-
enabled: true
42+
enabled: true
43+
paths:
44+
- kvPath: /kv/preprod/fss/modiapersonoversikt-api/q1
45+
mountPath: /var/run/secrets/nais.io/vault
46+
- kvPath: /serviceuser/data/dev/srvmodiabrukerdialog
47+
mountPath: /var/run/secrets/nais.io/service_user
48+
- kvPath: /serviceuser/data/dev/srvssolinux
49+
mountPath: /var/run/secrets/nais.io/ldap_user
50+
- kvPath: /serviceuser/data/dev/srvgosys
51+
mountPath: /var/run/secrets/nais.io/gosys_user

‎deploy/naiserator-q6.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,13 @@ spec:
3939
max: 2
4040
cpuThresholdPercentage: 60
4141
vault:
42-
enabled: true
42+
enabled: true
43+
paths:
44+
- kvPath: /kv/preprod/fss/modiapersonoversikt-api/q6
45+
mountPath: /var/run/secrets/nais.io/vault
46+
- kvPath: /serviceuser/data/dev/srvmodiabrukerdialog
47+
mountPath: /var/run/secrets/nais.io/service_user
48+
- kvPath: /serviceuser/data/dev/srvssolinux
49+
mountPath: /var/run/secrets/nais.io/ldap_user
50+
- kvPath: /serviceuser/data/dev/srvgosys
51+
mountPath: /var/run/secrets/nais.io/gosys_user

‎deploy/naiserator.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,13 @@ spec:
3838
prometheus:
3939
enabled: false
4040
vault:
41-
enabled: true
41+
enabled: true
42+
paths:
43+
- kvPath: /kv/prod/fss/modiapersonoversikt-api/default
44+
mountPath: /var/run/secrets/nais.io/vault
45+
- kvPath: /serviceuser/data/prod/srvmodiabrukerdialog
46+
mountPath: /var/run/secrets/nais.io/service_user
47+
- kvPath: /serviceuser/data/prod/srvssolinux
48+
mountPath: /var/run/secrets/nais.io/ldap_user
49+
- kvPath: /serviceuser/data/prod/srvgosys
50+
mountPath: /var/run/secrets/nais.io/gosys_user

‎web/src/main/java/Main.java

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11

22
import no.nav.apiapp.ApiApp;
3-
import no.nav.sbl.dialogarena.common.cxf.StsSecurityConstants;
3+
import no.nav.brukerdialog.tools.SecurityConstants;
4+
import no.nav.common.utils.NaisUtils;
5+
import no.nav.sbl.dialogarena.common.abac.pep.CredentialConstants;
6+
import no.nav.sbl.dialogarena.modiabrukerdialog.consumer.service.ldap.LdapContextProvider;
47
import no.nav.sbl.dialogarena.modiabrukerdialog.web.config.ModiaApplicationContext;
58
import no.nav.sbl.util.EnvironmentUtils;
69
import org.slf4j.Logger;
@@ -13,7 +16,10 @@
1316
import java.util.HashSet;
1417
import java.util.Properties;
1518

16-
import static java.util.stream.Collectors.toSet;
19+
import static no.nav.sbl.dialogarena.modiabrukerdialog.consumer.config.endpoint.v1.norg.NorgEndpointFelles.KJERNEINFO_TJENESTEBUSS_PASSWORD;
20+
import static no.nav.sbl.dialogarena.modiabrukerdialog.consumer.config.endpoint.v1.norg.NorgEndpointFelles.KJERNEINFO_TJENESTEBUSS_USERNAME;
21+
import static no.nav.sbl.util.EnvironmentUtils.Type.PUBLIC;
22+
import static no.nav.sbl.util.EnvironmentUtils.Type.SECRET;
1723
import static no.nav.sbl.util.EnvironmentUtils.getRequiredProperty;
1824

1925
public class Main {
@@ -28,12 +34,26 @@ public static void main(String... args) throws FileNotFoundException {
2834
);
2935

3036
// Overstyrer appnavn slik at vi er sikre på at vi later som vi er modiabrukerdialog. ;)
31-
System.setProperty("NAIS_APP_NAME", "modiabrukerdialog");
37+
EnvironmentUtils.setProperty("NAIS_APP_NAME", "modiabrukerdialog", PUBLIC);
3238

3339
ApiApp.runApp(ModiaApplicationContext.class, args);
3440
}
3541

3642
private static void loadVaultSecrets() throws FileNotFoundException {
43+
NaisUtils.Credentials serviceUser = NaisUtils.getCredentials("service_user");
44+
EnvironmentUtils.setProperty(CredentialConstants.SYSTEMUSER_USERNAME, serviceUser.username, PUBLIC);
45+
EnvironmentUtils.setProperty(CredentialConstants.SYSTEMUSER_PASSWORD, serviceUser.password, SECRET);
46+
EnvironmentUtils.setProperty(SecurityConstants.SYSTEMUSER_USERNAME, serviceUser.username, PUBLIC);
47+
EnvironmentUtils.setProperty(SecurityConstants.SYSTEMUSER_PASSWORD, serviceUser.password, SECRET);
48+
49+
NaisUtils.Credentials ldapUser = NaisUtils.getCredentials("ldap_user");
50+
EnvironmentUtils.setProperty(LdapContextProvider.LDAP_USERNAME, ldapUser.username, PUBLIC);
51+
EnvironmentUtils.setProperty(LdapContextProvider.LDAP_PASSWORD, ldapUser.password, SECRET);
52+
53+
NaisUtils.Credentials gosysUser = NaisUtils.getCredentials("gosys_user");
54+
EnvironmentUtils.setProperty(KJERNEINFO_TJENESTEBUSS_USERNAME, gosysUser.username, PUBLIC);
55+
EnvironmentUtils.setProperty(KJERNEINFO_TJENESTEBUSS_PASSWORD, gosysUser.password, SECRET);
56+
3757
loadFromInputStream(new FileInputStream(VAULT_APPLICATION_PROPERTIES_PATH), true);
3858
}
3959

‎web/src/main/resources/configurations/p.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,4 +165,4 @@ VISORGANISASJONENHETKONTAKTINFORMASJON=true
165165
FEATURE_AKTIVERPERSONRESTAPI=true
166166
FEATURE_NYTTVISITTKORT=true
167167
HASTEKASSERING_TILGANG=Z992323,Z990366,Z990083
168-
OIDC_REDIRECT_URL=https\://modapp.adeo.no/modiabrukerdialog/rest/login
168+
OIDC_REDIRECT_URL=https\://app.adeo.no/modiapersonoversikt-api/rest/login

‎web/src/main/resources/configurations/q0.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,4 +165,4 @@ VISORGANISASJONENHETKONTAKTINFORMASJON=true
165165
FEATURE_AKTIVERPERSONRESTAPI=true
166166
FEATURE_NYTTVISITTKORT=true
167167
HASTEKASSERING_TILGANG=Z992323,Z990366,Z990083
168-
OIDC_REDIRECT_URL=https\://modapp-q0.adeo.no/modiabrukerdialog/rest/login
168+
OIDC_REDIRECT_URL=https\://app-q0.adeo.no/modiapersonoversikt-api/rest/login

‎web/src/main/resources/configurations/q1.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,4 +165,4 @@ VISORGANISASJONENHETKONTAKTINFORMASJON=true
165165
FEATURE_AKTIVERPERSONRESTAPI=true
166166
FEATURE_NYTTVISITTKORT=true
167167
HASTEKASSERING_TILGANG=Z992323,Z990366,Z990083
168-
OIDC_REDIRECT_URL=https\://modapp-q1.adeo.no/modiabrukerdialog/rest/login
168+
OIDC_REDIRECT_URL=https\://app-q1.adeo.no/modiapersonoversikt-api/rest/login

‎web/src/main/resources/configurations/q6.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,4 +165,4 @@ VISORGANISASJONENHETKONTAKTINFORMASJON=true
165165
FEATURE_AKTIVERPERSONRESTAPI=true
166166
FEATURE_NYTTVISITTKORT=true
167167
HASTEKASSERING_TILGANG=Z992323,Z990366,Z990083
168-
OIDC_REDIRECT_URL=https\://modapp-q6.adeo.no/modiabrukerdialog/rest/login
168+
OIDC_REDIRECT_URL=https\://app-q6.adeo.no/modiapersonoversikt-api/rest/login

0 commit comments

Comments
 (0)