kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'file-curl-userpw' 

abeb42f1 Help: Add notes for topic 'file-curl-userpw'
e5ba1041 file(DOWNLOAD|UPLOAD): Add 'USERPWD' suboption
This commit is contained in:
Brad King 2016-09-14 08:56:22 -04:00 committed by CMake Topic Stage
parent b93623550d abeb42f1d9
commit 171ea5d3cf
10 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Help/command/file.rst
View File

@ -222,6 +222,9 @@ Options to both ``DOWNLOAD`` and ``UPLOAD`` are:
``TIMEOUT <seconds>``
Terminate the operation after a given total time has elapsed.
``USERPWD <username>:<password>``
Set username and password for operation.
Additional options to ``DOWNLOAD`` are:
``EXPECTED_HASH ALGO=<value>``

5
Help/release/dev/file-curl-userpw.rst Normal file
View File

@ -0,0 +1,5 @@
file-curl-userpw
----------------
* The :command:`file(DOWNLOAD)` and :command:`file(UPLOAD)` commands
gained a ``USERPWD <username>:<password>`` option.

26
Source/cmFileCommand.cxx
View File

@ -2481,6 +2481,7 @@ bool cmFileCommand::HandleDownloadCommand(std::vector<std::string> const& args)
std::string hashMatchMSG;
CM_AUTO_PTR<cmCryptoHash> hash;
bool showProgress = false;
std::string userpwd;
while (i != args.end()) {
if (*i == "TIMEOUT") {
@ -2564,6 +2565,13 @@ bool cmFileCommand::HandleDownloadCommand(std::vector<std::string> 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<std::string> 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<std::string> 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<std::string> 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<std::string> const& args)
::curl_easy_setopt(curl, CURLOPT_INFILESIZE, static_cast<long>(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 */

1
Tests/RunCMake/file/DOWNLOAD-pass-not-set-result.txt Normal file
View File

@ -0,0 +1 @@
1

4
Tests/RunCMake/file/DOWNLOAD-pass-not-set-stderr.txt Normal file
View File

@ -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\)$

1
Tests/RunCMake/file/DOWNLOAD-pass-not-set.cmake Normal file
View File

@ -0,0 +1 @@
file(DOWNLOAD "" "" USERPWD)

2
Tests/RunCMake/file/RunCMakeTest.cmake
View File

@ -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)

1
Tests/RunCMake/file/UPLOAD-pass-not-set-result.txt Normal file
View File

@ -0,0 +1 @@
1

4
Tests/RunCMake/file/UPLOAD-pass-not-set-stderr.txt Normal file
View File

@ -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\)$

1
Tests/RunCMake/file/UPLOAD-pass-not-set.cmake Normal file
View File

@ -0,0 +1 @@
file(UPLOAD "" "" USERPWD)