vines 0.2.1 → 0.3.0

data/lib/vines/stanza/iq.rb

@@ -33,11 +33,11 @@ module Vines
       private
 
       def route_iq
-        to = (self['to'] || '').strip
-        return false if to.empty? || to == stream.domain
+        to = validate_to
+        return false if to.nil? || to.to_s == stream.domain
         self['from'] = stream.user.jid.to_s
         if local?
-          router.available_resources(to).each do |recipient|
+          stream.available_resources(to).each do |recipient|
             recipient.write(@node)
           end
         else

data/lib/vines/stanza/iq/disco_info.rb

@@ -13,9 +13,13 @@ module Vines
           result = to_result.tap do |el|
             el << el.document.create_element('query') do |query|
               query.default_namespace = NS
+              query << el.document.create_element('identity', 'category' => 'server', 'type' => 'im')
+              query << el.document.create_element('feature', 'var' => NAMESPACES[:disco_info])
+              query << el.document.create_element('feature', 'var' => NAMESPACES[:disco_items])
               query << el.document.create_element('feature', 'var' => NAMESPACES[:ping])
               query << el.document.create_element('feature', 'var' => NAMESPACES[:vcard])
-              if stream.private_storage?
+              query << el.document.create_element('feature', 'var' => NAMESPACES[:version])
+              if stream.config.private_storage?(stream.domain)
                 query << el.document.create_element('feature', 'var' => NAMESPACES[:storage])
               end
             end

data/lib/vines/stanza/iq/disco_items.rb

@@ -13,6 +13,9 @@ module Vines
           result = to_result.tap do |el|
             el << el.document.create_element('query') do |query|
               query.default_namespace = NS
+              stream.config.vhosts[stream.domain].components.keys.sort.each do |domain|
+                query << el.document.create_element('item', 'jid' => domain)
+              end
             end
           end
           stream.write(result)

data/lib/vines/stanza/iq/private_storage.rb

@@ -12,10 +12,8 @@ module Vines
         register "/iq[@id and (@type='get' or @type='set')]/ns:query", 'ns' => NS
 
         def process
-          unless stream.private_storage?
-            raise StanzaErrors::ServiceUnavailable.new(self, 'cancel')
-          end
           validate_to_address
+          validate_storage_enabled
           validate_children_size
           validate_namespaces
           get? ? retrieve_fragment : update_fragment
@@ -64,12 +62,18 @@ module Vines
         end
 
         def validate_to_address
-          to = (self['to'] || '').strip
-          unless to.empty? || to == stream.user.jid.bare.to_s
+          to = validate_to
+          unless to.nil? || to == stream.user.jid.bare
             raise StanzaErrors::Forbidden.new(self, 'cancel')
           end
         end
 
+        def validate_storage_enabled
+          unless stream.config.private_storage?(stream.domain)
+            raise StanzaErrors::ServiceUnavailable.new(self, 'cancel')
+          end
+        end
+
         def validate_namespaces
           elements.first.elements.each do |node|
             if node.namespace.nil? || NAMESPACES.values.include?(node.namespace.href)

data/lib/vines/stanza/iq/roster.rb

@@ -9,6 +9,7 @@ module Vines
         register "/iq[@id and (@type='get' or @type='set')]/ns:query", 'ns' => NS
 
         def process
+          validate_to_address
           get? ? roster_query : update_roster
         end
 
@@ -26,8 +27,8 @@ module Vines
         # Roster sets must have no 'to' address or be addressed to the same
         # JID that sent the stanza. RFC 6121 sections 2.1.5 and 2.3.3.
         def validate_to_address
-          to = (self['to'] || '').strip
-          unless to.empty? || JID.new(to).bare == stream.user.jid.bare
+          to = validate_to
+          unless to.nil? || to.bare == stream.user.jid.bare
             raise StanzaErrors::Forbidden.new(self, 'auth')
           end
         end
@@ -35,14 +36,12 @@ module Vines
         # Add, update, or delete the roster item contained in the iq set
         # stanza received from the client. RFC 6121 sections 2.3, 2.4, 2.5.
         def update_roster
-          validate_to_address
-
           items = self.xpath('ns:query/ns:item', 'ns' => NS)
           raise StanzaErrors::BadRequest.new(self, 'modify') if items.size != 1
           item = items.first
 
