diff options
| author | Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com> | 2023-03-07 16:28:52 +0100 |
|---|---|---|
| committer | Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com> | 2023-03-08 15:50:46 +0100 |
| commit | fdac71b46721818f8656abeb5ae8bfee5f8feceb (patch) | |
| tree | f90b5bafa8406cd4e75f0c10bdff743c3dcc9405 /src | |
| parent | 81ace51dcd3dcf158f970eca57c45ceaa7e3e8d7 (diff) | |
| download | justbuild-fdac71b46721818f8656abeb5ae8bfee5f8feceb.tar.gz | |
Just-MR: Add command line options for SSL verification during archive fetch
Diffstat (limited to 'src')
| -rw-r--r-- | src/other_tools/just_mr/cli.hpp | 14 | ||||
| -rw-r--r-- | src/other_tools/just_mr/utils.hpp | 6 |
2 files changed, 20 insertions, 0 deletions
diff --git a/src/other_tools/just_mr/cli.hpp b/src/other_tools/just_mr/cli.hpp index 6ed07125..5548e073 100644 --- a/src/other_tools/just_mr/cli.hpp +++ b/src/other_tools/just_mr/cli.hpp @@ -38,6 +38,7 @@ struct MultiRepoCommonArguments { std::vector<std::string> explicit_distdirs{}; JustMR::PathsPtr just_mr_paths = std::make_shared<JustMR::Paths>(); std::optional<std::vector<std::string>> local_launcher{std::nullopt}; + JustMR::CAInfoPtr ca_info = std::make_shared<JustMR::CAInfo>(); std::optional<std::filesystem::path> just_path{std::nullopt}; std::optional<std::string> main{std::nullopt}; std::optional<std::filesystem::path> rc_path{std::nullopt}; @@ -123,6 +124,19 @@ static inline void SetupMultiRepoCommonArguments( ->type_name("PATH") ->trigger_on_parse(); // run callback on all instances while parsing, // not after all parsing is done + app->add_flag("--no-fetch-ssl-verify", + clargs->ca_info->no_ssl_verify, + "Do not perform SSL verification when fetching archives from " + "remote."); + app->add_option_function<std::string>( + "--fetch-cacert", + [clargs](auto const& cacert_raw) { + clargs->ca_info->ca_bundle = std::filesystem::weakly_canonical( + std::filesystem::absolute(cacert_raw)); + }, + "CA certificate bundle to use for SSL verification when fetching " + "archives from remote.") + ->type_name("CA_BUNDLE"); app->add_option("--just", clargs->just_path, "Path to the just binary.") ->type_name("PATH"); app->add_option("--main", diff --git a/src/other_tools/just_mr/utils.hpp b/src/other_tools/just_mr/utils.hpp index 57202a11..5cb82eb3 100644 --- a/src/other_tools/just_mr/utils.hpp +++ b/src/other_tools/just_mr/utils.hpp @@ -115,7 +115,13 @@ struct Paths { std::vector<std::filesystem::path> distdirs{}; }; +struct CAInfo { + bool no_ssl_verify{false}; + std::optional<std::filesystem::path> ca_bundle{std::nullopt}; +}; + using PathsPtr = std::shared_ptr<JustMR::Paths>; +using CAInfoPtr = std::shared_ptr<JustMR::CAInfo>; namespace Utils { |