diff options
| author | Andras Timar <andras.timar@collabora.com> | 2018-11-25 17:41:20 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-12-04 22:40:54 +0100 |
| commit | c625c49bac701c9b58ed4728a460b7094d632501 (patch) | |
| tree | 885b304f9b1b48b858a578cb13535e82c336a767 | |
| parent | 32c01c3e794ccdcbb167cdff9bac8f4cc379811e (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: I672ba9016b1555c6d9d8faba8d0a4b2a17adf453
Reviewed-on: https://gerrit.libreoffice.org/63993
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit ea471b508cb90fbaa770f291a40864324d8d74ef)
| -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 20688f7a3c9f..d27e273952b9 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 <osl/mutex.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <svl/zforlist.hxx> @@ -256,6 +257,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; |