-          jid = (item['jid'] || '').strip.empty? ? nil : JID.new(item['jid'].strip)
-          raise StanzaErrors::BadRequest.new(self, 'modify') unless jid && jid.bare?
+          jid = JID.new(item['jid']) rescue (raise StanzaErrors::JidMalformed.new(self, 'modify'))
+          raise StanzaErrors::BadRequest.new(self, 'modify') if jid.empty? || !jid.bare?
 
           if item['subscription'] == 'remove'
             remove_contact(jid)
@@ -75,7 +74,7 @@ module Vines
         def remove_contact(jid)
           contact = stream.user.contact(jid)
           raise StanzaErrors::ItemNotFound.new(self, 'modify') unless contact
-          if router.local_jid?(contact.jid)
+          if local_jid?(contact.jid)
             user = storage(contact.jid.domain).find_user(contact.jid)
           end
 
@@ -94,10 +93,10 @@ module Vines
             :jid => contact.jid,
             :subscription => 'remove'))
 
-          if router.local_jid?(contact.jid)
+          if local_jid?(contact.jid)
             send_unavailable(stream.user.jid, contact.jid) if contact.subscribed_from?
             send_unsubscribe(contact)
-            if user.contact(stream.user.jid)
+            if user && user.contact(stream.user.jid)
               push_roster_updates(contact.jid, user.contact(stream.user.jid))
             end
           else
@@ -112,8 +111,8 @@ module Vines
             presence(contact.jid, type) if contact.send("subscribed_#{meth}?")
           end.compact
 
-          if router.local_jid?(contact.jid)
-            router.interested_resources(contact.jid).each do |recipient|
+          if local_jid?(contact.jid)
+            stream.interested_resources(contact.jid).each do |recipient|
               presence.each {|el| recipient.write(el) }
             end
           else
@@ -133,7 +132,7 @@ module Vines
         # Send an iq set stanza to the user's interested resources, letting them
         # know their roster has been updated.
         def push_roster_updates(to, contact)
-          router.interested_resources(to).each do |recipient|
+          stream.interested_resources(to).each do |recipient|
             contact.send_roster_push(recipient)
           end
         end

data/lib/vines/stanza/iq/vcard.rb

@@ -20,8 +20,8 @@ module Vines
         private
 
         def vcard_query
-          jid = (self['to'] || '').strip
-          jid = jid.empty? ? stream.user.jid.bare : JID.new(jid).bare
+          to = validate_to
+          jid = to ? to.bare : stream.user.jid.bare
           card = storage.find_vcard(jid)
 
           raise StanzaErrors::ItemNotFound.new(self, 'cancel') unless card
@@ -38,8 +38,8 @@ module Vines
         end
 
         def vcard_update
-          to = (self['to'] || '').strip
-          unless to.empty? || to == stream.user.jid.bare.to_s
+          to = validate_to
+          unless to.nil? || to == stream.user.jid.bare
             raise StanzaErrors::Forbidden.new(self, 'auth')
           end
 

data/lib/vines/stanza/iq/version.rb

@@ -0,0 +1,25 @@
+# encoding: UTF-8
+
+module Vines
+  class Stanza
+    class Iq
+      class Version < Query
+        NS = NAMESPACES[:version]
+
+        register "/iq[@id and @type='get']/ns:query", 'ns' => NS
+
+        def process
+          return if route_iq
+          result = to_result.tap do |node|
+            node << node.document.create_element('query') do |query|
+              query.default_namespace = NS
+              query << node.document.create_element('name', 'Vines')
+              query << node.document.create_element('version', VERSION)
+            end
+          end
+          stream.write(result)
+        end
+      end
+    end
+  end
+end

data/lib/vines/stanza/message.rb

@@ -5,8 +5,8 @@ module Vines
     class Message < Stanza
       register "/message"
 
-      TYPE, TO, FROM = %w[type to from].map {|s| s.freeze }
-      VALID_TYPES    = %w[chat error groupchat headline normal].freeze
+      TYPE, FROM  = %w[type from].map {|s| s.freeze }
+      VALID_TYPES = %w[chat error groupchat headline normal].freeze
 
       VALID_TYPES.each do |type|
         define_method "#{type}?" do
@@ -20,9 +20,8 @@ module Vines
         end
 
         if local?
