|
 |
69d1a3 |
From 14c85889616de301e3a214c49fff2e6da3327d1f Mon Sep 17 00:00:00 2001
|
|
|
69d1a3 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
69d1a3 |
Date: Thu, 18 Oct 2018 20:39:23 +0100
|
|
|
69d1a3 |
Subject: [PATCH] keep pyuno script processing below base uri
|
|
|
69d1a3 |
MIME-Version: 1.0
|
|
|
69d1a3 |
Content-Type: text/plain; charset=UTF-8
|
|
|
69d1a3 |
Content-Transfer-Encoding: 8bit
|
|
|
69d1a3 |
|
|
|
69d1a3 |
Change-Id: Icc13fb7193fb1e7c50e0df286161a10b4ed636c7
|
|
|
69d1a3 |
Reviewed-on: https://gerrit.libreoffice.org/61970
|
|
|
69d1a3 |
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
|
|
|
69d1a3 |
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
|
|
|
69d1a3 |
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
|
|
|
69d1a3 |
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
|
69d1a3 |
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
|
69d1a3 |
---
|
|
|
69d1a3 |
scripting/source/pyprov/pythonscript.py | 30 +++++++++++++++++++++++--
|
|
|
69d1a3 |
1 file changed, 28 insertions(+), 2 deletions(-)
|
|
|
69d1a3 |
|
|
|
69d1a3 |
diff --git a/scripting/source/pyprov/pythonscript.py b/scripting/source/pyprov/pythonscript.py
|
|
|
69d1a3 |
index 4803d0bebc23..f5aa2173333a 100644
|
|
|
69d1a3 |
--- a/scripting/source/pyprov/pythonscript.py
|
|
|
69d1a3 |
+++ b/scripting/source/pyprov/pythonscript.py
|
|
|
69d1a3 |
@@ -25,6 +25,7 @@ import imp
|
|
|
69d1a3 |
import time
|
|
|
69d1a3 |
import ast
|
|
|
69d1a3 |
import platform
|
|
|
69d1a3 |
+from com.sun.star.uri.RelativeUriExcessParentSegments import RETAIN
|
|
|
69d1a3 |
|
|
|
69d1a3 |
try:
|
|
|
69d1a3 |
unicode
|
|
|
69d1a3 |
@@ -212,8 +213,33 @@ class MyUriHelper:
|
|
|
69d1a3 |
|
|
|
69d1a3 |
def scriptURI2StorageUri( self, scriptURI ):
|
|
|
69d1a3 |
try:
|
|
|
69d1a3 |
- myUri = self.m_uriRefFac.parse(scriptURI)
|
|
|
69d1a3 |
- ret = self.m_baseUri + "/" + myUri.getName().replace( "|", "/" )
|
|
|
69d1a3 |
+ # base path to the python script location
|
|
|
69d1a3 |
+ sBaseUri = self.m_baseUri + "/"
|
|
|
69d1a3 |
+ xBaseUri = self.m_uriRefFac.parse(sBaseUri)
|
|
|
69d1a3 |
+
|
|
|
69d1a3 |
+ # path to the .py file + "$functionname, arguments, etc
|
|
|
69d1a3 |
+ xStorageUri = self.m_uriRefFac.parse(scriptURI)
|
|
|
69d1a3 |
+ sStorageUri = xStorageUri.getName().replace( "|", "/" );
|
|
|
69d1a3 |
+
|
|
|
69d1a3 |
+ # path to the .py file, relative to the base
|
|
|
69d1a3 |
+ sFileUri = sStorageUri[0:sStorageUri.find("$")]
|
|
|
69d1a3 |
+ xFileUri = self.m_uriRefFac.parse(sFileUri)
|
|
|
69d1a3 |
+ if not xFileUri:
|
|
|
69d1a3 |
+ message = "pythonscript: invalid relative uri '" + sFileUri+ "'"
|
|
|
69d1a3 |
+ log.debug( message )
|
|
|
69d1a3 |
+ raise RuntimeException( message )
|
|
|
69d1a3 |
+
|
|
|
69d1a3 |
+ # absolute path to the .py file
|
|
|
69d1a3 |
+ xAbsScriptUri = self.m_uriRefFac.makeAbsolute(xBaseUri, xFileUri, True, RETAIN)
|
|
|
69d1a3 |
+ sAbsScriptUri = xAbsScriptUri.getUriReference()
|
|
|
69d1a3 |
+
|
|
|
69d1a3 |
+ # ensure py file is under the base path
|
|
|
69d1a3 |
+ if not sAbsScriptUri.startswith(sBaseUri):
|
|
|
69d1a3 |
+ message = "pythonscript: storage uri '" + sAbsScriptUri + "' not in base uri '" + self.m_baseUri + "'"
|
|
|
69d1a3 |
+ log.debug( message )
|
|
|
69d1a3 |
+ raise RuntimeException( message )
|
|
|
69d1a3 |
+
|
|
|
69d1a3 |
+ ret = sBaseUri + sStorageUri
|
|
|
69d1a3 |
log.debug( "converting scriptURI="+scriptURI + " to storageURI=" + ret )
|
|
|
69d1a3 |
return ret
|
|
|
69d1a3 |
except UnoException as e:
|
|
|
69d1a3 |
--
|
|
|
69d1a3 |
2.20.1
|
|
|
69d1a3 |
|