OF-734 Openfire cannot deal with SASL <abort/>

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@13959 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/openfire/net/SASLAuthentication.java

@@ -98,7 +98,7 @@ public class SASLAuthentication {
 
     public enum ElementType {
 
-        AUTH("auth"), RESPONSE("response"), CHALLENGE("challenge"), FAILURE("failure"), UNDEF("");
+        ABORT("abort"), AUTH("auth"), RESPONSE("response"), CHALLENGE("challenge"), FAILURE("failure"), UNDEF("");
 
         private String name = null;
 
@@ -258,6 +258,10 @@ public class SASLAuthentication {
         if (doc.getNamespace().asXML().equals(SASL_NAMESPACE)) {
             ElementType type = ElementType.valueof(doc.getName());
             switch (type) {
+                case ABORT:
+                    authenticationFailed(session, Failure.ABORTED);
+                    status = Status.failed;
+                    break;
                 case AUTH:
                     mechanism = doc.attributeValue("mechanism");
                     // http://xmpp.org/rfcs/rfc6120.html#sasl-errors-invalid-mechanism

src/java/org/jivesoftware/openfire/net/StanzaHandler.java

@@ -171,8 +171,7 @@ public abstract class StanzaHandler {
             startedSASL = true;
             // Process authentication stanza
             saslStatus = SASLAuthentication.handle(session, doc);
-        }
-        else if (startedSASL && "response".equals(tag)) {
+        } else if (startedSASL && "response".equals(tag) || "abort".equals(tag)) {
             // User is responding to SASL challenge. Process response
             saslStatus = SASLAuthentication.handle(session, doc);
         }