-          to = (self[TO] || '').strip
-          to = to.empty? ? stream.user.jid.bare : JID.new(to)
-          recipients = router.connected_resources(to)
+          to = validate_to || stream.user.jid.bare
+          recipients = stream.connected_resources(to)
           if recipients.empty?
             if user = storage(to.domain).find_user(to)
               # TODO Implement offline messaging storage

data/lib/vines/stanza/presence.rb

@@ -14,7 +14,7 @@ module Vines
       end
 
       def process
-        stream.last_broadcast_presence = @node.clone unless self['to']
+        stream.last_broadcast_presence = @node.clone unless validate_to
         unless self['type'].nil?
           raise StanzaErrors::BadRequest.new(self, 'modify')
         end
@@ -23,26 +23,28 @@ module Vines
       end
 
       def outbound?
-        stream.class != Vines::Stream::Server
+        !inbound?
       end
 
       def inbound?
-        stream.class == Vines::Stream::Server
+        stream.class == Vines::Stream::Server ||
+        stream.class == Vines::Stream::Component
       end
 
       def outbound_broadcast_presence
         self['from'] = stream.user.jid.to_s
-        to, type = %w[to type].map {|a| (self[a] || '').strip }
-        initial = to.empty? && type.empty? && !stream.available?
+        to = validate_to
+        type = (self['type'] || '').strip
+        initial = to.nil? && type.empty? && !stream.available?
 
-        recipients = if to.empty?
+        recipients = if to.nil?
           stream.available_subscribers
         else
-          stream.user.subscribed_from?(to) ? router.available_resources(to) : []
+          stream.user.subscribed_from?(to) ? stream.available_resources(to) : []
         end
 
         broadcast(recipients)
-        broadcast(router.available_resources(stream.user.jid))
+        broadcast(stream.available_resources(stream.user.jid))
 
         if initial
           stream.available_subscribed_to_resources.each do |recipient|
@@ -53,6 +55,9 @@ module Vines
               stream.write(el)
             end
           end
+          stream.remote_subscribed_to_contacts.each do |contact|
+            send_probe(contact.jid.bare)
+          end
           stream.available!
         end
 
@@ -60,12 +65,11 @@ module Vines
           node = @node.clone
           node['to'] = contact.jid.bare.to_s
           router.route(node) rescue nil # ignore RemoteServerNotFound
-          send_probe(contact.jid.bare) if initial
         end
       end
 
       def inbound_broadcast_presence
-        broadcast(router.available_resources(self['to']))
+        broadcast(stream.available_resources(validate_to))
       end
 
       private
@@ -78,7 +82,7 @@ module Vines
           'id'   => Kit.uuid,
           'to'   => to.bare.to_s,
           'type' => 'probe')
-        router.route(probe)
+        router.route(probe) rescue nil # ignore RemoteServerNotFound
       end
 
       def auto_reply_to_subscription_request(from, type)
@@ -96,13 +100,11 @@ module Vines
       # resource part from it so it's a bare jid. Return the bare JID object
       # that was stamped.
       def stamp_to
-        to = (self['to'] || '').strip
-        raise StanzaErrors::BadRequest.new(self, 'modify') if to.empty?
-        to = JID.new(to).bare
-        malformed = [to.node, to.domain].any? {|part| (part || '').strip.empty? }
-        raise StanzaErrors::JidMalformed.new(self, 'modify') if malformed
-        self['to'] = to.to_s
-        to
+        to = validate_to
+        raise StanzaErrors::BadRequest.new(self, 'modify') unless to
+        to.bare.tap do |bare|
+          self['to'] = bare.to_s
+        end
       end
     end
   end

data/lib/vines/stanza/presence/probe.rb

@@ -16,15 +16,14 @@ module Vines
         end
 
         def process_inbound
-          to = (self['to'] || '').strip
-          raise StanzaErrors::BadRequest.new(self, 'modify') if to.empty?
-          to = JID.new(to)
+          to = validate_to
+          raise StanzaErrors::BadRequest.new(self, 'modify') unless to
 
           user = storage(to.domain).find_user(to)
           unless user && user.subscribed_from?(stream.user.jid)
             auto_reply_to_subscription_request(to.bare, 'unsubscribed')
           else
-            router.available_resources(to).each do |recipient|
+            stream.available_resources(to).each do |recipient|
               el = recipient.last_broadcast_presence.clone
               el['from'] = recipient.user.jid.to_s
               el['to'] = stream.user.jid.to_s

