jabber4r-revive 0.9.0 → 0.10.0

data/spec/lib/jabber4r/protocol/authentication/non_sasl_spec.rb

@@ -0,0 +1,79 @@
+# coding: utf-8
+require "spec_helper"
+
+describe Jabber::Protocol::Authentication::NonSASL do
+  let(:jid) { Jabber::JID.new("strech@localhost/my-resource") }
+
+  describe "#initialize" do
+    context "when create plain non-sasl authentication" do
+      let(:auth) { described_class.new(jid, "my-password") }
+
+      it { expect(auth.stream_id).to be_nil }
+    end
+
+    context "when jid is a String" do
+      let(:auth) { described_class.new("hello@localhost/my-res", "my-password") }
+
+      it { expect { auth }.not_to raise_error TypeError }
+    end
+
+    context "when jid is not instance of Jabber::JID or String" do
+      let(:auth) { described_class.new(:hello, "my-password") }
+
+      it { expect { auth }.to raise_error TypeError }
+    end
+
+    context "when mechanism doesn't exists" do
+      let(:auth) { described_class.new("hello@localhost/my-res", "my-password", mechanism: :unknown) }
+
+      it { expect { auth }.to raise_error ArgumentError }
+    end
+
+    context "when mechanism is digest and no stream_id is given" do
+      let(:auth) { described_class.new("hello@localhost/my-res", "my-password", mechanism: :digest) }
+
+      it { expect { auth }.to raise_error KeyError }
+    end
+  end
+
+  describe "#plain" do
+    let(:auth) { described_class.new(jid, "my-password") }
+    let(:auth_xml) { auth.dump.strip.gsub(/[\r\n]+|\s{2,}/, "") }
+    let(:correct_xml) do
+      '<iq xmlns="jabber:client" type="set" id="auth2"><query xmlns="jabber:iq:auth">' +
+      '<username>strech</username><password>my-password</password>' +
+      '<resource>my-resource</resource></query></iq>'
+    end
+
+    before { Jabber.stub(:gen_random_id).and_return "auth2" }
+
+    it { expect(auth_xml).to eq correct_xml }
+  end
+
+  describe "#digest" do
+    let(:auth) { described_class.new(jid, "my-password", stream_id: 1, mechanism: :digest) }
+    let(:auth_xml) { auth.dump.strip.gsub(/[\r\n]+|\s{2,}/, "") }
+    let(:correct_xml) do
+      '<iq xmlns="jabber:client" type="set" id="auth2"><query xmlns="jabber:iq:auth">' +
+      '<username>strech</username><digest>0123456789</digest>' +
+      '<resource>my-resource</resource></query></iq>'
+    end
+
+    before { Jabber.stub(:gen_random_id).and_return "auth2" }
+    before { described_class.stub(:generate_digest).and_return "0123456789" }
+
+    it { expect(auth_xml).to eq correct_xml }
+  end
+
+  describe "#plain?" do
+    let(:auth) { described_class.new(jid, "my-password") }
+
+    it { expect(auth).to be_plain }
+  end
+
+  describe "#digest?" do
+    let(:auth) { described_class.new(jid, "my-password", mechanism: :digest, stream_id: 1) }
+
+    it { expect(auth).to be_digest }
+  end
+end

data/spec/lib/jabber4r/protocol/authentication/sasl_spec.rb

@@ -0,0 +1,42 @@
+# coding: utf-8
+require "spec_helper"
+
+describe Jabber::Protocol::Authentication::SASL do
+  let(:jid) { Jabber::JID.new("strech@localhost/my-resource") }
+
+  describe "#initialize" do
+    context "when jid is a String" do
+      let(:auth) { described_class.new("hello@localhost/my-res", "my-password") }
+
+      it { expect { auth }.not_to raise_error TypeError }
+    end
+
+    context "when jid is not instance of Jabber::JID or String" do
+      let(:auth) { described_class.new(:hello, "my-password") }
+
+      it { expect { auth }.to raise_error TypeError }
+    end
+
+    context "when mechanism doesn't exists" do
+      let(:auth) { described_class.new("hello@localhost/my-res", "my-password", mechanism: :unknown) }
+
+      it { expect { auth }.to raise_error ArgumentError }
+    end
+  end
+
+  describe "#plain" do
+    let(:auth) { described_class.new(jid, "my-password") }
+    let(:auth_xml) { auth.dump.strip.gsub(/[\r\n]+|\s{2,}/, "") }
+    let(:correct_xml) { '<auth xmlns="urn:ietf:params:xml:ns:xmpp-sasl" mechanism="PLAIN">0123456789</auth>' }
+
+    before { described_class.stub(:generate_plain).and_return "0123456789" }
+
+    it { expect(auth_xml).to eq correct_xml }
+  end
+
+  describe "#plain?" do
+    let(:auth) { described_class.new(jid, "my-password") }
+
+    it { expect(auth).to be_plain }
+  end
+end

