diff options
| author | Andras Timar <andras.timar@collabora.com> | 2018-11-25 18:15:24 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2019-07-09 09:58:17 +0200 |
| commit | 47e6e9c7644a88b905611cc7fc47ac495eb7bce9 (patch) | |
| tree | b82bfbd6a85e133f0acc464797d718c15bdf2486 /uui | |
| parent | fb8cd9b80932f139972d5c55887d8e3da0287317 (diff) | |
Do not validate SSL cert in LOK case
Currently we cannot tunnel interaction handler dialog, so if there
is a problem with site's SSL cert, the operation (e.g. insert image)
would silently fail. As a workaround, let's not validate the remote
site's SSL cert, as we also do not validate the site's SSL cert when
we download the file through WOPI from the site, in the first place.
So this patch does not really make things worse, but makes it possible
to use the insert image feature with a self signed cert in test environments.
Change-Id: Ibc14f0f76b814abcb9ec9ca02d92c27ad35d3878
Reviewed-on: https://gerrit.libreoffice.org/63994
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/75240
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'uui')
| -rw-r--r-- | uui/source/iahndl-ssl.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx index 096f81b21d4c..6db6695671d9 100644 --- a/uui/source/iahndl-ssl.cxx +++ b/uui/source/iahndl-ssl.cxx @@ -28,6 +28,7 @@ #include <com/sun/star/ucb/CertificateValidationRequest.hpp> #include <com/sun/star/uno/Reference.hxx> +#include <comphelper/lok.hxx> #include <comphelper/sequence.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <svl/zforlist.hxx> @@ -236,6 +237,12 @@ handleCertificateValidationRequest_( uno::Reference< task::XInteractionAbort > xAbort; getContinuations(rContinuations, &xApprove, &xAbort); + if ( comphelper::LibreOfficeKit::isActive() && xApprove.is() ) + { + xApprove->select(); + return; + } + sal_Int32 failures = rRequest.CertificateValidity; bool trustCert = true; |