diff options
Diffstat (limited to 'eaaf_core')
| -rw-r--r-- | eaaf_core/src/main/java/at/gv/egiz/eaaf/core/api/idp/ISPConfiguration.java | 2 | ||||
| -rw-r--r-- | eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/conf/SPConfigurationImpl.java | 18 |
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()); |