diaspora_federation 0.0.13 → 0.1.0

data/lib/diaspora_federation/properties_dsl.rb

@@ -58,7 +58,7 @@ module DiasporaFederation
     # @param [Hash] data entity data
     # @return [Hash] hash with resolved aliases
     def resolv_aliases(data)
-      Hash[data.map {|name, value|
+      data.map {|name, value|
         if class_prop_aliases.has_key? name
           prop_name = class_prop_aliases[name]
           raise InvalidData, "only use '#{name}' OR '#{prop_name}'" if data.has_key? prop_name
@@ -66,7 +66,7 @@ module DiasporaFederation
         else
           [name, value]
         end
-      }]
+      }.to_h
     end
 
     # @return [Symbol] alias for the xml-generation/parsing
@@ -144,7 +144,9 @@ module DiasporaFederation
     # @param [Symbol] alias_name alias name
     def define_alias(name, alias_name)
       class_prop_aliases[alias_name] = name
+      # rubocop:disable Style/Alias
       instance_eval { alias_method alias_name, name }
+      # rubocop:enable Style/Alias
     end
 
     # Raised, if the name is of an unexpected type

data/lib/diaspora_federation/salmon/encrypted_magic_envelope.rb

@@ -36,7 +36,7 @@ module DiasporaFederation
         key = AES.generate_key_and_iv
         encrypted_env = AES.encrypt(magic_env.to_xml, key[:key], key[:iv])
 
-        encoded_key = Hash[key.map {|k, v| [k, Base64.strict_encode64(v)] }]
+        encoded_key = key.map {|k, v| [k, Base64.strict_encode64(v)] }.to_h
         encrypted_key = Base64.strict_encode64(pubkey.public_encrypt(JSON.generate(encoded_key)))
 
         JSON.generate(aes_key: encrypted_key, encrypted_magic_envelope: encrypted_env)
@@ -51,7 +51,7 @@ module DiasporaFederation
         encrypted_json = JSON.parse(encrypted_env)
 
         encoded_key = JSON.parse(privkey.private_decrypt(Base64.decode64(encrypted_json["aes_key"])))
-        key = Hash[encoded_key.map {|k, v| [k, Base64.decode64(v)] }]
+        key = encoded_key.map {|k, v| [k, Base64.decode64(v)] }.to_h
 
         xml = AES.decrypt(encrypted_json["encrypted_magic_envelope"], key["key"], key["iv"])
         Nokogiri::XML::Document.parse(xml).root

data/lib/diaspora_federation/salmon/encrypted_slap.rb

@@ -140,7 +140,7 @@ module DiasporaFederation
       # @param [String] data base64 encoded, encrypted header data
       # @param [OpenSSL::PKey::RSA] privkey private key for decryption
       # @return [Hash] { iv: "...", aes_key: "...", author_id: "..." }
-      def self.header_data(data, privkey)
+      private_class_method def self.header_data(data, privkey)
         header_elem = decrypt_header(data, privkey)
         raise InvalidHeader unless header_elem.name == "decrypted_header"
 
@@ -150,20 +150,18 @@ module DiasporaFederation
 
         {iv: iv, aes_key: key, author_id: author_id}
       end
-      private_class_method :header_data
 
       # decrypts the xml header
       # @param [String] data base64 encoded, encrypted header data
       # @param [OpenSSL::PKey::RSA] privkey private key for decryption
       # @return [Nokogiri::XML::Element] header xml document
-      def self.decrypt_header(data, privkey)
+      private_class_method def self.decrypt_header(data, privkey)
         cipher_header = JSON.parse(Base64.decode64(data))
         key = JSON.parse(privkey.private_decrypt(Base64.decode64(cipher_header["aes_key"])))
 
         xml = AES.decrypt(cipher_header["ciphertext"], Base64.decode64(key["key"]), Base64.decode64(key["iv"]))
         Nokogiri::XML::Document.parse(xml).root
       end
