From 27594eeae6f40a402bc3110f06d57975168e74e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 4 Jun 2015 19:20:15 +0200
Subject: ics-openvpn as a submodule! beautiful

ics-openvpn is now officially on GitHub, and they track openssl and
openvpn as submodules, so it's easier to update everything. Just a git
submodule update --recursive.

I've also set up soft links to native modules from ics-openvpn in app,
so that we don't copy files in Gradle (which was causing problems with
the submodules .git* files, not being copied). That makes the repo
cleaner.
---
 .../java/de/blinkt/openvpn/core/ConfigParser.java  | 39 ++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

(limited to 'app/src/main/java/de/blinkt/openvpn/core/ConfigParser.java')

diff --git a/app/src/main/java/de/blinkt/openvpn/core/ConfigParser.java b/app/src/main/java/de/blinkt/openvpn/core/ConfigParser.java
index 5f5d486c..232c454b 100644
--- a/app/src/main/java/de/blinkt/openvpn/core/ConfigParser.java
+++ b/app/src/main/java/de/blinkt/openvpn/core/ConfigParser.java
@@ -31,6 +31,9 @@ public class ConfigParser {
     public static final String CONVERTED_PROFILE = "converted Profile";
     private HashMap<String, Vector<Vector<String>>> options = new HashMap<String, Vector<Vector<String>>>();
     private HashMap<String, Vector<String>> meta = new HashMap<String, Vector<String>>();
+    private String auth_user_pass_file;
+    private String crl_verify_file;
+
 
     public void parseConfig(Reader reader) throws IOException, ConfigParseError {
 
@@ -114,6 +117,14 @@ public class ConfigParser {
 
     }
 
+    public String getAuthUserPassFile() {
+        return auth_user_pass_file;
+    }
+
+    public String getCrlVerifyFile() {
+        return crl_verify_file;
+    }
+
     enum linestate {
         initial,
         readin_single_quote, reading_quoted, reading_unquoted, done
@@ -572,6 +583,7 @@ public class ConfigParser {
                 options.put("remotetls", remotetls);
 
         Vector<String> authuser = getOption("auth-user-pass", 0, 1);
+
         if (authuser != null) {
             if (noauthtypeset) {
                 np.mAuthenticationType = VpnProfile.TYPE_USERPASS;
@@ -581,12 +593,24 @@ public class ConfigParser {
                 np.mAuthenticationType = VpnProfile.TYPE_USERPASS_KEYSTORE;
             }
             if (authuser.size() > 1) {
-                // Set option value to password get to embed later.
+                if (!authuser.get(1).startsWith(VpnProfile.INLINE_TAG))
+                    auth_user_pass_file = authuser.get(1);
                 np.mUsername = null;
                 useEmbbedUserAuth(np, authuser.get(1));
             }
         }
 
+        Vector<String> crlfile = getOption("crl-verify", 1, 2);
+        if (crlfile != null) {
+            // If the 'dir' parameter is present just add it as custom option ..
+            np.mCustomConfigOptions += TextUtils.join(" ", crlfile) + "\n";
+            if (crlfile.size() == 2) {
+                // Save the filename for the config converter to add later
+                crl_verify_file = crlfile.get(1);
+            }
+        }
+
+
         Pair<Connection, Connection[]> conns = parseConnectionOptions(null);
         np.mConnections = conns.second;
 
@@ -761,6 +785,16 @@ public class ConfigParser {
         }
     }
 
+    public static void removeCRLCustomOption(VpnProfile np) {
+        String lines[] = np.mCustomConfigOptions.split("\\r?\\n");
+        Vector<String> keeplines = new Vector<>();
+        for (String l : lines) {
+            if (!l.startsWith("crl-verify "))
+                keeplines.add(l);
+        }
+        np.mCustomConfigOptions = TextUtils.join("\n", keeplines);
+    }
+
     private void checkIgnoreAndInvalidOptions(VpnProfile np) throws ConfigParseError {
         for (String option : unsupportedOptions)
             if (options.containsKey(option))
@@ -772,7 +806,8 @@ public class ConfigParser {
 
 
         if (options.size() > 0) {
-            np.mCustomConfigOptions += "# These Options were found in the config file do not map to config settings:\n";
+            np.mCustomConfigOptions = "# These options found in the config file do not map to config settings:\n"
+                    + np.mCustomConfigOptions;
 
             for (Vector<Vector<String>> option : options.values()) {
 
-- 
cgit v1.2.3