diaspora-vines 0.1.21 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2e10ea8cd78c49254b4e8dc363d3d23759b40f6
-  data.tar.gz: aeedf0672a7578414f0b174b2ab0d61403c0f5b2
+  metadata.gz: 9a46173efffc5217b488d5f6c5976884ccc2f708
+  data.tar.gz: aa7dd385af0c647ff67c13c2342dec210f04e131
 SHA512:
-  metadata.gz: 59a644d8dbd8cab888548ea2d49466ad27d5acc79f99097414d440f3942c72d7ec128ed33df3991841e6d409fca9fccaffc87552925532f0276e4a55e23ead3d
-  data.tar.gz: 7c85dcaaa5359bc99714cf24528b7e0f25731681339503e394b3c3856b5457cc81918395a2fce021d8172dc7ec9ef46e0137948e2ac8dcbee7323d87da4c38ba
+  metadata.gz: 6b07389956b5f47fc57f9b79afa0a6e28c013da900800e526c31247773877681bcc54a4940356370ebfe3fb2c36a0a62c667b25e71c593e4f151b03ef1b25f0f
+  data.tar.gz: 7196743cd8ee5505f72d05b662b10fc691187437e202bb9e8aef9341a338a7d477d299e1d951d1c2d5f0ef75833d2896a165e68e7a5606aaed802c3dd77d1ae4

data/conf/config.rb

@@ -16,6 +16,7 @@ Vines::Config.configure do
   pepper "065eb8798b181ff0ea2c5c16aee0ff8b70e04e2ee6bd6e08b49da46924223e39127d5335e466207d42bf2a045c12be5f90e92012a4f05f7fc6d9f3c875f4c95b"
 
   host 'diaspora' do
+    cross_domain_messages true
     storage 'sql'
   end
 

data/lib/vines/config.rb

@@ -158,7 +158,10 @@ module Vines
     # Returns true if server-to-server connections are allowed with the
     # given domain.
     def s2s?(domain)
-      @ports[:server] && @ports[:server].hosts.include?(domain.to_s)
+      # NOTE: Disabled whitelisting; It is necessary to allow
+      # anonymous hosts, otherwise everyone has to add all hosts manually
+      # TODO: Create a blacklist in case we have to block a malicious host
+      @ports[:server] # && @ports[:server].hosts.include?(domain.to_s)
     end
 
     # Return true if the server is a member of a cluster, serving the same

data/lib/vines/contact.rb

@@ -4,7 +4,7 @@ module Vines
   class Contact
     include Comparable
 
-    attr_accessor :name, :subscription, :ask, :groups
+    attr_accessor :name, :subscription, :ask, :groups, :from_diaspora
     attr_reader :jid
 
     def initialize(args={})
@@ -12,6 +12,7 @@ module Vines
       raise ArgumentError, 'invalid jid' if @jid.empty?
       @name = args[:name]
       @subscription = args[:subscription] || 'none'
+      @from_diaspora = args[:from_diaspora] || false
       @ask = args[:ask]
       @groups = args[:groups] || []
     end
@@ -29,6 +30,7 @@ module Vines
     def update_from(contact)
       @name = contact.name
       @subscription = contact.subscription
+      @from_diaspora = contact.from_diaspora
       @ask = contact.ask
       @groups = contact.groups.clone
     end
@@ -75,6 +77,7 @@ module Vines
       {
         'name' => @name,
         'subscription' => @subscription,
+        'from_diaspora' => @from_diaspora,
         'ask' => @ask,
         'groups' => @groups.sort!
       }
@@ -102,6 +105,7 @@ module Vines
         el['jid'] = @jid.bare.to_s
         el['name'] = @name unless @name.nil? || @name.empty?
         el['subscription'] = @subscription
+        el['from_diaspora'] = @from_diaspora
         @groups.sort!.each do |group|
           el << doc.create_element('group', group)
         end

data/lib/vines/storage/sql.rb

@@ -33,10 +33,22 @@ module Vines
 
       class User < ActiveRecord::Base
         has_many :contacts
+        has_many :chat_contacts, :dependent => :destroy
+        has_many :fragments, :dependent => :delete_all
 
         has_one :person, :foreign_key => :owner_id
       end
 