-      private_class_method :decrypt_header
 
       # encrypt the header xml with an AES cipher and encrypt the cipher params
       # with the recipients public_key
@@ -201,7 +199,7 @@ module DiasporaFederation
       # @param [Hash] hash { key: "...", iv: "..." }
       # @return [Hash] encoded hash: { key: "...", iv: "..." }
       def strict_base64_encode(hash)
-        Hash[hash.map {|k, v| [k, Base64.strict_encode64(v)] }]
+        hash.map {|k, v| [k, Base64.strict_encode64(v)] }.to_h
       end
     end
   end

data/lib/diaspora_federation/salmon/exceptions.rb

@@ -15,7 +15,7 @@ module DiasporaFederation
     class MissingHeader < RuntimeError
     end
 
-    # Raised if the decrypted header has an unexpected XML structure
+    # Raised, if the decrypted header has an unexpected XML structure
     # @deprecated
     class InvalidHeader < RuntimeError
     end

data/lib/diaspora_federation/salmon/magic_envelope.rb

@@ -19,8 +19,10 @@ module DiasporaFederation
     # When parsing the XML of an incoming Magic Envelope {MagicEnvelope.unenvelop}
     # is used.
     #
-    # @see http://salmon-protocol.googlecode.com/svn/trunk/draft-panzer-magicsig-01.html
+    # @see https://cdn.rawgit.com/salmon-protocol/salmon-protocol/master/draft-panzer-magicsig-01.html
     class MagicEnvelope
+      include Logging
+
       # encoding used for the payload data
       ENCODING = "base64url".freeze
 
@@ -123,6 +125,8 @@ module DiasporaFederation
 
         data = read_and_decrypt_data(magic_env, cipher_params)
 
+        logger.debug "unenvelop message from #{sender}:\n#{data}"
+
         new(XmlPayload.unpack(Nokogiri::XML::Document.parse(data).root), sender)
       end
 
@@ -131,7 +135,9 @@ module DiasporaFederation
       # the payload data as string
       # @return [String] payload data
       def payload_data
-        @payload_data ||= XmlPayload.pack(@payload).to_xml.strip
+        @payload_data ||= XmlPayload.pack(@payload).to_xml.strip.tap do |data|
+          logger.debug "send payload:\n#{data}"
+        end
       end
 
       def key_id
@@ -159,74 +165,67 @@ module DiasporaFederation
       end
 
       # @param [Nokogiri::XML::Element] env magic envelope XML
-      def self.envelope_valid?(env)
+      private_class_method def self.envelope_valid?(env)
         (env.instance_of?(Nokogiri::XML::Element) &&
           env.name == "env" &&
           !env.at_xpath("me:data").content.empty? &&
           !env.at_xpath("me:sig").content.empty?)
       end
-      private_class_method :envelope_valid?
 
       # @param [Nokogiri::XML::Element] env magic envelope XML
       # @param [String] sender diaspora-ID of the sender or nil
       # @return [Boolean]
-      def self.signature_valid?(env, sender)
+      private_class_method def self.signature_valid?(env, sender)
         subject = sig_subject([Base64.urlsafe_decode64(env.at_xpath("me:data").content),
                                env.at_xpath("me:data")["type"],
                                env.at_xpath("me:encoding").content,
                                env.at_xpath("me:alg").content])
 
-        sender_key = DiasporaFederation.callbacks.trigger(:fetch_public_key_by_diaspora_id, sender)
+        sender_key = DiasporaFederation.callbacks.trigger(:fetch_public_key, sender)
         raise SenderKeyNotFound unless sender_key
 
         sig = Base64.urlsafe_decode64(env.at_xpath("me:sig").content)
         sender_key.verify(DIGEST, sig, subject)
       end
