aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2014-11-27 07:04:29 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2014-11-27 07:04:29 +0100
commit6e32481ed5ac19a82165f229e690184e824a3008 (patch)
tree1978a0871d5e7d66c2ef033e533652bb3cce9b71
parent9ebec8cfa0e56467314bbd983d87640411b12ce3 (diff)
downloadmoa-id-spss-6e32481ed5ac19a82165f229e690184e824a3008.tar.gz
moa-id-spss-6e32481ed5ac19a82165f229e690184e824a3008.tar.bz2
moa-id-spss-6e32481ed5ac19a82165f229e690184e824a3008.zip
fix wrong error message if SSL server certificate is not trusted
-rw-r--r--id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java5
1 files changed, 5 insertions, 0 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 40e243d0b..964a10a1b 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
@@ -126,6 +126,9 @@ public class OAPVP2ConfigValidation {
} catch (ConfigurationException e) {
log.info("No MOA specific SSL-TrustStore configured. Use default Java TrustStore.", e);
+ } catch (CertificateException e) {
+ log.info("No MOA specific SSL-TrustStore configured. Use default Java TrustStore.", e);
+
}
httpProvider =
@@ -157,6 +160,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));