data/spec/spec_helper.rb

@@ -1,11 +1,11 @@
-# coding: utf-8
-$LOAD_PATH.unshift File.expand_path("../../", __FILE__)
-
-require "webmock/rspec"
-
-require "jabber4r"
-Dir["spec/support/**/*.rb"].sort.each { |f| require f }
-
-RSpec.configure do |config|
-  # ... rspec options
-end
+# coding: utf-8
+$LOAD_PATH.unshift File.expand_path("../../", __FILE__)
+
+require "webmock/rspec"
+
+require "jabber4r"
+Dir["spec/support/**/*.rb"].sort.each { |f| require f }
+
+RSpec.configure do |config|
+  # ... rspec options
+end

data/spec/support/mocks/tcp_socket_mock.rb

@@ -1,8 +1,8 @@
-# coding: utf-8
-
-# Mock of TCPSocket
-class TCPSocketMock < StringIO
-  def to_s
-    rewind; read
-  end
-end
+# coding: utf-8
+
+# Mock of TCPSocket
+class TCPSocketMock < StringIO
+  def to_s
+    rewind; read
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: jabber4r-revive
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Richard Kilmer
@@ -10,72 +10,72 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: ox
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  name: ox
-  type: :runtime
-  prerelease: false
+        version: 2.0.4
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+        version: 2.0.4
+  type: :runtime
+  prerelease: false
 - !ruby/object:Gem::Dependency
+  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  name: rspec
-  type: :development
-  prerelease: false
+        version: 2.13.0
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+        version: 2.13.0
+  type: :development
+  prerelease: false
 - !ruby/object:Gem::Dependency
+  name: webmock
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  name: webmock
-  type: :development
-  prerelease: false
+        version: 1.11.0
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+        version: 1.11.0
+  type: :development
+  prerelease: false
 - !ruby/object:Gem::Dependency
+  name: changelogger
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  name: changelogger
-  type: :development
-  prerelease: false
+        version: 0.0.3
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+        version: 0.0.3
+  type: :development
+  prerelease: false
 description: The purpose of this library is to allow Ruby applications to  talk to
   a Jabber IM system. Jabber is an open-source instant  messaging service, which can
   be learned about at http://www.jabber.org
@@ -91,17 +91,23 @@ files:
 - .travis.yml
 - CHANGELOG
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - jabber4r-revive.gemspec
 - lib/jabber4r.rb
-- lib/jabber4r/bosh_session.rb
+- lib/jabber4r/bosh.rb
+- lib/jabber4r/bosh/authentication.rb
+- lib/jabber4r/bosh/authentication/non_sasl.rb
+- lib/jabber4r/bosh/authentication/sasl.rb
+- lib/jabber4r/bosh/session.rb
 - lib/jabber4r/connection.rb
 - lib/jabber4r/debugger.rb
 - lib/jabber4r/jid.rb
 - lib/jabber4r/protocol.rb
+- lib/jabber4r/protocol/authentication.rb
+- lib/jabber4r/protocol/authentication/non_sasl.rb
+- lib/jabber4r/protocol/authentication/sasl.rb
 - lib/jabber4r/protocol/iq.rb
 - lib/jabber4r/protocol/message.rb
 - lib/jabber4r/protocol/parsed_xml_element.rb
@@ -112,10 +118,15 @@ files:
 - lib/jabber4r/session.rb
 - lib/jabber4r/vcard.rb
 - lib/jabber4r/version.rb
-- spec/lib/jabber4r/bosh_session_spec.rb
+- spec/lib/jabber4r/bosh/authentication/non_sasl_spec.rb
+- spec/lib/jabber4r/bosh/authentication/sasl_spec.rb
+- spec/lib/jabber4r/bosh/session_spec.rb
+- spec/lib/jabber4r/bosh_spec.rb
 - spec/lib/jabber4r/connection_spec.rb
 - spec/lib/jabber4r/debugger_spec.rb
 - spec/lib/jabber4r/jid_spec.rb
+- spec/lib/jabber4r/protocol/authentication/non_sasl_spec.rb
+- spec/lib/jabber4r/protocol/authentication/sasl_spec.rb
 - spec/spec_helper.rb
 - spec/support/mocks/tcp_socket_mock.rb
 homepage: https://github.com/Strech/jabber4r-revive
