diff options
Diffstat (limited to 'id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java')
| -rw-r--r-- | id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java | 45 |
1 files changed, 24 insertions, 21 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java index 82c9a92da..39f5479ce 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java @@ -40,13 +40,13 @@ import at.gv.egovernment.moa.util.StringUtils; public class STORKConfig {
/** STORK SAML signature creation parameters */
- private STORK stork;
- private Properties props;
- private Map<String, CPEPS> cpepsMap;
- private String basedirectory;
+ private Properties props = null;
+ private Map<String, CPEPS> cpepsMap = null;
+ private String basedirectory = null;
+ private SignatureVerificationParameter sigverifyparam = null;
+
public STORKConfig(STORK stork, Properties props, String basedirectory) {
- this.stork = stork;
this.basedirectory = basedirectory;
this.props = props;
@@ -90,30 +90,33 @@ public class STORKConfig { + cpep.getCountryCode() + " has an invalid Attribute and is ignored.");
}
}
- }
-
- public SignatureCreationParameter getSignatureCreationParameter() {
-
- return new SignatureCreationParameter(props, basedirectory);
- }
-
- public SignatureVerificationParameter getSignatureVerificationParameter() {
SAMLSigningParameter samlsign = stork.getSAMLSigningParameter();
if (samlsign == null) {
Log.warn("Error in MOA-ID Configuration. No STORK->SAMLSigningParameter configuration found.");
- return null;
- }
-
- SignatureVerificationParameterType sigverify = samlsign.getSignatureVerificationParameter();
+
+ } else {
+ SignatureVerificationParameterType sigverify = samlsign.getSignatureVerificationParameter();
- if (sigverify == null) {
- Log.warn("Error in MOA-ID Configuration. No STORK->SignatureVerificationParameter configuration found.");
- return null;
+ if (sigverify == null) {
+ Log.warn("Error in MOA-ID Configuration. No STORK->SignatureVerificationParameter configuration found.");
+
+ } else {
+ sigverifyparam = new SignatureVerificationParameter(sigverify.getTrustProfileID());
+ }
}
- return new SignatureVerificationParameter(sigverify.getTrustProfileID());
+ }
+
+ public SignatureCreationParameter getSignatureCreationParameter() {
+
+ return new SignatureCreationParameter(props, basedirectory);
+ }
+
+ public SignatureVerificationParameter getSignatureVerificationParameter() {
+
+ return sigverifyparam;
}
public Map<String, CPEPS> getCpepsMap() {
|