data/lib/vines/stanza/presence/subscribe.rb

@@ -13,14 +13,15 @@ module Vines
         def process_outbound
           self['from'] = stream.user.jid.bare.to_s
           to = stamp_to
-          local? ? process_inbound : route
 
           stream.user.request_subscription(to)
           storage.save_user(stream.user)
           stream.update_user_streams(stream.user)
 
+          local? ? process_inbound : route
+
           contact = stream.user.contact(to)
-          router.interested_resources(stream.user.jid).each do |recipient|
+          stream.interested_resources(stream.user.jid).each do |recipient|
             contact.send_roster_push(recipient)
           end
         end
@@ -35,7 +36,7 @@ module Vines
           elsif contact.subscribed_from?(stream.user.jid)
             auto_reply_to_subscription_request(to, 'subscribed')
           else
-            recipients = router.available_resources(to)
+            recipients = stream.available_resources(to)
             if recipients.empty?
               # TODO store subscription request per RFC 6121 3.1.3 #4
             else

data/lib/vines/stanza/presence/subscribed.rb

@@ -13,18 +13,19 @@ module Vines
         def process_outbound
           self['from'] = stream.user.jid.bare.to_s
           to = stamp_to
-          local? ? process_inbound : route
 
           stream.user.add_subscription_from(to)
           storage.save_user(stream.user)
           stream.update_user_streams(stream.user)
 
+          local? ? process_inbound : route
+
           contact = stream.user.contact(to)
-          router.interested_resources(stream.user.jid).each do |recipient|
+          stream.interested_resources(stream.user.jid).each do |recipient|
             contact.send_roster_push(recipient)
           end
 
-          presences = router.available_resources(stream.user.jid).map do |c|
+          presences = stream.available_resources(stream.user.jid).map do |c|
             c.last_broadcast_presence.clone.tap do |node|
               node['from'] = c.user.jid.to_s
               node['id'] = Kit.uuid
@@ -33,7 +34,7 @@ module Vines
           end
 
           if local?
-            router.available_resources(to).each do |recipient|
+            stream.available_resources(to).each do |recipient|
               presences.each {|el| recipient.write(el) }
             end
           else
@@ -52,7 +53,7 @@ module Vines
           storage(to.domain).save_user(user)
           stream.update_user_streams(user)
 
-          router.interested_resources(to).each do |recipient|
+          stream.interested_resources(to).each do |recipient|
             recipient.write(@node)
             contact.send_roster_push(recipient)
           end

data/lib/vines/stanza/presence/unsubscribe.rb

@@ -15,14 +15,14 @@ module Vines
           to = stamp_to
 
           return unless stream.user.subscribed_to?(to)
-          local? ? process_inbound : route
-
           stream.user.remove_subscription_to(to)
           storage.save_user(stream.user)
           stream.update_user_streams(stream.user)
 
+          local? ? process_inbound : route
+
           contact = stream.user.contact(to)
-          router.interested_resources(stream.user.jid).each do |recipient|
+          stream.interested_resources(stream.user.jid).each do |recipient|
             contact.send_roster_push(recipient)
           end
         end
@@ -38,7 +38,7 @@ module Vines
           storage(to.domain).save_user(user)
           stream.update_user_streams(user)
 
-          router.interested_resources(to).each do |recipient|
+          stream.interested_resources(to).each do |recipient|
             recipient.write(@node)
             contact.send_roster_push(recipient)
           end

data/lib/vines/stanza/presence/unsubscribed.rb

@@ -16,14 +16,15 @@ module Vines
 
           return unless stream.user.subscribed_from?(to)
           send_unavailable(stream.user.jid, to)
-          local? ? process_inbound : route
 
           stream.user.remove_subscription_from(to)
           storage.save_user(stream.user)
           stream.update_user_streams(stream.user)
 
+          local? ? process_inbound : route
+
           contact = stream.user.contact(to)
-          router.interested_resources(stream.user.jid).each do |recipient|
+          stream.interested_resources(stream.user.jid).each do |recipient|
             contact.send_roster_push(recipient)
           end
         end
@@ -39,7 +40,7 @@ module Vines
           storage(to.domain).save_user(user)
           stream.update_user_streams(user)
 
-          router.interested_resources(to).each do |recipient|
+          stream.interested_resources(to).each do |recipient|
             recipient.write(@node)
             contact.send_roster_push(recipient)
           end