diaspora_federation 0.0.12 → 0.0.13

data/lib/diaspora_federation/validators/profile_validator.rb

@@ -4,7 +4,7 @@ module DiasporaFederation
     class ProfileValidator < Validation::Validator
       include Validation
 
-      rule :diaspora_id, :diaspora_id
+      rule :author, :diaspora_id
 
       # the name must not contain a semicolon because of mentions
       # @{<full_name> ; <diaspora_id>}

data/lib/diaspora_federation/validators/relayable_retraction_validator.rb

@@ -9,7 +9,7 @@ module DiasporaFederation
 
       rule :target_type, :not_empty
 
-      rule :diaspora_id, %i(not_empty diaspora_id)
+      rule :author, %i(not_empty diaspora_id)
     end
   end
 end

data/lib/diaspora_federation/validators/relayable_validator.rb

@@ -6,6 +6,8 @@ module DiasporaFederation
       # @param [Validation::Validator] validator the validator in which it is included
       def self.included(validator)
         validator.class_eval do
+          rule :author, %i(not_empty diaspora_id)
+          rule :guid, :guid
           rule :parent_guid, :guid
         end
       end

data/lib/diaspora_federation/validators/request_validator.rb

@@ -1,11 +1,12 @@
 module DiasporaFederation
   module Validators
     # This validates a {Entities::Request}
+    # @deprecated the {Entities::Request} will be replaced with {Entities::Contact}
     class RequestValidator < Validation::Validator
       include Validation
 
-      rule :sender_id, %i(not_empty diaspora_id)
-      rule :recipient_id, %i(not_empty diaspora_id)
+      rule :author, %i(not_empty diaspora_id)
+      rule :recipient, %i(not_empty diaspora_id)
     end
   end
 end

data/lib/diaspora_federation/validators/reshare_validator.rb

@@ -4,13 +4,13 @@ module DiasporaFederation
     class ReshareValidator < Validation::Validator
       include Validation
 
-      rule :root_diaspora_id, %i(not_empty diaspora_id)
+      rule :root_author, %i(not_empty diaspora_id)
 
       rule :root_guid, :guid
 
-      rule :guid, :guid
+      rule :author, %i(not_empty diaspora_id)
 
-      rule :diaspora_id, %i(not_empty diaspora_id)
+      rule :guid, :guid
 
       rule :public, :boolean
     end

data/lib/diaspora_federation/validators/retraction_validator.rb

@@ -4,9 +4,9 @@ module DiasporaFederation
     class RetractionValidator < Validation::Validator
       include Validation
 
-      rule :target_guid, :guid
+      rule :author, %i(not_empty diaspora_id)
 
-      rule :diaspora_id, %i(not_empty diaspora_id)
+      rule :target_guid, :guid
 
       rule :target_type, :not_empty
     end

data/lib/diaspora_federation/validators/rules/guid.rb

@@ -7,6 +7,21 @@ module Validation
     # * Numbers: 0-9
     # * Special chars: '-', '_', '@', '.' and ':'
     class Guid
+      # This rule can have a +nilable+ param
+      # @return [Hash] params
+      attr_reader :params
+
+      # create a new rule for guid validation
+      # @param [Hash] params
+      # @option params [Boolean] :nilable guid allowed to be nil
+      def initialize(params={})
+        if params.include?(:nilable) && !params[:nilable].is_a?(TrueClass) && !params[:nilable].is_a?(FalseClass)
+          raise ArgumentError, ":nilable needs to be a boolean"
+        end
+
+        @params = params
+      end
+
       # The error key for this rule
       # @return [Symbol] error key
       def error_key
@@ -15,13 +30,7 @@ module Validation
 
       # Determines if value is a valid +GUID+
       def valid_value?(value)
-        value.is_a?(String) && value.downcase =~ /\A[0-9a-z\-_@.:]{16,}\z/
-      end
-
-      # This rule has no params
-      # @return [Hash] params
-      def params
-        {}
+        params[:nilable] && value.nil? || value.is_a?(String) && value.downcase =~ /\A[0-9a-z\-_@.:]{16,}\z/
       end
     end
   end

data/lib/diaspora_federation/validators/signed_retraction_validator.rb

