Author: btellier
Date: Thu Dec 17 15:10:01 2015
New Revision: 1720594
URL: http://svn.apache.org/viewvc?rev=1720594&view=rev
Log:
JAMES-1618 commands should not be case sensitive as demonstrated in RFC-5804
Modified:
james/project/trunk/mpt/impl/managesieve/core/src/main/resources/org/apache/james/managesieve/scripts/capability.test
james/project/trunk/mpt/impl/managesieve/core/src/main/resources/org/apache/james/managesieve/scripts/noop.test
james/project/trunk/mpt/impl/managesieve/core/src/main/resources/org/apache/james/managesieve/scripts/setactive.test
james/project/trunk/protocols/managesieve/src/main/java/org/apache/james/managesieve/transcode/ManageSieveProcessor.java
Modified:
james/project/trunk/mpt/impl/managesieve/core/src/main/resources/org/apache/james/managesieve/scripts/capability.test
URL:
http://svn.apache.org/viewvc/james/project/trunk/mpt/impl/managesieve/core/src/main/resources/org/apache/james/managesieve/scripts/capability.test?rev=1720594&r1=1720593&r2=1720594&view=diff
==============================================================================
---
james/project/trunk/mpt/impl/managesieve/core/src/main/resources/org/apache/james/managesieve/scripts/capability.test
(original)
+++
james/project/trunk/mpt/impl/managesieve/core/src/main/resources/org/apache/james/managesieve/scripts/capability.test
Thu Dec 17 15:10:01 2015
@@ -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
Modified:
james/project/trunk/mpt/impl/managesieve/core/src/main/resources/org/apache/james/managesieve/scripts/noop.test
URL:
http://svn.apache.org/viewvc/james/project/trunk/mpt/impl/managesieve/core/src/main/resources/org/apache/james/managesieve/scripts/noop.test?rev=1720594&r1=1720593&r2=1720594&view=diff
==============================================================================
---
james/project/trunk/mpt/impl/managesieve/core/src/main/resources/org/apache/james/managesieve/scripts/noop.test
(original)
+++
james/project/trunk/mpt/impl/managesieve/core/src/main/resources/org/apache/james/managesieve/scripts/noop.test
Thu Dec 17 15:10:01 2015
@@ -22,4 +22,7 @@ S: OK "NOOP completed"
C: NOOP "STARTTLS-SYNC-42"
S: OK \(TAG \{16\}
-S: STARTTLS-SYNC-42\) "DONE"
\ No newline at end of file
+S: STARTTLS-SYNC-42\) "DONE"
+
+C: NooP
+S: OK "NOOP completed"
\ No newline at end of file
Modified:
james/project/trunk/mpt/impl/managesieve/core/src/main/resources/org/apache/james/managesieve/scripts/setactive.test
URL:
http://svn.apache.org/viewvc/james/project/trunk/mpt/impl/managesieve/core/src/main/resources/org/apache/james/managesieve/scripts/setactive.test?rev=1720594&r1=1720593&r2=1720594&view=diff
==============================================================================
---
james/project/trunk/mpt/impl/managesieve/core/src/main/resources/org/apache/james/managesieve/scripts/setactive.test
(original)
+++
james/project/trunk/mpt/impl/managesieve/core/src/main/resources/org/apache/james/managesieve/scripts/setactive.test
Thu Dec 17 15:10:01 2015
@@ -42,4 +42,5 @@ S: OK
C: SETACTIVE "mysievescript"
S: OK
-
+C: SETACTIVe
+S: NO "Missing argument: script name"
Modified:
james/project/trunk/protocols/managesieve/src/main/java/org/apache/james/managesieve/transcode/ManageSieveProcessor.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/protocols/managesieve/src/main/java/org/apache/james/managesieve/transcode/ManageSieveProcessor.java?rev=1720594&r1=1720593&r2=1720594&view=diff
==============================================================================
---
james/project/trunk/protocols/managesieve/src/main/java/org/apache/james/managesieve/transcode/ManageSieveProcessor.java
(original)
+++
james/project/trunk/protocols/managesieve/src/main/java/org/apache/james/managesieve/transcode/ManageSieveProcessor.java
Thu Dec 17 15:10:01 2015
@@ -84,33 +84,33 @@ public class ManageSieveProcessor {
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";
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
