From 6d9d9758f134dc4e409e500c0e8639e58361747d Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Mon, 29 Nov 2021 17:23:17 +0100
Subject: [PATCH] More debug info
---
.../src/main/java/at/tuwien/config/SamlConfig.java | 7 ++++++-
.../rest-service/src/main/resources/application-docker.yml | 4 +++-
.../src/main/resources/application-sandbox.yml | 6 ++++--
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/fda-authentication-service/rest-service/src/main/java/at/tuwien/config/SamlConfig.java b/fda-authentication-service/rest-service/src/main/java/at/tuwien/config/SamlConfig.java
index 4d1e39c57d..0eae4de308 100644
--- a/fda-authentication-service/rest-service/src/main/java/at/tuwien/config/SamlConfig.java
+++ b/fda-authentication-service/rest-service/src/main/java/at/tuwien/config/SamlConfig.java
@@ -49,6 +49,9 @@ public class SamlConfig extends WebSecurityConfigurerAdapter {
@Value("${fda.idp.metadata}")
private String idpProviderMetadata;
+ @Value("${fda.idp.entity-id}")
+ private String idpEntityId;
+
@Value("${fda.saml.signkey}")
private String samlSignKey;
@@ -274,7 +277,7 @@ public class SamlConfig extends WebSecurityConfigurerAdapter {
@Bean
public MetadataGenerator metadataGenerator() {
final MetadataGenerator metadataGenerator = new MetadataGenerator();
- metadataGenerator.setEntityId("at:tuwien");
+ metadataGenerator.setEntityId(idpEntityId);
metadataGenerator.setRequestSigned(false);
metadataGenerator.setExtendedMetadata(extendedMetadata());
metadataGenerator.setIncludeDiscoveryExtension(false);
@@ -289,6 +292,8 @@ public class SamlConfig extends WebSecurityConfigurerAdapter {
final SAMLContextProviderLB contextProvider = new SAMLContextProviderLB();
contextProvider.setScheme("https");
contextProvider.setServerName(serverName + ":" + serverPort);
+ contextProvider.setServerPort(Integer.parseInt(serverPort));
+ contextProvider.setIncludeServerPortInRequestURL(false);
contextProvider.setContextPath("/");
return contextProvider;
}
diff --git a/fda-authentication-service/rest-service/src/main/resources/application-docker.yml b/fda-authentication-service/rest-service/src/main/resources/application-docker.yml
index 94affec972..5a724a57ee 100644
--- a/fda-authentication-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-authentication-service/rest-service/src/main/resources/application-docker.yml
@@ -33,6 +33,8 @@ eureka:
client.serviceUrl.defaultZone: http://fda-discovery-service:9090/eureka/
fda:
ready.path: /ready
- idp.metadata: https://idp.zid.tuwien.ac.at/saml2
+ idp:
+ entity-id: "at:tuwien"
+ metadata: https://idp.zid.tuwien.ac.at/saml2
saml.signkey: saml
base-url: https://fda-authentication-service
\ No newline at end of file
diff --git a/fda-authentication-service/rest-service/src/main/resources/application-sandbox.yml b/fda-authentication-service/rest-service/src/main/resources/application-sandbox.yml
index 614828e30d..9974f0be9a 100644
--- a/fda-authentication-service/rest-service/src/main/resources/application-sandbox.yml
+++ b/fda-authentication-service/rest-service/src/main/resources/application-sandbox.yml
@@ -26,13 +26,15 @@ server:
logging:
pattern.console: "%d %highlight(%-5level) %msg%n"
level:
- root: warn
+ root: debug
at.tuwien.: debug
eureka:
instance.hostname: fda-authentication-service
client.serviceUrl.defaultZone: http://fda-discovery-service:9090/eureka/
fda:
ready.path: /ready
- idp.metadata: https://idp.zid.tuwien.ac.at/saml2
+ idp:
+ entity-id: "at:tuwien"
+ metadata: https://idp.zid.tuwien.ac.at/saml2
saml.signkey: saml
base-url: https://dbrepo.ossdip.at:9097
\ No newline at end of file
--
GitLab