+      class ChatContact < ActiveRecord::Base
+        belongs_to :users
+
+        serialize :groups, JSON
+      end
+      
+      class ChatFragment < ActiveRecord::Base
+        belongs_to :users
+      end
+
       # Wrap the method with ActiveRecord connection pool logic, so we properly
       # return connections to the pool when we're finished with them. This also
       # defers the original method by pushing it onto the EM thread pool because
@@ -80,11 +92,27 @@ module Vines
             xuser.encrypted_password,
             xuser.authentication_token
 
+          # add diaspora contacts
           xuser.contacts.each do |contact|
-            entry = build_roster_entry(contact)
-            unless entry.nil?
-              user.roster << entry
-            end
+            handle = contact.person.diaspora_handle
+            ask, subscription, groups = get_diaspora_flags(contact)
+            user.roster << Vines::Contact.new(
+              jid: handle,
+              name: handle.gsub(/\@.*?$/, ''),
+              subscription: subscription,
+              from_diaspora: true,
+              groups: groups,
+              ask: ask)
+          end
+
+          # add external contacts
+          xuser.chat_contacts.each do |contact|
+            user.roster << Vines::Contact.new(
+              jid: contact.jid,
+              name: contact.name,
+              subscription: contact.subscription,
+              groups: contact.groups,
+              ask: contact.ask)
           end
         end if xuser
       end
@@ -93,8 +121,7 @@ module Vines
       def authenticate(username, password)
         user = find_user(username)
 
-        pepper = password
-        pepper << Config.instance.pepper unless Config
+        pepper = "#{password}#{Config.instance.pepper}" rescue password
         dbhash = BCrypt::Password.new(user.password) rescue nil
         hash = BCrypt::Engine.hash_secret(pepper, dbhash.salt) rescue nil
 
@@ -104,29 +131,72 @@ module Vines
       end
 
       def save_user(user)
-        # do nothing
+        # it is not possible to register an account via xmpp server
+        xuser = user_by_jid(user.jid) || return
+
+        # remove deleted contacts from roster
+        xuser.chat_contacts.delete(xuser.chat_contacts.select do |contact|
+          !user.contact?(contact.jid)
+        end)
+
+        # update contacts
+        xuser.chat_contacts.each do |contact|
+          fresh = user.contact(contact.jid)
+          contact.update_attributes(
+            name: fresh.name,
+            ask: fresh.ask,
+            subscription: fresh.subscription,
+            groups: fresh.groups)
+        end
+
+        # add new contacts to roster
+        jids = xuser.chat_contacts.map {|c|
+          c.jid if (c.user_id == xuser.id)
+        }.compact
+        user.roster.select {|contact|
+          unless contact.from_diaspora
+            xuser.chat_contacts.build(
+              user_id: xuser.id,
+              jid: contact.jid.bare.to_s,
+              name: contact.name,
+              ask: contact.ask,
+              subscription: contact.subscription,
+              groups: contact.groups) unless jids.include?(contact.jid.bare.to_s)
+          end
+        }
+        xuser.save
       end
       with_connection :save_user
 
       def find_vcard(jid)
-        # do nothing
+        # not supported yet
         nil
       end
       with_connection :find_vcard
 
       def save_vcard(jid, card)
-        # do nothing
+        # not supported yet
       end
       with_connection :save_vcard
 
       def find_fragment(jid, node)
-        # do nothing
-        nil
+        jid = JID.new(jid).bare.to_s
+        return if jid.empty?
+        if fragment = fragment_by_jid(jid, node)
+          Nokogiri::XML(fragment.xml).root rescue nil
+        end
       end
       with_connection :find_fragment
 
       def save_fragment(jid, node)
-        # do nothing
+        jid = JID.new(jid).bare.to_s
+        fragment = fragment_by_jid(jid, node) ||
+        Sql::ChatFragment.new(
+          user: user_by_jid(jid),
+          root: node.name,
+          namespace: node.namespace.href)
+        fragment.xml = node.to_xml
+        fragment.save
       end
       with_connection :save_fragment
 
@@ -141,16 +211,19 @@ module Vines
           Sql::User.find_by_username(name)
         end
 
-        def build_roster_entry(contact)
+        def fragment_by_jid(jid, node)
+          jid = JID.new(jid).bare.to_s
+          clause = 'user_id=(select id from users where jid=?) and root=? and namespace=?'
+          Sql::ChatFragment.where(clause, jid, node.name, node.namespace.href).first
+        end
+
+        def get_diaspora_flags(contact)
           groups = Array.new
+          ask, subscription = 'none', 'none'
           contact.aspects.each do |aspect|
             groups.push(aspect.name)
           end
 
