diaspora-vines 0.1.22 → 0.1.24

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diaspora-vines
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.24
 platform: ruby
 authors:
 - David Graham
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -67,20 +67,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: net-ldap
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -191,15 +177,12 @@ files:
 - lib/vines/cluster/pubsub.rb
 - lib/vines/cluster/sessions.rb
 - lib/vines/cluster/subscriber.rb
-- lib/vines/command/bcrypt.rb
 - lib/vines/command/cert.rb
-- lib/vines/command/init.rb
-- lib/vines/command/ldap.rb
 - lib/vines/command/restart.rb
-- lib/vines/command/schema.rb
 - lib/vines/command/start.rb
 - lib/vines/command/stop.rb
 - lib/vines/config.rb
+- lib/vines/config/diaspora.rb
 - lib/vines/config/host.rb
 - lib/vines/config/port.rb
 - lib/vines/config/pubsub.rb
@@ -216,6 +199,7 @@ files:
 - lib/vines/stanza/iq/disco_info.rb
 - lib/vines/stanza/iq/disco_items.rb
 - lib/vines/stanza/iq/error.rb
+- lib/vines/stanza/iq/offline.rb
 - lib/vines/stanza/iq/ping.rb
 - lib/vines/stanza/iq/private_storage.rb
 - lib/vines/stanza/iq/query.rb
@@ -240,7 +224,6 @@ files:
 - lib/vines/stanza/pubsub/subscribe.rb
 - lib/vines/stanza/pubsub/unsubscribe.rb
 - lib/vines/storage.rb
-- lib/vines/storage/ldap.rb
 - lib/vines/storage/local.rb
 - lib/vines/storage/null.rb
 - lib/vines/storage/sql.rb
@@ -320,14 +303,12 @@ files:
 - test/stanza/pubsub/subscribe_test.rb
 - test/stanza/pubsub/unsubscribe_test.rb
 - test/stanza_test.rb
-- test/storage/ldap_test.rb
 - test/storage/local_test.rb
 - test/storage/mock_redis.rb
 - test/storage/null_test.rb
-- test/storage/sql.rb
 - test/storage/sql_schema.rb
+- test/storage/sql_test.rb
 - test/storage/storage_tests.rb
-- test/storage_test.rb
 - test/store_test.rb
 - test/stream/client/auth_test.rb
 - test/stream/client/ready_test.rb
@@ -348,7 +329,6 @@ files:
 - test/test_helper.rb
 - test/token_bucket_test.rb
 - test/user_test.rb
-- vines.gemspec
 homepage: https://diasporafoundation.org
 licenses:
 - MIT
@@ -401,7 +381,6 @@ test_files:
 - test/stanza/pubsub/unsubscribe_test.rb
 - test/stanza/pubsub/delete_test.rb
 - test/token_bucket_test.rb
-- test/storage_test.rb
 - test/store_test.rb
 - test/stanza_test.rb
 - test/error_test.rb
@@ -427,7 +406,6 @@ test_files:
 - test/storage/storage_tests.rb
 - test/storage/sql_schema.rb
 - test/storage/null_test.rb
+- test/storage/sql_test.rb
 - test/storage/mock_redis.rb
-- test/storage/ldap_test.rb
 - test/storage/local_test.rb
-- test/storage/sql.rb

data/lib/vines/command/bcrypt.rb

@@ -1,12 +0,0 @@
-# encoding: UTF-8
-
-module Vines
-  module Command
-    class Bcrypt
-      def run(opts)
-        raise 'vines bcrypt <clear text>' unless opts[:args].size == 1
-        puts BCrypt::Password.create(opts[:args].first)
-      end
-    end
-  end
-end

data/lib/vines/command/init.rb

