diaspora-vines 0.2.0.develop.3 → 0.2.0.develop.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a64256ced89f075deb28a2bbb2732d3e844d9d79
-  data.tar.gz: 19a17ea9f031342906b992aef021fa19c171bf9e
+  metadata.gz: 48f441720bb11c550973cfb6d005f32eba5d5964
+  data.tar.gz: 520fdac3c999da654b5dd937310f83995ca68583
 SHA512:
-  metadata.gz: ecaacb012205ff57adae55c414532c651d6b70f74cdb71b567dbceec69497fa17d9e7d2e92b42f459972f0dba547d3578bd9f2e89ae2efe506b7331973f3d46f
-  data.tar.gz: a5a48d5b4a09603b8711706e3ade7a3d1c7f2ce1ba7f2ba7aca5b9dadc301180452128e64468def6f58da64d27d4a002ce5c03ad62b87ad8ee7bfe30c714982f
+  metadata.gz: 274718512849343107aa2da43cc5c48a4632ac028d1666677bc2c97a3405a75f0c067775df8b692273711ce937ab9f6d0c97a4d7137699e83a4a9010a0fa1612
+  data.tar.gz: 440184d2d504899ddbac9a1d1d4eaf271c7ce207bef1e2c297908d588de79f67f34a3655d5f7859c1259426da13088162b5db7a1054515f3db10c1208a65f69e

data/lib/vines/stanza/dialback.rb

@@ -21,6 +21,7 @@ module Vines
         secret = outbound_stream.state.dialback_secret
         type = Kit.dialback_key(secret, from, to, id) == key ? VALID_TYPE : INVALID_TYPE
         @stream.write(%Q{<db:verify from="#{to}" to="#{from}" id="#{id}" type="#{type}"/>})
+        @stream.close_connection_after_writing
       end
     end
   end

data/lib/vines/stream/server.rb

@@ -7,7 +7,7 @@ module Vines
     # both accepting incoming s2s streams and initiating outbound s2s streams
     # to other servers.
     class Server < Stream
-      MECHANISMS = %w[EXTERNAL].freeze
+      MECHANISMS, FROM, TO = %w(EXTERNAL from to).map(&:freeze)
 
       # Starts the connection to the remote server. When the stream is
       # connected and ready to send stanzas it will yield to the callback
@@ -140,6 +140,24 @@ module Vines
         state.class == Server::Ready
       end
 
+      def authoritative_dialback(node)
+        stream = self
+        Server.start(stream.config, node[FROM], node[TO], true) do |authoritative|
+          if authoritative
+            # will be closed in outbound/authoritative.rb
+            authoritative.write("<db:verify from='#{node[TO]}' id='#{stream.id}' " \
+                                "to='#{node[FROM]}'>#{node.text}</db:verify>")
+          end
+        end
+        # We need to be discoverable for the dialback connection
+        router << stream
+      rescue StanzaErrors::RemoteServerNotFound
+        write("<db:result from='#{node[TO]}' to='#{node[FROM]}' " \
+              "type='error'><error type='cancel'><item-not-found " \
+              "xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/></error></db:result>")
+        close_connection_after_writing
+      end
+
       def start(node)
         if @outbound then send_stream_header; return end
         to, from = %w[to from].map {|a| node[a] }

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

@@ -4,9 +4,26 @@ module Vines
   class Stream
     class Server
       class Auth < Client::Auth
+        RESULT = "result".freeze
+
         def initialize(stream, success=FinalRestart)
           super
         end
+
+        def node(node)
+          if dialback_result?(node)
+            # open a new connection and verify the dialback key
+            stream.authoritative_dialback(node)
+          else
+            super
+          end
+        end
+
+        private
+
+        def dialback_result?(node)
+          node.name == RESULT && namespace(node) == NAMESPACES[:legacy_dialback]
+        end
       end
     end
   end

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

@@ -40,21 +40,8 @@ module Vines
               stream.close_connection_after_writing
             end
           elsif dialback_result?(node)
-            begin
-              Vines::Stream::Server.start(stream.config, node[FROM], node[TO], true) do |authoritative|
-                if authoritative
-                  # will be closed in outbound/authoritative.rb
-                  authoritative.write("<db:verify from='#{node[TO]}' id='#{stream.id}' to='#{node[FROM]}'>#{node.text}</db:verify>")
-                end
-              end
-              # We need to be discoverable for the dialback connection
-              stream.router << stream
-            rescue StanzaErrors::RemoteServerNotFound => e
-              stream.write("<db:result from='#{node[TO]}' to='#{node[FROM]}' " \
-                           "type='error'><error type='cancel'><item-not-found " \
-                           "xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/></error></db:result>")
-              stream.close_connection_after_writing
-            end
+            # open a new connection and verify the dialback key
+            stream.authoritative_dialback(node)
           else
             raise StreamErrors::NotAuthorized
           end

data/lib/vines/version.rb

@@ -2,5 +2,5 @@
 
 module Vines
   # vines forked version 0.4.10
