From e5ba1041be862212a3ad66bd51930fc7beeb8140 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Tue, 13 Sep 2016 20:24:12 +0300 Subject: [PATCH] file(DOWNLOAD|UPLOAD): Add 'USERPWD' suboption --- Help/command/file.rst | 3 +++ Source/cmFileCommand.cxx | 26 +++++++++++++++++++ .../file/DOWNLOAD-pass-not-set-result.txt | 1 + .../file/DOWNLOAD-pass-not-set-stderr.txt | 4 +++ .../RunCMake/file/DOWNLOAD-pass-not-set.cmake | 1 + Tests/RunCMake/file/RunCMakeTest.cmake | 2 ++ .../file/UPLOAD-pass-not-set-result.txt | 1 + .../file/UPLOAD-pass-not-set-stderr.txt | 4 +++ Tests/RunCMake/file/UPLOAD-pass-not-set.cmake | 1 + 9 files changed, 43 insertions(+) create mode 100644 Tests/RunCMake/file/DOWNLOAD-pass-not-set-result.txt create mode 100644 Tests/RunCMake/file/DOWNLOAD-pass-not-set-stderr.txt create mode 100644 Tests/RunCMake/file/DOWNLOAD-pass-not-set.cmake create mode 100644 Tests/RunCMake/file/UPLOAD-pass-not-set-result.txt create mode 100644 Tests/RunCMake/file/UPLOAD-pass-not-set-stderr.txt create mode 100644 Tests/RunCMake/file/UPLOAD-pass-not-set.cmake diff --git a/Help/command/file.rst b/Help/command/file.rst index 256d16da1..f8727f09b 100644 --- a/Help/command/file.rst +++ b/Help/command/file.rst @@ -222,6 +222,9 @@ Options to both ``DOWNLOAD`` and ``UPLOAD`` are: ``TIMEOUT `` Terminate the operation after a given total time has elapsed. +``USERPWD :`` + Set username and password for operation. + Additional options to ``DOWNLOAD`` are: ``EXPECTED_HASH ALGO=`` diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index ae7a5111c..2c226cda2 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -2481,6 +2481,7 @@ bool cmFileCommand::HandleDownloadCommand(std::vector const& args) std::string hashMatchMSG; CM_AUTO_PTR hash; bool showProgress = false; + std::string userpwd; while (i != args.end()) { if (*i == "TIMEOUT") { @@ -2564,6 +2565,13 @@ bool cmFileCommand::HandleDownloadCommand(std::vector const& args) return false; } hashMatchMSG = algo + " hash"; + } else if (*i == "USERPWD") { + ++i; + if (i == args.end()) { + this->SetError("DOWNLOAD missing string for USERPWD."); + return false; + } + userpwd = *i; } else { // Do not return error for compatibility reason. std::string err = "Unexpected argument: "; @@ -2703,6 +2711,11 @@ bool cmFileCommand::HandleDownloadCommand(std::vector const& args) check_curl_result(res, "DOWNLOAD cannot set progress data: "); } + if (!userpwd.empty()) { + res = ::curl_easy_setopt(curl, CURLOPT_USERPWD, userpwd.c_str()); + check_curl_result(res, "DOWNLOAD cannot set user password: "); + } + res = ::curl_easy_perform(curl); /* always cleanup */ @@ -2783,6 +2796,7 @@ bool cmFileCommand::HandleUploadCommand(std::vector const& args) std::string logVar; std::string statusVar; bool showProgress = false; + std::string userpwd; while (i != args.end()) { if (*i == "TIMEOUT") { @@ -2817,6 +2831,13 @@ bool cmFileCommand::HandleUploadCommand(std::vector const& args) statusVar = *i; } else if (*i == "SHOW_PROGRESS") { showProgress = true; + } else if (*i == "USERPWD") { + ++i; + if (i == args.end()) { + this->SetError("UPLOAD missing string for USERPWD."); + return false; + } + userpwd = *i; } else { // Do not return error for compatibility reason. std::string err = "Unexpected argument: "; @@ -2930,6 +2951,11 @@ bool cmFileCommand::HandleUploadCommand(std::vector const& args) ::curl_easy_setopt(curl, CURLOPT_INFILESIZE, static_cast(file_size)); check_curl_result(res, "UPLOAD cannot set input file size: "); + if (!userpwd.empty()) { + res = ::curl_easy_setopt(curl, CURLOPT_USERPWD, userpwd.c_str()); + check_curl_result(res, "UPLOAD cannot set user password: "); + } + res = ::curl_easy_perform(curl); /* always cleanup */ diff --git a/Tests/RunCMake/file/DOWNLOAD-pass-not-set-result.txt b/Tests/RunCMake/file/DOWNLOAD-pass-not-set-result.txt new file mode 100644 index 000000000..d00491fd7 --- /dev/null +++ b/Tests/RunCMake/file/DOWNLOAD-pass-not-set-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/file/DOWNLOAD-pass-not-set-stderr.txt b/Tests/RunCMake/file/DOWNLOAD-pass-not-set-stderr.txt new file mode 100644 index 000000000..2fa2731d0 --- /dev/null +++ b/Tests/RunCMake/file/DOWNLOAD-pass-not-set-stderr.txt @@ -0,0 +1,4 @@ +^CMake Error at DOWNLOAD-pass-not-set.cmake:[0-9]+ \(file\): + file DOWNLOAD missing string for USERPWD. +Call Stack \(most recent call first\): + CMakeLists.txt:[0-9]+ \(include\)$ diff --git a/Tests/RunCMake/file/DOWNLOAD-pass-not-set.cmake b/Tests/RunCMake/file/DOWNLOAD-pass-not-set.cmake new file mode 100644 index 000000000..61eff6d65 --- /dev/null +++ b/Tests/RunCMake/file/DOWNLOAD-pass-not-set.cmake @@ -0,0 +1 @@ +file(DOWNLOAD "" "" USERPWD) diff --git a/Tests/RunCMake/file/RunCMakeTest.cmake b/Tests/RunCMake/file/RunCMakeTest.cmake index 4c05f24ef..d8e9ce0a9 100644 --- a/Tests/RunCMake/file/RunCMakeTest.cmake +++ b/Tests/RunCMake/file/RunCMakeTest.cmake @@ -2,7 +2,9 @@ include(RunCMake) run_cmake(DOWNLOAD-hash-mismatch) run_cmake(DOWNLOAD-unused-argument) +run_cmake(DOWNLOAD-pass-not-set) run_cmake(UPLOAD-unused-argument) +run_cmake(UPLOAD-pass-not-set) run_cmake(INSTALL-DIRECTORY) run_cmake(INSTALL-MESSAGE-bad) run_cmake(FileOpenFailRead) diff --git a/Tests/RunCMake/file/UPLOAD-pass-not-set-result.txt b/Tests/RunCMake/file/UPLOAD-pass-not-set-result.txt new file mode 100644 index 000000000..d00491fd7 --- /dev/null +++ b/Tests/RunCMake/file/UPLOAD-pass-not-set-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/file/UPLOAD-pass-not-set-stderr.txt b/Tests/RunCMake/file/UPLOAD-pass-not-set-stderr.txt new file mode 100644 index 000000000..089c0ad45 --- /dev/null +++ b/Tests/RunCMake/file/UPLOAD-pass-not-set-stderr.txt @@ -0,0 +1,4 @@ +^CMake Error at UPLOAD-pass-not-set.cmake:[0-9]+ \(file\): + file UPLOAD missing string for USERPWD. +Call Stack \(most recent call first\): + CMakeLists.txt:[0-9]+ \(include\)$ diff --git a/Tests/RunCMake/file/UPLOAD-pass-not-set.cmake b/Tests/RunCMake/file/UPLOAD-pass-not-set.cmake new file mode 100644 index 000000000..4f3d86ce4 --- /dev/null +++ b/Tests/RunCMake/file/UPLOAD-pass-not-set.cmake @@ -0,0 +1 @@ +file(UPLOAD "" "" USERPWD)