@@ -1,68 +0,0 @@
-# encoding: UTF-8
-
-module Vines
-  module Command
-    class Init
-      def run(opts)
-        raise 'vines init <domain>' unless opts[:args].size == 1
-        domain = opts[:args].first.downcase
-        dir = File.expand_path(domain)
-        raise "Directory already initialized: #{domain}" if File.exists?(dir)
-        Dir.mkdir(dir)
-
-        create_directories(dir)
-        create_users(domain, dir)
-        update_config(domain, dir)
-        Command::Cert.new.create_cert(domain, File.join(dir, 'conf/certs'))
-
-        puts "Initialized server directory: #{domain}"
-        puts "Run 'cd #{domain} && vines start' to begin"
-      end
-
-      private
-
-      # Limit file system database directory access so the server is the only
-      # process managing the data. The config.rb file contains component and
-      # database passwords, so restrict access to just the server user as well.
-      def create_directories(dir)
-        %w[conf web].each do |sub|
-          FileUtils.cp_r(File.expand_path("../../../../#{sub}", __FILE__), dir)
-        end
-        %w[data log pid].each do |sub|
-          Dir.mkdir(File.join(dir, sub), 0700)
-        end
-        File.chmod(0600, File.join(dir, 'conf/config.rb'))
-      end
-
-      def update_config(domain, dir)
-        config = File.expand_path('conf/config.rb', dir)
-        text = File.read(config, encoding: 'utf-8')
-        File.open(config, 'w:utf-8') do |f|
-          f.write(text.gsub('wonderland.lit', domain))
-        end
-      end
-
-      def create_users(domain, dir)
-        password = 'secr3t'
-        alice, arthur = %w[alice arthur].map do |jid|
-          User.new(jid: [jid, domain].join('@'),
-            password: BCrypt::Password.create(password).to_s)
-        end
-
-        [[alice, arthur], [arthur, alice]].each do |user, contact|
-          user.roster << Contact.new(
-            jid: contact.jid,
-            name: contact.jid.node.capitalize,
-            subscription: 'both',
-            groups: %w[Buddies])
-        end
-
-        storage = Storage::Local.new { dir(File.join(dir, 'data')) }
-        [alice, arthur].each do |user|
-          storage.save_user(user)
-          puts "Created example user #{user.jid} with password #{password}"
-        end
-      end
-    end
-  end
-end

data/lib/vines/command/ldap.rb

@@ -1,38 +0,0 @@
-# encoding: UTF-8
-
-module Vines
-  module Command
-    class Ldap
-      def run(opts)
-        raise 'vines ldap <domain>' unless opts[:args].size == 1
-        require opts[:config]
-        domain = opts[:args].first
-        unless storage = Config.instance.vhost(domain).storage rescue nil
-          raise "#{domain} virtual host not found in conf/config.rb"
-        end
-        unless storage.ldap?
-          raise "LDAP connector not configured for #{domain} virtual host"
-        end
-        $stdout.write('JID: ')
-        jid = $stdin.gets.chomp
-        jid = [jid, domain].join('@') unless jid.include?('@')
-        $stdout.write('Password: ')
-        `stty -echo`
-        password = $stdin.gets.chomp
-        `stty echo`
-        puts
-
-        begin
-          user = storage.ldap.authenticate(jid, password)
-        rescue => e
-          raise "LDAP connection failed: #{e.message}"
-        end
-
-        filter = storage.ldap.filter(jid)
-        raise "User not found with filter:\n  #{filter}" unless user
-        name = user.name.empty? ? '<name missing>' : user.name
-        puts "Found user #{name} with filter:\n  #{filter}"
-      end
-    end
-  end
-end

data/lib/vines/command/schema.rb

@@ -1,24 +0,0 @@
-# encoding: UTF-8
-
-module Vines
-  module Command
-    class Schema
-      def run(opts)
-        raise 'vines schema <domain>' unless opts[:args].size == 1
-        require opts[:config]
-        domain = opts[:args].first
-        unless storage = Config.instance.vhost(domain).storage rescue nil
-          raise "#{domain} virtual host not found in conf/config.rb"
-        end
-        unless storage.respond_to?(:create_schema)
-          raise "SQL storage not configured for #{domain} virtual host"
-        end
-        begin
-          storage.create_schema
-        rescue => e
-          raise "Schema creation failed: #{e.message}"
-        end
-      end
-    end
-  end
-end

data/lib/vines/storage/ldap.rb