-          handle = contact.person.diaspora_handle
-          ask = 'none'
-          subscription = 'none'
-          
           if contact.sharing && contact.receiving
             subscription = 'both'
           elsif contact.sharing && !contact.receiving
@@ -161,15 +234,7 @@ module Vines
           else
             ask = 'suscribe'
           end
-
-          # finally build the roster entry
-          return Vines::Contact.new(
-            jid: handle,
-            name: handle.gsub(/\@.*?$/, ''),
-            subscription: subscription,
-            groups: groups,
-            ask: ask
-          ) || nil
+          return ask, subscription, groups
         end
     end
   end

data/lib/vines/stream.rb

@@ -98,14 +98,7 @@ module Vines
       router.interested_resources(*jid, user.jid)
     end
 
-    def ssl_verify_peer(pem)
-      # EM is supposed to close the connection when this returns false,
-      # but it only does that for inbound connections, not when we
-      # make a connection to another server.
-      @store.trusted?(pem).tap do |trusted|
-        close_connection unless trusted
-      end
-    end
+    def ssl_verify_peer(pem); true; end
 
     def cert_domain_matches?(domain)
       @store.domain?(get_peer_cert, domain)

data/lib/vines/version.rb

@@ -2,5 +2,5 @@
 
 module Vines
   # vines forked version 0.4.9
-  VERSION = '0.1.21'
+  VERSION = '0.1.22'
 end

data/test/config_test.rb

@@ -231,7 +231,6 @@ describe Vines::Config do
     end
     port = config.ports.first
     refute_nil port
-    assert !config.s2s?('verona.lit')
     assert_equal Vines::Config::ServerPort, port.class
     assert_equal '0.0.0.0', port.host
     assert_equal 5269, port.port
@@ -248,17 +247,10 @@ describe Vines::Config do
       end
       server '0.0.0.1', 42 do
         max_stanza_size 60_000
-        hosts ['verona.lit', 'denmark.lit']
       end
     end
     port = config.ports.first
     refute_nil port
-    assert config.s2s?('verona.lit')
-    assert config.s2s?('denmark.lit')
-    assert config.s2s?(Vines::JID.new('denmark.lit'))
-    refute config.s2s?(Vines::JID.new('hamlet@denmark.lit'))
-    refute config.s2s?('bogus')
-    refute config.s2s?(nil)
     assert_equal Vines::Config::ServerPort, port.class
     assert_equal '0.0.0.1', port.host
     assert_equal 42, port.port

data/test/contact_test.rb

