File 0003-conf-Add-options-for-working-with-certific... of Package libdnf

Overview Repositories Revisions Requests Users Attributes Meta

File 0003-conf-Add-options-for-working-with-certificates-used-.patch of Package libdnf (Revision b3ca3e302ace63ba9cd86de13a0fe51b)

Currently displaying revision b3ca3e302ace63ba9cd86de13a0fe51b , Show latest

From e0afe4b1baccc8167d2943612f9a2747db0ab212 Mon Sep 17 00:00:00 2001
From: Jaroslav Rohel <jrohel@redhat.com>
Date: Sun, 31 Jan 2021 21:51:28 +0100
Subject: [PATCH 3/4] [conf] Add options for working with certificates used
 with proxy

Options were added to both (main and repository) configuration.
Added options:
proxy_sslcacert
proxy_sslverify
proxy_sslclientcert
proxy_sslclientkey

The meaning of the options is the same as for the options used with
server certificates.
---
 libdnf/conf/ConfigMain.cpp | 12 ++++++++++++
 libdnf/conf/ConfigMain.hpp |  4 ++++
 libdnf/conf/ConfigRepo.cpp | 12 ++++++++++++
 libdnf/conf/ConfigRepo.hpp |  4 ++++
 4 files changed, 32 insertions(+)

