vines 0.2.1 → 0.3.0

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

@@ -18,6 +18,7 @@ module Vines
           if stream.encrypt?
             stream.write(PROCEED)
             stream.encrypt
+            stream.reset
             advance
           else
             stream.write(FAILURE)

data/lib/vines/stream/component.rb

@@ -7,17 +7,17 @@ module Vines
     # streams. This serves connected streams using the jabber:component:accept
     # namespace.
     class Component < Stream
-      attr_reader :config, :remote_domain
+      attr_reader :remote_domain
 
       def initialize(config)
-        @config = config
+        super
         @remote_domain = nil
         @stream_id = Kit.uuid
         advance(Start.new(self))
       end
 
       def max_stanza_size
-        @config[:component].max_stanza_size
+        config[:component].max_stanza_size
       end
 
       def ready?
@@ -31,13 +31,14 @@ module Vines
       def start(node)
         @remote_domain = node['to']
         send_stream_header
-        raise StreamErrors::HostUnknown unless @config[:component].password(@remote_domain)
+        raise StreamErrors::ImproperAddressing unless valid_address?(@remote_domain)
+        raise StreamErrors::HostUnknown unless config.component?(@remote_domain)
         raise StreamErrors::InvalidNamespace unless node.namespaces['xmlns'] == NAMESPACES[:component]
         raise StreamErrors::InvalidNamespace unless node.namespaces['xmlns:stream'] == NAMESPACES[:stream]
       end
 
       def secret
-        password = @config[:component].password(@remote_domain)
+        password = config.component_password(@remote_domain)
         Digest::SHA1.hexdigest(@stream_id + password)
       end
 

data/lib/vines/stream/component/ready.rb

@@ -7,13 +7,12 @@ module Vines
         def node(node)
           stanza = to_stanza(node)
           raise StreamErrors::UnsupportedStanzaType unless stanza
-          to = (node['to'] || '').strip
-          from = JID.new(node['from'] || '')
-          raise StreamErrors::ImproperAddressing if to.empty? || from.domain != stream.remote_domain
+          to, from = stanza.validate_to, stanza.validate_from
+          raise StreamErrors::ImproperAddressing unless to && from
+          raise StreamErrors::InvalidFrom unless from.domain == stream.remote_domain
+          stream.user = User.new(:jid => from)
           if stanza.local?
-            stream.router.connected_resources(to).each do |recipient|
-              recipient.write(node)
-            end
+            stanza.process
           else
             stanza.route
           end

data/lib/vines/stream/http.rb

@@ -13,6 +13,11 @@ module Vines
       def post_init
         super
         router.delete(self)
+      end
+
+      # Override +Stream#create_parser+ to provide an HTTP parser rather than
+      # a Nokogiri XML parser.
+      def create_parser
         @parser = ::Http::Parser.new.tap do |p|
           body = ''
           p.on_body = proc {|data| body << data }
@@ -33,9 +38,9 @@ module Vines
         !!session
       end
 
-      %w[max_stanza_size max_resources_per_account private_storage? bind root].each do |name|
+      %w[max_stanza_size max_resources_per_account bind root].each do |name|
         define_method name do |*args|
-          @config[:http].send(name, *args)
+          config[:http].send(name, *args)
         end
       end
 
@@ -86,7 +91,8 @@ module Vines
 
         raise StreamErrors::UndefinedCondition.new('rid required') if rid.empty?
         raise StreamErrors::UnsupportedVersion unless version == '1.0'
-        raise StreamErrors::HostUnknown unless @config.vhost?(domain)
+        raise StreamErrors::ImproperAddressing unless valid_address?(domain)
+        raise StreamErrors::HostUnknown unless config.vhost?(domain)
         raise StreamErrors::InvalidNamespace unless node.namespaces['xmlns'] == NAMESPACES[:http_bind]
 
         Sessions[@session.id] = @session
@@ -109,7 +115,7 @@ module Vines
         doc = Nokogiri::XML::Document.new
         node = doc.create_element('body',
           'charsets'     => 'UTF-8',
-          'from'         => @session.domain, 
+          'from'         => @session.domain,
           'hold'         => @session.hold,
           'inactivity'   => @session.inactivity,
           'polling'      => '5',

data/lib/vines/stream/http/request.rb

@@ -6,6 +6,7 @@ module Vines
       class Request
         BUF_SIZE      = 1024
         MODIFIED      = '%a, %d %b %Y %H:%M:%S GMT'.freeze
+        MOVED         = 'Moved Permanently'.freeze
         NOT_FOUND     = 'Not Found'.freeze
         NOT_MODIFIED  = 'Not Modified'.freeze
         IF_MODIFIED   = 'If-Modified-Since'.freeze
@@ -44,6 +45,13 @@ module Vines
         # to implement caching.
         def reply_with_file(dir)
           path = File.expand_path(File.join(dir, @path))
+
+          # redirect requests missing a slash so relative links work
+          if File.directory?(path) && !@path.end_with?('/')
+            send_status(301, MOVED, "Location: #{redirect_uri}")
+            return
+          end
+
           path = File.join(path, 'index.html') if File.directory?(path)
 
           if path.start_with?(dir) && File.exist?(path)
@@ -72,6 +80,18 @@ module Vines
 
         private
 
+        # Attempt to rebuild the full request URI from the Host header. If it
+        # wasn't sent by the client, just return the relative path that
+        # was requested. The Location response header must contain the fully
+        # qualified URI, but most browsers will accept relative paths as well.
+        def redirect_uri
+          host = headers['Host']
+          uri = "#{path}/"
+          uri = "#{uri}?#{query}" unless (query || '').empty?
+          uri = "http://#{host}#{uri}" if host
+          uri
+        end
+
         # Return true if the file has been modified since the client last
         # requested it with the If-Modified-Since header.
         def modified?(path)
@@ -82,10 +102,11 @@ module Vines
           File.mtime(path).utc.strftime(MODIFIED)
         end
 
-        def send_status(status, message)
+        def send_status(status, message, *headers)
           header = [
             "HTTP/1.1 #{status} #{message}",
-            "Connection: close"
+            "Connection: close",
+            *headers
           ].join("\r\n")
           @stream.stream_write("#{header}\r\n\r\n")
           @stream.close_connection_after_writing

data/lib/vines/stream/server.rb

@@ -23,7 +23,7 @@ module Vines
         end
         cb = proc do |srv|
           if srv.empty?
-            srv << {:target => to, :port => 5269}
+            srv << {target: to, port: 5269}
             class << srv.first
               def method_missing(name); self[name]; end
             end
@@ -39,7 +39,7 @@ module Vines
         else
           begin
             rr = srv.shift
-            opts = {:to => to, :from => from, :srv => srv, :callback => callback}
+            opts = {to: to, from: from, srv: srv, callback: callback}
             EM.connect(rr.target.to_s, rr.port, Server, config, opts)
           rescue Exception => e
             connect(config, to, from, srv, callback)
@@ -47,11 +47,12 @@ module Vines
         end
       end
 
-      attr_reader :config, :domain
+      attr_reader   :domain
       attr_accessor :remote_domain
 
       def initialize(config, options={})
-        @config = config
+        super(config)
+        @connected = false
         @remote_domain = options[:to]
         @domain = options[:from]
         @srv = options[:srv]
@@ -67,7 +68,7 @@ module Vines
       end
 
       def max_stanza_size
-        @config[:server].max_stanza_size
+        config[:server].max_stanza_size
       end
 
       def ssl_handshake_completed
@@ -80,16 +81,17 @@ module Vines
 
       def unbind
         super
-        if @outbound && !ready?
-          Server.connect(@config, @remote_domain, @domain, @srv, @callback)
+        if @outbound && !@connected
+          Server.connect(config, @remote_domain, @domain, @srv, @callback)
         end
       end
 
       def vhost?(domain)
-        @config.vhost?(domain)
+        config.vhost?(domain)
       end
 
       def notify_connected
+        @connected = true
         if @callback
           @callback.call(self)
           @callback = nil
@@ -105,9 +107,9 @@ module Vines
         @domain, @remote_domain = %w[to from].map {|a| node[a] }
         send_stream_header
         raise StreamErrors::UnsupportedVersion unless node['version'] == '1.0'
-        raise StreamErrors::ImproperAddressing if [@domain, @remote_domain].any? {|addr| (addr || '').strip.empty? }
-        raise StreamErrors::HostUnknown unless @config.vhost?(@domain)
-        raise StreamErrors::NotAuthorized unless @config.s2s?(@remote_domain)
+        raise StreamErrors::ImproperAddressing unless valid_address?(@domain) && valid_address?(@remote_domain)
+        raise StreamErrors::HostUnknown unless config.vhost?(@domain)
+        raise StreamErrors::NotAuthorized unless config.s2s?(@remote_domain)
         raise StreamErrors::InvalidNamespace unless node.namespaces['xmlns'] == NAMESPACES[:server]
         raise StreamErrors::InvalidNamespace unless node.namespaces['xmlns:stream'] == NAMESPACES[:stream]
       end

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

@@ -14,6 +14,7 @@ module Vines
             case node.name
               when 'success'
                 stream.start(node)
+                stream.reset
                 advance
               when 'failure'
                 stream.close_connection

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

@@ -17,6 +17,7 @@ module Vines
               when 'proceed'
                 stream.encrypt
                 stream.start(node)
+                stream.reset
                 advance
               when 'failure'
                 stream.close_connection

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

@@ -7,8 +7,8 @@ module Vines
         def node(node)
           stanza = to_stanza(node)
           raise StreamErrors::UnsupportedStanzaType unless stanza
-          to, from = %w[to from].map {|attr| JID.new(stanza[attr] || '') }
-          raise StreamErrors::ImproperAddressing if [to, from].any? {|addr| (addr.domain || '').strip.empty? }
+          to, from = stanza.validate_to, stanza.validate_from
+          raise StreamErrors::ImproperAddressing unless to && from
           raise StreamErrors::InvalidFrom unless from.domain == stream.remote_domain
           raise StreamErrors::HostUnknown unless to.domain == stream.domain
           stream.user = User.new(:jid => from)

data/lib/vines/user.rb

@@ -9,7 +9,8 @@ module Vines
 
     def initialize(args={})
       @jid = JID.new(args[:jid])
-      raise ArgumentError, 'invalid jid' unless @jid.node && !@jid.domain.empty?
+      raise ArgumentError, 'invalid jid' if @jid.empty?
+
       @name = args[:name]
       @password = args[:password]
       @roster = args[:roster] || []

data/lib/vines/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module Vines
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/test/config/host_test.rb

@@ -0,0 +1,292 @@
+# encoding: UTF-8
+
+require 'vines'
+require 'minitest/autorun'
+
+class HostTest < MiniTest::Unit::TestCase
+  def test_missing_storage
+    assert_raises(RuntimeError) do
+      Vines::Config.new do
+        host 'wonderland.lit' do
+          # missing storage
+        end
+      end
+    end
+  end
+
+  def test_bad_storage
+    assert_raises(RuntimeError) do
+      Vines::Config.new do
+        host 'wonderland.lit' do
+          storage 'bogus' do
+            # no bogus storage implementation
+          end
+        end
+      end
+    end
+  end
+
+  def test_duplicate_storage
+    assert_raises(RuntimeError) do
+      Vines::Config.new do
+        host 'wonderland.lit' do
+          storage('fs') { dir '.' }
+          storage('fs') { dir '.' }
+        end
+      end
+    end
+  end
+
+  def test_good_storage_raises_no_errors
+    config = Vines::Config.new do
+      host 'wonderland.lit' do
+        storage 'fs' do
+          dir '.'
+        end
+      end
+    end
+    refute_nil config.vhosts['wonderland.lit'].storage
+  end
+
+  def test_ldap_added_to_storage
+    config = Vines::Config.new do
+      host 'wonderland.lit' do
+        storage(:fs) { dir '.' }
+        # added after storage
+        ldap 'ldap.wonderland.lit', 1636 do
+          tls true
+          dn 'cn=Directory Manager'
+          password 'secr3t'
+          basedn 'dc=wonderland,dc=lit'
+          groupdn 'cn=chatters,dc=wonderland,dc=lit'
+          object_class 'person'
+          user_attr 'uid'
+          name_attr 'cn'
+        end
+      end
+
+      host 'verona.lit' do
+        ldap 'ldap.verona.lit', 1636 do
+          tls true
+          dn 'cn=Directory Manager'
+          password 'secr3t'
+          basedn 'dc=wonderland,dc=lit'
+          object_class 'person'
+          user_attr 'uid'
+          name_attr 'cn'
+        end
+        # added before storage
+        storage(:fs) { dir '.' }
+      end
+    end
+    %w[wonderland.lit verona.lit].each do |domain|
+      refute_nil config.vhosts[domain].storage.ldap
+      assert config.vhosts[domain].storage.ldap?
+    end
+  end
+
+  def test_empty_component_name_raises
+    assert_raises(RuntimeError) do
+      Vines::Config.new do
+        host 'wonderland.lit' do
+          storage(:fs) { dir '.' }
+          components '' => 'secr3t'
+        end
+      end
+    end
+  end
+
+  def test_nil_component_name_raises
+    assert_raises(RuntimeError) do
+      Vines::Config.new do
+        host 'wonderland.lit' do
+          storage(:fs) { dir '.' }
+          components nil => 'secr3t'
+        end
+      end
+    end
+  end
+
+  def test_empty_component_password_raises
+    assert_raises(RuntimeError) do
+      Vines::Config.new do
+        host 'wonderland.lit' do
+          storage(:fs) { dir '.' }
+          components 'tea' => ''
+        end
+      end
+    end
+  end
+
+  def test_nil_component_password_raises
+    assert_raises(RuntimeError) do
+      Vines::Config.new do
+        host 'wonderland.lit' do
+          storage(:fs) { dir '.' }
+          components 'tea' => nil
+        end
+      end
+    end
+  end
+
+  def test_duplicate_component_raises
+    assert_raises(RuntimeError) do
+      Vines::Config.new do
+        host 'wonderland.lit' do
+          storage(:fs) { dir '.' }
+          components 'tea' => 'one'
+          components 'TEA' => 'two'
+        end
+      end
+    end
+  end
+
+  def test_duplicate_component_in_one_call_raises
+    assert_raises(RuntimeError) do
+      Vines::Config.new do
+        host 'wonderland.lit' do
+          storage(:fs) { dir '.' }
+          components 'tea' => 'one', 'TEA' => 'two'
+        end
+      end
+    end
+  end
+
+  def test_duplicate_component_symbol_raises
+    assert_raises(RuntimeError) do
+      Vines::Config.new do
+        host 'wonderland.lit' do
+          storage(:fs) { dir '.' }
+          components 'tea' => 'one'
+          components :TEA => 'two'
+        end
+      end
+    end
+  end
+
+  def test_invalid_host_domain_raises
+    assert_raises(ArgumentError) do
+      Vines::Config.new do
+        host 'wonderland.lit ' do
+          storage(:fs) { dir '.' }
+        end
+      end
+    end
+  end
+
+  def test_invalid_jid_host_domain_raises
+    assert_raises(RuntimeError) do
+      Vines::Config.new do
+        host 'alice@wonderland.lit' do
+          storage(:fs) { dir '.' }
+        end
+      end
+    end
+  end
+
+  def test_invalid_component_domain_raises
+    assert_raises(ArgumentError) do
+      Vines::Config.new do
+        host 'wonderland.lit' do
+          storage(:fs) { dir '.' }
+          components 'exam ple' => 'one'
+        end
+      end
+    end
+  end
+
+  def test_invalid_jid_component_domain_raises
+    assert_raises(RuntimeError) do
+      Vines::Config.new do
+        host 'wonderland.lit' do
+          storage(:fs) { dir '.' }
+          components 'alice@example' => 'one'
+        end
+      end
+    end
+  end
+
+  def test_multi_subdomain_component_raises
+    assert_raises(RuntimeError) do
+      Vines::Config.new do
+        host 'wonderland.lit' do
+          storage(:fs) { dir '.' }
+          components 'exam.ple' => 'one'
+        end
+      end
+    end
+  end
+
+  def test_case_insensitive_component_name
+    config = Vines::Config.new do
+      host 'WONDERLAND.LIT' do
+        storage(:fs) { dir '.' }
+        components 'TEA' => 'secr3t', CAKE: 'Passw0rd'
+      end
+    end
+    host = config.vhosts['wonderland.lit']
+    refute_nil host
+    assert_equal 2, host.components.size
+    assert_equal host.components['tea.wonderland.lit'], 'secr3t'
+    assert_equal host.components['cake.wonderland.lit'], 'Passw0rd'
+  end
+
+  def test_component?
+    config = Vines::Config.new do
+      host 'wonderland.lit' do
+        storage(:fs) { dir '.' }
+        components 'tea' => 'secr3t', cake: 'passw0rd'
+      end
+    end
+    host = config.vhosts['wonderland.lit']
+    refute_nil host
+    refute host.component?(nil)
+    refute host.component?('tea')
+    refute host.component?(:cake)
+    assert host.component?('tea.wonderland.lit')
+    assert host.component?('cake.wonderland.lit')
+    assert_nil host.password(nil)
+    assert_nil host.password('bogus')
+    assert_equal 'secr3t', host.password('tea.wonderland.lit')
+    assert_equal 'passw0rd', host.password('cake.wonderland.lit')
+    expected = {'tea.wonderland.lit' => 'secr3t', 'cake.wonderland.lit' => 'passw0rd'}
+    assert_equal expected, host.components
+
+    refute config.component?(nil)
+    refute config.component?('tea')
+    refute config.component?('bogus')
+    assert config.component?('tea.wonderland.lit')
+    assert config.component?('cake.wonderland.lit')
+    assert config.component?('tea.wonderland.lit', 'cake.wonderland.lit')
+    refute config.component?('tea.wonderland.lit', 'bogus.wonderland.lit')
+
+    assert_nil config.component_password(nil)
+    assert_nil config.component_password('bogus')
+    assert_equal 'secr3t', config.component_password('tea.wonderland.lit')
+    assert_equal 'passw0rd', config.component_password('cake.wonderland.lit')
+  end
+
+  def test_default_private_storage_is_off
+    config = Vines::Config.new do
+      host 'wonderland.lit' do
+        storage(:fs) { dir '.' }
+      end
+    end
+    host = config.vhosts['wonderland.lit']
+    refute_nil host
+    refute host.private_storage?
+  end
+
+  def test_enable_private_storage
+    config = Vines::Config.new do
+      host 'wonderland.lit' do
+        private_storage true
+        storage(:fs) { dir '.' }
+      end
+    end
+    host = config.vhosts['wonderland.lit']
+    refute_nil host
+    assert host.private_storage?
+    assert config.private_storage?('wonderland.lit')
+  end
+end