diaspora-vines 0.1.27 → 0.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87d2b07cbe2ab258cc25dbcea4fb8429feebd806
-  data.tar.gz: 35994b6743c62749b50002ba80ea354dbe5d6116
+  metadata.gz: 91735ca9844a9e2ae693c71d37e6394a4e658bfe
+  data.tar.gz: 942a2546e5dfee69ac9c8ca7eb186125e363e0b1
 SHA512:
-  metadata.gz: 33bcb7a97e8af3a83576adea4ef702a80276505ea2970b58b02a52265d8fd2be25158b8dc86b77da6234b78b1f703a084824f0b8830de5db0fc051f78b51c10e
-  data.tar.gz: 42dbc10e518ac5238b399d97c714b169fee8cf72ba61ff58b73c8d4d3e7440d723e54cc95b9b17ca1076a58ecaf0f8c78412e3e16d2ce2490b831c55e5003ad4
+  metadata.gz: c263a68d998e4fe7c3855d613a49d405a63c25a63fa306cedbe99d8e92178fc9c4c0e89200d5500be334f4e3dec33da815d9f342106e0ab4132774713412b4fc
+  data.tar.gz: 3c5b14198a6c2f20065b70133e8b0455b18bb3e11da9f1579414daacae694c4fc4d4965b451f4fcd7c52a99ef3f8b76b097f3d91c2a030711554e812fb6ee9e0

data/lib/vines.rb

@@ -100,6 +100,7 @@ end
   vines/stanza/iq/session
   vines/stanza/iq/vcard
   vines/stanza/iq/version
+  vines/stanza/dialback
   vines/stanza/message
   vines/stanza/presence
   vines/stanza/presence/error

data/lib/vines/stanza/dialback.rb

@@ -0,0 +1,27 @@
+# encoding: UTF-8
+
+module Vines
+  class Stanza
+    class Dialback < Stanza
+      VALID_TYPE, INVALID_TYPE = %w[valid invalid].map {|t| t.freeze }
+      NS = NAMESPACES[:legacy_dialback]
+
+      register "/db:verify", 'db' => NS
+
+      def process
+        id, from, to = %w[id from to].map {|a| @node[a] }
+        key = @node.text
+
+        outbound_stream = router.stream_by_id(id)
+        unless outbound_stream && outbound_stream.state.is_a?(Stream::Server::Outbound::AuthDialbackResult)
+          @stream.write(%Q{<db:verify from="#{to}" to="#{from}" id="#{id}" type="error"><error type="cancel"><item-not-found xmlns="#{NAMESPACES[:stanzas]}"/></error></db:verify>})
+          return
+        end
+
+        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}"/>})
+      end
+    end
+  end
+end

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

@@ -43,6 +43,7 @@ module Vines
             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

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

@@ -21,10 +21,6 @@ module Vines
               @success = Authoritative
               stream.callback!
               advance
-            elsif tls?(node)
-              @success = TLSResult
-              stream.write("<starttls xmlns='#{NAMESPACES[:tls]}'/>")
-              advance
             elsif dialback?(node)
               secret = Kit.auth_token
               dialback_key = Kit.dialback_key(secret, stream.remote_domain, stream.domain, stream.id)
@@ -33,6 +29,10 @@ module Vines
               advance
               stream.router << stream # We need to be discoverable for the dialback connection
               stream.state.dialback_secret = secret
+            elsif tls?(node)
+              @success = TLSResult
+              stream.write("<starttls xmlns='#{NAMESPACES[:tls]}'/>")
+              advance
             else
               raise StreamErrors::NotAuthorized
             end

data/lib/vines/version.rb

@@ -2,5 +2,5 @@
 
 module Vines
   # vines forked version 0.4.10
-  VERSION = '0.1.27'
+  VERSION = '0.1.28'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diaspora-vines
 version: !ruby/object:Gem::Version
-  version: 0.1.27
+  version: 0.1.28
 platform: ruby
 authors:
 - David Graham
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -135,14 +135,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -201,6 +201,7 @@ files:
 - lib/vines/node.rb
 - lib/vines/router.rb
 - lib/vines/stanza.rb
+- lib/vines/stanza/dialback.rb
 - lib/vines/stanza/iq.rb
 - lib/vines/stanza/iq/auth.rb
 - lib/vines/stanza/iq/disco_info.rb
@@ -364,70 +365,70 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 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/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/client/ready_test.rb
-- test/stream/client/auth_test.rb
-- test/stream/client/session_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/stream/http/sessions_test.rb
+- test/stream/parser_test.rb
 - test/stream/http/start_test.rb
+- test/stream/http/sessions_test.rb
+- test/stream/http/request_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/server/start_test.rb
-- test/stream/server/ready_test.rb
-- test/stream/server/auth_test.rb
+- test/stream/client/session_test.rb
+- test/stream/client/ready_test.rb
+- test/stream/client/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/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/stanza_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/token_bucket_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