@@ -1,71 +0,0 @@
-# encoding: UTF-8
-
-module Vines
-  class Storage
-
-    # Authenticates usernames and passwords against an LDAP directory. This can
-    # provide authentication logic for the other, full-featured Storage
-    # implementations while they store and retrieve the rest of the user
-    # information.
-    class Ldap
-      @@required = [:host, :port]
-      %w[tls dn password basedn object_class user_attr name_attr groupdn].each do |name|
-        @@required << name.to_sym unless name == 'groupdn'
-        define_method name do |*args|
-          @config[name.to_sym] = args.first
-        end
-      end
-
-      def initialize(host='localhost', port=636, &block)
-        @config = {host: host, port: port}
-        instance_eval(&block)
-        @@required.each {|key| raise "Must provide #{key}" if @config[key].nil? }
-      end
-
-      # Validates a username and password by binding to the LDAP instance with
-      # those credentials. If the bind succeeds, the user's attributes are
-      # retrieved.
-      def authenticate(username, password)
-        username = JID.new(username).to_s rescue nil
-        return if [username, password].any? {|arg| (arg || '').strip.empty? }
-
-        ldap = connect(@config[:dn], @config[:password])
-        entries = ldap.search(
-          attributes: [@config[:name_attr], 'mail'],
-          filter: filter(username))
-        return unless entries && entries.size == 1
-
-        user = if connect(entries.first.dn, password).bind
-          name = entries.first[@config[:name_attr]].first
-          User.new(jid: username, name: name.to_s, roster: [])
-        end
-        user
-      end
-
-      # Return an LDAP search filter for a user optionally belonging to the
-      # group defined by the groupdn config attribute.
-      def filter(username)
-        clas = Net::LDAP::Filter.eq('objectClass', @config[:object_class])
-        uid = Net::LDAP::Filter.eq(@config[:user_attr], username)
-        filter = clas & uid
-        if group = @config[:groupdn]
-          memberOf = Net::LDAP::Filter.eq('memberOf', group)
-          isMemberOf = Net::LDAP::Filter.eq('isMemberOf', group)
-          filter = filter & (memberOf | isMemberOf)
-        end
-        filter
-      end
-
-      private
-
-      def connect(dn, password)
-        options = [:host, :port, :base].zip(
-          @config.values_at(:host, :port, :basedn))
-        Net::LDAP.new(Hash[options]).tap do |ldap|
-          ldap.encryption(:simple_tls) if @config[:tls]
-          ldap.auth(dn, password)
-        end
-      end
-    end
-  end
-end

data/test/storage/ldap_test.rb