-      private_class_method :signature_valid?
 
       # reads the +key_id+ from the magic envelope
       # @param [Nokogiri::XML::Element] env magic envelope XML
       # @return [String] diaspora-ID of the sender
-      def self.sender(env)
+      private_class_method def self.sender(env)
         key_id = env.at_xpath("me:sig")["key_id"]
         raise InvalidEnvelope, "no key_id" unless key_id # TODO: move to `envelope_valid?`
         Base64.urlsafe_decode64(key_id)
       end
-      private_class_method :sender
 
       # constructs the signature subject.
       # the given array should consist of the data, data_type (mimetype), encoding
       # and the algorithm
       # @param [Array<String>] data_arr
       # @return [String] signature subject
-      def self.sig_subject(data_arr)
+      private_class_method def self.sig_subject(data_arr)
         data_arr.map {|i| Base64.urlsafe_encode64(i) }.join(".")
       end
-      private_class_method :sig_subject
 
       # @param [Nokogiri::XML::Element] magic_env magic envelope XML
       # @return [Boolean]
-      def self.encoding_valid?(magic_env)
+      private_class_method def self.encoding_valid?(magic_env)
         magic_env.at_xpath("me:encoding").content == ENCODING
       end
-      private_class_method :encoding_valid?
 
       # @param [Nokogiri::XML::Element] magic_env magic envelope XML
       # @return [Boolean]
-      def self.algorithm_valid?(magic_env)
+      private_class_method def self.algorithm_valid?(magic_env)
         magic_env.at_xpath("me:alg").content == ALGORITHM
       end
-      private_class_method :algorithm_valid?
 
       # @param [Nokogiri::XML::Element] magic_env magic envelope XML
       # @param [Hash] cipher_params hash containing the key and iv
       # @return [String] data
-      def self.read_and_decrypt_data(magic_env, cipher_params)
+      private_class_method def self.read_and_decrypt_data(magic_env, cipher_params)
         data = Base64.urlsafe_decode64(magic_env.at_xpath("me:data").content)
         data = AES.decrypt(data, cipher_params[:key], cipher_params[:iv]) unless cipher_params.nil?
         data
       end
-      private_class_method :read_and_decrypt_data
     end
   end
 end

data/lib/diaspora_federation/salmon/slap.rb

@@ -86,12 +86,11 @@ module DiasporaFederation
       # Parses the magic envelop from the document.
       #
       # @param [Nokogiri::XML::Document] doc Salmon XML Document
-      def self.magic_env_from_doc(doc)
+      private_class_method def self.magic_env_from_doc(doc)
         doc.at_xpath("d:diaspora/me:env", Slap::NS).tap do |env|
           raise MissingMagicEnvelope if env.nil?
         end
       end
-      private_class_method :magic_env_from_doc
     end
   end
 end

data/lib/diaspora_federation/salmon/xml_payload.rb

@@ -51,11 +51,10 @@ module DiasporaFederation
       end
 
       # @param [Nokogiri::XML::Element] element
-      def self.xml_wrapped?(element)
+      private_class_method def self.xml_wrapped?(element)
         (element.name == "XML" && !element.at_xpath("post").nil? &&
          !element.at_xpath("post").children.empty?)
       end
-      private_class_method :xml_wrapped?
     end
   end
 end

data/lib/diaspora_federation/validators.rb

@@ -34,6 +34,8 @@ module DiasporaFederation
   end
 end
 
+require "diaspora_federation/validators/related_entity_validator"
+
 # abstract types
 require "diaspora_federation/validators/relayable_validator"
 

data/lib/diaspora_federation/validators/conversation_validator.rb

@@ -6,6 +6,8 @@ module DiasporaFederation
 
       rule :guid, :guid
 
+      rule :messages, :not_nil
+
       rule :author, %i(not_empty diaspora_id)
 
       rule :participants, diaspora_id_count: {maximum: 20}

data/lib/diaspora_federation/validators/message_validator.rb

