JAMES-1618 commands should not be case sensitive as demonstrated in R…

…FC-5804 git-svn-id: https://svn.apache.org/repos/asf/james/project/trunk@1720594 13f79535-47bb-0310-9956-ffa450edef68
apache · Dec 17, 2015 · 6cdb998 · 6cdb998
1 parent eae6a04
commit 6cdb998
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 16 deletions.
diff --git a/.../managesieve/core/src/main/resources/org/apache/james/managesieve/scripts/capability.test b/.../managesieve/core/src/main/resources/org/apache/james/managesieve/scripts/capability.test
@@ -27,6 +27,16 @@ S: "VERSION" "1.0"
 }
 S: OK
 
+C: CaPaBiLiTy
+SUB {
+S: "SASL" "PLAIN"
+S: "SIEVE" "log reject fileinto i;ascii-numeric envelope body"
+S: "STARTTLS"
+S: "IMPLEMENTATION" "Apache ManageSieve v1.0"
+S: "VERSION" "1.0"
+}
+S: OK
+
 C: AUTHENTICATE "PLAIN"
 S: \+ ""
 C:  user password

diff --git a/mpt/impl/managesieve/core/src/main/resources/org/apache/james/managesieve/scripts/noop.test b/mpt/impl/managesieve/core/src/main/resources/org/apache/james/managesieve/scripts/noop.test
@@ -22,4 +22,7 @@ S: OK "NOOP completed"
 
 C: NOOP "STARTTLS-SYNC-42"
 S: OK \(TAG \{16\}
-S: STARTTLS-SYNC-42\) "DONE"
+S: STARTTLS-SYNC-42\) "DONE"
+
+C: NooP
+S: OK "NOOP completed"
diff --git a/...l/managesieve/core/src/main/resources/org/apache/james/managesieve/scripts/setactive.test b/...l/managesieve/core/src/main/resources/org/apache/james/managesieve/scripts/setactive.test
@@ -42,4 +42,5 @@ S: OK
 C: SETACTIVE "mysievescript"
 S: OK
 
-
+C: SETACTIVe
+S: NO "Missing argument: script name"
diff --git a/...anagesieve/src/main/java/org/apache/james/managesieve/transcode/ManageSieveProcessor.java b/...anagesieve/src/main/java/org/apache/james/managesieve/transcode/ManageSieveProcessor.java
@@ -84,33 +84,33 @@ private String matchCommandWithImplementation(Session session, String arguments,
         if (session.getState() == Session.State.AUTHENTICATION_IN_PROGRESS) {
             return argumentParser.authenticate(session, arguments);
         }
-        if (command.equals(AUTHENTICATE)) {
+        if (command.equalsIgnoreCase(AUTHENTICATE)) {
             return argumentParser.chooseMechanism(session, arguments);
-        } else if (command.equals(CAPABILITY)) {
+        } else if (command.equalsIgnoreCase(CAPABILITY)) {
             return argumentParser.capability(session, arguments);
-        } else if (command.equals(CHECKSCRIPT)) {
+        } else if (command.equalsIgnoreCase(CHECKSCRIPT)) {
             return argumentParser.checkScript(session, arguments);
-        } else if (command.equals(DELETESCRIPT)) {
+        } else if (command.equalsIgnoreCase(DELETESCRIPT)) {
             return argumentParser.deleteScript(session, arguments);
-        } else if (command.equals(GETSCRIPT)) {
+        } else if (command.equalsIgnoreCase(GETSCRIPT)) {
             return argumentParser.getScript(session, arguments);
-        } else if (command.equals(HAVESPACE)) {
+        } else if (command.equalsIgnoreCase(HAVESPACE)) {
             return argumentParser.haveSpace(session, arguments);
-        } else if (command.equals(LISTSCRIPTS)) {
+        } else if (command.equalsIgnoreCase(LISTSCRIPTS)) {
             return argumentParser.listScripts(session, arguments);
-        } else if (command.equals(LOGOUT)) {
+        } else if (command.equalsIgnoreCase(LOGOUT)) {
             argumentParser.logout();
-        } else if (command.equals(NOOP)) {
+        } else if (command.equalsIgnoreCase(NOOP)) {
             return argumentParser.noop(arguments);
-        } else if (command.equals(PUTSCRIPT)) {
+        } else if (command.equalsIgnoreCase(PUTSCRIPT)) {
             return argumentParser.putScript(session, arguments);
-        } else if (command.equals(RENAMESCRIPT)) {
+        } else if (command.equalsIgnoreCase(RENAMESCRIPT)) {
             return argumentParser.renameScript(session, arguments);
-        } else if (command.equals(SETACTIVE)) {
+        } else if (command.equalsIgnoreCase(SETACTIVE)) {
             return argumentParser.setActive(session, arguments);
-        } else if (command.equals(STARTTLS)) {
+        } else if (command.equalsIgnoreCase(STARTTLS)) {
             return argumentParser.startTLS(session);
-        } else if (command.equals(UNAUTHENTICATE)) {
+        } else if (command.equalsIgnoreCase(UNAUTHENTICATE)) {
             return argumentParser.unauthenticate(session, arguments);
         }
         return "NO unknown " + command + " command";