frank/wirevpn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Config: make parsing stricter

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld
2017-11-26 23:45:41 +01:00
committed by Samuel Holland
parent 14a7ada6e1
commit e421b997cd
4 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/wireguard/config/Config.java
+11 -3
View File
@@ -139,19 +139,27 @@ public class Config extends BaseObservable
new InputStreamReader(stream, StandardCharsets.UTF_8))) {
Peer currentPeer = null;
String line;
boolean inInterfaceSection = false;
while ((line = reader.readLine()) != null) {
if (line.isEmpty())
if (line.isEmpty() || line.startsWith("#"))
continue;
if ("[Interface]".equals(line)) {
currentPeer = null;
inInterfaceSection = true;
} else if ("[Peer]".equals(line)) {
currentPeer = addPeer();
} else if (currentPeer == null) {
inInterfaceSection = false;
} else if (inInterfaceSection) {
iface.parse(line);
} else {
} else if (currentPeer != null) {
currentPeer.parse(line);
} else {
throw new IllegalArgumentException("Invalid configuration line: " + line);
}
}
if (!inInterfaceSection && currentPeer == null) {
throw new IllegalArgumentException("Did not find any config information");
}
}
}