File 0004-Apply-proxy-certificate-options.patch of Package libdnf

Overview Repositories Revisions Requests Users Attributes Meta

File 0004-Apply-proxy-certificate-options.patch of Package libdnf (Revision 1d67b4b415856ad4f60437a0191439da)

Currently displaying revision 1d67b4b415856ad4f60437a0191439da , Show latest

From 296e6d1bb34a1f76ed8dec02f20e0ef4c08a203f Mon Sep 17 00:00:00 2001
From: Jaroslav Rohel <jrohel@redhat.com>
Date: Sun, 31 Jan 2021 22:00:28 +0100
Subject: [PATCH 4/4] Apply proxy certificate options

Requires "librepo >= 1.13.0".

Related to: https://bugzilla.redhat.com/show_bug.cgi?id=1920991
---
 CMakeLists.txt       |  2 +-
 libdnf.spec          |  2 +-
 libdnf/dnf-repo.cpp  | 25 +++++++++++++++++++++++++
 libdnf/repo/Repo.cpp | 22 ++++++++++++++++++++++
 4 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index acd8da41..42fc03b1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,7 +62,7 @@ include_directories(${GLIB_INCLUDE_DIRS})
 pkg_check_modules(JSONC REQUIRED json-c)
 include_directories(${JSONC_INCLUDE_DIRS})
 pkg_check_modules(LIBMODULEMD REQUIRED modulemd-2.0>=2.11.2)
-pkg_check_modules(REPO REQUIRED librepo>=1.12.0)
+pkg_check_modules(REPO REQUIRED librepo>=1.13.0)
 include_directories(${REPO_INCLUDE_DIRS})
 link_directories(${REPO_LIBRARY_DIRS})
 pkg_check_modules(RPM REQUIRED rpm>=4.11.0)
diff --git a/libdnf.spec b/libdnf.spec
index 856af890..ea185158 100644
--- a/libdnf.spec
+++ b/libdnf.spec
@@ -1,6 +1,6 @@
 %global libsolv_version 0.7.7
 %global libmodulemd_version 2.11.2-2
-%global librepo_version 1.12.0
+%global librepo_version 1.13.0
 %global dnf_conflict 4.3.0
 %global swig_version 3.0.12
 %global libdnf_major_version 0
diff --git a/libdnf/dnf-repo.cpp b/libdnf/dnf-repo.cpp
index 05570d9a..6f72b9c5 100644
--- a/libdnf/dnf-repo.cpp
+++ b/libdnf/dnf-repo.cpp
@@ -1118,6 +1118,31 @@ dnf_repo_set_keyfile_data(DnfRepo *repo, gboolean reloadFromGKeyFile, GError **e
     if (!lr_handle_setopt(priv->repo_handle, error, LRO_USERPWD, tmp_cstr))
         return FALSE;
 
+    auto proxy_sslverify = conf->proxy_sslverify().getValue();
+    /* XXX: setopt() expects a long, so we need a long on the stack */
+    if (!lr_handle_setopt(priv->repo_handle, error, LRO_PROXY_SSLVERIFYPEER, (long)proxy_sslverify))
+        return FALSE;
+    if (!lr_handle_setopt(priv->repo_handle, error, LRO_PROXY_SSLVERIFYHOST, (long)proxy_sslverify))
+        return FALSE;
+
+    auto & proxy_sslcacert = conf->proxy_sslcacert().getValue();
+    if (!proxy_sslcacert.empty()) {
+        if (!lr_handle_setopt(priv->repo_handle, error, LRO_PROXY_SSLCACERT, proxy_sslcacert.c_str()))
+            return FALSE;
+    }
+
+    auto & proxy_sslclientcert = conf->proxy_sslclientcert().getValue();
+    if (!proxy_sslclientcert.empty()) {
+        if (!lr_handle_setopt(priv->repo_handle, error, LRO_PROXY_SSLCLIENTCERT, proxy_sslclientcert.c_str()))
+            return FALSE;
+    }
+
+    auto & proxy_sslclientkey = conf->proxy_sslclientkey().getValue();
+    if (!proxy_sslclientkey.empty()) {
+        if (!lr_handle_setopt(priv->repo_handle, error, LRO_PROXY_SSLCLIENTKEY, proxy_sslclientkey.c_str()))
+            return FALSE;
+    }
+
     return TRUE;
 }
 
diff --git a/libdnf/repo/Repo.cpp b/libdnf/repo/Repo.cpp
index eefaff6e..ec247782 100644
--- a/libdnf/repo/Repo.cpp
+++ b/libdnf/repo/Repo.cpp
@@ -633,6 +633,17 @@ std::unique_ptr<LrHandle> Repo::Impl::lrHandleInitRemote(const char *destdir)
     handleSetOpt(h.get(), LRO_SSLVERIFYHOST, sslverify);
     handleSetOpt(h.get(), LRO_SSLVERIFYPEER, sslverify);
 
+    // setup proxy ssl stuff
+    if (!conf->proxy_sslcacert().getValue().empty())
+        handleSetOpt(h.get(), LRO_PROXY_SSLCACERT, conf->proxy_sslcacert().getValue().c_str());
+    if (!conf->proxy_sslclientcert().getValue().empty())
+        handleSetOpt(h.get(), LRO_PROXY_SSLCLIENTCERT, conf->proxy_sslclientcert().getValue().c_str());
+    if (!conf->proxy_sslclientkey().getValue().empty())
+        handleSetOpt(h.get(), LRO_PROXY_SSLCLIENTKEY, conf->proxy_sslclientkey().getValue().c_str());
+    auto proxy_sslverify = conf->proxy_sslverify().getValue() ? 1L : 0L;
+    handleSetOpt(h.get(), LRO_PROXY_SSLVERIFYHOST, proxy_sslverify);
+    handleSetOpt(h.get(), LRO_PROXY_SSLVERIFYPEER, proxy_sslverify);
+
     return h;
 }
 
@@ -1731,6 +1742,17 @@ static LrHandle * newHandle(ConfigMain * conf)
         auto sslverify = conf->sslverify().getValue() ? 1L : 0L;
         handleSetOpt(h, LRO_SSLVERIFYHOST, sslverify);
         handleSetOpt(h, LRO_SSLVERIFYPEER, sslverify);
+
+        // setup proxy ssl stuff
+        if (!conf->proxy_sslcacert().getValue().empty())
+            handleSetOpt(h, LRO_PROXY_SSLCACERT, conf->proxy_sslcacert().getValue().c_str());
+        if (!conf->proxy_sslclientcert().getValue().empty())
+            handleSetOpt(h, LRO_PROXY_SSLCLIENTCERT, conf->proxy_sslclientcert().getValue().c_str());
+        if (!conf->proxy_sslclientkey().getValue().empty())
+            handleSetOpt(h, LRO_PROXY_SSLCLIENTKEY, conf->proxy_sslclientkey().getValue().c_str());
+        auto proxy_sslverify = conf->proxy_sslverify().getValue() ? 1L : 0L;
+        handleSetOpt(h, LRO_PROXY_SSLVERIFYHOST, proxy_sslverify);
+        handleSetOpt(h, LRO_PROXY_SSLVERIFYPEER, proxy_sslverify);
     }
     handleSetOpt(h, LRO_USERAGENT, user_agent);
     return h;
-- 
2.30.1

Places

File 0004-Apply-proxy-certificate-options.patch of Package libdnf (Revision 1d67b4b415856ad4f60437a0191439da)

Places