Skip to content
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

[SELC-5798] feat: modify NAMIRIAL URL from test to container app #556

Merged
merged 4 commits into from
Oct 24, 2024
Merged

[SELC-5798] feat: modify NAMIRIAL URL from test to container app #556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
690ab9a
modify NAMIRIAL URL from test to container app
giulia-tremolada Oct 18, 2024
891b97d
Merge branch 'main' into feature/SELC-5798
giulia-tremolada Oct 18, 2024
3ab58c8
Merge branch 'main' into feature/SELC-5798
giulia-tremolada Oct 21, 2024
61519df
Merge branch 'main' into feature/SELC-5798
giulia-tremolada Oct 22, 2024
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
10 changes: 4 additions & 6 deletions ...unctions/src/main/java/it/pagopa/selfcare/onboarding/config/OnboardingFunctionConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ public Pkcs7HashSignService arubaPkcs7HashSignService(){
return new ArubaPkcs7HashSignServiceImpl(new ArubaSignServiceImpl());
}

public Pkcs7HashSignService namirialPkcs7HashSignService(String username, String password){
public Pkcs7HashSignService namirialPkcs7HashSignService(){
log.info("Signature will be performed using NamirialPkcs7HashSignServiceImpl");
return new NamirialPkcs7HashSignServiceImpl(new NamiralSignServiceImpl(username,password));
return new NamirialPkcs7HashSignServiceImpl(new NamiralSignServiceImpl());
}


Expand All @@ -89,12 +89,10 @@ public Pkcs7HashSignService pkcs7HashSignService(){
return new Pkcs7HashSignServiceImpl();
}
@ApplicationScoped
public PadesSignService padesSignService(@ConfigProperty(name = "onboarding-functions.pagopa-signature.source") String source,
@ConfigProperty(name = "onboarding-functions.pagopa-signature.namirial-user") String username,
@ConfigProperty(name = "onboarding-functions.pagopa-signature.namirial-psw") String psw){
public PadesSignService padesSignService(@ConfigProperty(name = "onboarding-functions.pagopa-signature.source") String source){
return switch (source) {
case SIGNATURE_SOURCE_ARUBA -> new PadesSignServiceImpl(arubaPkcs7HashSignService());
case SIGNATURE_SOURCE_NAMIRIAL -> new PadesSignServiceImpl(namirialPkcs7HashSignService(username, psw));
case SIGNATURE_SOURCE_NAMIRIAL -> new PadesSignServiceImpl(namirialPkcs7HashSignService());
case SIGNATURE_SOURCE_DISABLED -> new PadesSignServiceImpl(disabledPkcs7HashSignService());
default -> new PadesSignServiceImpl(pkcs7HashSignService());
};
Expand Down
3 changes: 0 additions & 3 deletions ...g-functions/src/main/java/it/pagopa/selfcare/onboarding/config/PagoPaSignatureConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,4 @@ public interface PagoPaSignatureConfig {

String applyOnboardingTemplateReason();

String namirialUser();

String namirialPsw();
}
2 changes: 0 additions & 2 deletions apps/onboarding-functions/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,6 @@ onboarding-functions.pagopa-signature.source=${PAGOPA_SIGNATURE_SOURCE:disabled}
onboarding-functions.pagopa-signature.signer=${PAGOPA_SIGNATURE_SIGNER:PagoPA S.p.A.}
onboarding-functions.pagopa-signature.location=${PAGOPA_SIGNATURE_LOCATION:Roma}
onboarding-functions.pagopa-signature.apply-onboarding-template-reason=${PAGOPA_SIGNATURE_ONBOARDING_REASON_TEMPLATE:Firma contratto adesione prodotto}
onboarding-functions.pagopa-signature.namirial-user=${NAMIRIAL_SIGN_SERVICE_IDENTITY_USER:test}
onboarding-functions.pagopa-signature.namirial-psw=${NAMIRIAL_SIGN_SERVICE_IDENTITY_PASSWORD:test}

## Jacoco
quarkus.jacoco.includes=it/pagopa/selfcare/onboarding/*,it/pagopa/selfcare/onboarding/service/**,it/pagopa/selfcare/onboarding/repository/**
Expand Down
1 change: 1 addition & 0 deletions infra/functions/onboarding-functions/env/dev/terraform.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ app_settings = {

##NAMIRIAL SIGNATURE
"PAGOPA_SIGNATURE_SOURCE" = "disabled",
"NAMIRIAL_BASE_URL" = "https://selc-d-namirial-sign-ca.whitemoss-eb7ef327.westeurope.azurecontainerapps.io",
"NAMIRIAL_SIGN_SERVICE_IDENTITY_USER" = "@Microsoft.KeyVault(SecretUri=https://selc-d-kv.vault.azure.net/secrets/namirial-sign-service-user/)",
"NAMIRIAL_SIGN_SERVICE_IDENTITY_PASSWORD" = "@Microsoft.KeyVault(SecretUri=https://selc-d-kv.vault.azure.net/secrets/namirial-sign-service-psw/)"
}
1 change: 1 addition & 0 deletions infra/functions/onboarding-functions/env/prod/terraform.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ app_settings = {
"JWT_TOKEN_KID" = "@Microsoft.KeyVault(SecretUri=https://selc-p-kv.vault.azure.net/secrets/jwt-kid/)"

##NAMIRIAL SIGNATURE
"NAMIRIAL_BASE_URL" = "https://selc-p-namirial-sign-ca.lemonpond-bb0b750e.westeurope.azurecontainerapps.io",
"NAMIRIAL_SIGN_SERVICE_IDENTITY_USER" = "@Microsoft.KeyVault(SecretUri=https://selc-p-kv.vault.azure.net/secrets/namirial-sign-service-user/)",
"NAMIRIAL_SIGN_SERVICE_IDENTITY_PASSWORD" = "@Microsoft.KeyVault(SecretUri=https://selc-p-kv.vault.azure.net/secrets/namirial-sign-service-psw/)"
}
1 change: 1 addition & 0 deletions infra/functions/onboarding-functions/env/uat/terraform.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ app_settings = {
"JWT_TOKEN_KID" = "@Microsoft.KeyVault(SecretUri=https://selc-u-kv.vault.azure.net/secrets/jwt-kid/)"

##NAMIRIAL SIGNATURE
"NAMIRIAL_BASE_URL" = "https://selc-u-namirial-sign-ca.mangopond-2a5d4d65.westeurope.azurecontainerapps.io",
"NAMIRIAL_SIGN_SERVICE_IDENTITY_USER" = "@Microsoft.KeyVault(SecretUri=https://selc-u-kv.vault.azure.net/secrets/namirial-sign-service-user/)",
"NAMIRIAL_SIGN_SERVICE_IDENTITY_PASSWORD" = "@Microsoft.KeyVault(SecretUri=https://selc-u-kv.vault.azure.net/secrets/namirial-sign-service-psw/)"
}
12 changes: 4 additions & 8 deletions ...sdk-crypto/src/main/java/it/pagopa/selfcare/onboarding/crypto/NamiralSignServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,12 @@
public class NamiralSignServiceImpl implements NamirialSignService {

private final NamirialHttpClient namirialHttpClient;
private final String username;
private final String password;
private static final String USERNAME = System.getenv("NAMIRIAL_SIGN_SERVICE_IDENTITY_USER");
private static final String PASSWORD = System.getenv("NAMIRIAL_SIGN_SERVICE_IDENTITY_PASSWORD");

// Constructor for manual dependency injection
public NamiralSignServiceImpl(String username,
String password
) {
public NamiralSignServiceImpl() {
this.namirialHttpClient = new NamirialHttpClient();
this.username = username;
this.password = password;
}

@Override
Expand All @@ -38,7 +34,7 @@ public byte[] pkcs7Signhash(InputStream is) {
// Copy InputStream data to the temporary file
Files.copy(is, tempFilePath, StandardCopyOption.REPLACE_EXISTING);

Credentials credentials = new Credentials(username, password);
Credentials credentials = new Credentials(USERNAME, PASSWORD);
Preferences preferences = new Preferences("SHA256");
SignRequest request = new SignRequest(tempFile, credentials, preferences);

Expand Down
4 changes: 2 additions & 2 deletions ...-crypto/src/main/java/it/pagopa/selfcare/onboarding/crypto/client/NamirialHttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@

public class NamirialHttpClient {

private static final String NAMIRIAL_BASE_URL = "https://sws.test.namirialtsp.com/SignEngineWeb";
private static final String NAMIRIAL_BASE_URL = System.getenv("NAMIRIAL_BASE_URL");

private static final String NAMIRIAL_SIGN_PADES_URL = NAMIRIAL_BASE_URL + "/rest/service/signPAdES";
private static final String NAMIRIAL_SIGN_PADES_URL = NAMIRIAL_BASE_URL + "/SignEngineWeb/rest/service/signPAdES";

public byte[] signDocument(SignRequest request) throws IOException {
// Initialize HTTP Transport and Request Factory
Expand Down
Loading