From 8dcc226bb5996c1822c703c459bac389cd4cc199 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Niess?= Date: Wed, 9 Sep 2009 11:10:34 +0000 Subject: [PATCH] SMACK-264 Fix NPE in SASLMechanism git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11256 b35dd754-fafc-0310-a699-88a17e54d16e --- .../smack/SASLAuthentication.java | 6 +- .../smack/sasl/SASLMechanism.java | 94 ++++++++++++++----- 2 files changed, 76 insertions(+), 24 deletions(-) diff --git a/source/org/jivesoftware/smack/SASLAuthentication.java b/source/org/jivesoftware/smack/SASLAuthentication.java index 516e874ab..e76521772 100644 --- a/source/org/jivesoftware/smack/SASLAuthentication.java +++ b/source/org/jivesoftware/smack/SASLAuthentication.java @@ -23,6 +23,7 @@ package org.jivesoftware.smack; import org.jivesoftware.smack.filter.PacketIDFilter; import org.jivesoftware.smack.packet.Bind; import org.jivesoftware.smack.packet.IQ; +import org.jivesoftware.smack.packet.Packet; import org.jivesoftware.smack.packet.Session; import org.jivesoftware.smack.sasl.*; @@ -528,9 +529,8 @@ public class SASLAuthentication implements UserAuthentication { } } - public void send(String stanza) throws IOException { - connection.writer.write(stanza); - connection.writer.flush(); + public void send(Packet stanza) { + connection.sendPacket(stanza); } /** diff --git a/source/org/jivesoftware/smack/sasl/SASLMechanism.java b/source/org/jivesoftware/smack/sasl/SASLMechanism.java index b41c23b1f..7c12f92bb 100644 --- a/source/org/jivesoftware/smack/sasl/SASLMechanism.java +++ b/source/org/jivesoftware/smack/sasl/SASLMechanism.java @@ -22,6 +22,7 @@ package org.jivesoftware.smack.sasl; import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.SASLAuthentication; +import org.jivesoftware.smack.packet.Packet; import org.jivesoftware.smack.util.Base64; import java.io.IOException; @@ -110,24 +111,18 @@ public abstract class SASLMechanism implements CallbackHandler { } protected void authenticate() throws IOException, XMPPException { - StringBuilder stanza = new StringBuilder(); - stanza.append(""); + String authenticationText = null; try { if(sc.hasInitialResponse()) { byte[] response = sc.evaluateChallenge(new byte[0]); - String authenticationText = Base64.encodeBytes(response,Base64.DONT_BREAK_LINES); - if(authenticationText != null && !authenticationText.equals("")) { - stanza.append(authenticationText); - } + authenticationText = Base64.encodeBytes(response,Base64.DONT_BREAK_LINES); } } catch (SaslException e) { throw new XMPPException("SASL authentication failed", e); } - stanza.append(""); // Send the authentication to the server - getSASLAuthentication().send(stanza.toString()); + getSASLAuthentication().send(new AuthMechanism(getName(), authenticationText)); } @@ -139,27 +134,23 @@ public abstract class SASLMechanism implements CallbackHandler { * @throws IOException if an exception sending the response occurs. */ public void challengeReceived(String challenge) throws IOException { - // Build the challenge response stanza encoding the response text - StringBuilder stanza = new StringBuilder(); - byte response[]; if(challenge != null) { response = sc.evaluateChallenge(Base64.decode(challenge)); } else { - response = sc.evaluateChallenge(null); + response = sc.evaluateChallenge(new byte[0]); } - String authenticationText = Base64.encodeBytes(response,Base64.DONT_BREAK_LINES); - if(authenticationText.equals("")) { - authenticationText = "="; + Packet responseStanza; + if (response == null) { + responseStanza = new Response(); + } + else { + responseStanza = new Response(Base64.encodeBytes(response,Base64.DONT_BREAK_LINES)); } - - stanza.append(""); - stanza.append(authenticationText); - stanza.append(""); // Send the authentication to the server - getSASLAuthentication().send(stanza.toString()); + getSASLAuthentication().send(responseStanza); } /** @@ -196,4 +187,65 @@ public abstract class SASLMechanism implements CallbackHandler { } } } + + /** + * Initiating SASL authentication by select a mechanism. + */ + public class AuthMechanism extends Packet { + final private String name; + final private String authenticationText; + + public AuthMechanism(String name, String authenticationText) { + if (name == null) { + throw new NullPointerException("SASL mechanism name shouldn't be null."); + } + this.name = name; + this.authenticationText = authenticationText; + } + + public String toXML() { + StringBuilder stanza = new StringBuilder(); + stanza.append(""); + if (authenticationText != null && + authenticationText.trim().length() > 0) { + stanza.append(authenticationText); + } + stanza.append(""); + return stanza.toString(); + } + } + + /** + * A SASL response stanza. + */ + public class Response extends Packet { + final private String authenticationText; + + public Response() { + authenticationText = null; + } + + public Response(String authenticationText) { + if (authenticationText == null || authenticationText.trim().length() == 0) { + this.authenticationText = null; + } + else { + this.authenticationText = authenticationText; + } + } + + public String toXML() { + StringBuilder stanza = new StringBuilder(); + stanza.append(""); + if (authenticationText == null) { + stanza.append(authenticationText); + } + else { + stanza.append("="); + } + stanza.append(""); + return stanza.toString(); + } + } }