From 82916a59b169c7c6377db75ee8bbcd48f56c5207 Mon Sep 17 00:00:00 2001
From: Martyn Gigg <martyn.gigg@gmail.com>
Date: Tue, 3 Sep 2019 11:15:05 +0100
Subject: [PATCH] Update script repository endpoints to https
The server has handled https for some time now.
---
Framework/Kernel/CMakeLists.txt | 6 +++---
Framework/Properties/Mantid.properties.template | 2 +-
Framework/ScriptRepository/src/ScriptRepositoryImpl.cpp | 4 ++--
Framework/ScriptRepository/test/ScriptRepositoryTestImpl.h | 4 ++--
docs/source/concepts/PropertiesFile.rst | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Framework/Kernel/CMakeLists.txt b/Framework/Kernel/CMakeLists.txt
index d154eec872a..cb5de710173 100644
--- a/Framework/Kernel/CMakeLists.txt
+++ b/Framework/Kernel/CMakeLists.txt
@@ -267,7 +267,7 @@ set(INC_FILES
inc/MantidKernel/RegexStrings.h
inc/MantidKernel/RegistrationHelper.h
inc/MantidKernel/RemoteJobManager.h
- inc/MantidKernel/SimpleJSON.h
+ inc/MantidKernel/SimpleJSON.h
inc/MantidKernel/SingletonHolder.h
inc/MantidKernel/SobolSequence.h
inc/MantidKernel/SpecialCoordinateSystem.h
@@ -594,7 +594,7 @@ set(
${ExternalData_BINARY_ROOT}/Testing/Data/UnitTest;${ExternalData_BINARY_ROOT}/Testing/Data/DocTest;${MANTID_ROOT}/instrument
)
set(COLORMAPS_FOLDER ${MANTID_ROOT}/installers/colormaps/)
-set(MANTIDPUBLISHER "http://upload.mantidproject.org/scriptrepository?debug=1")
+set(MANTIDPUBLISHER "https://upload.mantidproject.org/scriptrepository?debug=1")
set(HTML_ROOT ${DOCS_BUILDDIR}/html)
# For an mpi-enabled build, do not log to file, format console output (which
@@ -665,7 +665,7 @@ set(UPDATE_INSTRUMENT_DEFINTITIONS "${ENABLE_NETWORK_ACCESS}")
set(CHECK_FOR_NEW_MANTID_VERSION "${ENABLE_NETWORK_ACCESS}")
set(ENABLE_USAGE_REPORTS "${ENABLE_NETWORK_ACCESS}")
set(DATADIRS "")
-set(MANTIDPUBLISHER "http://upload.mantidproject.org/scriptrepository")
+set(MANTIDPUBLISHER "https://upload.mantidproject.org/scriptrepository")
set(HTML_ROOT ../share/doc/html)
# For a framework-only (e.g. MPI) build some of these are not relevant and
diff --git a/Framework/Properties/Mantid.properties.template b/Framework/Properties/Mantid.properties.template
index 143135818e6..516b49cdc59 100644
--- a/Framework/Properties/Mantid.properties.template
+++ b/Framework/Properties/Mantid.properties.template
@@ -216,7 +216,7 @@ UploaderWebServer = @MANTIDPUBLISHER@
# Local system path for the script repository.
ScriptLocalRepository =
# Base Url for the remote script repository. Not necessarily accessible, it is used to construct longer URLs
-ScriptRepository = http://download.mantidproject.org/scriptrepository/
+ScriptRepository = https://download.mantidproject.org/scriptrepository/
# Pattern given to ScriptRepository that is used to hide entries from repository to the users. It is a csv string separated with ';'
ScriptRepositoryIgnore = *pyc;
diff --git a/Framework/ScriptRepository/src/ScriptRepositoryImpl.cpp b/Framework/ScriptRepository/src/ScriptRepositoryImpl.cpp
index e3389c08183..b21bd4f70d1 100644
--- a/Framework/ScriptRepository/src/ScriptRepositoryImpl.cpp
+++ b/Framework/ScriptRepository/src/ScriptRepositoryImpl.cpp
@@ -161,7 +161,7 @@ DECLARE_SCRIPTREPOSITORY(ScriptRepositoryImpl)
ScriptrepositoryImpl sharing();
// apply given values
ScriptrepositoryImpl sharing("/tmp/gitrep",
- "http://repository.mantidproject.com");
+ "https://repository.mantidproject.com");
@endcode
*/
ScriptRepositoryImpl::ScriptRepositoryImpl(const std::string &local_rep,
@@ -983,7 +983,7 @@ void ScriptRepositoryImpl::updateRepositoryJson(const std::string &path,
*changing the word
* publish to remove. For example:
*
- * http://upload.mantidproject.org/scriptrepository/payload/remove
+ * https://upload.mantidproject.org/scriptrepository/payload/remove
*
* The server will them create a git commit deleting the file. And will reply
*with a json string
diff --git a/Framework/ScriptRepository/test/ScriptRepositoryTestImpl.h b/Framework/ScriptRepository/test/ScriptRepositoryTestImpl.h
index 98df977aa20..39e87f48909 100644
--- a/Framework/ScriptRepository/test/ScriptRepositoryTestImpl.h
+++ b/Framework/ScriptRepository/test/ScriptRepositoryTestImpl.h
@@ -79,7 +79,7 @@ const std::string REPOSITORYJSON =
const std::string TOFCONV_README = "This is the content of TOFCONV_README";
const std::string TOFCONV_CONVERTER = "print 'hello world'";
-const std::string webserverurl = "http://localhost";
+const std::string webserverurl = "https://localhost";
/** The ScriptRepositoryTest aims to ensure and protect the logic and
the interfaces described for ScriptRepository without requiring
@@ -140,7 +140,7 @@ public:
// request to ping the site
if (local_file_path.empty())
return;
- if (url_file.find("http://") == std::string::npos) {
+ if (url_file.find("https://") == std::string::npos) {
throw ScriptRepoException("Invalid url to download");
}
Poco::FileStream _out(local_file_path);
diff --git a/docs/source/concepts/PropertiesFile.rst b/docs/source/concepts/PropertiesFile.rst
index 08a5581c863..4229c7894dd 100644
--- a/docs/source/concepts/PropertiesFile.rst
+++ b/docs/source/concepts/PropertiesFile.rst
@@ -210,12 +210,12 @@ ScriptRepository Properties
+============================+===============================================+======================================================================+
| ``ScriptLocalRepository`` |Directory where ScriptRepository is Installed. | ``C:\\MantidInstall\\MyScriptRepository`` |
+----------------------------+-----------------------------------------------+----------------------------------------------------------------------+
-| ``ScriptRepository`` |Base URL for the remote script repository. | ``http://download.mantidproject.org/scriptrepository/`` |
+| ``ScriptRepository`` |Base URL for the remote script repository. | ``https://download.mantidproject.org/scriptrepository/`` |
+----------------------------+-----------------------------------------------+----------------------------------------------------------------------+
| ``ScriptRepositoryIgnore`` |CSV patterns for paths that should not be | ``*pyc;`` |
| |listed at ScriptRepository. | |
+----------------------------+-----------------------------------------------+----------------------------------------------------------------------+
-| ``UploaderWebServer`` |URL for uploading scripts. | ``http://upload.mantidproject.org/scriptrepository/payload/publish`` |
+| ``UploaderWebServer`` |URL for uploading scripts. | ``https://upload.mantidproject.org/scriptrepository/payload/publish``|
+----------------------------+-----------------------------------------------+----------------------------------------------------------------------+
--
GitLab