@@ -9,7 +9,7 @@ module DiasporaFederation
 
       rule :target_type, :not_empty
 
-      rule :diaspora_id, %i(not_empty diaspora_id)
+      rule :author, %i(not_empty diaspora_id)
     end
   end
 end

data/lib/diaspora_federation/validators/status_message_validator.rb

@@ -4,9 +4,9 @@ module DiasporaFederation
     class StatusMessageValidator < Validation::Validator
       include Validation
 
-      rule :guid, :guid
+      rule :author, %i(not_empty diaspora_id)
 
-      rule :diaspora_id, %i(not_empty diaspora_id)
+      rule :guid, :guid
 
       rule :public, :boolean
     end

data/lib/diaspora_federation/version.rb

@@ -1,4 +1,4 @@
 module DiasporaFederation
   # the gem version
-  VERSION = "0.0.12"
+  VERSION = "0.0.13".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diaspora_federation
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Benjamin Neff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-23 00:00:00.000000000 Z
+date: 2016-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -19,7 +19,7 @@ dependencies:
         version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.7.1
+        version: 1.6.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.7.1
+        version: 1.6.7.2
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: valid
   requirement: !ruby/object:Gem::Requirement
@@ -109,6 +109,7 @@ files:
 - lib/diaspora_federation/entities.rb
 - lib/diaspora_federation/entities/account_deletion.rb
 - lib/diaspora_federation/entities/comment.rb
+- lib/diaspora_federation/entities/contact.rb
 - lib/diaspora_federation/entities/conversation.rb
 - lib/diaspora_federation/entities/like.rb
 - lib/diaspora_federation/entities/location.rb
@@ -119,6 +120,7 @@ files:
 - lib/diaspora_federation/entities/poll.rb
 - lib/diaspora_federation/entities/poll_answer.rb
 - lib/diaspora_federation/entities/poll_participation.rb
+- lib/diaspora_federation/entities/post.rb
 - lib/diaspora_federation/entities/profile.rb
 - lib/diaspora_federation/entities/relayable.rb
 - lib/diaspora_federation/entities/relayable_retraction.rb
@@ -128,23 +130,30 @@ files:
 - lib/diaspora_federation/entities/signed_retraction.rb
 - lib/diaspora_federation/entities/status_message.rb
 - lib/diaspora_federation/entity.rb
-- lib/diaspora_federation/fetcher.rb
+- lib/diaspora_federation/federation.rb
+- lib/diaspora_federation/federation/fetcher.rb
+- lib/diaspora_federation/federation/receiver.rb
+- lib/diaspora_federation/federation/receiver/abstract_receiver.rb
+- lib/diaspora_federation/federation/receiver/exceptions.rb
+- lib/diaspora_federation/federation/receiver/private.rb
+- lib/diaspora_federation/federation/receiver/public.rb
+- lib/diaspora_federation/federation/sender.rb
+- lib/diaspora_federation/federation/sender/hydra_wrapper.rb
+- lib/diaspora_federation/http_client.rb
 - lib/diaspora_federation/logging.rb
 - lib/diaspora_federation/properties_dsl.rb
-- lib/diaspora_federation/receiver.rb
-- lib/diaspora_federation/receiver/private.rb
-- lib/diaspora_federation/receiver/public.rb
 - lib/diaspora_federation/salmon.rb
 - lib/diaspora_federation/salmon/aes.rb
+- lib/diaspora_federation/salmon/encrypted_magic_envelope.rb
 - lib/diaspora_federation/salmon/encrypted_slap.rb
 - lib/diaspora_federation/salmon/exceptions.rb
 - lib/diaspora_federation/salmon/magic_envelope.rb
 - lib/diaspora_federation/salmon/slap.rb
 - lib/diaspora_federation/salmon/xml_payload.rb
-- lib/diaspora_federation/signing.rb
 - lib/diaspora_federation/validators.rb
 - lib/diaspora_federation/validators/account_deletion_validator.rb
 - lib/diaspora_federation/validators/comment_validator.rb
+- lib/diaspora_federation/validators/contact_validator.rb
 - lib/diaspora_federation/validators/conversation_validator.rb
 - lib/diaspora_federation/validators/h_card_validator.rb
 - lib/diaspora_federation/validators/like_validator.rb

