diff options
author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-01-16 07:46:09 +0100 |
---|---|---|
committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-01-16 07:46:09 +0100 |
commit | f50df2907e144784d77097653f9896b6c6a69361 (patch) | |
tree | 35677411c79a68aba792237e9d5022fad2191a2d /id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa | |
parent | 6d242194721574b6f7284f8b705a518d2f39b36f (diff) | |
parent | c0ce67ebe2c4882b71ef04d64a6db7e3db416ce4 (diff) | |
download | moa-id-spss-f50df2907e144784d77097653f9896b6c6a69361.tar.gz moa-id-spss-f50df2907e144784d77097653f9896b6c6a69361.tar.bz2 moa-id-spss-f50df2907e144784d77097653f9896b6c6a69361.zip |
Merge branch 'ISA-1.18-action' into during_authsource_refactoring
Conflicts:
id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/verification/SAMLVerificationEngine.java
pom.xml
Diffstat (limited to 'id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa')
-rw-r--r-- | id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java index a64a0eaf1..8e1dd6e64 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java @@ -129,7 +129,7 @@ public class OAPVP2ConfigValidation { } catch (ConfigurationException e) { log.info("No MOA specific SSL-TrustStore configured. Use default Java TrustStore.", e); - } + } List<MetadataFilter> filterList = new ArrayList<MetadataFilter>(); filterList.add(new MetaDataVerificationFilter(credential)); @@ -172,6 +172,8 @@ public class OAPVP2ConfigValidation { } catch (MetadataProviderException e) { + + //TODO: check exception handling if (e.getCause() != null && e.getCause().getCause() instanceof SSLHandshakeException) { log.info("SSL Server certificate not trusted.", e); errors.add(LanguageHelper.getErrorString("validation.pvp2.metadata.ssl", request)); |