@@ -53,7 +53,7 @@ describe Vines::Contact do
   describe '#to_roster_xml' do
     let(:expected) do
       node(%q{
-        <item jid="alice@wonderland.lit" name="Alice" subscription="from">
+        <item jid="alice@wonderland.lit" name="Alice" subscription="from" from_diaspora="false">
           <group>Buddies</group>
           <group>Friends</group>
         </item>
@@ -71,7 +71,7 @@ describe Vines::Contact do
       node(%q{
         <iq to="hatter@wonderland.lit" type="set">
           <query xmlns="jabber:iq:roster">
-          <item jid="alice@wonderland.lit" name="Alice" subscription="from">
+          <item jid="alice@wonderland.lit" name="Alice" subscription="from" from_diaspora="false">
             <group>Buddies</group>
             <group>Friends</group>
           </item>

data/test/stanza/iq/roster_test.rb

@@ -36,11 +36,11 @@ describe Vines::Stanza::Iq::Roster do
       node(%q{
         <iq id="42" type="result">
           <query xmlns="jabber:iq:roster">
-            <item jid="cat@wonderland.lit" subscription="none">
+            <item jid="cat@wonderland.lit" subscription="none" from_diaspora="false">
               <group>Cats</group>
               <group>Friends</group>
             </item>
-            <item jid="hatter@wonderland.lit" subscription="none"/>
+            <item jid="hatter@wonderland.lit" subscription="none" from_diaspora="false"/>
           </query>
         </iq>})
     end
@@ -187,7 +187,7 @@ describe Vines::Stanza::Iq::Roster do
       node(%q{
         <iq to="alice@wonderland.lit/tea" type="set">
           <query xmlns="jabber:iq:roster">
-            <item jid="hatter@wonderland.lit" name="Mad Hatter" subscription="none">
+            <item jid="hatter@wonderland.lit" name="Mad Hatter" subscription="none" from_diaspora="false">
               <group>Friends</group>
             </item>
           </query>

data/test/stanza/presence/subscribe_test.rb

@@ -74,7 +74,7 @@ describe Vines::Stanza::Presence::Subscribe do
       subject.process
       recipient.nodes.size.must_equal 1
 
-      query = %q{<query xmlns="jabber:iq:roster"><item jid="hatter@wonderland.lit" subscription="none"/></query>}
+      query = %q{<query xmlns="jabber:iq:roster"><item jid="hatter@wonderland.lit" subscription="none" from_diaspora="false"/></query>}
       expected = node(%Q{<iq to="alice@wonderland.lit/tea" type="set">#{query}</iq>})
       recipient.nodes.first.remove_attribute('id') # id is random
       recipient.nodes.first.must_equal expected

data/test/storage/sql.rb

@@ -34,6 +34,28 @@ describe Vines::Storage::Sql do
     db = Rails.application.config.database_configuration["development"]["database"]
     File.delete(db) if File.exist?(db)
   end
+  
+  def test_save_user
+    fibered do
+      db = storage
+      user = Vines::User.new(
+        jid: 'test@test.de',
+        name: 'test@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
+    end
+  end
 
   def test_find_user
     fibered do
@@ -75,4 +97,49 @@ describe Vines::Storage::Sql do
       assert_equal "test", user.name
     end
   end
+
+  def test_find_fragment
+    skip("not working probably")
+
+    fibered do
+      db = storage
+      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")
+
+    fibered do
+      db = storage
+      root = Nokogiri::XML(%q{<characters xmlns="urn:wonderland"/>}).root
+      db.save_fragment('test@test.de/resource1', fragment)
+      node = db.find_fragment('test@test.de', root)
+      assert (node != nil), "node should include fragment"
+      assert_equal fragment.to_s, node.to_s
+    end
+  end
 end

data/test/storage/sql_schema.rb

@@ -8,6 +8,18 @@ module SqlSchema
     end
   end
 
+  def fragment_id
+    Digest::SHA1.hexdigest("characters:urn:wonderland")
+  end
+  
+  def fragment
+    Nokogiri::XML(%q{
+      <characters xmlns="urn:wonderland">
+        <character>Alice</character>
+      </characters>
+    }.strip).root
+  end
+
   def storage
     Vines::Storage::Sql.new
   end
@@ -67,6 +79,26 @@ module SqlSchema
       add_index "contacts", ["person_id"], :name => "index_contacts_on_person_id"
       add_index "contacts", ["user_id", "person_id"], :name => "index_contacts_on_user_id_and_person_id", :unique => true
 
+      create_table "chat_contacts", :force => true do |t|
+        t.integer "user_id", :null => false
+        t.string "jid", :null => false
+        t.string "name"
+        t.string "ask", :limit => 128
+        t.string "subscription", :limit => 128, :null => false
+        t.text "groups"
+      end
+      
+      add_index "chat_contacts", ["user_id", "jid"], :name => "index_chat_contacts_on_user_id_and_jid", :unique => true
+      
+      create_table "chat_fragments", :force => true do |t|
+        t.integer "user_id", :null => false
+        t.string "root", :limit => 256, :null => false
+        t.string "namespace", :limit => 256, :null => false
+        t.text "xml", :null => false
+      end
+      
+      add_index "chat_fragments", ["user_id"], :name => "index_chat_fragments_on_user_id", :unique => true
+
       create_table "users", :force => true do |t|
         t.string   "username"
         t.text     "serialized_private_key"

data/test/user_test.rb

@@ -77,8 +77,13 @@ describe Vines::User do
       node(%q{
         <iq id="42" type="result">
           <query xmlns="jabber:iq:roster">
-            <item jid="a@wonderland.lit" name="Contact 1" subscription="none"><group>A</group><group>B</group></item>
-            <item jid="b@wonderland.lit" name="Contact 2" subscription="none"><group>C</group></item>
+            <item jid="a@wonderland.lit" name="Contact 1" subscription="none" from_diaspora="false">
+              <group>A</group>
+              <group>B</group>
+            </item>
+            <item jid="b@wonderland.lit" name="Contact 2" subscription="none" from_diaspora="false">
+              <group>C</group>
+            </item>
           </query>
         </iq>
       })

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diaspora-vines
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.22
 platform: ruby
 authors:
 - David Graham