@@ -1,201 +0,0 @@
-# encoding: UTF-8
-
-require 'test_helper'
-
-describe Vines::Storage::Ldap do
-  ALICE_DN = 'uid=alice@wondlerand.lit,ou=People,dc=wonderland,dc=lit'
-  CONTEXT = {}
-
-  after do
-    CONTEXT.clear
-  end
-
-  describe '#initialize' do
-    it 'raises with missing host and port' do
-      assert_raises(RuntimeError) do
-        Vines::Storage::Ldap.new(nil, nil) do
-          tls true
-          dn 'cn=Directory Manager'
-          password 'secr3t'
-          basedn 'dc=wonderland,dc=lit'
-          object_class 'person'
-          user_attr 'uid'
-          name_attr 'cn'
-        end
-      end
-    end
-
-    it 'does not raise when using default host and port' do
-      Vines::Storage::Ldap.new do
-        tls true
-        dn 'cn=Directory Manager'
-        password 'secr3t'
-        basedn 'dc=wonderland,dc=lit'
-        object_class 'person'
-        user_attr 'uid'
-        name_attr 'cn'
-      end
-    end
-
-    it 'does not raise when given a host and port' do
-      Vines::Storage::Ldap.new('0.0.0.1', 42) do
-        tls true
-        dn 'cn=Directory Manager'
-        password 'secr3t'
-        basedn 'dc=wonderland,dc=lit'
-        object_class 'person'
-        user_attr 'uid'
-        name_attr 'cn'
-      end
-    end
-
-    it 'raises when given no parameters' do
-      assert_raises(RuntimeError) do
-        Vines::Storage::Ldap.new {}
-      end
-    end
-
-    it 'raises when given blank parameters' do
-      assert_raises(RuntimeError) do
-        Vines::Storage::Ldap.new do
-          tls
-          dn
-          password
-          basedn
-          object_class
-          user_attr
-          name_attr
-        end
-      end
-    end
-
-    it 'handles boolean false values without raising' do
-      Vines::Storage::Ldap.new do
-        tls false
-        dn 'cn=Directory Manager'
-        password 'secr3t'
-        basedn 'dc=wonderland,dc=lit'
-        object_class 'person'
-        user_attr 'uid'
-        name_attr 'cn'
-      end
-    end
-  end
-
-  describe '#authenticate' do
-    it 'fails with invalid credentials' do
-      ldap = connect
-      assert_nil ldap.authenticate(nil, nil)
-      assert_nil ldap.authenticate('', '')
-      assert_nil ldap.authenticate('alice@wonderland.lit', ' ')
-      assert_nil ldap.authenticate('bogus"jid@wonderland.lit', 'password')
-      assert_nil ldap.authenticate(Vines::JID.new('alice@wonderland.lit'), '')
-    end
-
-    it 'fails when user not found' do
-      CONTEXT.merge!({
-        :mock_ldap => MiniTest::Mock.new,
-        :connect_calls => 0
-      })
-      ldap = connect
-      def ldap.connect(dn, password)
-        CONTEXT[:connect_calls] += 1
-        raise unless 'cn=Directory Manager' == dn
-        raise unless 'secr3t' == password
-
-        clas = Net::LDAP::Filter.eq('objectClass', 'person')
-        uid = Net::LDAP::Filter.eq('uid', 'alice@wonderland.lit')
-
-        mock = CONTEXT[:mock_ldap]
-        mock.expect(:search, [], [{:attributes => ['cn', 'mail'], :filter => clas & uid}])
-      end
-      assert_nil ldap.authenticate('alice@wonderland.lit', 'passw0rd')
-      assert CONTEXT[:mock_ldap]
-      assert_equal 1, CONTEXT[:connect_calls]
-    end
-
-    it 'fails when user cannot bind' do
-      CONTEXT.merge!({
-        :credentials => [
-          {:dn => 'cn=Directory Manager', :password => 'secr3t'},
-          {:dn => ALICE_DN, :password => 'passw0rd'}
-        ],
-        :mock_ldap => MiniTest::Mock.new,
-        :mock_entry => MiniTest::Mock.new,
-        :connect_calls => 0
-      })
-      ldap = connect
-      def ldap.connect(dn, password)
-        credentials = CONTEXT[:credentials][CONTEXT[:connect_calls]]
-        CONTEXT[:connect_calls] += 1
-        raise unless credentials[:dn] == dn && credentials[:password] == password
-
-        clas = Net::LDAP::Filter.eq('objectClass', 'person')
-        uid = Net::LDAP::Filter.eq('uid', 'alice@wonderland.lit')
-
-        entry = CONTEXT[:mock_entry]
-        entry.expect(:dn, ALICE_DN)
-
-        mock = CONTEXT[:mock_ldap]
-        mock.expect(:search, [entry], [{:attributes => ['cn', 'mail'], :filter => clas & uid}])
-        mock.expect(:bind, false)
-      end
-      assert_nil ldap.authenticate('alice@wonderland.lit', 'passw0rd')
-      assert_equal 2, CONTEXT[:connect_calls]
-      assert CONTEXT[:mock_entry].verify
-      assert CONTEXT[:mock_ldap].verify
-    end
-
-    it 'authenticates successfully with proper credentials' do
-      CONTEXT.merge!({
-        :credentials => [
-          {:dn => 'cn=Directory Manager', :password => 'secr3t'},
-          {:dn => ALICE_DN, :password => 'passw0rd'}
-        ],
-        :mock_ldap => MiniTest::Mock.new,
-        :mock_entry => MiniTest::Mock.new,
-        :connect_calls => 0
-      })
-      ldap = connect
-      def ldap.connect(dn, password)
-        credentials = CONTEXT[:credentials][CONTEXT[:connect_calls]]
-        CONTEXT[:connect_calls] += 1
-        raise unless credentials[:dn] == dn && credentials[:password] == password
-
-        clas = Net::LDAP::Filter.eq('objectClass', 'person')
-        uid = Net::LDAP::Filter.eq('uid', 'alice@wonderland.lit')
-
-        entry = CONTEXT[:mock_entry]
-        entry.expect(:dn, ALICE_DN)
-        entry.expect(:[], ['Alice Liddell'], ['cn'])
-
-        mock = CONTEXT[:mock_ldap]
-        mock.expect(:search, [entry], [{:attributes => ['cn', 'mail'], :filter => clas & uid}])
-        mock.expect(:bind, true)
-      end
-      user = ldap.authenticate('alice@wonderland.lit', 'passw0rd')
-      refute_nil user
-      assert_equal 'alice@wonderland.lit', user.jid.to_s
-      assert_equal 'Alice Liddell', user.name
-      assert_equal [], user.roster
-
-      assert_equal 2, CONTEXT[:connect_calls]
-      assert CONTEXT[:mock_entry].verify
-      assert CONTEXT[:mock_ldap].verify
-    end
-  end
-
-  private
-
-  def connect
-    Vines::Storage::Ldap.new('0.0.0.0', 636) do
-      tls true
-      dn 'cn=Directory Manager'
-      password 'secr3t'
-      basedn 'dc=wonderland,dc=lit'
-      object_class 'person'
-      user_attr 'uid'
-      name_attr 'cn'
-    end
-  end
-end