Add proxy support (#53)

Signed-off-by: Raul Metsma <[email protected]>

Author: metsma

cdoc/NetworkBackend.cpp

@@ -197,6 +197,28 @@ setPeerCertificates(httplib::SSLClient& cli, libcdoc::NetworkBackend *network, c
     return libcdoc::OK;
 }
 
+//
+// Set proxy parameters
+//
+static libcdoc::result_t
+setProxy(httplib::SSLClient& cli, libcdoc::NetworkBackend *network)
+{
+    libcdoc::NetworkBackend::ProxyCredentials cred;
+    switch (auto result = network->getProxyCredentials(cred)) {
+    case libcdoc::NOT_IMPLEMENTED:
+        return libcdoc::OK;
+    case libcdoc::OK:
+        if (!cred.host.empty()) {
+            cli.set_proxy(cred.host, cred.port);
+        }
+        if (!cred.username.empty()) {
+            cli.set_proxy_basic_auth(cred.username, cred.password);
+        }
+        return libcdoc::OK;
+    default: return result;
+    }
+}
+
 //
 // Post request and fetch response
 //
@@ -262,6 +284,7 @@ libcdoc::NetworkBackend::sendKey (CapsuleInfo& dst, const std::string& url, cons
     httplib::SSLClient cli(host, port);
     result = setPeerCertificates(cli, this, buildURL(host, port));
     if (result != OK) return result;
+    if (result = setProxy(cli, this); result != OK) return result;
 
     std::string full = path + "/key-capsules";
     httplib::Response rsp;
@@ -322,6 +345,7 @@ libcdoc::NetworkBackend::sendShare(std::vector<uint8_t>& dst, const std::string&
     httplib::SSLClient cli(host, port);
     result = setPeerCertificates(cli, this, buildURL(host, port));
     if (result != OK) return result;
+    if (result = setProxy(cli, this); result != OK) return result;
 
     std::string full = path + "/key-shares";
     httplib::Response rsp;
@@ -360,6 +384,7 @@ libcdoc::NetworkBackend::fetchKey (std::vector<uint8_t>& dst, const std::string&
     httplib::SSLClient cli(host, port, d->x509.get(), d->pkey);
     result = setPeerCertificates(cli, this, buildURL(host, port));
     if (result != OK) return result;
+    if (result = setProxy(cli, this); result != OK) return result;
 
     std::string full = path + "/key-capsules/" + transaction_id;
     httplib::Headers hdrs;
@@ -395,6 +420,7 @@ libcdoc::NetworkBackend::fetchNonce(std::vector<uint8_t>& dst, const std::string
     httplib::SSLClient cli(host, port);
     result = setPeerCertificates(cli, this, buildURL(host, port));
     if (result != OK) return result;
+    if (result = setProxy(cli, this); result != OK) return result;
 
     std::string full = path + "/key-shares/" + share_id + "/nonce";
     httplib::Response rsp;
@@ -430,6 +456,7 @@ libcdoc::NetworkBackend::fetchShare(ShareInfo& share, const std::string& url, co
 
     result = setPeerCertificates(cli, this, buildURL(host, port));
     if (result != OK) return result;
+    if (result = setProxy(cli, this); result != OK) return result;
 
     std::string full = path + "/key-shares/" + share_id;
     LOG_DBG("Share url: {}", full);
@@ -680,6 +707,7 @@ libcdoc::NetworkBackend::signSID(std::vector<uint8_t>& dst, std::vector<uint8_t>
     httplib::SSLClient cli(host, port);
     result = setPeerCertificates(cli, this, buildURL(host, port));
     if (result != OK) return result;
+    if (result = setProxy(cli, this); result != OK) return result;
 
     //
     // Let user choose certificate (if multiple)
@@ -801,6 +829,7 @@ libcdoc::NetworkBackend::signMID(std::vector<uint8_t>& dst, std::vector<uint8_t>
     httplib::SSLClient cli(host, port);
     result = setPeerCertificates(cli, this, buildURL(host, port));
     if (result != OK) return result;
+    if (result = setProxy(cli, this); result != OK) return result;
 
     //
     // Authenticate

cdoc/NetworkBackend.h

@@ -96,6 +96,29 @@ struct CDOC_EXPORT NetworkBackend {
         std::string recipient;
     };
 
+    /**
+     * @brief Proxy credentials used for network access
+     * 
+     */
+    struct ProxyCredentials {
+        /**
+         * @brief Proxy host
+         */
+        std::string host;
+        /**
+         * @brief Proxy port
+         */
+        uint16_t port;
+        /**
+         * @brief Proxy username
+         */
+        std::string username;
+        /**
+         * @brief Proxy password
+         */
+        std::string password;
+    };
+
     NetworkBackend() = default;
 	virtual ~NetworkBackend() noexcept = default;
     NetworkBackend(const NetworkBackend&) = delete;
@@ -191,6 +214,14 @@ struct CDOC_EXPORT NetworkBackend {
         return getPeerTLSCertificates(dst);
     }
 
+    /**
+     * @brief Get proxy configuration currently set
+     * @param credentials output for proxy credentials
+     */
+    virtual result_t getProxyCredentials(ProxyCredentials& credentials) const {
+        return NOT_IMPLEMENTED;
+    }
+
     /**
      * @brief sign TLS digest with client's private key
      * @param dst a destination container for signature

libcdoc.i

@@ -89,6 +89,7 @@
 %apply long long { libcdoc::result_t }
 %apply long long { int64_t }
 %apply long long { uint64_t }
+%apply int { uint16_t }
 %apply int { int32_t }
 %apply int { unsigned int }