data/lib/diaspora_federation/receiver.rb

@@ -1,28 +0,0 @@
-module DiasporaFederation
-  # Raised if failed to fetch a public key of the sender of the received message
-  class SenderKeyNotFound < Exception
-  end
-
-  # Raised if recipient private key is missing for a private receive
-  class RecipientKeyNotFound < Exception
-  end
-
-  # Common base for Private and Public receivers
-  #   @see Receiver::Public
-  #   @see Receiver::Private
-  class Receiver
-    def initialize(salmon_xml)
-      @salmon_xml = salmon_xml
-    end
-
-    def receive!
-      sender_id = slap.author_id
-      public_key = DiasporaFederation.callbacks.trigger(:fetch_public_key_by_diaspora_id, sender_id)
-      raise SenderKeyNotFound if public_key.nil?
-      DiasporaFederation.callbacks.trigger(:save_entity_after_receive, slap.entity(public_key))
-    end
-  end
-end
-
-require "diaspora_federation/receiver/private"
-require "diaspora_federation/receiver/public"

data/lib/diaspora_federation/receiver/private.rb

@@ -1,19 +0,0 @@
-module DiasporaFederation
-  class Receiver
-    # Receiver::Private is used to receive private messages, which are addressed to a specific user, encrypted with his
-    # public key and packed using Salmon::EncryptedSlap
-    class Private < Receiver
-      def initialize(salmon_xml, recipient_private_key)
-        super(salmon_xml)
-        raise RecipientKeyNotFound if recipient_private_key.nil?
-        @recipient_private_key = recipient_private_key
-      end
-
-      protected
-
-      def slap
-        @salmon ||= Salmon::EncryptedSlap.from_xml(@salmon_xml, @recipient_private_key)
-      end
-    end
-  end
-end

data/lib/diaspora_federation/receiver/public.rb

@@ -1,13 +0,0 @@
-module DiasporaFederation
-  class Receiver
-    # Receiver::Public is used to receive public messages, which are not addressed to a specific user, unencrypted
-    # and packed using Salmon::Slap
-    class Public < Receiver
-      protected
-
-      def slap
-        @salmon ||= Salmon::Slap.from_xml(@salmon_xml)
-      end
-    end
-  end
-end

data/lib/diaspora_federation/signing.rb

@@ -1,56 +0,0 @@
-module DiasporaFederation
-  # this module defines operations of signing an arbitrary hash with an arbitrary key
-  module Signing
-    extend Logging
-
-    # Sign the data with the key
-    #
-    # @param [Hash] hash data to sign
-    # @param [OpenSSL::PKey::RSA] key An RSA key
-    # @return [String] A Base64 encoded signature of #signable_string with key
-    def self.sign_with_key(hash, key)
-      sig = Base64.strict_encode64(
-        key.sign(
-          OpenSSL::Digest::SHA256.new,
-          signable_string(hash)
-        )
-      )
-      logger.info "event=sign_with_key status=complete guid=#{hash[:guid]}"
-      sig
-    end
-
-    # Check that signature is a correct signature
-    #
-    # @param [Hash] hash data to verify
-    # @param [String] signature The signature to be verified.
-    # @param [OpenSSL::PKey::RSA] key An RSA key
-    # @return [Boolean]
-    def self.verify_signature(hash, signature, key)
-      if key.nil?
-        logger.warn "event=verify_signature status=abort reason=no_key guid=#{hash[:guid]}"
-        return false
-      elsif signature.nil?
-        logger.warn "event=verify_signature status=abort reason=no_signature guid=#{hash[:guid]}"
-        return false
-      end
-
-      validity = key.verify(
-        OpenSSL::Digest::SHA256.new,
-        Base64.decode64(signature),
-        signable_string(hash)
-      )
-      logger.info "event=verify_signature status=complete guid=#{hash[:guid]} validity=#{validity}"
-      validity
-    end
-
-    private
-
-    # @param [Hash] hash data to sign
-    # @return [String] signature data string
-    def self.signable_string(hash)
-      hash.map { |name, value|
-        value.to_s unless name.match(/signature/)
-      }.compact.join(";")
-    end
-  end
-end