diaspora_federation 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5dbce3e434737107507881b68c2f8d51a0cf2d78
-  data.tar.gz: 6c974f67b87f2ffa988c1286d17b920ad49fe9ef
+  metadata.gz: 79f5ac9d463c824a36b9769994431ac6e66625fd
+  data.tar.gz: 270ed5a33de71c405bdcd584c620d3f1d97422c9
 SHA512:
-  metadata.gz: 9ac23b66e6c06e368f7dff5a190222e123a388653c2bb9983a28b80c08a9f6831fb584e86195ac627ad16f1d73fb9f185695d5b5c469efb19be70bddb2681f91
-  data.tar.gz: 248882b3d9a8c71a94894724719f63a04a4398eabb2f13b35fb7559cae0fdf017b0010a1940390ecab70664598fe01cf168efb2ac6f44f404fc6c82360b26c38
+  metadata.gz: 14ed9bc7669bf07166bebacfe43bbb0cb78821010964181f94f3f395838ba7836755ebdc913048f7455fa6ca6cf0e78e281190ec1f914591c5233a641d986040
+  data.tar.gz: 91b6f07218394e0e066aefd973de6ddc4fa7c0d694c4ee25e53504d15f5371036e8b765f1d911f6008464c9f86e23e66a2a9010c32e3fb4f30da8c064099668e

data/Changelog.md

