From dffd441304aee6e33d05172ea6e24d7f85bc6c0a Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 28 Nov 2015 18:53:40 +0000
Subject: [PATCH] SAM: Allow backslash escapes in parser (tickets #1325, #1488)
remove unneeded escape char in other parsers
---
apps/sam/java/src/net/i2p/sam/SAMUtils.java | 10 ++++++++--
core/java/src/net/i2p/util/EepGet.java | 2 +-
.../src/net/i2p/router/startup/LoadClientAppsJob.java | 2 +-
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/apps/sam/java/src/net/i2p/sam/SAMUtils.java b/apps/sam/java/src/net/i2p/sam/SAMUtils.java
index 723defab62..c5e9d9594f 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMUtils.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMUtils.java
@@ -180,10 +180,10 @@ class SAMUtils {
* PING any thing goes
* PONG any thing goes
*
- * No escaping of '"' or anything else is allowed or defined
+ * Escaping is allowed with a backslash, e.g. \"
* No spaces before or after '=' allowed
* Keys may not be quoted
- * COMMAND and OPCODE may not have '='
+ * COMMAND, OPCODE, and keys may not have '=' or whitespace unless escaped
* Duplicate keys not allowed
*</pre>
*
@@ -274,6 +274,12 @@ class SAMUtils {
}
break;
+ case '\\':
+ if (++i >= length)
+ throw new SAMException("Unterminated escape");
+ c = args.charAt(i);
+ // fall through...
+
default:
buf.append(c);
break;
diff --git a/core/java/src/net/i2p/util/EepGet.java b/core/java/src/net/i2p/util/EepGet.java
index 1c2406291a..85c34b49b8 100644
--- a/core/java/src/net/i2p/util/EepGet.java
+++ b/core/java/src/net/i2p/util/EepGet.java
@@ -1520,7 +1520,7 @@ public class EepGet {
String key = null;
for (int i = 0; i < data.length; i++) {
switch (data[i]) {
- case '\"':
+ case '"':
if (isQuoted) {
// keys never quoted
if (key != null) {
diff --git a/router/java/src/net/i2p/router/startup/LoadClientAppsJob.java b/router/java/src/net/i2p/router/startup/LoadClientAppsJob.java
index 05969ec03a..67ab009519 100644
--- a/router/java/src/net/i2p/router/startup/LoadClientAppsJob.java
+++ b/router/java/src/net/i2p/router/startup/LoadClientAppsJob.java
@@ -123,7 +123,7 @@ public class LoadClientAppsJob extends JobImpl {
for (int i = 0; i < data.length; i++) {
switch (data[i]) {
case '\'':
- case '\"':
+ case '"':
if (isQuoted) {
String str = buf.toString().trim();
if (str.length() > 0)
--
GitLab