@@ -4,8 +4,8 @@ module DiasporaFederation
     class MessageValidator < Validation::Validator
       include Validation
 
-      include RelayableValidator
-
+      rule :author, %i(not_empty diaspora_id)
+      rule :guid, :guid
       rule :conversation_guid, :guid
     end
   end

data/lib/diaspora_federation/validators/participation_validator.rb

@@ -4,8 +4,9 @@ module DiasporaFederation
     class ParticipationValidator < Validation::Validator
       include Validation
 
-      include RelayableValidator
-
+      rule :author, %i(not_empty diaspora_id)
+      rule :guid, :guid
+      rule :parent_guid, :guid
       rule :parent_type, [:not_empty, regular_expression: {regex: /\APost\z/}]
     end
   end

data/lib/diaspora_federation/validators/poll_validator.rb

@@ -6,6 +6,7 @@ module DiasporaFederation
 
       rule :guid, :guid
       rule :question, [:not_empty, length: {maximum: 255}]
+      rule :poll_answers, length: {minimum: 2}
     end
   end
 end

data/lib/diaspora_federation/validators/related_entity_validator.rb

@@ -0,0 +1,12 @@
+module DiasporaFederation
+  module Validators
+    # This validates a {Entities::RelatedEntity}
+    class RelatedEntityValidator < Validation::Validator
+      include Validation
+
+      rule :author, %i(not_empty diaspora_id)
+      rule :local, :boolean
+      rule :public, :boolean
+    end
+  end
+end

data/lib/diaspora_federation/validators/relayable_retraction_validator.rb

@@ -6,8 +6,8 @@ module DiasporaFederation
       include Validation
 
       rule :target_guid, :guid
-
       rule :target_type, :not_empty
+      rule :target, :not_nil
 
       rule :author, %i(not_empty diaspora_id)
     end

data/lib/diaspora_federation/validators/relayable_validator.rb

@@ -9,6 +9,7 @@ module DiasporaFederation
           rule :author, %i(not_empty diaspora_id)
           rule :guid, :guid
           rule :parent_guid, :guid
+          rule :parent, :not_nil
         end
       end
     end

data/lib/diaspora_federation/validators/retraction_validator.rb

@@ -7,8 +7,8 @@ module DiasporaFederation
       rule :author, %i(not_empty diaspora_id)
 
       rule :target_guid, :guid
-
       rule :target_type, :not_empty
+      rule :target, :not_nil
     end
   end
 end

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

@@ -2,23 +2,20 @@ module Validation
   module Rule
     # Diaspora ID validation rule
     #
-    # This rule is based on https://github.com/zombor/Validator/blob/master/lib/validation/rule/email.rb
-    # which was adapted from https://github.com/emmanuel/aequitas/blob/master/lib/aequitas/rule/format/email_address.rb
+    # A simple rule to validate the base structure of diaspora IDs.
     class DiasporaId
       # The Regex for a valid diaspora ID
       DIASPORA_ID = begin
         letter         = "a-zA-Z"
         digit          = "0-9"
+        hexadecimal    = "[a-fA-F#{digit}]"
         username       = "[#{letter}#{digit}\\-\\_\\.]+"
-        atext          = "[#{letter}#{digit}+\\=\\-\\_]"
-        dot_atom       = "#{atext}+([.]#{atext}*)*"
-        no_ws_ctl      = '\x01-\x08\x11\x12\x14-\x1f\x7f'
-        text           = '[\x01-\x09\x11\x12\x14-\x7f]'
-        quoted_pair    = "(\\x5c#{text})"
-        dtext          = "[#{no_ws_ctl}\\x21-\\x5a\\x5e-\\x7e]"
-        dcontent       = "(?:#{dtext}|#{quoted_pair})"
-        domain_literal = "\\[#{dcontent}+\\]"
-        domain         = "(?:#{dot_atom}|#{domain_literal})"
+        hostname_part  = "[#{letter}#{digit}\\-]"
+        hostname       = "#{hostname_part}+([.]#{hostname_part}*)*"
+        ipv4           = "(?:[#{digit}]{1,3}\\.){3}[#{digit}]{1,3}"
+        ipv6           = "\\[(?:#{hexadecimal}{0,4}:){0,7}#{hexadecimal}{1,4}\\]"
+        ip_addr        = "(?:#{ipv4}|#{ipv6})"
+        domain         = "(?:#{hostname}|#{ip_addr})"
         port           = "(:[#{digit}]+)?"
         addr_spec      = "(#{username}\\@#{domain}#{port})?"
 

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

