jabber4r-revive 0.9.0 → 0.10.0

data/lib/jabber4r/protocol/authentication.rb

@@ -0,0 +1,14 @@
+# coding: utf-8
+
+# License: see LICENSE
+# Jabber4R - Jabber Instant Messaging Library for Ruby
+# Copyright (C) 2002  Rich Kilmer <rich@infoether.com>
+# Copyright (C) 2013  Sergey Fedorov <strech_ftf@mail.ru>
+
+module Jabber::Protocol
+  # Public: This module provide authentication methods for xmpp protocol
+  module Authentication; end
+end
+
+require "jabber4r/protocol/authentication/non_sasl"
+require "jabber4r/protocol/authentication/sasl"

data/lib/jabber4r/protocol/authentication/non_sasl.rb

@@ -0,0 +1,138 @@
+# coding: utf-8
+
+# License: see LICENSE
+# Jabber4R - Jabber Instant Messaging Library for Ruby
+# Copyright (C) 2002  Rich Kilmer <rich@infoether.com>
+# Copyright (C) 2013  Sergey Fedorov <strech_ftf@mail.ru>
+
+require "digest/sha1"
+
+module Jabber::Protocol::Authentication
+  # Class provided Non-SASL authentication on jabber server
+  # http://xmpp.org/extensions/xep-0078.html
+  class NonSASL
+    MECHANISMS = [:plain, :digest].freeze
+
+    attr_reader :jid, :password
+    attr_reader :stream_id, :mechanism
+
+    # Public: Creates new Non-SASL authentication object
+    #
+    # jid      - [Jabber::JID|String] the jid of jabber server user
+    # password - String the user password
+    # options  - Hash the authentication options (default: Empty hash)
+    #            :stream_id - String the stream identifier (authid)
+    #            :mechanism - Symbol the name of mechnism to use
+    #
+    # Examples
+    #
+    # non_sasl = Jabber::Protocol::Authentication::NonSASL.new("strech@localhost/res-1", "my-pass-phrase")
+    # non_sasl.plain? # => true
+    # non_sasl.to_xml # =>
+    #
+    # <iq type="set" id="...">
+    #   <query xmlns="jabber:iq:auth">
+    #     <username>strech</username>
+    #     <password>my-pass-phrase</password>
+    #     <resource>res-1</resource>
+    #   </query>
+    # </iq>
+    def initialize(jid, password, options = {})
+      raise TypeError,
+        "Class(Jabber::JID) or Class(String) expected," +
+        " but #{jid.class} was given" unless jid.is_a?(Jabber::JID) || jid.is_a?(String)
+
+      @jid = jid.is_a?(Jabber::JID) ? jid : Jabber::JID.new(jid)
+      @password = password
+
+      @mechanism = options.fetch(:mechanism, :plain)
+      @stream_id = options.fetch(:stream_id) if digest?
+
+      raise ArgumentError,
+        "Unknown authentication mechanism '#{mechanism}'," +
+        " available is [#{MECHANISMS * ", "}]" unless MECHANISMS.include?(mechanism)
+    end
+
+    # Public: Is NonSASL object is for plain authentication
+    #
+    # Returns boolean
+    def plain?
+      mechanism == :plain
+    end
+
+    # Public: Is NonSASL object is for digest authentication
+    #
+    # Returns boolean
+    def digest?
+      mechanism == :digest
+    end
+
+    # Public: Create XML string from NonSASL object
+    #
+    # Returns String
+    def dump
+      Ox.dump(send mechanism)
+    end
+    alias :to_xml :dump
+
+    # Public: Create Ox::Element from NonSASL object
+    #
+    # Returns Ox::Element
+    def to_ox
+      send(mechanism)
+    end
+
+    private
+    # Internal: Make xml object for plain authentication mechanism
+    #
+    # Returns Ox:Element
+    def plain
+      query = Ox::Element.new("query").tap do |element|
+        element[:xmlns] = "jabber:iq:auth"
+
+        element << (Ox::Element.new("username") << jid.node)
+        element << (Ox::Element.new("password") << password)
+        element << (Ox::Element.new("resource") << jid.resource)
+      end
+
+      build_iq(query)
+    end
+
+    # Internal: Make xml object for digest authentication mechanism
+    #
+    # Returns Ox:Element
+    def digest
+      query = Ox::Element.new("query").tap do |element|
+        element[:xmlns] = "jabber:iq:auth"
+
+        digest_password = self.class.generate_digest(stream_id, password)
+
+        element << (Ox::Element.new("username") << jid.node)
+        element << (Ox::Element.new("digest")   << digest_password)
+        element << (Ox::Element.new("resource") << jid.resource)
+      end
+
+      build_iq(query)
+    end
+
+    # Internal: The root iq stanza for authentication
+    #
+    # Returns Ox:Element
+    def build_iq(query)
+      Ox::Element.new("iq").tap do |element|
+        element[:xmlns] = "jabber:client"
+        element[:type]  = "set"
+        element[:id]    = Jabber.gen_random_id
+
+        element << query
+      end
+    end
+
+    # Internal: Generate hex string consist of concatination stream_id and password
+    #
+    # Returns String
+    def self.generate_digest(stream_id, password)
+      Digest::SHA1.hexdigest([stream_id, password].join)
+    end
+  end
+end

