You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2022/01/07 09:09:17 UTC
[openoffice] branch serf updated (c607ac8 -> cde4dfa)
This is an automated email from the ASF dual-hosted git repository.
ardovm pushed a change to branch serf
in repository https://gitbox.apache.org/repos/asf/openoffice.git.
from c607ac8 Fix OpenSSL and Serf library names
new 56c8a34 Decode APR errors and display them
new ae157b6 Include the nsssysinit dynamic library
new 9f6b710 Recognize SSL certificate validation errors
new cde4dfa Slightly improve debugging output
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
main/nss/prj/d.lst | 1 +
main/scp2/source/ooo/file_library_ooo.scp | 1 +
main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx | 14 +++++++++++++-
main/ucb/source/ucp/webdav/SerfSession.cxx | 10 ++++++++++
4 files changed, 25 insertions(+), 1 deletion(-)
[openoffice] 03/04: Recognize SSL certificate validation errors
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ardovm pushed a commit to branch serf
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 9f6b710f22856c3fc884a30f5c0524f2668a2157
Author: Arrigo Marchiori <ar...@yahoo.it>
AuthorDate: Fri Jan 7 09:54:44 2022 +0100
Recognize SSL certificate validation errors
---
main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx b/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx
index 8806e32..423dd51 100644
--- a/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx
+++ b/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx
@@ -551,6 +551,11 @@ void SerfRequestProcessor::postprocessProcessor( const apr_status_t inStatus )
}
break;
+ case SERF_SSL_CERT_UNKNOWN_FAILURE:
+ mpDAVException = new DAVException(DAVException::DAV_HTTP_ERROR,
+ rtl::OUString::createFromAscii("SSL certificate failure"));
+ break;
+
default:
{
// APR can help us describe this error
[openoffice] 02/04: Include the nsssysinit dynamic library
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ardovm pushed a commit to branch serf
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit ae157b69cc5ca3c616f4314ace64dcdcca5ae6ef
Author: Arrigo Marchiori <ar...@yahoo.it>
AuthorDate: Fri Jan 7 09:50:55 2022 +0100
Include the nsssysinit dynamic library
It seems to be required by the nss3 dynamic library.
---
main/nss/prj/d.lst | 1 +
main/scp2/source/ooo/file_library_ooo.scp | 1 +
2 files changed, 2 insertions(+)
diff --git a/main/nss/prj/d.lst b/main/nss/prj/d.lst
index c33f734..b4a430a 100644
--- a/main/nss/prj/d.lst
+++ b/main/nss/prj/d.lst
@@ -17,6 +17,7 @@ mkdir: %_DEST%\inc%_EXT%\mozilla\nss
..\%__SRC%\lib\libnss3.* %_DEST%\lib%_EXT%\libnss3.*
..\%__SRC%\lib\libnssckbi.* %_DEST%\lib%_EXT%\libnssckbi.*
..\%__SRC%\lib\libnssdbm3.* %_DEST%\lib%_EXT%\libnssdbm3.*
+..\%__SRC%\lib\libnsssysinit.* %_DEST%\lib%_EXT%\libnsssysinit.*
..\%__SRC%\lib\libnssutil3.* %_DEST%\lib%_EXT%\libnssutil3.*
..\%__SRC%\lib\libplc4.* %_DEST%\lib%_EXT%\libplc4.*
..\%__SRC%\lib\libplds4.* %_DEST%\lib%_EXT%\libplds4.*
diff --git a/main/scp2/source/ooo/file_library_ooo.scp b/main/scp2/source/ooo/file_library_ooo.scp
index 3d8486f..e95eb2f 100644
--- a/main/scp2/source/ooo/file_library_ooo.scp
+++ b/main/scp2/source/ooo/file_library_ooo.scp
@@ -1631,6 +1631,7 @@ STD_LIB_FILE( gid_File_Lib_Nspr4, nspr4)
STD_LIB_FILE( gid_File_Lib_Nss3, nss3)
STD_LIB_FILE( gid_File_Lib_Nsckbi, nssckbi)
STD_LIB_FILE( gid_File_Lib_Nssdbm3, nssdbm3)
+STD_LIB_FILE( gid_File_Lib_Nsssysinit, nsssysinit)
STD_LIB_FILE( gid_File_Lib_Nssutil3, nssutil3)
STD_LIB_FILE( gid_File_Lib_Plc4, plc4)
STD_LIB_FILE( gid_File_Lib_Plds4, plds4)
[openoffice] 04/04: Slightly improve debugging output
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ardovm pushed a commit to branch serf
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit cde4dfa98980f8a37cb82e5a89f8d107d9ae968a
Author: Arrigo Marchiori <ar...@yahoo.it>
AuthorDate: Fri Jan 7 09:55:22 2022 +0100
Slightly improve debugging output
---
main/ucb/source/ucp/webdav/SerfSession.cxx | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/main/ucb/source/ucp/webdav/SerfSession.cxx b/main/ucb/source/ucp/webdav/SerfSession.cxx
index 4643fc9..e88c615 100644
--- a/main/ucb/source/ucp/webdav/SerfSession.cxx
+++ b/main/ucb/source/ucp/webdav/SerfSession.cxx
@@ -591,6 +591,16 @@ apr_status_t SerfSession::verifySerfCertificateChain (
(security::CertificateValidity::INVALID | security::CertificateValidity::REVOKED)) != 0)
{
// Certificate (chain) is invalid.
+ if (nVerificationResult & security::CertificateValidity::INVALID) {
+ OSL_TRACE("Certificate \"%s\" for host \"%s\" is invalid",
+ rtl::OUStringToOString(sServerCertificateSubject, RTL_TEXTENCODING_UTF8).getStr(),
+ rtl::OUStringToOString(getHostName(), RTL_TEXTENCODING_UTF8).getStr());
+ }
+ if (nVerificationResult & security::CertificateValidity::REVOKED) {
+ OSL_TRACE("Certificate \"%s\" for host \"%s\" was revoked",
+ rtl::OUStringToOString(sServerCertificateSubject, RTL_TEXTENCODING_UTF8).getStr(),
+ rtl::OUStringToOString(getHostName(), RTL_TEXTENCODING_UTF8).getStr());
+ }
xCertificateContainer->addCertificate(getHostName(), sServerCertificateSubject, sal_False);
return SERF_SSL_CERT_UNKNOWN_FAILURE;
}
[openoffice] 01/04: Decode APR errors and display them
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ardovm pushed a commit to branch serf
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 56c8a34d623b90b13dee9379422621b1de33b38d
Author: Arrigo Marchiori <ar...@yahoo.it>
AuthorDate: Tue Dec 21 22:15:06 2021 +0100
Decode APR errors and display them
---
main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx b/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx
index e378630..8806e32 100644
--- a/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx
+++ b/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx
@@ -552,7 +552,14 @@ void SerfRequestProcessor::postprocessProcessor( const apr_status_t inStatus )
break;
default:
- mpDAVException = new DAVException( DAVException::DAV_HTTP_ERROR );
+ {
+ // APR can help us describe this error
+ char *buff = new char[512];
+ apr_strerror(inStatus, buff, 512);
+ rtl::OUString message(buff, strlen(buff), RTL_TEXTENCODING_DONTKNOW);
+ delete[] buff;
+ mpDAVException = new DAVException( DAVException::DAV_HTTP_ERROR, message );
+ }
break;
}
}