@@ -28,7 +28,7 @@ module Validation
         ids = value.split(";")
         return false unless ids.count <= params[:maximum]
         ids.each do |id|
-          return false unless DiasporaId.new.valid_value?(id)
+          return false if DiasporaId::DIASPORA_ID.match(id).nil?
         end
         true
       end

data/lib/diaspora_federation/validators/signed_retraction_validator.rb

@@ -6,8 +6,8 @@ module DiasporaFederation
       include Validation
 
       rule :target_guid, :guid
-
       rule :target_type, :not_empty
+      rule :target, :not_nil
 
       rule :author, %i(not_empty diaspora_id)
     end

data/lib/diaspora_federation/validators/status_message_validator.rb

@@ -8,6 +8,8 @@ module DiasporaFederation
 
       rule :guid, :guid
 
+      rule :photos, :not_nil
+
       rule :public, :boolean
     end
   end

data/lib/diaspora_federation/validators/web_finger_validator.rb

@@ -12,8 +12,8 @@ module DiasporaFederation
       rule :alias_url, URI: %i(host path)
       rule :hcard_url, [:not_nil, URI: %i(host path)]
       rule :seed_url, %i(not_nil URI)
-      rule :profile_url, [:not_nil, URI: %i(host path)]
-      rule :atom_url, [:not_nil, URI: %i(host path)]
+      rule :profile_url, URI: %i(host path)
+      rule :atom_url, URI: %i(host path)
       rule :salmon_url, URI: %i(host path)
     end
   end

data/lib/diaspora_federation/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diaspora_federation
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.1.0
 platform: ruby
 authors:
 - Benjamin Neff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-25 00:00:00.000000000 Z
+date: 2016-06-26 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.2
+        version: 1.6.8
   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.2
+        version: 1.6.8
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,7 @@ files:
 - lib/diaspora_federation/entities/poll_participation.rb
 - lib/diaspora_federation/entities/post.rb
 - lib/diaspora_federation/entities/profile.rb
+- lib/diaspora_federation/entities/related_entity.rb
 - lib/diaspora_federation/entities/relayable.rb
 - lib/diaspora_federation/entities/relayable_retraction.rb
 - lib/diaspora_federation/entities/request.rb
@@ -166,6 +167,7 @@ files:
 - lib/diaspora_federation/validators/poll_participation_validator.rb
 - lib/diaspora_federation/validators/poll_validator.rb
 - lib/diaspora_federation/validators/profile_validator.rb
+- lib/diaspora_federation/validators/related_entity_validator.rb
 - lib/diaspora_federation/validators/relayable_retraction_validator.rb
 - lib/diaspora_federation/validators/relayable_validator.rb
 - lib/diaspora_federation/validators/request_validator.rb
@@ -186,7 +188,7 @@ files:
 - lib/tasks/build.rake
 - lib/tasks/diaspora_federation_tasks.rake
 - lib/tasks/tests.rake
-homepage: https://github.com/SuperTux88/diaspora_federation
+homepage: https://github.com/diaspora/diaspora_federation
 licenses:
 - AGPL 3.0 - http://www.gnu.org/licenses/agpl-3.0.html
 metadata: {}
@@ -198,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -206,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: diaspora* federation library