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 2021/06/05 13:35:23 UTC
[openoffice] branch bug128453 updated (af31ee4 -> a1411a9)
This is an automated email from the ASF dual-hosted git repository.
ardovm pushed a change to branch bug128453
in repository https://gitbox.apache.org/repos/asf/openoffice.git.
from af31ee4 Update list of safe extensions
new afda4d9 Install Python libraries also from lib64 (#111)
new 8670466 change c++ include paths on gcc >= 7 (#109)
new a1411a9 Ask for confirmation only when the OS is involved
The 3 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/boost/boost_1_55_0.patch | 14 ++++++
main/python/prj/d.lst | 2 +
main/sfx2/source/appl/appopen.cxx | 90 +++++++++++++++------------------------
3 files changed, 51 insertions(+), 55 deletions(-)
[openoffice] 02/03: change c++ include paths on gcc >= 7 (#109)
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ardovm pushed a commit to branch bug128453
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 86704661abcc9c5b0b48b9d3e0245eff343e2274
Author: Arrigo Marchiori <ar...@yahoo.it>
AuthorDate: Tue Feb 2 18:24:43 2021 +0100
change c++ include paths on gcc >= 7 (#109)
---
main/boost/boost_1_55_0.patch | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/main/boost/boost_1_55_0.patch b/main/boost/boost_1_55_0.patch
index df9b8ec..b2042a0 100644
--- a/main/boost/boost_1_55_0.patch
+++ b/main/boost/boost_1_55_0.patch
@@ -359,3 +359,17 @@ diff -ur misc/boost_1_55_0/boost/config/compiler/gcc.hpp misc/build/boost_1_55_0
# define BOOST_HAS_VARIADIC_TMPL
# else
# define BOOST_NO_CXX11_VARIADIC_TEMPLATES
+--- misc/boost_1_55_0/boost/tr1/detail/config_all.hpp 2020-11-21 14:07:48.895886290 +0100
++++ misc/build/boost_1_55_0/boost/tr1/detail/config_all.hpp 2020-11-21 14:10:16.895419939 +0100
+@@ -95,6 +95,11 @@
+ // compiler version:
+ # define BOOST_TR1_STD_HEADER(name) <../4.0.0/name>
+ /*
++ * After version 6 the include path consists of the major number only
++ */
++# elif (__GNUC__ > 6)
++# define BOOST_TR1_STD_HEADER(name) <../__GNUC__/name>
++ /*
+ * Before version 3.4.0 the 0 patch level was not part of the include path:
+ */
+ # elif defined (__GNUC_PATCHLEVEL__) && ((__GNUC_PATCHLEVEL__ > 0) || \
[openoffice] 01/03: Install Python libraries also from lib64 (#111)
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ardovm pushed a commit to branch bug128453
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit afda4d987333b8d62d9b88cf748f73eb5d3ba1c3
Author: Arrigo Marchiori <ar...@yahoo.it>
AuthorDate: Fri Feb 26 00:40:12 2021 +0100
Install Python libraries also from lib64 (#111)
---
main/python/prj/d.lst | 2 ++
1 file changed, 2 insertions(+)
diff --git a/main/python/prj/d.lst b/main/python/prj/d.lst
index 229edb6..78da281 100644
--- a/main/python/prj/d.lst
+++ b/main/python/prj/d.lst
@@ -82,8 +82,10 @@ mkdir: %_DEST%\lib%_EXT%\python\python2.7\config
..\%__SRC%\misc\build\python-inst\bin\python %_DEST%\bin%_EXT%\python
..\%__SRC%\misc\build\Python-2.7.18\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h
..\%__SRC%\misc\build\python-inst\lib\python2.7\lib-dynload\* %_DEST%\lib%_EXT%\python\lib-dynload\*
+..\%__SRC%\misc\build\python-inst\lib64\python2.7\lib-dynload\* %_DEST%\lib%_EXT%\python\lib-dynload\*
..\%__SRC%\misc\build\python-inst\bin\python2.7 %_DEST%\bin%_EXT%\python
..\%__SRC%\misc\build\python-inst\lib\libpython2.7.so.1.0 %_DEST%\lib%_EXT%\libpython2.7.so.1.0
+..\%__SRC%\misc\build\python-inst\lib64\libpython2.7.so.1.0 %_DEST%\lib%_EXT%\libpython2.7.so.1.0
symlink: %_DEST%\lib%_EXT%\libpython2.7.so.1.0 %_DEST%\lib%_EXT%\libpython2.7.so
# MacOS X
[openoffice] 03/03: Ask for confirmation only when the OS is
involved
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ardovm pushed a commit to branch bug128453
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit a1411a9cea0852bab2cb91d8c42f95e61e97dd2b
Author: Arrigo Marchiori <ar...@yahoo.it>
AuthorDate: Sat Jun 5 15:33:21 2021 +0200
Ask for confirmation only when the OS is involved
---
main/sfx2/source/appl/appopen.cxx | 90 +++++++++++++++------------------------
1 file changed, 35 insertions(+), 55 deletions(-)
diff --git a/main/sfx2/source/appl/appopen.cxx b/main/sfx2/source/appl/appopen.cxx
index ee68ab7..4b58708 100644
--- a/main/sfx2/source/appl/appopen.cxx
+++ b/main/sfx2/source/appl/appopen.cxx
@@ -930,60 +930,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
INetProtocol aINetProtocol = aINetURLObject.GetProtocol();
SvtExtendedSecurityOptions aExtendedSecurityOptions;
SvtExtendedSecurityOptions::OpenHyperlinkMode eMode = aExtendedSecurityOptions.GetOpenHyperlinkMode();
- if ( eMode == SvtExtendedSecurityOptions::OPEN_WITHSECURITYCHECK )
- {
- /*!!! pb: #i49802# no security warning any longer
- ardovm: Restored security checks in March 2021 */
- // Check if file URL is a directory. This is not insecure!
- sal_Bool bIsDir = aINetURLObject.hasFinalSlash() ||
- ( osl::Directory(aURL.Main).open() ==
- osl::Directory::E_None );
- // Use SvtExtendedSecurityOptions::IsSecureHyperlink()
- // to check the extension of the link destination.
- sal_Bool bSafeExtension = aExtendedSecurityOptions.IsSecureHyperlink(aURL.Complete);
- // We consider some protocols unsafe
- sal_Bool bUnsafeProtocol;
- switch (aINetProtocol) {
- case INET_PROT_HTTP:
- case INET_PROT_HTTPS:
- bSafeExtension = true; // trust the browser to prevent unsafe extensions
- // Fall-through
- // case INET_PROT_FTP:
- case INET_PROT_VND_SUN_STAR_HELP:
- case INET_PROT_MAILTO:
- case INET_PROT_FILE:
- bUnsafeProtocol = false;
- break;
- default: // Anything else, including INET_PROT_FILE
- bUnsafeProtocol = true;
- break;
- }
- if ( (!bIsDir && !bSafeExtension) || bUnsafeProtocol )
- {
- // Security check for local files depending on the extension
- vos::OGuard aGuard( Application::GetSolarMutex() );
- Window *pWindow = SFX_APP()->GetTopWindow();
-
- String aSecurityWarningBoxTitle( SfxResId( RID_SECURITY_WARNING_TITLE ));
- WarningBox aSecurityWarningBox( pWindow, SfxResId( RID_SECURITY_WARNING_HYPERLINK ));
- aSecurityWarningBox.SetText( aSecurityWarningBoxTitle );
-
- // Replace %s with the real file name
- String aMsgText = aSecurityWarningBox.GetMessText();
- String aMainURL( aURL.Main );
- String aFileNameInMsg;
-
- if (!utl::LocalFileHelper::ConvertURLToPhysicalName( aMainURL, aFileNameInMsg )) {
- aFileNameInMsg = aMainURL;
- }
- aMsgText.SearchAndReplaceAscii( "%s", aFileNameInMsg );
- aSecurityWarningBox.SetMessText( aMsgText );
-
- if( aSecurityWarningBox.Execute() == RET_NO )
- return;
- }
- }
- else if ( eMode == SvtExtendedSecurityOptions::OPEN_NEVER && aINetProtocol != INET_PROT_VND_SUN_STAR_HELP )
+ if ( eMode == SvtExtendedSecurityOptions::OPEN_NEVER && aINetProtocol != INET_PROT_VND_SUN_STAR_HELP )
{
vos::OGuard aGuard( Application::GetSolarMutex() );
Window *pWindow = SFX_APP()->GetTopWindow();
@@ -1099,7 +1046,40 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
if (SFX_APP()->IsSecureURL(rtl::OUString(), &aReferer))
{
::rtl::OUString aURLString( aURL.Complete );
-
+ // Before letting the OS execute the URL, we may have to request for
+ // confirmation
+ if ( eMode == SvtExtendedSecurityOptions::OPEN_WITHSECURITYCHECK ) {
+ // Check if file URL is a directory. This is not insecure!
+ sal_Bool bIsDir = aINetURLObject.hasFinalSlash() ||
+ ( osl::Directory(aURL.Main).open() ==
+ osl::Directory::E_None );
+ // Use SvtExtendedSecurityOptions::IsSecureHyperlink()
+ // to check the extension of the link destination.
+ sal_Bool bSafeExtension = aExtendedSecurityOptions.IsSecureHyperlink(aURL.Complete);
+ if (!bIsDir && !bSafeExtension) {
+ // Security check for local files depending on the extension
+ vos::OGuard aGuard( Application::GetSolarMutex() );
+ Window *pWindow = SFX_APP()->GetTopWindow();
+
+ String aSecurityWarningBoxTitle( SfxResId( RID_SECURITY_WARNING_TITLE ));
+ WarningBox aSecurityWarningBox( pWindow, SfxResId( RID_SECURITY_WARNING_HYPERLINK ));
+ aSecurityWarningBox.SetText( aSecurityWarningBoxTitle );
+
+ // Replace %s with the real file name
+ String aMsgText = aSecurityWarningBox.GetMessText();
+ String aMainURL( aURL.Main );
+ String aFileNameInMsg;
+
+ if (!utl::LocalFileHelper::ConvertURLToPhysicalName( aMainURL, aFileNameInMsg )) {
+ aFileNameInMsg = aMainURL;
+ }
+ aMsgText.SearchAndReplaceAscii( "%s", aFileNameInMsg );
+ aSecurityWarningBox.SetMessText( aMsgText );
+
+ if( aSecurityWarningBox.Execute() == RET_NO )
+ return;
+ }
+ }
try
{
// give os this file