summaryrefslogtreecommitdiff
path: root/eaaf_core/src
diff options
context:
space:
mode:
authorThomas Lenz <thomas.lenz@egiz.gv.at>2019-02-14 13:42:16 +0100
committerThomas Lenz <thomas.lenz@egiz.gv.at>2019-02-14 13:42:16 +0100
commit2af3fe54a8572b66fd8942a53594792c204fbd9f (patch)
treed6cd53605077fa8748c6e44e89fc0faee66055e6 /eaaf_core/src
parente101cfb7691aed8a53d6c56815c6372a9076ace9 (diff)
downloadEAAF-Components-2af3fe54a8572b66fd8942a53594792c204fbd9f.tar.gz
EAAF-Components-2af3fe54a8572b66fd8942a53594792c204fbd9f.tar.bz2
EAAF-Components-2af3fe54a8572b66fd8942a53594792c204fbd9f.zip
add additional configuration flag
Diffstat (limited to 'eaaf_core/src')
-rw-r--r--eaaf_core/src/main/java/at/gv/egiz/eaaf/core/api/idp/ISPConfiguration.java2
-rw-r--r--eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/conf/SPConfigurationImpl.java18
2 files changed, 13 insertions, 7 deletions
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/api/idp/ISPConfiguration.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/api/idp/ISPConfiguration.java
index 3b7d3a25..9d92b713 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/api/idp/ISPConfiguration.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/api/idp/ISPConfiguration.java
@@ -37,6 +37,8 @@ public interface ISPConfiguration extends Serializable {
public static final String CONFIG_KEY_RESTRICTIONS_BASEID_INTERNAL = "configuration.restrictions.baseID.idpProcessing";
public static final String CONFIG_KEY_RESTRICTIONS_BASEID_TRANSMISSION = "configuration.restrictions.baseID.spTransmission";
+ public static final String CONFIG_KEY_RESTRICTIONS_EID_DEMO_MODE = "configuration.restrictions.eIDTestMode";
+
/**
* Get the full key/value configuration for this Service Provider
*
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/conf/SPConfigurationImpl.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/conf/SPConfigurationImpl.java
index adc7629d..6c827489 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/conf/SPConfigurationImpl.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/conf/SPConfigurationImpl.java
@@ -47,8 +47,7 @@ public class SPConfigurationImpl implements ISPConfiguration {
private final Map<String, String> spConfiguration;
private final List<String> targetAreasWithNoInteralBaseIdRestriction;
private final List<String> targetAreasWithNoBaseIdTransmissionRestriction;
-
-
+
public SPConfigurationImpl(final Map<String, String> spConfig, IConfiguration authConfig) {
this.spConfiguration = spConfig;
@@ -59,11 +58,16 @@ public class SPConfigurationImpl implements ISPConfiguration {
CONFIG_KEY_RESTRICTIONS_BASEID_INTERNAL,
EAAFConstants.URN_PREFIX_CDID)));
- targetAreasWithNoBaseIdTransmissionRestriction = Collections.unmodifiableList(
- KeyValueUtils.getListOfCSVValues(
- authConfig.getBasicConfiguration(
- CONFIG_KEY_RESTRICTIONS_BASEID_TRANSMISSION,
- EAAFConstants.URN_PREFIX_CDID)));
+ if (!authConfig.getBasicMOAIDConfigurationBoolean(CONFIG_KEY_RESTRICTIONS_EID_DEMO_MODE, false)) {
+ targetAreasWithNoBaseIdTransmissionRestriction = Collections.unmodifiableList(
+ KeyValueUtils.getListOfCSVValues(
+ authConfig.getBasicConfiguration(
+ CONFIG_KEY_RESTRICTIONS_BASEID_TRANSMISSION,
+ EAAFConstants.URN_PREFIX_CDID)));
+
+ } else
+ targetAreasWithNoBaseIdTransmissionRestriction = Collections.emptyList();
+
if (log.isTraceEnabled()) {
log.trace("Internal policy for OA: " + getUniqueIdentifier());