-  VERSION = '0.2.0.develop.3'
+  VERSION = '0.2.0.develop.4'
 end

data/test/stream/server/auth_method_test.rb

@@ -101,6 +101,7 @@ describe Vines::Stream::Server::AuthMethod do
         %(<db:result xmlns:db="#{Vines::NAMESPACES[:legacy_dialback]}" ) +
         %(from="#{@result[:from]}" to="#{@result[:to]}">#{@result[:token]}</db:result>)
       )
+      @stream.expect(:authoritative_dialback, nil, [node])
       assert_nothing_raised {
         @state.node(node)
       }.must_equal(true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diaspora-vines
 version: !ruby/object:Gem::Version
-  version: 0.2.0.develop.3
+  version: 0.2.0.develop.4
 platform: ruby
 authors:
 - David Graham
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-28 00:00:00.000000000 Z
+date: 2015-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -387,70 +387,70 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Diaspora-vines is a Vines fork build for diaspora integration.
 test_files:
+- test/error_test.rb
+- test/test_helper.rb
+- test/storage/local_test.rb
+- test/storage/mock_redis.rb
+- test/storage/sql_schema.rb
+- test/storage/sql_test.rb
+- test/storage/null_test.rb
+- test/storage/storage_tests.rb
 - test/ext/nokogiri.rb
-- test/router_test.rb
 - test/contact_test.rb
-- test/stanza/iq_test.rb
-- test/stanza/presence/subscribe_test.rb
-- test/stanza/presence/probe_test.rb
-- test/stanza/pubsub/unsubscribe_test.rb
-- test/stanza/pubsub/subscribe_test.rb
-- test/stanza/pubsub/create_test.rb
-- test/stanza/pubsub/delete_test.rb
-- test/stanza/pubsub/publish_test.rb
-- test/stanza/message_test.rb
-- test/stanza/iq/version_test.rb
-- test/stanza/iq/private_storage_test.rb
-- test/stanza/iq/session_test.rb
-- test/stanza/iq/disco_info_test.rb
-- test/stanza/iq/vcard_test.rb
-- test/stanza/iq/disco_items_test.rb
-- test/stanza/iq/roster_test.rb
-- test/stream/sasl_test.rb
+- test/store_test.rb
+- test/cluster/sessions_test.rb
+- test/cluster/publisher_test.rb
+- test/cluster/subscriber_test.rb
+- test/config_test.rb
 - test/stream/parser_test.rb
-- test/stream/http/start_test.rb
+- test/stream/client/ready_test.rb
+- test/stream/client/auth_test.rb
+- test/stream/client/session_test.rb
+- test/stream/sasl_test.rb
 - test/stream/http/sessions_test.rb
-- test/stream/http/request_test.rb
+- test/stream/http/start_test.rb
 - test/stream/http/ready_test.rb
 - test/stream/http/auth_test.rb
+- test/stream/http/request_test.rb
 - test/stream/component/start_test.rb
 - test/stream/component/ready_test.rb
 - test/stream/component/handshake_test.rb
-- test/stream/client/session_test.rb
-- test/stream/client/ready_test.rb
-- test/stream/client/auth_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/authoritative_test.rb
 - test/stream/server/outbound/start_test.rb
-- test/stream/server/outbound/auth_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/start_test.rb
-- test/stream/server/ready_test.rb
-- test/stream/server/auth_test.rb
-- test/storage/storage_tests.rb
-- test/storage/sql_schema.rb
-- test/storage/sql_test.rb
-- test/storage/local_test.rb
-- test/storage/null_test.rb
-- test/storage/mock_redis.rb
-- test/config/host_test.rb
-- test/config/pubsub_test.rb
+- test/stream/server/outbound/authoritative_test.rb
 - test/token_bucket_test.rb
+- test/router_test.rb
+- test/user_test.rb
+- test/stanza/message_test.rb
+- test/stanza/presence/subscribe_test.rb
+- test/stanza/presence/probe_test.rb
+- test/stanza/pubsub/publish_test.rb
+- test/stanza/pubsub/delete_test.rb
+- test/stanza/pubsub/create_test.rb
+- test/stanza/pubsub/unsubscribe_test.rb
+- test/stanza/pubsub/subscribe_test.rb
+- test/stanza/iq_test.rb
+- test/stanza/iq/roster_test.rb
+- test/stanza/iq/vcard_test.rb
+- test/stanza/iq/disco_info_test.rb
+- test/stanza/iq/private_storage_test.rb
+- test/stanza/iq/session_test.rb
+- test/stanza/iq/version_test.rb
+- test/stanza/iq/disco_items_test.rb
 - test/jid_test.rb
-- test/kit_test.rb
-- test/cluster/publisher_test.rb
-- test/cluster/sessions_test.rb
-- test/cluster/subscriber_test.rb
 - test/stanza_test.rb
-- test/test_helper.rb
-- test/error_test.rb
-- test/store_test.rb
-- test/config_test.rb
-- test/user_test.rb
+- test/config/host_test.rb
+- test/config/pubsub_test.rb
+- test/kit_test.rb