diff --git a/libdnf/conf/ConfigMain.cpp b/libdnf/conf/ConfigMain.cpp
index 2c3e0a90..39ed4b1e 100644
--- a/libdnf/conf/ConfigMain.cpp
+++ b/libdnf/conf/ConfigMain.cpp
@@ -346,6 +346,10 @@ class ConfigMain::Impl {
     OptionBool sslverify{true};
     OptionString sslclientcert{""};
     OptionString sslclientkey{""};
+    OptionString proxy_sslcacert{""};
+    OptionBool proxy_sslverify{true};
+    OptionString proxy_sslclientcert{""};
+    OptionString proxy_sslclientkey{""};
     OptionBool deltarpm{true};
     OptionNumber<std::uint32_t> deltarpm_percentage{75};
     OptionBool skip_if_unavailable{false};
@@ -493,6 +497,10 @@ ConfigMain::Impl::Impl(Config & owner)
     owner.optBinds().add("sslverify", sslverify);
     owner.optBinds().add("sslclientcert", sslclientcert);
     owner.optBinds().add("sslclientkey", sslclientkey);
+    owner.optBinds().add("proxy_sslcacert", proxy_sslcacert);
+    owner.optBinds().add("proxy_sslverify", proxy_sslverify);
+    owner.optBinds().add("proxy_sslclientcert", proxy_sslclientcert);
+    owner.optBinds().add("proxy_sslclientkey", proxy_sslclientkey);
     owner.optBinds().add("deltarpm", deltarpm);
     owner.optBinds().add("deltarpm_percentage", deltarpm_percentage);
     owner.optBinds().add("skip_if_unavailable", skip_if_unavailable);
@@ -607,6 +615,10 @@ OptionString & ConfigMain::sslcacert() { return pImpl->sslcacert; }
 OptionBool & ConfigMain::sslverify() { return pImpl->sslverify; }
 OptionString & ConfigMain::sslclientcert() { return pImpl->sslclientcert; }
 OptionString & ConfigMain::sslclientkey() { return pImpl->sslclientkey; }
+OptionString & ConfigMain::proxy_sslcacert() { return pImpl->proxy_sslcacert; }
+OptionBool & ConfigMain::proxy_sslverify() { return pImpl->proxy_sslverify; }
+OptionString & ConfigMain::proxy_sslclientcert() { return pImpl->proxy_sslclientcert; }
+OptionString & ConfigMain::proxy_sslclientkey() { return pImpl->proxy_sslclientkey; }
 OptionBool & ConfigMain::deltarpm() { return pImpl->deltarpm; }
 OptionNumber<std::uint32_t> & ConfigMain::deltarpm_percentage() { return pImpl->deltarpm_percentage; }
 OptionBool & ConfigMain::skip_if_unavailable() { return pImpl->skip_if_unavailable; }
diff --git a/libdnf/conf/ConfigMain.hpp b/libdnf/conf/ConfigMain.hpp
index 7dfdba3e..4833e444 100644
--- a/libdnf/conf/ConfigMain.hpp
+++ b/libdnf/conf/ConfigMain.hpp
@@ -159,6 +159,10 @@ public:
     OptionBool & sslverify();
     OptionString & sslclientcert();
     OptionString & sslclientkey();
+    OptionString & proxy_sslcacert();
+    OptionBool & proxy_sslverify();
+    OptionString & proxy_sslclientcert();
+    OptionString & proxy_sslclientkey();
     OptionBool & deltarpm();
     OptionNumber<std::uint32_t> & deltarpm_percentage();
     OptionBool & skip_if_unavailable();
diff --git a/libdnf/conf/ConfigRepo.cpp b/libdnf/conf/ConfigRepo.cpp
index 25bf900b..0048b896 100644
--- a/libdnf/conf/ConfigRepo.cpp
+++ b/libdnf/conf/ConfigRepo.cpp
@@ -69,6 +69,10 @@ class ConfigRepo::Impl {
     OptionChild<OptionBool> sslverify{masterConfig.sslverify()};
     OptionChild<OptionString> sslclientcert{masterConfig.sslclientcert()};
     OptionChild<OptionString> sslclientkey{masterConfig.sslclientkey()};
+    OptionChild<OptionString> proxy_sslcacert{masterConfig.proxy_sslcacert()};
+    OptionChild<OptionBool> proxy_sslverify{masterConfig.proxy_sslverify()};
+    OptionChild<OptionString> proxy_sslclientcert{masterConfig.proxy_sslclientcert()};
+    OptionChild<OptionString> proxy_sslclientkey{masterConfig.proxy_sslclientkey()};
     OptionChild<OptionBool> deltarpm{masterConfig.deltarpm()};
     OptionChild<OptionNumber<std::uint32_t> > deltarpm_percentage{masterConfig.deltarpm_percentage()};
     OptionChild<OptionBool> skip_if_unavailable{masterConfig.skip_if_unavailable()};
@@ -159,6 +163,10 @@ ConfigRepo::Impl::Impl(Config & owner, ConfigMain & masterConfig)
     owner.optBinds().add("sslverify", sslverify);
     owner.optBinds().add("sslclientcert", sslclientcert);
     owner.optBinds().add("sslclientkey", sslclientkey);
+    owner.optBinds().add("proxy_sslcacert", proxy_sslcacert);
+    owner.optBinds().add("proxy_sslverify", proxy_sslverify);
+    owner.optBinds().add("proxy_sslclientcert", proxy_sslclientcert);
+    owner.optBinds().add("proxy_sslclientkey", proxy_sslclientkey);
     owner.optBinds().add("deltarpm", deltarpm);
     owner.optBinds().add("deltarpm_percentage", deltarpm_percentage);
     owner.optBinds().add("skip_if_unavailable", skip_if_unavailable);
@@ -210,6 +218,10 @@ OptionChild<OptionString> & ConfigRepo::sslcacert() { return pImpl->sslcacert; }
 OptionChild<OptionBool> & ConfigRepo::sslverify() { return pImpl->sslverify; }
 OptionChild<OptionString> & ConfigRepo::sslclientcert() { return pImpl->sslclientcert; }
 OptionChild<OptionString> & ConfigRepo::sslclientkey() { return pImpl->sslclientkey; }
+OptionChild<OptionString> & ConfigRepo::proxy_sslcacert() { return pImpl->proxy_sslcacert; }
+OptionChild<OptionBool> & ConfigRepo::proxy_sslverify() { return pImpl->proxy_sslverify; }
+OptionChild<OptionString> & ConfigRepo::proxy_sslclientcert() { return pImpl->proxy_sslclientcert; }
+OptionChild<OptionString> & ConfigRepo::proxy_sslclientkey() { return pImpl->proxy_sslclientkey; }
 OptionChild<OptionBool> & ConfigRepo::deltarpm() { return pImpl->deltarpm; }
 OptionChild<OptionNumber<std::uint32_t> > & ConfigRepo::deltarpm_percentage() { return pImpl->deltarpm_percentage; }
 OptionChild<OptionBool> & ConfigRepo::skip_if_unavailable() { return pImpl->skip_if_unavailable; }
diff --git a/libdnf/conf/ConfigRepo.hpp b/libdnf/conf/ConfigRepo.hpp
index a59e0209..12bd142f 100644
--- a/libdnf/conf/ConfigRepo.hpp
+++ b/libdnf/conf/ConfigRepo.hpp
@@ -83,6 +83,10 @@ public:
     OptionChild<OptionBool> & sslverify();
     OptionChild<OptionString> & sslclientcert();
     OptionChild<OptionString> & sslclientkey();
+    OptionChild<OptionString> & proxy_sslcacert();
+    OptionChild<OptionBool> & proxy_sslverify();
+    OptionChild<OptionString> & proxy_sslclientcert();
+    OptionChild<OptionString> & proxy_sslclientkey();
     OptionChild<OptionBool> & deltarpm();
     OptionChild<OptionNumber<std::uint32_t> > & deltarpm_percentage();
     OptionChild<OptionBool> & skip_if_unavailable();
-- 
2.30.1

Places

File 0003-conf-Add-options-for-working-with-certificates-used-.patch of Package libdnf (Revision b3ca3e302ace63ba9cd86de13a0fe51b)

Places