diaspora_federation 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98960499491bf5fa4f32f9b26b07d251be8feb1e
-  data.tar.gz: 0769440c0da228ac91ac6129ce7129bb81a144ef
+  metadata.gz: ada8efaa115784225786ce35f925e13179f7d5e2
+  data.tar.gz: 9ecfc78d096a8f5173ddbcd3665fd22445c9374c
 SHA512:
-  metadata.gz: d0237ce04699644b5925a6a80350070305d16addbbd1c032c802dcc527d6fd648668f97834349e43ec1711fac469a571379a0951cb551f39998ded04528ce9de
-  data.tar.gz: a6a930e63aea294c0a0437cb831a0607de17361e8e00fb7ecc4f25bd76a453cb55a6010eb12e5fed2e3e331f122d1f5b44e31a997c8f76fad4a953628b69e028
+  metadata.gz: 1ad31c9c21a5e42e0197ccb51ec14d8e5262b6fc527f9b3b7ba95ff9162d69c8be8783275d576a7051bca3ddfbe0913dd3d1b5d46ad9d32a90c2288b510c6f42
+  data.tar.gz: 1b32aa2ff5b1c4d0763f8b97eb1473cc03d143ae3f7bd028a24557e11780d8a2b6d2f14c89ecd67977eae708b33aba868de867e3c92031c583468577f4fd2c4a

data/Changelog.md

