diaspora-vines 0.1.26 → 0.1.27

data/test/stream/server/outbound/start_test.rb

@@ -0,0 +1,33 @@
+# encoding: UTF-8
+
+require 'test_helper'
+
+describe Vines::Stream::Server::Outbound::Start do
+  before do
+    @stream = MiniTest::Mock.new
+    @state = Vines::Stream::Server::Outbound::Start.new(@stream)
+  end
+
+  def test_missing_namespace
+    node = node('<stream:stream/>')
+    assert_raises(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
+  end
+
+  def test_invalid_namespace
+    node = node(%Q{<stream:stream xmlns="#{Vines::NAMESPACES[:stream]}"/>})
+    assert_raises(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
+  end
+
+  def test_valid_stream
+    node = node(%Q{<stream:stream xmlns='jabber:client' xmlns:stream='#{Vines::NAMESPACES[:stream]}' xml:lang='en' id='1234' from='host.com' version='1.0'>})
+    @stream.expect(:advance, nil, [Vines::Stream::Server::Outbound::Auth])
+    @state.node(node)
+    assert @stream.verify
+  end
+
+  private
+
+  def node(xml)
+    Nokogiri::XML(xml).root
+  end
+end

data/test/stream/server/start_test.rb

@@ -0,0 +1,70 @@
+# encoding: UTF-8
+
+require 'test_helper'
+
+class VhostWrapper
+  def initialize(force = false)
+    @force_s2s_encryption = force
+  end
+  def force_s2s_encryption?
+    @force_s2s_encryption
+  end
+end
+
+describe Vines::Stream::Server::AuthMethod do
+  before do
+    @stream = MiniTest::Mock.new
+    @state = Vines::Stream::Server::Start.new(@stream)
+  end
+
+  def test_missing_namespace
+    node = node('<stream:stream/>')
+    assert_raises(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
+  end
+
+  def test_invalid_namespace
+    node = node(%Q{<stream:stream xmlns="#{Vines::NAMESPACES[:stream]}"/>})
+    assert_raises(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
+  end
+
+  def test_valid_stream_tls_required
+    node = node(%Q{<stream:stream xmlns="jabber:client" xmlns:stream="#{Vines::NAMESPACES[:stream]}" to="host.com" version="1.0"/>})
+    features = node(%Q{<stream:features xmlns:stream="#{Vines::NAMESPACES[:stream]}"><starttls xmlns="#{Vines::NAMESPACES[:tls]}"/><dialback xmlns="#{Vines::NAMESPACES[:dialback]}"/></stream:features>})
+    @stream.expect(:start, nil, [node])
+    @stream.expect(:vhost, VhostWrapper.new(false))
+    @stream.expect(:advance, nil, [Vines::Stream::Server::AuthMethod])
+    @stream.expect(:dialback_retry?, false)
+    @stream.expect(:write, nil, [features])
+    @state.node(node)
+    assert @stream.verify
+  end
+
+  def test_valid_stream_with_dialback_flag
+    node = node(%Q{<stream:stream xmlns="jabber:client" xmlns:stream="#{Vines::NAMESPACES[:stream]}" to="host.com" version="1.0"/>})
+    features = node(%Q{<stream:features xmlns:stream="#{Vines::NAMESPACES[:stream]}"><dialback xmlns="#{Vines::NAMESPACES[:dialback]}"/></stream:features>})
+    @stream.expect(:start, nil, [node])
+    @stream.expect(:advance, nil, [Vines::Stream::Server::AuthMethod])
+    @stream.expect(:dialback_retry?, true)
+    @stream.expect(:write, nil, [features])
+    @state.node(node)
+    assert @stream.verify
+  end
+
+  def test_valid_stream
+    node = node(%Q{<stream:stream xmlns="jabber:client" xmlns:stream="#{Vines::NAMESPACES[:stream]}" to="host.com" version="1.0"/>})
+    features = node(%Q{<stream:features xmlns:stream="#{Vines::NAMESPACES[:stream]}"><starttls xmlns="#{Vines::NAMESPACES[:tls]}"><required/></starttls><dialback xmlns="#{Vines::NAMESPACES[:dialback]}"/></stream:features>})
+    @stream.expect(:start, nil, [node])
+    @stream.expect(:vhost, VhostWrapper.new(true))
+    @stream.expect(:advance, nil, [Vines::Stream::Server::AuthMethod])
+    @stream.expect(:dialback_retry?, false)
+    @stream.expect(:write, nil, [features])
+    @state.node(node)
+    assert @stream.verify
+  end
+
+  private
+
+  def node(xml)
+    Nokogiri::XML(xml).root
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diaspora-vines
 version: !ruby/object:Gem::Version
-  version: 0.1.26
+  version: 0.1.27
 platform: ruby
 authors:
 - David Graham
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-28 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -43,16 +43,22 @@ dependencies:
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +198,7 @@ files:
 - lib/vines/jid.rb
 - lib/vines/kit.rb
 - lib/vines/log.rb
+- lib/vines/node.rb
 - lib/vines/router.rb
 - lib/vines/stanza.rb
 - lib/vines/stanza/iq.rb
@@ -255,19 +262,21 @@ files:
 - lib/vines/stream/sasl.rb
 - lib/vines/stream/server.rb
 - lib/vines/stream/server/auth.rb
+- lib/vines/stream/server/auth_method.rb
 - lib/vines/stream/server/auth_restart.rb
 - lib/vines/stream/server/final_restart.rb
 - lib/vines/stream/server/outbound/auth.rb
+- lib/vines/stream/server/outbound/auth_dialback_result.rb
+- lib/vines/stream/server/outbound/auth_external.rb
+- lib/vines/stream/server/outbound/auth_external_result.rb
 - lib/vines/stream/server/outbound/auth_restart.rb
-- lib/vines/stream/server/outbound/auth_result.rb
+- lib/vines/stream/server/outbound/authoritative.rb
 - lib/vines/stream/server/outbound/final_features.rb
 - lib/vines/stream/server/outbound/final_restart.rb
 - lib/vines/stream/server/outbound/start.rb
-- lib/vines/stream/server/outbound/tls.rb
 - lib/vines/stream/server/outbound/tls_result.rb
 - lib/vines/stream/server/ready.rb
 - lib/vines/stream/server/start.rb
-- lib/vines/stream/server/tls.rb
 - lib/vines/stream/state.rb
 - lib/vines/token_bucket.rb
 - lib/vines/user.rb
@@ -322,9 +331,16 @@ files:
 - test/stream/http/start_test.rb
 - test/stream/parser_test.rb
 - test/stream/sasl_test.rb
+- test/stream/server/auth_method_test.rb
 - test/stream/server/auth_test.rb
+- test/stream/server/outbound/auth_dialback_result_test.rb
+- test/stream/server/outbound/auth_external_test.rb
+- test/stream/server/outbound/auth_restart_test.rb
 - test/stream/server/outbound/auth_test.rb
+- test/stream/server/outbound/authoritative_test.rb
+- test/stream/server/outbound/start_test.rb
 - test/stream/server/ready_test.rb
+- test/stream/server/start_test.rb
 - test/test_helper.rb
 - test/token_bucket_test.rb
 - test/user_test.rb
@@ -348,7 +364,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Diaspora-vines is a Vines fork build for diaspora integration.
@@ -381,9 +397,16 @@ test_files:
 - test/stream/component/start_test.rb
 - test/stream/component/ready_test.rb
 - test/stream/component/handshake_test.rb
+- test/stream/server/start_test.rb
 - test/stream/server/ready_test.rb
 - test/stream/server/auth_test.rb
+- test/stream/server/auth_method_test.rb
+- test/stream/server/outbound/start_test.rb
+- test/stream/server/outbound/auth_restart_test.rb
+- test/stream/server/outbound/auth_external_test.rb
 - test/stream/server/outbound/auth_test.rb
+- test/stream/server/outbound/auth_dialback_result_test.rb
+- test/stream/server/outbound/authoritative_test.rb
 - test/token_bucket_test.rb
 - test/router_test.rb
 - test/user_test.rb

data/lib/vines/stream/server/outbound/tls.rb

@@ -1,30 +0,0 @@
-# encoding: UTF-8
-
-module Vines
-  class Stream
-    class Server
-      class Outbound
-        class TLS < State
-          NS = NAMESPACES[:tls]
-
-          def initialize(stream, success=TLSResult)
-            super
-          end
-
-          def node(node)
-            raise StreamErrors::NotAuthorized unless tls?(node)
-            stream.write("<starttls xmlns='#{NS}'/>")
-            advance
-          end
-
-          private
-
-          def tls?(node)
-            tls = node.xpath('ns:starttls', 'ns' => NS).any?
-            node.name == 'features' && namespace(node) == NAMESPACES[:stream] && tls
-          end
-        end
-      end
-    end
-  end
-end

data/lib/vines/stream/server/tls.rb

@@ -1,13 +0,0 @@
-# encoding: UTF-8
-
-module Vines
-  class Stream
-    class Server
-      class TLS < Client::TLS
-        def initialize(stream, success=AuthRestart)
-          super
-        end
-      end
-    end
-  end
-end