From 8ef4a2f2f0216d5bd716d990dbf89b80868b9103 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 3 May 2018 15:41:44 +0200 Subject: config: loosen parser to match reality Mid-line comments, mixed case. --- app/src/main/java/com/wireguard/config/Attribute.java | 4 ++-- app/src/main/java/com/wireguard/config/Config.java | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/wireguard/config/Attribute.java b/app/src/main/java/com/wireguard/config/Attribute.java index 2caa9fb2..98e9fcbc 100644 --- a/app/src/main/java/com/wireguard/config/Attribute.java +++ b/app/src/main/java/com/wireguard/config/Attribute.java @@ -42,7 +42,7 @@ enum Attribute { static { KEY_MAP = new HashMap<>(Attribute.values().length); for (final Attribute key : Attribute.values()) { - KEY_MAP.put(key.token, key); + KEY_MAP.put(key.token.toLowerCase(), key); } } @@ -67,7 +67,7 @@ enum Attribute { } public static Attribute match(final CharSequence line) { - return KEY_MAP.get(SEPARATOR_PATTERN.split(line)[0]); + return KEY_MAP.get(SEPARATOR_PATTERN.split(line)[0].toLowerCase()); } public static InetAddress parseIPString(final String address) { diff --git a/app/src/main/java/com/wireguard/config/Config.java b/app/src/main/java/com/wireguard/config/Config.java index f2bcd2fe..2b6b0705 100644 --- a/app/src/main/java/com/wireguard/config/Config.java +++ b/app/src/main/java/com/wireguard/config/Config.java @@ -41,12 +41,16 @@ public class Config { String line; boolean inInterfaceSection = false; while ((line = reader.readLine()) != null) { - if (line.isEmpty() || line.startsWith("#")) + final int commentIndex = line.indexOf('#'); + if (commentIndex != -1) + line = line.substring(0, commentIndex); + line = line.trim(); + if (line.isEmpty()) continue; - if ("[Interface]".equals(line)) { + if ("[Interface]".toLowerCase().equals(line.toLowerCase())) { currentPeer = null; inInterfaceSection = true; - } else if ("[Peer]".equals(line)) { + } else if ("[Peer]".toLowerCase().equals(line.toLowerCase())) { currentPeer = new Peer(); config.peers.add(currentPeer); inInterfaceSection = false; -- cgit v1.2.3-59-g8ed1b