data/lib/jabber4r/protocol/authentication/sasl.rb

@@ -0,0 +1,88 @@
+# coding: utf-8
+
+# License: see LICENSE
+# Jabber4R - Jabber Instant Messaging Library for Ruby
+# Copyright (C) 2002  Rich Kilmer <rich@infoether.com>
+# Copyright (C) 2013  Sergey Fedorov <strech_ftf@mail.ru>
+
+require 'base64'
+
+module Jabber::Protocol::Authentication
+  # Class provided SASL authentication on jabber server
+  class SASL
+    # Full list of mechanisms
+    # http://www.iana.org/assignments/sasl-mechanisms/sasl-mechanisms.xhtml
+    MECHANISMS = [:plain].freeze
+
+    attr_reader :jid, :password
+    attr_reader :mechanism
+
+    # Public: Creates new SASL authentication object
+    #
+    # jid      - [Jabber::JID|String] the jid of jabber server user
+    # password - String the user password
+    # options  - Hash the authentication options (default: Empty hash)
+    #            :mechanism - Symbol the name of mechnism to use
+    #
+    # Examples
+    #
+    # non_sasl = Jabber::Protocol::Authentication::SASL.new("strech@localhost/res-1", "my-pass-phrase")
+    # non_sasl.plain? # => true
+    # non_sasl.to_xml # =>
+    #
+    # <auth xmlns="urn:ietf:params:xml:ns:xmpp-sasl" mechanism="PLAIN">biwsbj1qdWxpZXQscj1vTXNUQUF3QUFBQU1BQUFBTlAwVEFBQUFBQUJQVTBBQQ==</auth>
+    def initialize(jid, password, options = {})
+      raise TypeError,
+        "Class(Jabber::JID) or Class(String) expected," +
+        " but #{jid.class} was given" unless jid.is_a?(Jabber::JID) || jid.is_a?(String)
+
+      @jid = jid.is_a?(Jabber::JID) ? jid : Jabber::JID.new(jid)
+      @password = password
+
+      @mechanism = options.fetch(:mechanism, :plain)
+
+      raise ArgumentError,
+        "Unknown authentication mechanism '#{mechanism}'," +
+        " available is [#{MECHANISMS * ", "}]" unless MECHANISMS.include?(mechanism)
+    end
+
+    # Public: Is SASL object is for plain authentication
+    #
+    # Returns boolean
+    def plain?
+      mechanism == :plain
+    end
+
+    # Public: Create XML string from SASL object
+    #
+    # Returns String
+    def dump
+      Ox.dump(send mechanism)
+    end
+    alias :to_xml :dump
+
+    # Public: Create Ox::Element from SASL object
+    #
+    # Returns Ox::Element
+    def to_ox
+      send(mechanism)
+    end
+
+    private
+    # Internal: Make xml object for plain authentication mechanism
+    #
+    # Returns Ox:Element
+    def plain
+      Ox::Element.new("auth").tap do |element|
+        element[:xmlns]     = "urn:ietf:params:xml:ns:xmpp-sasl"
+        element[:mechanism] = "PLAIN"
+
+        element << self.class.generate_plain(jid, password)
+      end
+    end
+
+    def self.generate_plain(jid, password)
+      ["#{jid.strip}\x00#{jid.node}\x00#{password}"].pack("m").gsub(/\s/, "")
+    end
+  end
+end