@@ -1,3 +1,14 @@
+# 0.1.5
+
+## Refactor
+
+* Use `head` method instead of `:nothing` option [44f6527](https://github.com/diaspora/diaspora_federation/commit/44f6527d64489c212c0f6b050ad343ea0e53e964)
+* Add `sender` parameter to `:receive_entity` callback [fb60f83](https://github.com/diaspora/diaspora_federation/commit/fb60f8392698f49b9291f3461e7a68ec84def9e2)
+
+## Bug fixes
+
+* HydraWrapper: Validate hostname after redirect [d18e623](https://github.com/diaspora/diaspora_federation/commit/d18e623082ac620a89e0542ceb97a9f2501c16bf)
+
 # 0.1.4
 
 ## Refactor

data/lib/diaspora_federation.rb

@@ -232,8 +232,8 @@ module DiasporaFederation
     private
 
     def validate_http_config
-      configuration_error "http_concurrency: please configure a number" unless @http_concurrency.is_a?(Fixnum)
-      configuration_error "http_timeout: please configure a number" unless @http_timeout.is_a?(Fixnum)
+      configuration_error "http_concurrency: please configure a number" unless @http_concurrency.is_a?(Integer)
+      configuration_error "http_timeout: please configure a number" unless @http_timeout.is_a?(Integer)
 
       return unless !@http_verbose.is_a?(TrueClass) && !@http_verbose.is_a?(FalseClass)
       configuration_error "http_verbose: please configure a boolean"

data/lib/diaspora_federation/discovery/discovery.rb

@@ -44,13 +44,13 @@ module DiasporaFederation
         raise "Failed to fetch #{url}: #{response.status}" unless response.success?
         response.body
       rescue => e
-        if http_fallback && url.start_with?("https://")
-          logger.warn "Retry with http: #{url} for #{diaspora_id}: #{e.class}: #{e.message}"
-          url.sub!("https://", "http://")
-          retry
-        else
+        unless http_fallback && url.start_with?("https://")
           raise DiscoveryError, "Failed to fetch #{url} for #{diaspora_id}: #{e.class}: #{e.message}"
         end
+
+        logger.warn "Retry with http: #{url} for #{diaspora_id}: #{e.class}: #{e.message}"
+        url.sub!("https://", "http://")
+        retry
       end
 
       def host_meta_url

data/lib/diaspora_federation/entities/relayable.rb

@@ -131,10 +131,10 @@ module DiasporaFederation
       # @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)
-        if privkey
-          sign_with_key(privkey).tap do
-            logger.info "event=sign status=complete signature=parent_author_signature obj=#{self}"
-          end
+        return unless privkey
+
+        sign_with_key(privkey).tap do
+          logger.info "event=sign status=complete signature=parent_author_signature obj=#{self}"
         end
       end
 
@@ -209,11 +209,9 @@ module DiasporaFederation
 
         def fetch_parent(data)
           type = data.fetch(:parent_type) {
-            if const_defined?(:PARENT_TYPE)
-              self::PARENT_TYPE
-            else
-              raise DiasporaFederation::Entity::ValidationError, "invalid #{self}! missing 'parent_type'."
-            end
+            break self::PARENT_TYPE if const_defined?(:PARENT_TYPE)
+
+            raise DiasporaFederation::Entity::ValidationError, "invalid #{self}! missing 'parent_type'."
           }
           guid = data.fetch(:parent_guid) {
             raise DiasporaFederation::Entity::ValidationError, "invalid #{self}! missing 'parent_guid'."
@@ -221,11 +219,11 @@ module DiasporaFederation
 
           data[:parent] = DiasporaFederation.callbacks.trigger(:fetch_related_entity, type, guid)
 
-          unless data[:parent]
-            # Fetch and receive parent from remote, if not available locally
-            Federation::Fetcher.fetch_public(data[:author], type, guid)
-            data[:parent] = DiasporaFederation.callbacks.trigger(:fetch_related_entity, type, guid)
-          end
+          return if data[:parent]
+
+          # Fetch and receive parent from remote, if not available locally
+          Federation::Fetcher.fetch_public(data[:author], type, guid)
+          data[:parent] = DiasporaFederation.callbacks.trigger(:fetch_related_entity, type, guid)
         end
       end
 

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

@@ -28,7 +28,7 @@ module DiasporaFederation
 
         def validate_and_receive
           validate
-          DiasporaFederation.callbacks.trigger(:receive_entity, entity, recipient_id)
+          DiasporaFederation.callbacks.trigger(:receive_entity, entity, sender, recipient_id)
           logger.info "successfully received #{entity} from person #{sender}#{" for #{recipient_id}" if recipient_id}"
         end
 

data/lib/diaspora_federation/federation/sender/hydra_wrapper.rb

@@ -11,13 +11,14 @@ module DiasporaFederation
         # @return [Hash] hydra opts
         def self.hydra_opts
           @hydra_opts ||= {
-            maxredirs:    DiasporaFederation.http_redirect_limit,
-            timeout:      DiasporaFederation.http_timeout,
-            method:       :post,
-            verbose:      DiasporaFederation.http_verbose,
-            cainfo:       DiasporaFederation.certificate_authorities,
-            forbid_reuse: true,
-            headers:      {
+            followlocation: true,
+            maxredirs:      DiasporaFederation.http_redirect_limit,
+            timeout:        DiasporaFederation.http_timeout,
+            method:         :post,
+            verbose:        DiasporaFederation.http_verbose,
+            cainfo:         DiasporaFederation.certificate_authorities,
+            forbid_reuse:   true,
+            headers:        {
               "Expect"            => "",
               "Transfer-Encoding" => "",
               "User-Agent"        => DiasporaFederation.http_user_agent
@@ -62,9 +63,7 @@ module DiasporaFederation
         # @param [Typhoeus::Request] request
         def prepare_request(request)
           request.on_complete do |response|
-            DiasporaFederation.callbacks.trigger(:update_pod, pod_url(response.effective_url), status(response))
-
-            success = response.success?
+            success = validate_response_and_update_pod(request, response)
             log_line = "success=#{success} sender=#{@sender_id} obj=#{@obj_str} url=#{response.effective_url} " \
                        "message=#{response.return_code} code=#{response.response_code} time=#{response.total_time}"
             if success
@@ -77,15 +76,20 @@ module DiasporaFederation
           end
         end
 
-        # Get the pod root-url from the send-url
-        # @param [String] url
-        # @return [String] pod root-url
-        def pod_url(url)
-          URI.parse(url).tap {|uri| uri.path = "/" }.to_s
+        def validate_response_and_update_pod(request, response)
+          url = URI.parse(request.url)
+          effective_url = URI.parse(response.effective_url)
+          same_host = url.host == effective_url.host
+
+          (response.success? && same_host).tap do |success|
+            pod_url = (success ? effective_url : url).tap {|uri| uri.path = "/" }.to_s
+            status = same_host ? status_from_response(response) : :redirected_to_other_hostname
+            DiasporaFederation.callbacks.trigger(:update_pod, pod_url, status)
+          end
         end
 
-        def status(res)
-          res.return_code == :ok ? res.response_code : res.return_code
+        def status_from_response(response)
+          response.return_code == :ok ? response.response_code : response.return_code
         end
       end
     end

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

@@ -4,7 +4,7 @@ module Validation
     #
     # Valid is:
     # * a +String+: "true", "false", "t", "f", "yes", "no", "y", "n", "1", "0"
-    # * a +Fixnum+: 1 or 0
+    # * a +Integer+: 1 or 0
     # * a +Boolean+: true or false
     class Boolean
       # The error key for this rule
@@ -19,7 +19,7 @@ module Validation
 
         if value.is_a?(String)
           true if value =~ /\A(true|false|t|f|yes|no|y|n|1|0)\z/i
-        elsif value.is_a?(Fixnum)
+        elsif value.is_a?(Integer)
           true if value == 1 || value == 0
         elsif [true, false].include? value
           true

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

@@ -9,9 +9,9 @@ module Validation
 
       # Creates a new rule for a maximum diaspora* ID count validation
       # @param [Hash] params
-      # @option params [Fixnum] :maximum maximum allowed id count
+      # @option params [Integer] :maximum maximum allowed id count
       def initialize(params)
-        unless params.include?(:maximum) && params[:maximum].is_a?(Fixnum)
+        unless params.include?(:maximum) && params[:maximum].is_a?(Integer)
           raise ArgumentError, "A number has to be specified for :maximum"
         end
 

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

@@ -10,9 +10,9 @@ module Validation
 
       # Creates a new rule for a maximum tag count validation
       # @param [Hash] params
-      # @option params [Fixnum] :maximum maximum allowed tag count
+      # @option params [Integer] :maximum maximum allowed tag count
       def initialize(params)
-        unless params.include?(:maximum) && params[:maximum].is_a?(Fixnum)
+        unless params.include?(:maximum) && params[:maximum].is_a?(Integer)
           raise ArgumentError, "A number has to be specified for :maximum"
         end
 

data/lib/diaspora_federation/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diaspora_federation
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Benjamin Neff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-21 00:00:00.000000000 Z
+date: 2016-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri