diaspora-vines 0.1.22 → 0.1.24

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

@@ -73,6 +73,10 @@ module Vines
 
         # Send an HTTP 200 OK response wrapping the XMPP node content back
         # to the client.
+        #
+        # node - The XML::Node to send to the client.
+        #
+        # Returns nothing.
         def reply(node)
           if request = @requests.shift
             request.reply(node, @content_type)
@@ -83,6 +87,10 @@ module Vines
         # Write the XMPP node to the client stream after wrapping it in a BOSH
         # body tag. If there's a waiting request, the node is written
         # immediately. If not, it's queued until the next request arrives.
+        #
+        # data - The XML String or XML::Node to send in the next HTTP response.
+        #
+        # Returns nothing.
         def write(node)
           if request = @requests.shift
             request.reply(wrap_body(node), @content_type)

data/lib/vines/stream/server.rb

@@ -125,23 +125,29 @@ module Vines
 
       private
 
-      # The +to+ and +from+ domain addresses set on the initial stream header
+      # The `to` and `from` domain addresses set on the initial stream header
       # must not change during stream restarts. This prevents a server from
       # authenticating as one domain, then sending stanzas from users in a
       # different domain.
+      #
+      # to   - The String domain the other server thinks we are.
+      # from - The String domain the other server is asserting as its identity.
+      #
+      # Returns true if the other server is misbehaving and its connection
+      #   should be closed.
       def domain_change?(to, from)
         to != @domain || from != @remote_domain
       end
 
       def send_stream_header
         attrs = {
-          'xmlns' => NAMESPACES[:server],
+          'xmlns'        => NAMESPACES[:server],
           'xmlns:stream' => NAMESPACES[:stream],
-          'xml:lang' => 'en',
-          'id' => Kit.uuid,
-          'from' => @domain,
-          'to' => @remote_domain,
-          'version' => '1.0'
+          'xml:lang'     => 'en',
+          'id'           => Kit.uuid,
+          'from'         => @domain,
+          'to'           => @remote_domain,
+          'version'      => '1.0'
         }
         write "<stream:stream %s>" % attrs.to_a.map{|k,v| "#{k}='#{v}'"}.join(' ')
       end

data/lib/vines/version.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
 module Vines
-  # vines forked version 0.4.9
-  VERSION = '0.1.22'
+  # vines forked version 0.4.10
+  VERSION = '0.1.24'
 end

data/test/config/host_test.rb

@@ -47,43 +47,6 @@ describe Vines::Config::Host do
     refute_nil config.vhost('wonderland.lit').storage
   end
 
-  def test_ldap_added_to_storage
-    config = Vines::Config.new do
-      host 'wonderland.lit' do
-        storage(:fs) { dir Dir.tmpdir }
-        # 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 Dir.tmpdir }
-      end
-    end
-    %w[wonderland.lit verona.lit].each do |domain|
-      refute_nil config.vhost(domain).storage.ldap
-      assert config.vhost(domain).storage.ldap?
-    end
-  end
-
   def test_empty_component_name_raises
     assert_raises(RuntimeError) do
       Vines::Config.new do
@@ -366,4 +329,30 @@ describe Vines::Config::Host do
     refute config.private_storage?(Vines::JID.new('alice@wonderland.lit'))
     refute config.private_storage?(nil)
   end
+
+  def test_enabled_blacklisting
+    config = Vines::Config.new do
+      host 'wonderland.lit' do
+        storage(:fs) { dir Dir.tmpdir }
+      end
+      server '0.0.0.0', 5269 do
+        max_stanza_size 131072
+        blacklist ['wonderland.lit']
+      end
+    end
+    refute config.s2s?('wonderland.lit')
+  end
+
+  def test_disabled_blacklisting
+    config = Vines::Config.new do
+      host 'wonderland.lit' do
+        storage(:fs) { dir Dir.tmpdir }
+      end
+      server '0.0.0.0', 5269 do
+        max_stanza_size 131072
+        blacklist []
+      end
+    end
+    assert config.s2s?('wonderland.lit')
+  end
 end

data/test/config_test.rb

@@ -405,6 +405,20 @@ describe Vines::Config do
     assert config.vhost('verona.lit').cross_domain_messages?
   end
 
+  def test_accept_self_signed
+    config = Vines::Config.new do
+      host 'wonderland.lit' do
+        storage(:fs) { dir Dir.tmpdir }
+      end
+      host 'verona.lit' do
+        accept_self_signed true
+        storage(:fs) { dir Dir.tmpdir }
+      end
+    end
+    refute config.vhost('wonderland.lit').accept_self_signed?
+    assert config.vhost('verona.lit').accept_self_signed?
+  end
+
   def test_local_jid?
     config = Vines::Config.new do
       host 'wonderland.lit', 'verona.lit' do

data/test/storage/sql_schema.rb

@@ -11,7 +11,7 @@ module SqlSchema
   def fragment_id
     Digest::SHA1.hexdigest("characters:urn:wonderland")
   end
-  
+
   def fragment
     Nokogiri::XML(%q{
       <characters xmlns="urn:wonderland">
@@ -26,7 +26,9 @@ module SqlSchema
 
   def create_schema(args={})
     args[:force] ||= false
-    
+
+    # disable stdout logging
+    ActiveRecord::Migration.verbose = false
     ActiveRecord::Schema.define do
       create_table "people", :force => true do |t|
         t.string   "guid",                                     :null => false
@@ -51,6 +53,7 @@ module SqlSchema
         t.datetime "updated_at",                         :null => false
         t.boolean  "contacts_visible", :default => true, :null => false
         t.integer  "order_id"
+        t.boolean  "chat_enabled",     default: false
       end
       
       add_index "aspects", ["user_id", "contacts_visible"], :name => "index_aspects_on_user_id_and_contacts_visible"

data/test/storage/{sql.rb → sql_test.rb}

@@ -20,13 +20,43 @@ describe Vines::Storage::Sql do
   include SqlSchema
 
   before do
+    @test_user = {
+      :name => "test",
+      :jid => "test@local.host",
+      :email => "test@test.de",
+      :password => "$2a$10$c2G6rHjGeamQIOFI0c1/b.4mvFBw4AfOtgVrAkO1QPMuAyporj5e6", # pppppp
+      :token => "1234"
+    }
+    # create sql schema
     storage && create_schema(:force => true)
-    
+
     Vines::Storage::Sql::User.new(
-      username: "test",
-      email: "test@test.de",
-      encrypted_password: "$2a$10$c2G6rHjGeamQIOFI0c1/b.4mvFBw4AfOtgVrAkO1QPMuAyporj5e6", # pppppp
-      authentication_token: "1234"
+      username: @test_user[:name],
+      email: @test_user[:email],
+      encrypted_password: @test_user[:password],
+      authentication_token: @test_user[:token]
+    ).save
+    Vines::Storage::Sql::Person.new(
+      guid: "1697a4b0198901321e9b10e6ba921ce9",
+      url: "http://remote.host/",
+      serialized_public_key: "some pub key",
+      diaspora_handle: "test2@remote.host"
+    ).save
+    Vines::Storage::Sql::Contact.new(
+      user_id: 1,
+      person_id: 1,
+      sharing: true,
+      receiving: true
+    ).save
+    Vines::Storage::Sql::Aspect.new(
+      :user_id => 1,
+      :name => "without_chat",
+      :contacts_visible => true,
+      :order_id => nil
+    ).save
+    Vines::Storage::Sql::AspectMembership.new(
+      :aspect_id => 1, # without_chat
+      :contact_id => 1 # person
     ).save
   end
 
@@ -34,26 +64,32 @@ describe Vines::Storage::Sql do
     db = Rails.application.config.database_configuration["development"]["database"]
     File.delete(db) if File.exist?(db)
   end
-  
+
+  def test_aspect_chat_enabled
+    fibered do
+      db = storage
+      user = db.find_user(@test_user[:jid])
+      assert_equal 0, user.roster.length
+
+      aspect = Vines::Storage::Sql::Aspect.where(:id => 1)
+      aspect.update_all(
+        :name => "with_chat",
+        :chat_enabled => true
+      )
+      user = db.find_user(@test_user[:jid])
+      assert_equal 1, user.roster.length
+    end
+  end
+
   def test_save_user
     fibered do
       db = storage
       user = Vines::User.new(
-        jid: 'test@test.de',
-        name: 'test@test.de',
+        jid: 'test2@test.de',
+        name: 'test2@test.de',
         password: 'secret')
-      user.roster << Vines::Contact.new(
-        jid: 'contact1@domain.tld/resource2',
-        name: 'Contact 1')
       db.save_user(user)
-      user = db.find_user('test@test.de')
-      
-      assert (user != nil), "no user found"
-      assert_equal "test@test.de", user.jid.to_s
-      
-      assert_equal 1, user.roster.length
-      assert_equal "contact1@domain.tld", user.roster[0].jid.to_s
-      assert_equal "Contact 1", user.roster[0].name
+      assert_nil db.find_user('test2@test.de')
     end
   end
 
@@ -63,17 +99,17 @@ describe Vines::Storage::Sql do
       user = db.find_user(nil)
       assert_nil user
 
-      user = db.find_user("test@local.host")
+      user = db.find_user(@test_user[:jid])
       assert (user != nil), "no user found"
-      assert_equal "test", user.name
+      assert_equal @test_user[:name], user.name
 
-      user = db.find_user(Vines::JID.new("test@local.host"))
+      user = db.find_user(Vines::JID.new(@test_user[:jid]))
       assert (user != nil), "no user found"
-      assert_equal "test", user.name
+      assert_equal @test_user[:name], user.name
 
-      user = db.find_user(Vines::JID.new("test@local.host/resource"))
+      user = db.find_user(Vines::JID.new("#{@test_user[:jid]}/resource"))
       assert (user != nil), "no user found"
-      assert_equal "test", user.name
+      assert_equal @test_user[:name], user.name
     end
   end
 
@@ -87,14 +123,14 @@ describe Vines::Storage::Sql do
 
       # user credential auth
       pepper = "065eb8798b181ff0ea2c5c16aee0ff8b70e04e2ee6bd6e08b49da46924223e39127d5335e466207d42bf2a045c12be5f90e92012a4f05f7fc6d9f3c875f4c95b"
-      user = db.authenticate("test@test.de", "pppppp#{pepper}")
+      user = db.authenticate(@test_user[:jid], "pppppp#{pepper}")
       assert (user != nil), "no user found"
-      assert_equal "test", user.name
+      assert_equal @test_user[:name], user.name
 
       # user token auth
-      user = db.authenticate("test@test.de", "1234")
+      user = db.authenticate(@test_user[:jid], @test_user[:token])
       assert (user != nil), "no user found"
-      assert_equal "test", user.name
+      assert_equal @test_user[:name], user.name
     end
   end
 
@@ -106,30 +142,30 @@ describe Vines::Storage::Sql do
       root = Nokogiri::XML(%q{<characters xmlns="urn:wonderland"/>}).root
       bad_name = Nokogiri::XML(%q{<not_characters xmlns="urn:wonderland"/>}).root
       bad_ns = Nokogiri::XML(%q{<characters xmlns="not:wonderland"/>}).root
-      
+
       node = db.find_fragment(nil, nil)
       assert_nil node
-      
+
       node = db.find_fragment('full@wonderland.lit', bad_name)
       assert_nil node
-      
+
       node = db.find_fragment('full@wonderland.lit', bad_ns)
       assert_nil node
-      
+
       node = db.find_fragment('full@wonderland.lit', root)
       assert (node != nil), "node should include fragment"
       assert_equal fragment.to_s, node.to_s
-      
+
       node = db.find_fragment(Vines::JID.new('full@wonderland.lit'), root)
       assert (node != nil), "node should include fragment"
       assert_equal fragment.to_s, node.to_s
-      
+
       node = db.find_fragment(Vines::JID.new('full@wonderland.lit/resource'), root)
       assert (node != nil), "node should include fragment"
       assert_equal fragment.to_s, node.to_s
     end
   end
-  
+
   def test_save_fragment
     skip("not working probably")
 

data/test/stream/http/request_test.rb

@@ -3,20 +3,13 @@
 require 'test_helper'
 
 describe Vines::Stream::Http::Request do
-  PASSWORD = File.expand_path('../passwords')
-  INDEX    = File.expand_path('index.html')
+  PASSWORD = File.expand_path('../passwords').freeze
+  INDEX    = File.expand_path('index.html').freeze
 
   before do
     File.open(PASSWORD, 'w') {|f| f.puts '/etc/passwd contents' }
     File.open(INDEX, 'w') {|f| f.puts 'index.html contents' }
-
     @stream = MiniTest::Mock.new
-    @parser = MiniTest::Mock.new
-    @parser.expect(:headers, {'Content-Type' => 'text/html', 'Host' => 'wonderland.lit'})
-    @parser.expect(:http_method, 'GET')
-    @parser.expect(:request_path, '/blogs/12')
-    @parser.expect(:request_url, '/blogs/12?ok=true')
-    @parser.expect(:query_string, 'ok=true')
   end
 
   after do
@@ -26,21 +19,26 @@ describe Vines::Stream::Http::Request do
 
   describe 'initialize' do
     it 'copies request info from parser' do
-      request = Vines::Stream::Http::Request.new(@stream, @parser, '<html></html>')
-      assert_equal request.headers, {'Content-Type' => 'text/html', 'Host' => 'wonderland.lit'}
+      headers = ['Host: wonderland.lit', 'Content-Type: text/html']
+      parser = parser('GET', '/blogs/12?ok=true', headers)
+      request = Vines::Stream::Http::Request.new(@stream, parser, '<html></html>')
+
+      assert_equal request.headers, {'Host' => 'wonderland.lit', 'Content-Type' => 'text/html'}
       assert_equal request.method, 'GET'
       assert_equal request.path, '/blogs/12'
       assert_equal request.url, '/blogs/12?ok=true'
       assert_equal request.query, 'ok=true'
       assert_equal request.body, '<html></html>'
       assert @stream.verify
-      assert @parser.verify
     end
   end
 
   describe 'reply_with_file' do
     it 'returns 404 file not found' do
-      request = Vines::Stream::Http::Request.new(@stream, @parser, '<html></html>')
+      headers = ['Host: wonderland.lit', 'Content-Type: text/html']
+      parser = parser('GET', '/blogs/12?ok=true', headers)
+      request = Vines::Stream::Http::Request.new(@stream, parser, '<html></html>')
+
       headers = [
         "HTTP/1.1 404 Not Found",
         "Content-Length: 0"
@@ -50,17 +48,11 @@ describe Vines::Stream::Http::Request do
 
       request.reply_with_file(Dir.pwd)
       assert @stream.verify
-      assert @parser.verify
     end
 
     it 'prevents directory traversal with 404 response' do
-      parser = MiniTest::Mock.new
-      parser.expect(:headers, {'Content-Type' => 'text/html', 'Host' => 'wonderland.lit'})
-      parser.expect(:http_method, 'GET')
-      parser.expect(:request_path, '/../passwords')
-      parser.expect(:request_url, '/../passwords')
-      parser.expect(:query_string, '')
-
+      headers = ['Host: wonderland.lit', 'Content-Type: text/html']
+      parser = parser('GET', '/../passwords', headers)
       request = Vines::Stream::Http::Request.new(@stream, parser, '<html></html>')
 
       headers = [
@@ -72,17 +64,11 @@ describe Vines::Stream::Http::Request do
 
       request.reply_with_file(Dir.pwd)
       assert @stream.verify
-      assert parser.verify
     end
 
     it 'serves index.html for directory request' do
-      parser = MiniTest::Mock.new
-      parser.expect(:headers, {'Content-Type' => 'text/html', 'Host' => 'wonderland.lit'})
-      parser.expect(:http_method, 'GET')
-      parser.expect(:request_path, '/')
-      parser.expect(:request_url, '/?ok=true')
-      parser.expect(:query_string, 'ok=true')
-
+      headers = ['Host: wonderland.lit', 'Content-Type: text/html']
+      parser = parser('GET', '/?ok=true', headers)
       request = Vines::Stream::Http::Request.new(@stream, parser, '<html></html>')
 
       mtime = File.mtime(INDEX).utc.strftime('%a, %d %b %Y %H:%M:%S GMT')
@@ -98,17 +84,11 @@ describe Vines::Stream::Http::Request do
 
       request.reply_with_file(Dir.pwd)
       assert @stream.verify
-      assert parser.verify
     end
 
     it 'redirects for missing trailing slash' do
-      parser = MiniTest::Mock.new
-      parser.expect(:headers, {'Content-Type' => 'text/html', 'Host' => 'wonderland.lit'})
-      parser.expect(:http_method, 'GET')
-      parser.expect(:request_path, '/http')
-      parser.expect(:request_url, '/http?ok=true')
-      parser.expect(:query_string, 'ok=true')
-
+      headers = ['Host: wonderland.lit', 'Content-Type: text/html']
+      parser = parser('GET', '/http?ok=true', headers)
       request = Vines::Stream::Http::Request.new(@stream, parser, '<html></html>')
 
       headers = [
@@ -121,23 +101,18 @@ describe Vines::Stream::Http::Request do
       # so the /http url above will work
       request.reply_with_file(File.expand_path('../../', __FILE__))
       assert @stream.verify
-      assert parser.verify
     end
   end
 
   describe 'reply_to_options' do
     it 'returns cors headers' do
-      parser = MiniTest::Mock.new
-      parser.expect(:headers, {
-        'Content-Type' => 'text/xml',
-        'Host' => 'wonderland.lit',
-        'Origin' => 'remote.wonderland.lit',
-        'Access-Control-Request-Headers' => 'Content-Type, Origin'})
-      parser.expect(:http_method, 'OPTIONS')
-      parser.expect(:request_path, '/xmpp')
-      parser.expect(:request_url, '/xmpp')
-      parser.expect(:query_string, '')
-
+      headers = [
+        'Content-Type: text/xml',
+        'Host: wonderland.lit',
+        'Origin: remote.wonderland.lit',
+        'Access-Control-Request-Headers: Content-Type, Origin'
+      ]
+      parser = parser('OPTIONS', '/xmpp', headers)
       request = Vines::Stream::Http::Request.new(@stream, parser, '')
 
       headers = [
@@ -152,7 +127,6 @@ describe Vines::Stream::Http::Request do
       @stream.expect(:stream_write, nil, ["#{headers}\r\n\r\n"])
       request.reply_to_options
       assert @stream.verify
-      assert parser.verify
     end
   end
 
@@ -168,6 +142,21 @@ describe Vines::Stream::Http::Request do
 
   private
 
+  # Create a parser that has completed one valid HTTP request.
+  #
+  # method  - The HTTP method String (e.g. 'GET', 'POST').
+  # url     - The request URL String (e.g. '/blogs/12?ok=true').
+  # headers - The optional Array of request headers.
+  #
+  # Returns an Http::Parser.
+  def parser(method, url, headers = [])
+    head = ["#{method} #{url} HTTP/1.1"].concat(headers).join("\r\n")
+    body = '<html></html>'
+    Http::Parser.new.tap do |parser|
+      parser << "%s\r\n\r\n%s" % [head, body]
+    end
+  end
+
   def reply_with_cookie(cookie)
     config = Vines::Config.new do
       host 'wonderland.lit' do
@@ -178,15 +167,12 @@ describe Vines::Stream::Http::Request do
       end
     end
 
-    parser = MiniTest::Mock.new
-    parser.expect(:headers, {
-      'Content-Type' => 'text/xml',
-      'Host' => 'wonderland.lit',
-      'Origin' => 'remote.wonderland.lit'})
-    parser.expect(:http_method, 'POST')
-    parser.expect(:request_path, '/xmpp')
-    parser.expect(:request_url, '/xmpp')
-    parser.expect(:query_string, '')
+    headers = [
+      'Content-Type: text/xml',
+      'Host: wonderland.lit',
+      'Origin: remote.wonderland.lit'
+    ]
+    parser = parser('POST', '/xmpp', headers)
 
     request = Vines::Stream::Http::Request.new(@stream, parser, '')
     message = '<message>hello</message>'
@@ -204,6 +190,5 @@ describe Vines::Stream::Http::Request do
     @stream.expect(:config, config)
     request.reply(message, 'application/xml')
     assert @stream.verify
-    assert parser.verify
   end
 end