eldonilo/lightstring: lightstring.js comparison

comparison lightstring.js @ 27:b6e4bc19ff5a

undoing

author	Sonny Piers <sonny.piers@gmail.com>
date	Sat, 28 Jan 2012 01:27:00 +0100
parents	119ceb121908
children	630b9579fe4a

comparison

equal deleted inserted replaced

-:fc577e5b2f4a
+:b6e4bc19ff5a
 */
 stanza: {
 stream: {
 open: function(aService) {
 //FIXME no ending "/" - node-xmpp-bosh bug
-return "<stream:stream to='" + aService + "'\
+return "<stream:stream to='" + aService + "'" +
-xmlns='" + Lightstring.NS.jabberClient + "'\
+" xmlns='" + Lightstring.NS.jabberClient + "'" +
-xmlns:stream='" + Lightstring.NS.stream + "'\
+" xmlns:stream='" + Lightstring.NS.stream + "'" +
-version='1.0'/>";
+" version='1.0'/>";
 },
 close: function() {
-return '</stream:stream>';
+return "</stream:stream>";
 }
 }
 },
 /**
 * @private
 //FIXME support SCRAM-SHA1 && allow specify method preferences
 if ('DIGEST-MD5' in mechanisms)
 that.send(
-"<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl'\
+"<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl'" +
-mechanism='DIGEST-MD5'/>"
+" mechanism='DIGEST-MD5'/>"
 );
 else if ('PLAIN' in mechanisms) {
 var token = btoa(
 that.jid +
 '\u0000' +
 that.jid.node +
 '\u0000' +
 that.password
 );
 that.send(
-"<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl'\
+"<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl'" +
-mechanism='PLAIN'>" + token + '</auth>'
+" mechanism='PLAIN'>" + token + "</auth>"
 );
 }
 }
 //XMPP features
 else {
 that.emit('features', stanza);
 //Bind http://xmpp.org/rfcs/rfc3920.html#bind
+var bind =
+"<iq type='set' xmlns='jabber:client'>" +
+"<bind xmlns='urn:ietf:params:xml:ns:xmpp-bind'>" +
+(that.jid.resource? "<resource>" + that.jid.resource + "</resource>": "") +
+"</bind>" +
+"</iq>";
 that.send(
-"<iq type='set' xmlns='jabber:client'>\
+bind,
-<bind xmlns='urn:ietf:params:xml:ns:xmpp-bind'/>\
+function(stanza) {
-</iq>",
+//Session http://xmpp.org/rfcs/rfc3921.html#session
-function() {
+that.jid = new Lightstring.JID(stanza.textContent);
-//Session http://xmpp.org/rfcs/rfc3921.html#session
+that.send(
-that.send(
+"<iq type='set' xmlns='jabber:client'>" +
-"<iq type='set' xmlns='jabber:client'>\
+"<session xmlns='urn:ietf:params:xml:ns:xmpp-session'/>" +
-<session xmlns='urn:ietf:params:xml:ns:xmpp-session'/>\
+"</iq>",
-</iq>",
+function() {
-function() {
+that.emit('connected');
-that.emit('connected');
+}
-}
+);
-);
+}
-});
+);
 }
 });
 this.on('success', function(stanza, that) {
 that.send(
-"<stream:stream to='" + that.host + "'\
+"<stream:stream to='" + that.jid.domain + "'" +
-xmlns='jabber:client'\
+" xmlns='jabber:client'" +
-xmlns:stream='http://etherx.jabber.org/streams'\
+" xmlns:stream='http://etherx.jabber.org/streams'" +
-version='1.0' />"
+" version='1.0'/>"
 );
 });
 this.on('failure', function(stanza, that) {
 that.emit('conn-error', stanza.firstChild.tagName);
 });
 host = matches[2];
 break;
 }
 }
-var digest_uri = 'xmpp/' + that.host;
+var digest_uri = 'xmpp/' + that.jid.domain;
-if (host !== null) {
+if (host !== null)
 digest_uri = digest_uri + '/' + host;
-}
+var A1 = MD5.hash(that.jid.node +
-var A1 = MD5.hash(that.node +
 ':' + realm + ':' + that.password) +
 ':' + nonce + ':' + cnonce;
 var A2 = 'AUTHENTICATE:' + digest_uri;
 var responseText = '';
-responseText += 'username=' + _quote(that.node) + ',';
+responseText += 'username=' + _quote(that.jid.node) + ',';
 responseText += 'realm=' + _quote(realm) + ',';
 responseText += 'nonce=' + _quote(nonce) + ',';
 responseText += 'cnonce=' + _quote(cnonce) + ',';
 responseText += 'nc="00000001",';
 responseText += 'qop="auth",';
 nonce + ':00000001:' +
 cnonce + ':auth:' +
 MD5.hexdigest(A2))) + ',';
 responseText += 'charset="utf-8"';
 that.send(
-"<response xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>"
+"<response xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>" +
-+ btoa(responseText) +
+btoa(responseText) +
-'</response>');
+"</response>");
 });
 };
 Lightstring.Connection.prototype = {
 /**
 * @function Create and open a websocket then go though the XMPP authentification process.
 * @param {String} [aJid] The JID (Jabber id) to use.
 * @param {String} [aPassword] The associated password.
 */
 connect: function(aJid, aPassword) {
 this.emit('connecting');
-if (aJid)
+this.jid = new Lightstring.JID(aJid);
-this.jid = aJid;
-if (this.jid) {
-this.host = this.jid.split('@')[1];
-this.node = this.jid.split('@')[0];
-this.resource = this.jid.split('/')[1];
-}
 if (aPassword)
 this.password = aPassword;
-if (!this.jid)
+if (!this.jid.bare)
 throw 'Lightstring: Connection.jid is undefined.';
 if (!this.password)
 throw 'Lightstring: Connection.password is undefined.';
 if (!this.service)
 throw 'Lightstring: Connection.service is undefined.';
 var that = this;
 this.socket.addEventListener('open', function() {
 if (this.protocol !== 'xmpp')
 console.error('Lightstring: The server located at '+ that.service + ' doesn\'t seems to be XMPP aware.');
-var stream = Lightstring.stanza.stream.open(that.host);
+var stream = Lightstring.stanza.stream.open(that.jid.domain);
 that.socket.send(stream);
 that.emit('XMLOutput', stream);
 });
 this.socket.addEventListener('error', function(e) {
 that.emit('XMLInput', e.data);
 var elm = Lightstring.xml2dom(e.data);
 that.emit('DOMInput', elm);
 that.emit(elm.tagName, elm);
+<<<<<<< HEAD
 if (elm.tagName === 'iq')
 that.emit(elm.getAttribute('id'), elm);
+=======
+if (elm.tagName === 'iq') {
+var payload = elm.firstChild;
+if (payload)
+that.emit('iq/' + payload.namespaceURI + ':' + payload.localName, elm);
+that.emit(elm.getAttribute('id'), elm); //FIXME: possible attack vector.
+}
+>>>>>>> f6a7c0f93d154c2cd34dfdda4ab8eec808b91b34
 });
 },
 /**
 * @function Send a message.
 * @param {String|Object} aStanza The message to send.
 str = Lightstring.dom2xml(elm);
 }
 if (aCallback)
 this.on(elm.getAttribute('id'), aCallback);
 }
-else if (aCallback) {
+else if (aCallback)
 this.emit('warning', 'Callback can\'t be called with non-iq stanza.');
-}
 this.socket.send(str);
 this.emit('XMLOutput', str);
 this.emit('DOMOutput', elm);