diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-05-07 16:28:22 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-05-07 16:28:22 +0200 |
| commit | 26822fcf41e37e0fedca87489b60304496c9d0f0 (patch) | |
| tree | c782966221b43642976e91bd53a918cd04d03c35 /id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java | |
| parent | 44cb2c6299c247a9836150c68ba45b206c6499aa (diff) | |
| download | moa-id-spss-26822fcf41e37e0fedca87489b60304496c9d0f0.tar.gz moa-id-spss-26822fcf41e37e0fedca87489b60304496c9d0f0.tar.bz2 moa-id-spss-26822fcf41e37e0fedca87489b60304496c9d0f0.zip | |
check SAML2 metadata URL against publicService flag
Diffstat (limited to 'id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java')
| -rw-r--r-- | id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java | 12 |
1 files changed, 10 insertions, 2 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 98d500526..62fc83ab9 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 @@ -30,6 +30,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Timer; +import javax.net.ssl.SSLHandshakeException; import javax.servlet.http.HttpServletRequest; import org.apache.commons.httpclient.MOAHttpClient; @@ -142,8 +143,15 @@ public class OAPVP2ConfigValidation { errors.add(LanguageHelper.getErrorString("validation.pvp2.metadataurl.read", request)); } catch (MetadataProviderException e) { - log.info("MetaDate verification failed"); - errors.add(LanguageHelper.getErrorString("validation.pvp2.metadata.verify", request)); + + 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)); + + } else { + log.info("MetaDate verification failed", e); + errors.add(LanguageHelper.getErrorString("validation.pvp2.metadata.verify", request)); + } } finally { if (httpProvider != null) |