data/lib/jabber4r/protocol/iq.rb

@@ -1,260 +1,260 @@
-# coding: utf-8
-
-# License: see LICENSE
-# Jabber4R - Jabber Instant Messaging Library for Ruby
-# Copyright (C) 2002  Rich Kilmer <rich@infoether.com>
-
-module Jabber::Protocol
-  ##
-  # A class used to build/parse IQ requests/responses
-  #
-  class Iq
-    attr_accessor :session,:to, :from, :id, :type, :xmlns, :data,:error,:errorcode
-    ERROR="error"
-    GET="get"
-    SET="set"
-    RESULT="result"
-
-    ##
-    # Factory to build an IQ object from xml element
-    #
-    # session:: [Jabber::Session] The Jabber session instance
-    # element:: [Jabber::Protocol::ParsedXMLElement] The received XML object
-    # return:: [Jabber::Protocol::Iq] The newly created Iq object
-    #
-    def self.from_element(session, element)
-      iq = new(session)
-
-      iq.from = Jabber::JID.new(element.attr_from) if element.attr_from
-      iq.to   = Jabber::JID.new(element.attr_to) if element.attr_to
-
-      iq.id = element.attr_id
-      iq.type = element.attr_type
-      iq.xmlns = element.query.attr_xmlns
-      iq.data  = element.query
-      iq.session = session
-
-      if element.attr_type = "error"
-        iq.error = element.error
-        iq.errorcode = element.error.attr_code
-      end
-
-      return iq
-    end
-
-    ##
-    # Default constructor to build an Iq object
-    # session:: [Jabber::Session] The Jabber session instance
-    # id:: [String=nil] The (optional) id of the Iq object
-    def initialize(session,id=nil)
-      @session=session
-      @id=id
-    end
-
-    ##
-    # Return an IQ object that uses the jabber:iq:private namespace
-    #
-    def self.get_private(session,id,ename,ns)
-      iq=Iq.new(session,id)
-      iq.type="get"
-      iq.xmlns="jabber:iq:private"
-      iq.data=XMLElement.new(ename,{'xmlns' => ns});
-      return iq
-    end
-
-
-    ##
-    # Generates an IQ roster request XML element
-    #
-    # id:: [String] The message id
-    # return:: [String] The XML data to send
-    #
-    def self.gen_roster(session, id)
-      iq = Iq.new(session, id)
-      iq.type = "get"
-      iq.xmlns = "jabber:iq:roster"
-      return iq
-      #return XMLElement.new("iq", {"type"=>"get", "id"=>id}).add_child("query", {"xmlns"=>"jabber:iq:roster"}).to_s
-    end
-
-    ##
-    # Generates an IQ authortization request XML element
-    #
-    # id:: [String] The message id
-    # username:: [String] The username
-    # password:: [String] The password
-    # email:: [String] The email address of the account
-    # name:: [String] The full name
-    # return:: [String] The XML data to send
-    #
-    def self.gen_registration(session, id, username, password, email, name)
-      iq = Iq.new(session, id)
-      iq.type = "set"
-      iq.xmlns = "jabber:iq:register"
-      iq.data = XMLElement.new("username").add_data(username).to_s
-      iq.data << XMLElement.new("password").add_data(password).to_s
-      iq.data << XMLElement.new("email").add_data(email).to_s
-      iq.data << XMLElement.new("name").add_data(name).to_s
-      return iq
-    end
-
-    ##
-    # Generates an IQ Roster Item add request XML element
-    #
-    # session:: [Session] The session
-    # id:: [String] The message id
-    # jid:: [JID] The Jabber ID to add to the roster
-    # name:: [String] The full name
-    # return:: [String] The XML data to send
-    #
-    def self.gen_add_rosteritem(session, id, jid, name)
-      iq = Iq.new(session, id)
-      iq.type = "set"
-      iq.xmlns = "jabber:iq:roster"
-      iq.data = XMLElement.new("item").add_attribute("jid", jid).add_attribute("name", name).to_s
-      return iq
-    end
-
-    ##
-    # Generates an IQ authortization request XML element
-    #
-    # id:: [String] The message id
-    # username:: [String] The username
-    # password:: [String] The password
-    # resource:: [String] The resource to bind this session to
-    # return:: [String] The XML data to send
-    #
-    def self.gen_auth(session, id, username, password, resource)
-      iq = Iq.new(session, id)
-      iq.type = "set"
-      iq.xmlns = "jabber:iq:auth"
-      iq.data = XMLElement.new("username").add_data(username).to_s
-      iq.data << XMLElement.new("password").add_data(password).to_s
-      iq.data << XMLElement.new("resource").add_data(resource).to_s
-      return iq
-      #element = XMLElement.new("iq", {"type"=>"set", "id"=>id}).add_child("query", {"xmlns"=>"jabber:iq:auth"}).add_child("username").add_data(username).to_parent.add_child("password").add_data(password).to_parent.add_child("resource").add_data(resource).to_parent.to_s
-    end
-
-    ##
-    # Generates an IQ digest authortization request XML element
-    #
-    # id:: [String] The message id
-    # username:: [String] The username
-    # digest:: [String] The SHA-1 hash of the sessionid and the password
-    # resource:: [String] The resource to bind this session to
-    # return:: [String] The XML data to send
-    #
-    def self.gen_auth_digest(session, id, username, digest, resource)
-      iq = Iq.new(session, id)
-      iq.type = "set"
-      iq.xmlns = "jabber:iq:auth"
-      iq.data = XMLElement.new("username").add_data(username).to_s
-      iq.data << XMLElement.new("digest").add_data(digest).to_s
-      iq.data << XMLElement.new("resource").add_data(resource).to_s
-      return iq
-      #return XMLElement.new("iq", {"type"=>"set", "id"=>id}).add_child("query", {"xmlns"=>"jabber:iq:auth"}).add_child("username").add_data(username).to_parent.add_child("digest").add_data(digest).to_parent.add_child("resource").add_data(resource).to_parent.to_s
-    end
-
-    ##
-    # Generates an IQ out of bounds XML element
-    #
-    # to:: [JID] The Jabber ID to send to
-    # url:: [String] The data to send
-    # desc:: [String=""] The description of the data
-    # return:: [String] The XML data to send
-    #
-    def self.gen_oob(session, to, url, desc="")
-      iq = Iq.new(session, nil)
-      iq.type = "set"
-      iq.xmlns = "jabber:iq:oob"
-      iq.data = XMLElement.new("url").add_data(url).to_s
-      iq.data << XMLElement.new("desc").add_data(desc).to_s
-      return iq
-      #return XMLElement.new("iq", {"type"=>"set"}).add_child("query", {"xmlns"=>"jabber:iq:oob"}).add_child("url").add_data(url).to_parent.add_child("desc").add_data(data).to_parent.to_s
-    end
-
-    ##
-    # Generates an VCard request XML element
-    #
-    # id:: [String] The message ID
-    # to:: [JID] The jabber id of the account to get the VCard for
-    # return:: [String] The XML data to send
-    #
-    def self.gen_vcard(session, id, to)
-      iq = Iq.new(session, id)
-      iq.xmlns = "vcard-temp"
-      iq.type = "get"
-      iq.to = to
-      return iq
-      #return XMLElement.new("iq", {"type"=>"get", "id"=>id, "to"=>to}).add_child("query", {"xmlns"=>"vcard-temp"}).to_s
-    end
-
-
-
-
-    ##
-    # Sends the IQ to the Jabber service for delivery
-    #
-    # wait:: [Boolean = false] Wait for reply before return?
-    # &block:: [Block] A block to process the message replies
-    #
-    def send(wait=false, &block)
-      if wait
-        iq = nil
-        blockedThread = Thread.current
-        @session.connection.send(self.to_s, block) do |je|
-          if je.element_tag == "iq" and je.attr_id == @id
-            je.consume_element
-            iq = self.class.from_element(@session, je)
-            blockedThread.wakeup
-          end
-        end
-        Thread.stop
-        return iq
-      else
-        @session.connection.send(self.to_s, block) if @session
-      end
-    end
-
-    ##
-    # Builds a reply to an existing Iq
-    #
-    # return:: [Jabber::Protocol::Iq] The result Iq
-    #
-    def reply
-      iq = Iq.new(@session,@id)
-      iq.to = @from
-      iq.id = @id
-      iq.type = 'result'
-      @is_reply = true
-      return iq
-    end
-
-    ##
-    # Generates XML that complies with the Jabber protocol for
-    # sending the Iq through the Jabber service.
-    #
-    # return:: [String] The XML string.
-    #
-    def to_xml
-      elem = XMLElement.new("iq", { "type"=>@type})
-      elem.add_attribute("to" ,@to) if @to
-      elem.add_attribute("id", @id) if @id
-      elem.add_child("query").add_attribute("xmlns",@xmlns).add_data(@data.to_s)
-      if @type=="error" then
-        e=elem.add_child("error");
-        e.add_attribute("code",@errorcode) if @errorcode
-        e.add_data(@error) if @error
-      end
-      return elem.to_s
-    end
-
-    ##
-    # see to_xml
-    #
-    def to_s
-      to_xml
-    end
-
-  end
+# coding: utf-8
+
+# License: see LICENSE
+# Jabber4R - Jabber Instant Messaging Library for Ruby
+# Copyright (C) 2002  Rich Kilmer <rich@infoether.com>
+
+module Jabber::Protocol
+  ##
+  # A class used to build/parse IQ requests/responses
+  #
+  class Iq
+    attr_accessor :session,:to, :from, :id, :type, :xmlns, :data,:error,:errorcode
+    ERROR="error"
+    GET="get"
+    SET="set"
+    RESULT="result"
+
+    ##
+    # Factory to build an IQ object from xml element
+    #
+    # session:: [Jabber::Session] The Jabber session instance
+    # element:: [Jabber::Protocol::ParsedXMLElement] The received XML object
+    # return:: [Jabber::Protocol::Iq] The newly created Iq object
+    #
+    def self.from_element(session, element)
+      iq = new(session)
+
+      iq.from = Jabber::JID.new(element.attr_from) if element.attr_from
+      iq.to   = Jabber::JID.new(element.attr_to) if element.attr_to
+
+      iq.id = element.attr_id
+      iq.type = element.attr_type
+      iq.xmlns = element.query.attr_xmlns
+      iq.data  = element.query
+      iq.session = session
+
+      if element.attr_type = "error"
+        iq.error = element.error
+        iq.errorcode = element.error.attr_code
+      end
+
+      return iq
+    end
+
+    ##
+    # Default constructor to build an Iq object
+    # session:: [Jabber::Session] The Jabber session instance
+    # id:: [String=nil] The (optional) id of the Iq object
+    def initialize(session,id=nil)
+      @session=session
+      @id=id
+    end
+
+    ##
+    # Return an IQ object that uses the jabber:iq:private namespace
+    #
+    def self.get_private(session,id,ename,ns)
+      iq=Iq.new(session,id)
+      iq.type="get"
+      iq.xmlns="jabber:iq:private"
+      iq.data=XMLElement.new(ename,{'xmlns' => ns});
+      return iq
+    end
+
+
+    ##
+    # Generates an IQ roster request XML element
+    #
+    # id:: [String] The message id
+    # return:: [String] The XML data to send
+    #
+    def self.gen_roster(session, id)
+      iq = Iq.new(session, id)
+      iq.type = "get"
+      iq.xmlns = "jabber:iq:roster"
+      return iq
+      #return XMLElement.new("iq", {"type"=>"get", "id"=>id}).add_child("query", {"xmlns"=>"jabber:iq:roster"}).to_s
+    end
+
+    ##
+    # Generates an IQ authortization request XML element
+    #
+    # id:: [String] The message id
+    # username:: [String] The username
+    # password:: [String] The password
+    # email:: [String] The email address of the account
+    # name:: [String] The full name
+    # return:: [String] The XML data to send
+    #
+    def self.gen_registration(session, id, username, password, email, name)
+      iq = Iq.new(session, id)
+      iq.type = "set"
+      iq.xmlns = "jabber:iq:register"
+      iq.data = XMLElement.new("username").add_data(username).to_s
+      iq.data << XMLElement.new("password").add_data(password).to_s
+      iq.data << XMLElement.new("email").add_data(email).to_s
+      iq.data << XMLElement.new("name").add_data(name).to_s
+      return iq
+    end
+
+    ##
+    # Generates an IQ Roster Item add request XML element
+    #
+    # session:: [Session] The session
+    # id:: [String] The message id
+    # jid:: [JID] The Jabber ID to add to the roster
+    # name:: [String] The full name
+    # return:: [String] The XML data to send
+    #
+    def self.gen_add_rosteritem(session, id, jid, name)
+      iq = Iq.new(session, id)
+      iq.type = "set"
+      iq.xmlns = "jabber:iq:roster"
+      iq.data = XMLElement.new("item").add_attribute("jid", jid).add_attribute("name", name).to_s
+      return iq
+    end
+
+    ##
+    # Generates an IQ authortization request XML element
+    #
+    # id:: [String] The message id
+    # username:: [String] The username
+    # password:: [String] The password
+    # resource:: [String] The resource to bind this session to
+    # return:: [String] The XML data to send
+    #
+    def self.gen_auth(session, id, username, password, resource)
+      iq = Iq.new(session, id)
+      iq.type = "set"
+      iq.xmlns = "jabber:iq:auth"
+      iq.data = XMLElement.new("username").add_data(username).to_s
+      iq.data << XMLElement.new("password").add_data(password).to_s
+      iq.data << XMLElement.new("resource").add_data(resource).to_s
+      return iq
+      #element = XMLElement.new("iq", {"type"=>"set", "id"=>id}).add_child("query", {"xmlns"=>"jabber:iq:auth"}).add_child("username").add_data(username).to_parent.add_child("password").add_data(password).to_parent.add_child("resource").add_data(resource).to_parent.to_s
+    end
+
+    ##
+    # Generates an IQ digest authortization request XML element
+    #
+    # id:: [String] The message id
+    # username:: [String] The username
+    # digest:: [String] The SHA-1 hash of the sessionid and the password
+    # resource:: [String] The resource to bind this session to
+    # return:: [String] The XML data to send
+    #
+    def self.gen_auth_digest(session, id, username, digest, resource)
+      iq = Iq.new(session, id)
+      iq.type = "set"
+      iq.xmlns = "jabber:iq:auth"
+      iq.data = XMLElement.new("username").add_data(username).to_s
+      iq.data << XMLElement.new("digest").add_data(digest).to_s
+      iq.data << XMLElement.new("resource").add_data(resource).to_s
+      return iq
+      #return XMLElement.new("iq", {"type"=>"set", "id"=>id}).add_child("query", {"xmlns"=>"jabber:iq:auth"}).add_child("username").add_data(username).to_parent.add_child("digest").add_data(digest).to_parent.add_child("resource").add_data(resource).to_parent.to_s
+    end
+
+    ##
+    # Generates an IQ out of bounds XML element
+    #
+    # to:: [JID] The Jabber ID to send to
+    # url:: [String] The data to send
+    # desc:: [String=""] The description of the data
+    # return:: [String] The XML data to send
+    #
+    def self.gen_oob(session, to, url, desc="")
+      iq = Iq.new(session, nil)
+      iq.type = "set"
+      iq.xmlns = "jabber:iq:oob"
+      iq.data = XMLElement.new("url").add_data(url).to_s
+      iq.data << XMLElement.new("desc").add_data(desc).to_s
+      return iq
+      #return XMLElement.new("iq", {"type"=>"set"}).add_child("query", {"xmlns"=>"jabber:iq:oob"}).add_child("url").add_data(url).to_parent.add_child("desc").add_data(data).to_parent.to_s
+    end
+
+    ##
+    # Generates an VCard request XML element
+    #
+    # id:: [String] The message ID
+    # to:: [JID] The jabber id of the account to get the VCard for
+    # return:: [String] The XML data to send
+    #
+    def self.gen_vcard(session, id, to)
+      iq = Iq.new(session, id)
+      iq.xmlns = "vcard-temp"
+      iq.type = "get"
+      iq.to = to
+      return iq
+      #return XMLElement.new("iq", {"type"=>"get", "id"=>id, "to"=>to}).add_child("query", {"xmlns"=>"vcard-temp"}).to_s
+    end
+
+
+
+
+    ##
+    # Sends the IQ to the Jabber service for delivery
+    #
+    # wait:: [Boolean = false] Wait for reply before return?
+    # &block:: [Block] A block to process the message replies
+    #
+    def send(wait=false, &block)
+      if wait
+        iq = nil
+        blockedThread = Thread.current
+        @session.connection.send(self.to_s, block) do |je|
+          if je.element_tag == "iq" and je.attr_id == @id
+            je.consume_element
+            iq = self.class.from_element(@session, je)
+            blockedThread.wakeup
+          end
+        end
+        Thread.stop
+        return iq
+      else
+        @session.connection.send(self.to_s, block) if @session
+      end
+    end
+
+    ##
+    # Builds a reply to an existing Iq
+    #
+    # return:: [Jabber::Protocol::Iq] The result Iq
+    #
+    def reply
+      iq = Iq.new(@session,@id)
+      iq.to = @from
+      iq.id = @id
+      iq.type = 'result'
+      @is_reply = true
+      return iq
+    end
+
+    ##
+    # Generates XML that complies with the Jabber protocol for
+    # sending the Iq through the Jabber service.
+    #
+    # return:: [String] The XML string.
+    #
+    def to_xml
+      elem = XMLElement.new("iq", { "type"=>@type})
+      elem.add_attribute("to" ,@to) if @to
+      elem.add_attribute("id", @id) if @id
+      elem.add_child("query").add_attribute("xmlns",@xmlns).add_data(@data.to_s)
+      if @type=="error" then
+        e=elem.add_child("error");
+        e.add_attribute("code",@errorcode) if @errorcode
+        e.add_data(@error) if @error
+      end
+      return elem.to_s
+    end
+
+    ##
+    # see to_xml
+    #
+    def to_s
+      to_xml
+    end
+
+  end
 end