@@ -125,27 +136,32 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Read more http://jabber4r.rubyforge.org
 test_files:
-- spec/lib/jabber4r/bosh_session_spec.rb
+- spec/lib/jabber4r/bosh/authentication/non_sasl_spec.rb
+- spec/lib/jabber4r/bosh/authentication/sasl_spec.rb
+- spec/lib/jabber4r/bosh/session_spec.rb
+- spec/lib/jabber4r/bosh_spec.rb
 - spec/lib/jabber4r/connection_spec.rb
 - spec/lib/jabber4r/debugger_spec.rb
 - spec/lib/jabber4r/jid_spec.rb
+- spec/lib/jabber4r/protocol/authentication/non_sasl_spec.rb
+- spec/lib/jabber4r/protocol/authentication/sasl_spec.rb
 - spec/spec_helper.rb
 - spec/support/mocks/tcp_socket_mock.rb

data/Gemfile.lock

@@ -1,45 +0,0 @@
-PATH
-  remote: .
-  specs:
-    jabber4r-revive (0.9.0)
-      ox
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.3.4)
-    changelogger (0.0.3)
-      grit (~> 2.5.0)
-      thor (~> 0.16.0)
-    crack (0.4.0)
-      safe_yaml (~> 0.9.0)
-    diff-lcs (1.2.4)
-    grit (2.5.0)
-      diff-lcs (~> 1.1)
-      mime-types (~> 1.15)
-      posix-spawn (~> 0.3.6)
-    mime-types (1.23)
-    ox (2.0.4)
-    posix-spawn (0.3.6)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    safe_yaml (0.9.3)
-    thor (0.16.0)
-    webmock (1.11.0)
-      addressable (>= 2.2.7)
-      crack (>= 0.3.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  changelogger
-  jabber4r-revive!
-  rspec
-  webmock

data/lib/jabber4r/bosh_session.rb

@@ -1,224 +0,0 @@
-# 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 "ox"
-require "json"
-require "net/http"
-require "digest/sha1"
-
-module Jabber
-  # XMPP Over BOSH class
-  # NOTE: http://xmpp.org/extensions/xep-0206.html
-  class BoshSession
-    # Public: Default connection options
-    DEFAULTS = {
-      host: "localhost",
-      port: 5280,
-      bind_uri: "/http-bind"
-    }.freeze
-
-    attr_reader :stream_id
-    attr_reader :jid, :rid, :sid
-    attr_reader :host, :port, :bind_uri
-
-    # Public: Create new BOSH-session and bind it to jabber http-bind service
-    #
-    # username - String the login of jabber server user
-    # password - String the password of jabber server user
-    # options  - Hash the options for jabber http-bind service (default: Empty hash)
-    #            :host     - String the jabber server host
-    #            :port     - [String|Fixnum] the port of http-bind endpoint of jabber server
-    #            :bind_uri - String the http-bind uri
-    #
-    #
-    # Examples
-    #
-    # Jabber::BoshSession.bind("strech@localhost/res-1", "secret-pass")
-    # Jabber::BoshSession.bind("strech@localhost/res-1", "secret-pass", )
-    #
-    # Raises Jabber::AuthenticationError
-    # Returns Jabber::BoshSession
-    def self.bind(username, password, options = {})
-      host, port, bind_uri = DEFAULTS.dup.merge!(options).values
-
-      session = new(host, port, bind_uri)
-      raise AuthenticationError, "Failed to login" unless session.authenticate(username, password)
-
-      session
-    end
-
-    # Public: Create new BOSH-session (not binded to http-bind service)
-    #
-    # host     - String the jabber server host
-    # port     - [String|Fixnum] the port of http-bind endpoint of jabber server
-    # bind_uri - String the http-bind uri
-    #
-    # Examples
-    #
-    # Jabber::BoshSession.new("localhost", 5280, "/http-bind")
-    #
-    # Returns Jabber::BoshSession
-    def initialize(host, port, bind_uri)
-      @host, @port, @bind_uri = host, port, bind_uri
-      @alive = false
-    end
-
-    # Public: Authenticate user in jabber server by his username and password
-    # NOTE: This authentication is Non-SASL http://xmpp.org/extensions/xep-0078.html
-    #
-    # Examples
-    #
-    # bosh = Jabber::BoshSession.new ...
-    # bosh.authenticate("strech@localhost/my-resource", "super-secret-password") # => true
-    # bosh.alive? # => true
-    #
-    # Returns boolean
-    def authenticate(username, password)
-      open_new_stream
-
-      @jid = username.is_a?(JID) ? username : JID.new(username)
-      @alive = login(jid, password)
-    end
-
-    # Public: Is BOSH-session active? (no polling consider)
-    #
-    # Returns boolean
-    def alive?
-      @alive
-    end
-
-    # Public: Represent BOSH-session as json object
-    #
-    # Returns String
-    def to_json
-      {jid: jid.to_s, rid: rid, sid: sid}.to_json
-    end
-
-    private
-   # Internal: Send open stream command to jabber server
-    #
-    # Raises XMLMalformedError
-    # Returns boolean
-    def open_new_stream
-      Jabber.debug("Open stream for bosh session")
-
-      body = Ox::Element.new("body").tap do |element|
-        element[:xmlns]   = "http://jabber.org/protocol/httpbind"
-        element[:content] = "text/xml; charset=utf-8"
-        element[:rid]     = generate_next_rid
-        element[:to]      = host
-        element[:secure]  = true
-        element[:wait]    = 60
-        element[:hold]    = 1
-      end
-
-      response = post(Ox.dump body)
-      xml = Ox.parse(response.body.tr("'", '"'))
-
-      [:sid, :authid].each do |m|
-        raise XMLMalformedError,
-          "Couldn't find <body /> attribute [#{m}]" if xml[m].nil?
-      end
-
-      @sid, @stream_id = xml.sid, xml.authid
-
-      true
-    end
-
-    # Internal: Send login request to jabber server
-    #
-    # jid - Jabber::JID the jid of jabber user
-    # password - String the password of jabber user
-    #
-    # Raises ArgumentError
-    # Raises XMLMalformedError
-    # Returns boolean
-    def login(jid, password)
-      raise ArgumentError,
-        "Jabber::JID expected, but #{jid.class} was given" unless jid.is_a?(JID)
-
-      query = Ox::Element.new("query").tap do |element|
-        element[:xmlns] = "jabber:iq:auth"
-
-        element << (Ox::Element.new("username") << jid.node)
-        element << (Ox::Element.new("digest")   << generate_digest_for(stream_id, password))
-        element << (Ox::Element.new("resource") << jid.resource)
-      end
-
-      iq = Ox::Element.new("iq").tap do |element|
-        element[:xmlns] = "jabber:client"
-        element[:type]  = "set"
-        element[:id]    = Jabber.gen_random_id
-
-        element << query
-      end
-
-      body = Ox::Element.new("body").tap do |element|
-        element[:xmlns]   = 'http://jabber.org/protocol/httpbind'
-        element[:content] = "text/xml; charset=utf-8"
-        element[:rid]     = generate_next_rid
-        element[:sid]     = sid
-
-        element << iq
-      end
-
-      response = post(Ox.dump body)
-      xml = Ox.parse(response.body.tr("'", '"'))
-
-      raise XMLMalformedError, "Couldn't find xml tag <iq/>" if xml.locate("iq").empty?
-      return false unless xml.iq[:type] == "result"
-
-      @rid = body.rid
-
-      true
-    end
-
-    # Internal: Send HTTP-post request on HTTP-bind uri
-    #
-    # body - String data, which will be sended
-    #
-    # Examples
-    #
-    # post(%Q[<body><iq id="1"/></body>]) # => Net::HTTPSuccess
-    #
-    # Raises Net::HTTPBadResponse
-    # Returns Net:HttpResponse
-    def post(body)
-      request = Net::HTTP::Post.new(bind_uri)
-      request.body = body
-      request.content_length = request.body.size
-      request["Content-Type"] = "text/xml; charset=utf-8"
-
-      Jabber.debug("Sending POST request - #{body.strip}")
-
-      response = Net::HTTP.new(host, port).start { |http| http.request(request) }
-
-      Jabber.debug("Receiving - #{response.code}: #{response.body.inspect}")
-
-      unless response.is_a?(Net::HTTPSuccess)
-        raise Net::HTTPBadResponse, "Net::HTTPSuccess expected, but #{response.class} was received"
-      end
-
-      response
-    end
-
-    # Internal: Generate hex string consist of concatination of all arguments
-    #
-    # Returns String
-    def generate_digest_for(*args)
-      Digest::SHA1.hexdigest(args.join)
-    end
-
-    # Internal: Generate next request id for http post request
-    #
-    # Returns Fixnum
-    def generate_next_rid
-      @rid ||= rand(1_000_000_000)
-      @rid += 1
-    end
-  end
-end