Fix proxy SSL

open-eid · Feb 15, 2024 · 38f64af · 38f64af
1 parent 86cf367
commit 38f64af
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/MoppApp/MoppApp/ManualProxy.swift b/MoppApp/MoppApp/ManualProxy.swift
@@ -38,6 +38,6 @@ public class ManualProxy {
 
     public static func getMoppLibProxyConfiguration() -> MoppLibProxyConfiguration {
         let manualProxy = ManualProxy.getManualProxyConfiguration()
-        return MoppLibProxyConfiguration(configuration: manualProxy.host, port: NSNumber(value: manualProxy.port), username: manualProxy.username, password: manualProxy.password)
+        return MoppLibProxyConfiguration(configuration: manualProxy.host, port: NSNumber(value: manualProxy.port), username: manualProxy.username, password: manualProxy.password, issslenabled: manualProxy.isSSLEnabled)
     }
 }
diff --git a/MoppApp/MoppApp/Signing/SivaCertViewController.swift b/MoppApp/MoppApp/Signing/SivaCertViewController.swift
@@ -306,6 +306,8 @@ class SivaCertViewController: MoppViewController {
 }
 
 extension SivaCertViewController: SettingsCellDelegate {
+    func didStartEditingField(_ field: SigningCategoryViewController.FieldId, _ textField: UITextField) { return }
+
     func didStartEditingField(_ field: SigningCategoryViewController.FieldId, _ indexPath: IndexPath) {
         currentlyEditingCell = indexPath
     }

diff --git a/MoppLib/MoppLib/MoppLibDigidocManager.mm b/MoppLib/MoppLib/MoppLibDigidocManager.mm
@@ -159,6 +159,10 @@
     virtual std::string proxyPass() const override {
         return std::string([proxyConfiguration.PASSWORD UTF8String]);
     }
+
+    virtual bool proxyTunnelSSL() const override {
+        return proxyConfiguration.ISSSLENABLED;
+    }
 
     std::vector<digidoc::X509Cert> stringsToX509Certs(NSArray<NSString*> *certBundle) const {
         __block std::vector<digidoc::X509Cert> x509Certs;

diff --git a/MoppLib/MoppLib/PublicInterface/MoppLibProxyConfiguration.h b/MoppLib/MoppLib/PublicInterface/MoppLibProxyConfiguration.h
@@ -29,7 +29,8 @@
 @property (nonatomic, strong) NSNumber *PORT;
 @property (nonatomic, strong) NSString *USERNAME;
 @property (nonatomic, strong) NSString *PASSWORD;
+@property (nonatomic, assign) BOOL *ISSSLENABLED;
 
-- (id) initWithConfiguration:(NSString *)HOST PORT:(NSNumber *)PORT USERNAME:(NSString *)USERNAME PASSWORD:(NSString *)PASSWORD;
+- (id) initWithConfiguration:(NSString *)HOST PORT:(NSNumber *)PORT USERNAME:(NSString *)USERNAME PASSWORD:(NSString *)PASSWORD ISSSLENABLED:(BOOL)ISSSLENABLED;
 
 @end