summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2016-08-10 21:01:19 +1000
committerJan Holesovsky <kendy@collabora.com>2016-08-10 14:40:03 +0000
commitea8ba40c06fe2d0702c6dba22d1d4bed4af306b5 (patch)
tree79b37725f371ac6d27fc67e94bc48c7351a49111
parent4fbc3dbe44857b52677844c47a750abc40713d60 (diff)
tdf#101385: don't try to get SharePoint folder outside of allowed range
for a given site. This patch uses the fact that getFolderByServerRelativeUrl API returns site's root folder if used with empty path (''). Hopefully this isn't otherwise context-dependent, so that it doesn't return other folders in some unknown circumstances. More correct would be instead to use the site's root path directly, like '/sites/mysite'. But I don't know a reliable way to filter the API part from the base URI. To make use of the corrected SharePoint repository root id, the patch also redirects all cases where "/" object is queried, to session's getRootFolder(). Reviewed-on: https://gerrit.libreoffice.org/27987 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 1b482aec4e7b6aec86fb20bcda555c4060a80332) Change-Id: Id31b4c2be0d8d81b94c0e9307acdfbc9e6441828 Reviewed-on: https://gerrit.libreoffice.org/28015 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
-rw-r--r--external/libcmis/UnpackedTarball_cmis.mk1
-rw-r--r--external/libcmis/libcmis-sharepoint-repository-root.patch24
-rw-r--r--ucb/source/ucp/cmis/cmis_content.cxx2
3 files changed, 26 insertions, 1 deletions
diff --git a/external/libcmis/UnpackedTarball_cmis.mk b/external/libcmis/UnpackedTarball_cmis.mk
index b203f47f2b7f..039e361dd412 100644
--- a/external/libcmis/UnpackedTarball_cmis.mk
+++ b/external/libcmis/UnpackedTarball_cmis.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,cmis, \
external/libcmis/tdf90351.patch \
external/libcmis/http_auth.patch \
external/libcmis/libcmis-fix-google-drive.patch \
+ external/libcmis/libcmis-sharepoint-repository-root.patch \
))
ifeq ($(OS)$(COM),WNTMSC)
diff --git a/external/libcmis/libcmis-sharepoint-repository-root.patch b/external/libcmis/libcmis-sharepoint-repository-root.patch
new file mode 100644
index 000000000000..f89b134cc7a4
--- /dev/null
+++ b/external/libcmis/libcmis-sharepoint-repository-root.patch
@@ -0,0 +1,24 @@
+diff --git a/src/libcmis/sharepoint-repository.cxx b/src/libcmis/sharepoint-repository.cxx
+index 780624d..f992689 100644
+--- a/src/libcmis/sharepoint-repository.cxx
++++ b/src/libcmis/sharepoint-repository.cxx
+@@ -35,7 +35,18 @@ SharePointRepository::SharePointRepository( std::string baseUrl ) :
+ m_description = "SharePoint repository";
+ m_productName = "SharePoint";
+ m_productVersion = "2010/2013";
+- m_rootId = baseUrl + "/getFolderByServerRelativeUrl('/')";
++ // getFolderByServerRelativeUrl() API expects path to be
++ // *server-relative*, i.e. they must include site path.
++ // Given the baseUrl like "https://sp2013/sites/mysite/_api/Web"
++ // for a site "mysite" on sharepoint server "sp2013",
++ // the site root is '/sites/mysite/', not '/'.
++ // Trying to get folder '/' results in "Value does not fall
++ // within expected range" error.
++ // Preferrable here is to extract the root path from baseUrl,
++ // stripping server and api parts. But it can be unreliable
++ // if api part (_api/Web) is different for some server.
++ // On the other side, just querying empty path '' gives the root folder.
++ m_rootId = baseUrl + "/getFolderByServerRelativeUrl('')";
+
+ m_capabilities[ ACL ] = "discover";
+ m_capabilities[ AllVersionsSearchable ] = "true";
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
index 9963632b809b..0cfc651efc7b 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -504,7 +504,7 @@ namespace cmis
throw libcmis::Exception( "Object not found" );
}
}
- else if ( !m_sObjectPath.isEmpty( ) )
+ else if (!(m_sObjectPath.isEmpty() || m_sObjectPath == "/"))
{
try
{