@@ -1,12 +1,37 @@
+# 0.2.2
+
+## Features
+
+* Add support for [diaspora://](https://diaspora.github.io/diaspora_federation/federation/diaspora_scheme.html) URIs and fetch linked entities (see [#75](https://github.com/diaspora/diaspora_federation/pull/75)) [#78](https://github.com/diaspora/diaspora_federation/pull/78) [#85](https://github.com/diaspora/diaspora_federation/pull/85)
+* Fetch RFC 7033 WebFinger with fallback to legacy WebFinger [#74](https://github.com/diaspora/diaspora_federation/pull/74)
+* Add support to receive and relay likes for comments [#81](https://github.com/diaspora/diaspora_federation/pull/81)
+
+## Refactor
+
+* Always raise a DiscoveryError when something with the discovery fails [#77](https://github.com/diaspora/diaspora_federation/pull/77)
+* Tighten the validation of diaspora\* IDs [#86](https://github.com/diaspora/diaspora_federation/pull/86)
+* Allow to receive non-public profiles without private data [#79](https://github.com/diaspora/diaspora_federation/pull/79)
+* Remove `public` and `provider_display_name` from `Reshare` entity [#84](https://github.com/diaspora/diaspora_federation/pull/84)
+
+## Bug fixes
+
+* Allow reshares with no root [#73](https://github.com/diaspora/diaspora_federation/pull/73)
+* Make `height` and `width` optional for photos [#76](https://github.com/diaspora/diaspora_federation/pull/76)
+* Detect loops when fetching entities [#87](https://github.com/diaspora/diaspora_federation/pull/87)
+
+## Documentation
+
+* Add documentation for the future of the `Reshare` entity (see [#83](https://github.com/diaspora/diaspora_federation/pull/83)) [#84](https://github.com/diaspora/diaspora_federation/pull/84)
+
 # 0.2.1
 
 ## Features
 
-Add `DiasporaFederation::Schemas` to access the JSON schema [#70](https://github.com/diaspora/diaspora_federation/pull/70)
+* Add `DiasporaFederation::Schemas` to access the JSON schema [#70](https://github.com/diaspora/diaspora_federation/pull/70)
 
 ## Refactor
 
-Don't add optional properties to generated XML and JSON when nil [#71](https://github.com/diaspora/diaspora_federation/pull/71)
+* Don't add optional properties to generated XML and JSON when nil [#71](https://github.com/diaspora/diaspora_federation/pull/71)
 
 # 0.2.0
 

data/lib/diaspora_federation.rb

@@ -39,6 +39,7 @@ module DiasporaFederation
   ]
 
   # defaults
+  @webfinger_http_fallback = false
   @http_concurrency = 20
   @http_timeout = 30
   @http_verbose = false
@@ -74,6 +75,21 @@ module DiasporaFederation
     #   @param [String] value path to certificate authorities
     attr_accessor :certificate_authorities
 
+    # Configure if WebFinger discovery should fallback to http if https fails (default: +false+)
+    #
+    # This is useful for example for development environments where https isn't available.
+    #
+    # This setting only applies to the WebFinger route from RFC 7033 +/.well-known/webfinger+.
+    # Legacy WebFinger flow unconditionally falls back to http.
+    #
+    # @overload webfinger_http_fallback
+    #   @return [Boolean] webfinger http fallback enabled
+    # @overload webfinger_http_fallback=
+    #   @example
+    #     config.webfinger_http_fallback = AppConfig.server.rails_environment == "development"
+    #   @param [Boolean] value  webfinger http fallback enabled
+    attr_accessor :webfinger_http_fallback
+
     # Maximum number of parallel HTTP requests made to other pods (default: +20+)
     #
     # @overload http_concurrency

data/lib/diaspora_federation/discovery/discovery.rb

@@ -15,6 +15,7 @@ module DiasporaFederation
 
       # Fetches all metadata for the account and saves it via callback
       # @return [Person]
+      # @raise [DiscoveryError] if something with the discovery failed
       def fetch_and_save
         logger.info "Fetch data for #{diaspora_id}"
 
@@ -23,6 +24,10 @@ module DiasporaFederation
         DiasporaFederation.callbacks.trigger(:save_person_after_webfinger, person)
         logger.info "successfully webfingered #{diaspora_id}"
         person
+      rescue DiscoveryError
+        raise # simply re-raise DiscoveryError
+      rescue => e # rubocop:disable Lint/RescueWithoutErrorClass
+        raise DiscoveryError, "Failed discovery for #{diaspora_id}: #{e.class}: #{e.message}"
       end
 
       private
@@ -43,7 +48,7 @@ module DiasporaFederation
         response = HttpClient.get(url)
         raise "Failed to fetch #{url}: #{response.status}" unless response.success?
         response.body
-      rescue => e
+      rescue => e # rubocop:disable Lint/RescueWithoutErrorClass
         unless http_fallback && url.start_with?("https://")
           raise DiscoveryError, "Failed to fetch #{url} for #{diaspora_id}: #{e.class}: #{e.message}"
         end
@@ -53,23 +58,33 @@ module DiasporaFederation
         retry
       end
 
-      def host_meta_url
-        domain = diaspora_id.split("@")[1]
-        "https://#{domain}/.well-known/host-meta"
+      def domain
+        @domain ||= diaspora_id.split("@")[1]
+      end
+
+      def acct_parameter
+        "acct:#{diaspora_id}"
       end
 
       def legacy_webfinger_url_from_host_meta
         # This tries the xrd url with https first, then falls back to http.
-        host_meta = HostMeta.from_xml get(host_meta_url, true)
-        host_meta.webfinger_template_url.gsub("{uri}", "acct:#{diaspora_id}")
+        host_meta = HostMeta.from_xml(get("https://#{domain}/.well-known/host-meta", true))
+        host_meta.webfinger_template_url.gsub("{uri}", acct_parameter)
       end
 
       def webfinger
-        @webfinger ||= WebFinger.from_xml get(legacy_webfinger_url_from_host_meta)
+        return @webfinger if @webfinger
+        webfinger_url = "https://#{domain}/.well-known/webfinger?resource=#{acct_parameter}"
+
+        # This tries the WebFinger URL with https first, then falls back to http if webfinger_http_fallback is enabled.
+        @webfinger = WebFinger.from_json(get(webfinger_url, DiasporaFederation.webfinger_http_fallback))
+      rescue => e # rubocop:disable Lint/RescueWithoutErrorClass
+        logger.warn "WebFinger failed, retrying with legacy WebFinger for #{diaspora_id}: #{e.class}: #{e.message}"
+        @webfinger = WebFinger.from_xml(get(legacy_webfinger_url_from_host_meta))
       end
 
       def hcard
-        @hcard ||= HCard.from_html get(webfinger.hcard_url)
+        @hcard ||= HCard.from_html(get(webfinger.hcard_url))
       end
 
       def person

data/lib/diaspora_federation/discovery/exceptions.rb

@@ -1,7 +1,11 @@
 module DiasporaFederation
   module Discovery
+    # Raised, if there is an error while discover a new person
+    class DiscoveryError < RuntimeError
+    end
+
     # Raised, if the XML structure is invalid
-    class InvalidDocument < RuntimeError
+    class InvalidDocument < DiscoveryError
     end
 
     # Raised, if something is wrong with the webfinger data
@@ -9,11 +13,7 @@ module DiasporaFederation
     # * if the +webfinger_url+ is missing or malformed in {HostMeta.from_base_url} or {HostMeta.from_xml}
     # * if the parsed XML from {WebFinger.from_xml} is incomplete
     # * if the html passed to {HCard.from_html} in some way is malformed, invalid or incomplete.
-    class InvalidData < RuntimeError
-    end
-
-    # Raised, if there is an error while discover a new person
-    class DiscoveryError < RuntimeError
+    class InvalidData < DiscoveryError
     end
   end
 end

data/lib/diaspora_federation/discovery/web_finger.rb

@@ -119,8 +119,20 @@ module DiasporaFederation
       # @return [WebFinger] WebFinger instance
       # @raise [InvalidData] if the given XML string is invalid or incomplete
       def self.from_xml(webfinger_xml)
-        data = parse_xml_and_validate(webfinger_xml)
+        from_hash(parse_xml_and_validate(webfinger_xml))
+      end
 
+      # Creates a WebFinger instance from the given JSON string
+      # @param [String] webfinger_json WebFinger JSON string
+      # @return [WebFinger] WebFinger instance
+      def self.from_json(webfinger_json)
+        from_hash(XrdDocument.json_data(webfinger_json))
+      end
+
+      # Creates a WebFinger instance from the given data
+      # @param [Hash] data WebFinger data hash
+      # @return [WebFinger] WebFinger instance
+      def self.from_hash(data)
         links = data[:links]
 
         new(

data/lib/diaspora_federation/discovery/xrd_document.rb

@@ -83,10 +83,10 @@ module DiasporaFederation
       def to_json
         {
           subject:    subject,
-          expires:    expires,
+          expires:    (expires.strftime(DATETIME_FORMAT) if expires.instance_of?(DateTime)),
           aliases:    (aliases if aliases.any?),
-          links:      (links if links.any?),
-          properties: (properties if properties.any?)
+          properties: (properties if properties.any?),
+          links:      (links if links.any?)
         }.reject {|_, v| v.nil? }
       end
 
@@ -115,6 +115,27 @@ module DiasporaFederation
         end
       end
 
+      # Parse the JRD document from the given string and create a hash containing
+      # the extracted data with symbolized keys.
+      #
+      # @param [String] jrd_doc JSON string
+      # @return [Hash] extracted data
+      # @raise [InvalidDocument] if the JRD is malformed
+      def self.json_data(jrd_doc)
+        json_hash = JSON.parse(jrd_doc)
+
+        {
+          subject:    json_hash["subject"],
+          expires:    (DateTime.strptime(json_hash["expires"], DATETIME_FORMAT) if json_hash.key?("expires")),
+          aliases:    json_hash["aliases"],
+          properties: json_hash["properties"],
+          links:      symbolize_keys_for_links(json_hash["links"])
+        }.reject {|_, v| v.nil? }
+      rescue JSON::JSONError => e
+        raise InvalidDocument,
+              "Not a JRD document: #{e.class}: #{e.message[0..255].encode(Encoding.default_external, undef: :replace)}"
+      end
+
       private
 
       attr_reader :expires
@@ -180,6 +201,17 @@ module DiasporaFederation
         end
         data[:links] = links unless links.empty?
       end
+
+      # symbolize link keys from JSON hash, but only convert known keys
+      private_class_method def self.symbolize_keys_for_links(links)
+        links.map do |link|
+          {}.tap do |hash|
+            LINK_ATTRS.each do |attr|
+              hash[attr] = link[attr.to_s] if link.key?(attr.to_s)
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/diaspora_federation/entities/event.rb

@@ -24,7 +24,7 @@ module DiasporaFederation
       # @!attribute [r] description
       #   Description of the event
       #   @return [String] event description
-      property :description, :string, optional: true
+      property :description, :string, alias: :text, optional: true
 
       # @!attribute [r] start
       #   The start time of the event

data/lib/diaspora_federation/entities/photo.rb

@@ -48,12 +48,12 @@ module DiasporaFederation
       # @!attribute [r] height
       #   Photo height
       #   @return [Integer] height
-      property :height, :integer
+      property :height, :integer, optional: true
 
       # @!attribute [r] width
       #   Photo width
       #   @return [Integer] width
-      property :width, :integer
+      property :width, :integer, optional: true
     end
   end
 end

data/lib/diaspora_federation/entities/post.rb

@@ -19,6 +19,10 @@ module DiasporaFederation
       #   Post entity creation time
       #   @return [Time] creation time
       #
+      # @!attribute [r] public
+      #   Shows whether the post is visible to everyone or only to some aspects
+      #   @return [Boolean] is it public
+      #
       # @!attribute [r] provider_display_name
       #   A string that describes a means by which a user has posted the post
       #   @return [String] provider display name
@@ -29,6 +33,7 @@ module DiasporaFederation
           property :author, :string, xml_name: :diaspora_handle
           property :guid, :string
           property :created_at, :timestamp, default: -> { Time.now.utc }
+          property :public, :boolean, default: false
           property :provider_display_name, :string, optional: true
         end
       end

data/lib/diaspora_federation/entities/profile.rb

@@ -43,9 +43,12 @@ module DiasporaFederation
       #   @return [String] url to the small avatar (50x50)
       property :image_url_small, :string, optional: true
 
+      # @!attribute [r] bio
+      #   @return [String] bio of the person
+      property :bio, :string, alias: :text, optional: true
+
       property :birthday, :string, optional: true
       property :gender, :string, optional: true
-      property :bio, :string, optional: true
       property :location, :string, optional: true
 
       # @!attribute [r] searchable

data/lib/diaspora_federation/entities/related_entity.rb

@@ -24,6 +24,14 @@ module DiasporaFederation
       #   @return [RelatedEntity] parent entity
       entity :parent, Entities::RelatedEntity, default: nil
 
+      # The root entity, this entity is responsible for relaying relayables
+      # @return [RelatedEntity] absolute parent entity
+      def root
+        root = self
+        root = root.parent until root.parent.nil?
+        root
+      end
+
       # Get related entity from the backend or fetch it from remote if not available locally
       # @return [RelatedEntity] fetched related entity
       def self.fetch(author, type, guid)

data/lib/diaspora_federation/entities/relayable.rb

@@ -76,11 +76,11 @@ module DiasporaFederation
       # @raise [SignatureVerificationFailed] if the signature is not valid
       # @raise [PublicKeyNotFound] if no public key is found
       def verify_signature
-        super(author, :author_signature) unless author == parent.author
+        super(author, :author_signature) unless author == parent.root.author
       end
 
       def sender_valid?(sender)
-        (sender == author && parent.local) || sender == parent.author
+        (sender == author && parent.root.local) || sender == parent.root.author
       end
 
       # @return [String] string representation of this object
@@ -121,7 +121,7 @@ module DiasporaFederation
       # Sign with parent author key, if the parent author is local (if the private key is found)
       # @return [String] A Base64 encoded signature of #signature_data with key
       def sign_with_parent_author_if_available
-        privkey = DiasporaFederation.callbacks.trigger(:fetch_private_key, parent.author)
+        privkey = DiasporaFederation.callbacks.trigger(:fetch_private_key, parent.root.author)
         return unless privkey
 
         sign_with_key(privkey).tap do

data/lib/diaspora_federation/entities/reshare.rb

@@ -4,24 +4,34 @@ module DiasporaFederation
     #
     # @see Validators::ReshareValidator
     class Reshare < Entity
-      include Post
+      # @!attribute [r] author
+      #   The diaspora* ID of the person who reshares the post
+      #   @see Person#author
+      #   @return [String] diaspora* ID
+      property :author, :string, xml_name: :diaspora_handle
+
+      # @!attribute [r] guid
+      #   A random string of at least 16 chars
+      #   @see Validation::Rule::Guid
+      #   @return [String] status message guid
+      property :guid, :string
+
+      # @!attribute [r] created_at
+      #   Post entity creation time
+      #   @return [Time] creation time
+      property :created_at, :timestamp, default: -> { Time.now.utc }
 
       # @!attribute [r] root_author
       #   The diaspora* ID of the person who posted the original post
       #   @see Person#author
       #   @return [String] diaspora* ID
-      property :root_author, :string, xml_name: :root_diaspora_id
+      property :root_author, :string, optional: true, xml_name: :root_diaspora_id
 
       # @!attribute [r] root_guid
       #   Guid of the original post
       #   @see StatusMessage#guid
       #   @return [String] root guid
-      property :root_guid, :string
-
-      # @!attribute [r] public
-      #   Has no meaning at the moment
-      #   @return [Boolean] public
-      property :public, :boolean, optional: true, default: true # always true? (we only reshare public posts)
+      property :root_guid, :string, optional: true
 
       # @return [String] string representation of this object
       def to_s
@@ -30,7 +40,17 @@ module DiasporaFederation
 
       # Fetch and receive root post from remote, if not available locally
       # and validates if it's from the correct author
+      # TODO: after reshares are only used to increase the reach of a post (and
+      # legacy reshares with own interactions are migrated to the new form),
+      # root_author and root_guid aren't allowed to be empty anymore, so a
+      # not_nil check should be added to the validator and the first few lines
+      # here can be removed.
       def validate_root
+        return if root_author.nil? && root_guid.nil?
+
+        raise Entity::ValidationError, "#{self}: root_guid can't be nil if root_author is present" if root_guid.nil?
+        raise Entity::ValidationError, "#{self}: root_author can't be nil if root_guid is present" if root_author.nil?
+
         root = RelatedEntity.fetch(root_author, "Post", root_guid)
 
         return if root_author == root.author

data/lib/diaspora_federation/entities/retraction.rb

@@ -28,7 +28,7 @@ module DiasporaFederation
       def sender_valid?(sender)
         case target_type
         when "Comment", "Like", "PollParticipation"
-          sender == target.author || sender == target.parent.author
+          sender == target.author || sender == target.root.author
         else
           sender == target.author
         end

data/lib/diaspora_federation/entities/status_message.rb

@@ -31,11 +31,6 @@ module DiasporaFederation
       #   @return [Entities::Event] event
       entity :event, Entities::Event, optional: true
 
-      # @!attribute [r] public
-      #   Shows whether the status message is visible to everyone or only to some aspects
-      #   @return [Boolean] is it public
-      property :public, :boolean, default: false
-
       private
 
       def validate

data/lib/diaspora_federation/entity.rb

@@ -40,6 +40,9 @@ module DiasporaFederation
     # @see https://www.w3.org/TR/REC-xml/#charsets "Extensible Markup Language (XML) 1.0"
     INVALID_XML_REGEX = /[^\x09\x0A\x0D\x20-\uD7FF\uE000-\uFFFD\u{10000}-\u{10FFFF}]/
 
+    # Regex to validate and find entity names
+    ENTITY_NAME_REGEX = "[a-z]*(?:_[a-z]*)*".freeze
+
     # Initializes the Entity with the given attribute hash and freezes the created
     # instance it returns.
     #
@@ -145,7 +148,7 @@ module DiasporaFederation
     # @param [String] entity_name "snake_case" class name
     # @return [Class] entity class
     def self.entity_class(entity_name)
-      raise InvalidEntityName, "'#{entity_name}' is invalid" unless entity_name =~ /\A[a-z]*(_[a-z]*)*\z/
+      raise InvalidEntityName, "'#{entity_name}' is invalid" unless entity_name =~ /\A#{ENTITY_NAME_REGEX}\z/
       class_name = entity_name.sub(/\A[a-z]/, &:upcase)
       class_name.gsub!(/_([a-z])/) { Regexp.last_match[1].upcase }
 

data/lib/diaspora_federation/federation.rb

@@ -4,6 +4,7 @@ module DiasporaFederation
   end
 end
 
+require "diaspora_federation/federation/diaspora_url_parser"
 require "diaspora_federation/federation/fetcher"
 require "diaspora_federation/federation/receiver"
 require "diaspora_federation/federation/sender"

data/lib/diaspora_federation/federation/diaspora_url_parser.rb

@@ -0,0 +1,34 @@
+module DiasporaFederation
+  module Federation
+    # This module is for parsing and fetching linked entities.
+    module DiasporaUrlParser
+      include Logging
+
+      # Regex to find diaspora:// URLs
+      DIASPORA_URL_REGEX = %r{
+        diaspora://
+        (#{Validation::Rule::DiasporaId::DIASPORA_ID_REGEX})/
+        (#{Entity::ENTITY_NAME_REGEX})/
+        (#{Validation::Rule::Guid::VALID_CHARS})
+      }ux
+
+      # Parses all diaspora:// URLs from the text and fetches the entities from
+      # the remote server if needed.
+      # @param [String] sender the diaspora* ID of the sender of the entity
+      # @param [String] text text with diaspora:// URLs to fetch
+      def self.fetch_linked_entities(text)
+        text.scan(DIASPORA_URL_REGEX).each do |author, type, guid|
+          fetch_entity(author, type, guid)
+        end
+      end
+
+      private_class_method def self.fetch_entity(author, type, guid)
+        class_name = Entity.entity_class(type).to_s.rpartition("::").last
+        return if DiasporaFederation.callbacks.trigger(:fetch_related_entity, class_name, guid)
+        Fetcher.fetch_public(author, type, guid)
+      rescue => e # rubocop:disable Lint/RescueWithoutErrorClass
+        logger.error "Failed to fetch linked entity #{type}:#{guid}: #{e.class}: #{e.message}"
+      end
+    end
+  end
+end

data/lib/diaspora_federation/federation/fetcher.rb

@@ -6,28 +6,40 @@ module DiasporaFederation
       # @param [String] author the diaspora* ID of the author of the entity
       # @param [Symbol, String] entity_type snake_case version of the entity class
       # @param [String] guid guid of the entity to fetch
+      # @raise [NotFetchable] if something with the fetching failed
       def self.fetch_public(author, entity_type, guid)
-        url = DiasporaFederation.callbacks.trigger(
-          :fetch_person_url_to, author, "/fetch/#{entity_name(entity_type)}/#{guid}"
-        )
-        response = HttpClient.get(url)
-        raise "Failed to fetch #{url}: #{response.status}" unless response.success?
-
-        magic_env_xml = Nokogiri::XML(response.body).root
-        magic_env = Salmon::MagicEnvelope.unenvelop(magic_env_xml)
-        Receiver::Public.new(magic_env).receive
-      rescue => e
+        type = entity_name(entity_type).to_s
+        raise "Already fetching ..." if fetching[type].include?(guid)
+        fetch_from_url(author, type, guid)
+      rescue => e # rubocop:disable Lint/RescueWithoutErrorClass
         raise NotFetchable, "Failed to fetch #{entity_type}:#{guid} from #{author}: #{e.class}: #{e.message}"
       end
 
       private_class_method def self.entity_name(class_name)
-        return class_name if class_name =~ /\A[a-z]*(_[a-z]*)*\z/
+        return class_name if class_name =~ /\A#{Entity::ENTITY_NAME_REGEX}\z/
 
         raise DiasporaFederation::Entity::UnknownEntity, class_name unless Entities.const_defined?(class_name)
 
         class_name.gsub(/(.)([A-Z])/, '\1_\2').downcase
       end
 
+      private_class_method def self.fetch_from_url(author, type, guid)
+        fetching[type] << guid
+
+        url = DiasporaFederation.callbacks.trigger(:fetch_person_url_to, author, "/fetch/#{type}/#{guid}")
+        response = HttpClient.get(url)
+        raise "Failed to fetch #{url}: #{response.status}" unless response.success?
+
+        Receiver.receive_public(response.body)
+      ensure
+        fetching[type].delete(guid)
+      end
+
+      # currently fetching entities in the same thread
+      private_class_method def self.fetching
+        Thread.current[:fetching_entities] ||= Hash.new {|h, k| h[k] = [] }
+      end
+
       # Raised, if the entity is not fetchable
       class NotFetchable < RuntimeError
       end

data/lib/diaspora_federation/federation/receiver.rb

@@ -15,7 +15,7 @@ module DiasporaFederation
                       Salmon::MagicEnvelope.unenvelop(magic_env_xml)
                     end
         Public.new(magic_env).receive
-      rescue => e
+      rescue => e # rubocop:disable Lint/RescueWithoutErrorClass
         logger.error "failed to receive public message: #{e.class}: #{e.message}"
         logger.debug "received data:\n#{data}"
         raise e
@@ -36,7 +36,7 @@ module DiasporaFederation
                       Salmon::MagicEnvelope.unenvelop(magic_env_xml)
                     end
         Private.new(magic_env, recipient_id).receive
-      rescue => e
+      rescue => e # rubocop:disable Lint/RescueWithoutErrorClass
         logger.error "failed to receive private message for #{recipient_id}: #{e.class}: #{e.message}"
         logger.debug "received data:\n#{data}"
         raise e

data/lib/diaspora_federation/federation/receiver/abstract_receiver.rb

@@ -17,7 +17,7 @@ module DiasporaFederation
         # Validates and receives the entity
         def receive
           validate_and_receive
-        rescue => e
+        rescue => e # rubocop:disable Lint/RescueWithoutErrorClass
           logger.error "failed to receive #{entity}"
           raise e
         end
@@ -28,6 +28,7 @@ module DiasporaFederation
 
         def validate_and_receive
           validate
+          fetch_linked_entities_from_text
           DiasporaFederation.callbacks.trigger(:receive_entity, entity, sender, recipient_id)
           logger.info "successfully received #{entity} from person #{sender}#{" for #{recipient_id}" if recipient_id}"
         end
@@ -43,6 +44,10 @@ module DiasporaFederation
             sender == entity.author
           end
         end
+
+        def fetch_linked_entities_from_text
+          DiasporaUrlParser.fetch_linked_entities(entity.text) if entity.respond_to?(:text) && entity.text
+        end
       end
     end
   end

data/lib/diaspora_federation/federation/receiver/public.rb

@@ -7,11 +7,18 @@ module DiasporaFederation
 
         def validate
           super
-          raise NotPublic if entity_can_be_public_but_it_is_not?
+          validate_public_flag
         end
 
-        def entity_can_be_public_but_it_is_not?
-          entity.respond_to?(:public) && !entity.public
+        def validate_public_flag
+          return if !entity.respond_to?(:public) || entity.public
+
+          if entity.is_a?(Entities::Profile) &&
+            %i[bio birthday gender location].all? {|prop| entity.public_send(prop).nil? }
+            return
+          end
+
+          raise NotPublic, "received entity #{entity} should be public!"
         end
       end
     end

data/lib/diaspora_federation/parsers/base_parser.rb

@@ -29,7 +29,7 @@ module DiasporaFederation
         when :timestamp
           begin
             Time.parse(text).utc
-          rescue
+          rescue ArgumentError
             nil
           end
         when :integer

data/lib/diaspora_federation/properties_dsl.rb

@@ -158,9 +158,7 @@ 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/validators.rb

@@ -37,6 +37,7 @@ end
 require "diaspora_federation/validators/related_entity_validator"
 
 # abstract types
+require "diaspora_federation/validators/optional_aware_validator"
 require "diaspora_federation/validators/relayable_validator"
 
 # types

data/lib/diaspora_federation/validators/account_deletion_validator.rb

@@ -1,10 +1,10 @@
 module DiasporaFederation
   module Validators
     # This validates a {Entities::AccountDeletion}.
-    class AccountDeletionValidator < Validation::Validator
+    class AccountDeletionValidator < OptionalAwareValidator
       include Validation
 
-      rule :author, %i[not_empty diaspora_id]
+      rule :author, :diaspora_id
     end
   end
 end

data/lib/diaspora_federation/validators/account_migration_validator.rb

@@ -1,10 +1,10 @@
 module DiasporaFederation
   module Validators
     # This validates a {Entities::AccountMigration}.
-    class AccountMigrationValidator < Validation::Validator
+    class AccountMigrationValidator < OptionalAwareValidator
       include Validation
 
-      rule :author, %i[not_empty diaspora_id]
+      rule :author, :diaspora_id
 
       rule :profile, :not_nil
     end

data/lib/diaspora_federation/validators/comment_validator.rb

@@ -1,7 +1,7 @@
 module DiasporaFederation
   module Validators
     # This validates a {Entities::Comment}.
-    class CommentValidator < Validation::Validator
+    class CommentValidator < OptionalAwareValidator
       include Validation
 
       include RelayableValidator

data/lib/diaspora_federation/validators/contact_validator.rb

@@ -1,11 +1,11 @@
 module DiasporaFederation
   module Validators
     # This validates a {Entities::Contact}.
-    class ContactValidator < Validation::Validator
+    class ContactValidator < OptionalAwareValidator
       include Validation
 
-      rule :author, %i[not_empty diaspora_id]
-      rule :recipient, %i[not_empty diaspora_id]
+      rule :author, :diaspora_id
+      rule :recipient, :diaspora_id
       rule :following, :boolean
       rule :sharing, :boolean
     end

data/lib/diaspora_federation/validators/conversation_validator.rb

@@ -1,10 +1,10 @@
 module DiasporaFederation
   module Validators
     # This validates a {Entities::Conversation}.
-    class ConversationValidator < Validation::Validator
+    class ConversationValidator < OptionalAwareValidator
       include Validation
 
-      rule :author, %i[not_empty diaspora_id]
+      rule :author, :diaspora_id
       rule :guid, :guid
 
       rule :subject, [:not_empty, length: {maximum: 255}]

data/lib/diaspora_federation/validators/event_participation_validator.rb

@@ -1,7 +1,7 @@
 module DiasporaFederation
   module Validators
     # This validates a {Entities::EventParticipation}.
-    class EventParticipationValidator < Validation::Validator
+    class EventParticipationValidator < OptionalAwareValidator
       include Validation
 
       include RelayableValidator

data/lib/diaspora_federation/validators/event_validator.rb

@@ -1,10 +1,10 @@
 module DiasporaFederation
   module Validators
     # This validates a {Entities::Event}.
-    class EventValidator < Validation::Validator
+    class EventValidator < OptionalAwareValidator
       include Validation
 
-      rule :author, %i[not_empty diaspora_id]
+      rule :author, :diaspora_id
 
       rule :guid, :guid
 

data/lib/diaspora_federation/validators/h_card_validator.rb

@@ -3,7 +3,7 @@ module DiasporaFederation
     # This validates a {Discovery::HCard}.
     #
     # @note
-    class HCardValidator < Validation::Validator
+    class HCardValidator < OptionalAwareValidator
       include Validation
 
       rule :guid, :guid

data/lib/diaspora_federation/validators/like_validator.rb

@@ -1,7 +1,7 @@
 module DiasporaFederation
   module Validators
     # This validates a {Entities::Like}.
-    class LikeValidator < Validation::Validator
+    class LikeValidator < OptionalAwareValidator
       include Validation
 
       include RelayableValidator

data/lib/diaspora_federation/validators/location_validator.rb

@@ -1,7 +1,7 @@
 module DiasporaFederation
   module Validators
     # This validates a {Entities::Location}.
-    class LocationValidator < Validation::Validator
+    class LocationValidator < OptionalAwareValidator
       include Validation
 
       rule :lat, :not_empty

data/lib/diaspora_federation/validators/message_validator.rb

@@ -1,10 +1,10 @@
 module DiasporaFederation
   module Validators
     # This validates a {Entities::Message}.
-    class MessageValidator < Validation::Validator
+    class MessageValidator < OptionalAwareValidator
       include Validation
 
-      rule :author, %i[not_empty diaspora_id]
+      rule :author, :diaspora_id
       rule :guid, :guid
       rule :conversation_guid, :guid
 

data/lib/diaspora_federation/validators/optional_aware_validator.rb

@@ -0,0 +1,23 @@
+module DiasporaFederation
+  module Validators
+    # Abstract validator which only validates optional fields when they are not nil.
+    class OptionalAwareValidator < Validation::Validator
+      def rules
+        super.reject do |field, rules|
+          @obj.public_send(field).nil? &&
+            !rules.map(&:class).include?(Validation::Rule::NotNil) &&
+            optional_props.include?(field)
+        end
+      end
+
+      private
+
+      def optional_props
+        entity_name = self.class.name.split("::").last.sub("Validator", "")
+        return [] unless Entities.const_defined?(entity_name)
+
+        Entities.const_get(entity_name).optional_props
+      end
+    end
+  end
+end

data/lib/diaspora_federation/validators/participation_validator.rb

@@ -1,10 +1,10 @@
 module DiasporaFederation
   module Validators
     # This validates a {Entities::Participation}.
-    class ParticipationValidator < Validation::Validator
+    class ParticipationValidator < OptionalAwareValidator
       include Validation
 
-      rule :author, %i[not_empty diaspora_id]
+      rule :author, :diaspora_id
       rule :guid, :guid
       rule :parent_guid, :guid
       rule :parent_type, [:not_empty, regular_expression: {regex: /\APost\z/}]

data/lib/diaspora_federation/validators/person_validator.rb

@@ -1,12 +1,12 @@
 module DiasporaFederation
   module Validators
     # This validates a {Entities::Person}.
-    class PersonValidator < Validation::Validator
+    class PersonValidator < OptionalAwareValidator
       include Validation
 
       rule :guid, :guid
 
-      rule :author, %i[not_empty diaspora_id]
+      rule :author, :diaspora_id
 
       rule :url, %i[not_nil URI]
 

data/lib/diaspora_federation/validators/photo_validator.rb

@@ -1,12 +1,12 @@
 module DiasporaFederation
   module Validators
     # This validates a {Entities::Photo}.
-    class PhotoValidator < Validation::Validator
+    class PhotoValidator < OptionalAwareValidator
       include Validation
 
       rule :guid, :guid
 
-      rule :author, %i[not_empty diaspora_id]
+      rule :author, :diaspora_id
 
       rule :public, :boolean
 
@@ -14,7 +14,7 @@ module DiasporaFederation
 
       rule :remote_photo_name, :not_empty
 
-      rule :status_message_guid, guid: {nilable: true}
+      rule :status_message_guid, :guid
 
       rule :text, length: {maximum: 65_535}
 

data/lib/diaspora_federation/validators/poll_answer_validator.rb

@@ -1,7 +1,7 @@
 module DiasporaFederation
   module Validators
     # This validates a {Entities::PollAnswer}.
-    class PollAnswerValidator < Validation::Validator
+    class PollAnswerValidator < OptionalAwareValidator
       include Validation
 
       rule :guid, :guid

data/lib/diaspora_federation/validators/poll_participation_validator.rb

@@ -1,7 +1,7 @@
 module DiasporaFederation
   module Validators
     # This validates a {Entities::PollParticipation}.
-    class PollParticipationValidator < Validation::Validator
+    class PollParticipationValidator < OptionalAwareValidator
       include Validation
 
       include RelayableValidator

data/lib/diaspora_federation/validators/poll_validator.rb

@@ -1,7 +1,7 @@
 module DiasporaFederation
   module Validators
     # This validates a {Entities::Poll}.
-    class PollValidator < Validation::Validator
+    class PollValidator < OptionalAwareValidator
       include Validation
 
       rule :guid, :guid

data/lib/diaspora_federation/validators/profile_validator.rb

@@ -1,7 +1,7 @@
 module DiasporaFederation
   module Validators
     # This validates a {Entities::Profile}.
-    class ProfileValidator < Validation::Validator
+    class ProfileValidator < OptionalAwareValidator
       include Validation
 
       rule :author, :diaspora_id

data/lib/diaspora_federation/validators/related_entity_validator.rb

@@ -4,7 +4,7 @@ module DiasporaFederation
     class RelatedEntityValidator < Validation::Validator
       include Validation
 
-      rule :author, %i[not_empty diaspora_id]
+      rule :author, :diaspora_id
       rule :local, :boolean
       rule :public, :boolean
     end

data/lib/diaspora_federation/validators/relayable_validator.rb

@@ -6,7 +6,7 @@ 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 :author, :diaspora_id
           rule :guid, :guid
           rule :parent_guid, :guid
           rule :parent, :not_nil

data/lib/diaspora_federation/validators/reshare_validator.rb

@@ -1,18 +1,16 @@
 module DiasporaFederation
   module Validators
     # This validates a {Entities::Reshare}.
-    class ReshareValidator < Validation::Validator
+    class ReshareValidator < OptionalAwareValidator
       include Validation
 
-      rule :root_author, %i[not_empty diaspora_id]
+      rule :root_author, :diaspora_id
 
       rule :root_guid, :guid
 
-      rule :author, %i[not_empty diaspora_id]
+      rule :author, :diaspora_id
 
       rule :guid, :guid
-
-      rule :public, :boolean
     end
   end
 end

data/lib/diaspora_federation/validators/retraction_validator.rb

@@ -1,10 +1,10 @@
 module DiasporaFederation
   module Validators
     # This validates a {Entities::Retraction}.
-    class RetractionValidator < Validation::Validator
+    class RetractionValidator < OptionalAwareValidator
       include Validation
 
-      rule :author, %i[not_empty diaspora_id]
+      rule :author, :diaspora_id
 
       rule :target_guid, :guid
       rule :target_type, :not_empty

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

@@ -4,24 +4,26 @@ module Validation
     #
     # A simple rule to validate the base structure of diaspora* IDs.
     class DiasporaId
+      # Maximum length of a full diaspora* ID
+      DIASPORA_ID_MAX_LENGTH = 255
+
       # 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}\\-\\_\\.]+"
-        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}\\]"
+      DIASPORA_ID_REGEX = begin
+        username       = "[[:lower:]\\d\\-\\.\\_]+"
+        hostname_part  = "[[:lower:]\\d\\-]"
+        hostname       = "#{hostname_part}+(?:[.]#{hostname_part}*)*"
+        ipv4           = "(?:[\\d]{1,3}\\.){3}[\\d]{1,3}"
+        ipv6           = "\\[(?:[[:xdigit:]]{0,4}:){0,7}[[:xdigit:]]{1,4}\\]"
         ip_addr        = "(?:#{ipv4}|#{ipv6})"
         domain         = "(?:#{hostname}|#{ip_addr})"
-        port           = "(:[#{digit}]+)?"
-        addr_spec      = "(#{username}\\@#{domain}#{port})?"
+        port           = "(?::[\\d]+)?"
 
-        /\A#{addr_spec}\z/u
+        "#{username}\\@#{domain}#{port}"
       end
 
+      # The Regex for validating a full diaspora* ID
+      DIASPORA_ID = /\A#{DIASPORA_ID_REGEX}\z/u
+
       # The error key for this rule
       # @return [Symbol] error key
       def error_key
@@ -30,7 +32,10 @@ module Validation
 
       # Determines if value is a valid diaspora* ID
       def valid_value?(value)
-        value.nil? || !DIASPORA_ID.match(value).nil?
+        return false unless value.is_a?(String)
+        return false if value.length > DIASPORA_ID_MAX_LENGTH
+
+        value =~ DIASPORA_ID
       end
 
       # This rule has no params.

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

@@ -6,21 +6,10 @@ module Validation
     # * Letters: a-z
     # * Numbers: 0-9
     # * Special chars: '-', '_', '@', '.' and ':'
+    # Special chars aren't allowed at the end.
     class Guid
-      # This rule can have a +nilable+ param.
-      # @return [Hash] params
-      attr_reader :params
-
-      # Creates 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
+      # Allowed chars to validate a GUID with a regex
+      VALID_CHARS = "[0-9A-Za-z\\-_@.:]{15,254}[0-9A-Za-z]".freeze
 
       # The error key for this rule
       # @return [Symbol] error key
@@ -30,7 +19,13 @@ module Validation
 
       # Determines if value is a valid +GUID+
       def valid_value?(value)
-        params[:nilable] && value.nil? || value.is_a?(String) && value.downcase =~ /\A[0-9a-z\-_@.:]{16,255}\z/
+        value.is_a?(String) && value =~ /\A#{VALID_CHARS}\z/
+      end
+
+      # This rule has no params.
+      # @return [Hash] params
+      def params
+        {}
       end
     end
   end

data/lib/diaspora_federation/validators/status_message_validator.rb

@@ -1,10 +1,10 @@
 module DiasporaFederation
   module Validators
     # This validates a {Entities::StatusMessage}.
-    class StatusMessageValidator < Validation::Validator
+    class StatusMessageValidator < OptionalAwareValidator
       include Validation
 
-      rule :author, %i[not_empty diaspora_id]
+      rule :author, :diaspora_id
 
       rule :guid, :guid
 

data/lib/diaspora_federation/validators/web_finger_validator.rb

@@ -4,7 +4,7 @@ module DiasporaFederation
     #
     # @note It does not validate the guid and public key, because it will be
     #   removed in the webfinger.
-    class WebFingerValidator < Validation::Validator
+    class WebFingerValidator < OptionalAwareValidator
       include Validation
 
       rule :acct_uri, :not_empty

data/lib/diaspora_federation/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diaspora_federation
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Benjamin Neff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-07 00:00:00.000000000 Z
+date: 2017-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -39,7 +39,7 @@ dependencies:
         version: 0.9.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: 0.9.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
@@ -149,6 +149,7 @@ files:
 - lib/diaspora_federation/entities/status_message.rb
 - lib/diaspora_federation/entity.rb
 - lib/diaspora_federation/federation.rb
+- lib/diaspora_federation/federation/diaspora_url_parser.rb
 - lib/diaspora_federation/federation/fetcher.rb
 - lib/diaspora_federation/federation/receiver.rb
 - lib/diaspora_federation/federation/receiver/abstract_receiver.rb
@@ -186,6 +187,7 @@ files:
 - lib/diaspora_federation/validators/like_validator.rb
 - lib/diaspora_federation/validators/location_validator.rb
 - lib/diaspora_federation/validators/message_validator.rb
+- lib/diaspora_federation/validators/optional_aware_validator.rb
 - lib/diaspora_federation/validators/participation_validator.rb
 - lib/diaspora_federation/validators/person_validator.rb
 - lib/diaspora_federation/validators/photo_validator.rb
@@ -228,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: diaspora* federation library