diaspora_federation 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55951778511742a4269e05b406ef43ca976410c07e91364896138e3df1cf7019
-  data.tar.gz: 3fed9b6d22ec275798e45a1df2c593835d1750fdac9c68158192a06640b4bcb5
+  metadata.gz: 126bd285db912266d404ee6db4fb7016291438fee3089341f60a257e64386ad6
+  data.tar.gz: 4e6301e3937258f34771d6a373618f0f24ebe230d7f9004bd2173f00b653ab30
 SHA512:
-  metadata.gz: 33b62f247e32f32874930b71f907540ae7f0dbf88182d1bd8e5a4c4590dd21eee9c2f9b691d54ed96d5688b9eca5c7523780fbd1b1a89ad7e2ae4ad9ca77c371
-  data.tar.gz: 581f0595fbd988aa146aea231bf80c2f81063c0719c671a83f685b162364922941bc8f68bd55b9a22385f520e0f7e162c66f71802e99703ccd54f03426d79731
+  metadata.gz: bf115ea37e268d101a94b1df2fcab533f147a238861813742800aa77edf287a8b23e6a2473344817e203374af884f2fc81ed470a0fab91d6b40891d8d58f9c29
+  data.tar.gz: 25749275957489227c092294b25c8d04809a4d79f42512f09941b0881dd9193eb94fe7716c292416c5e40bd7695dab835297e139bf243bfb535c81ac27413c7c

data/Changelog.md

@@ -1,3 +1,11 @@
+# 1.1.0
+
+* Don't follow redirects when federating messages [#128](https://github.com/diaspora/diaspora_federation/pull/128)
+
+# 1.0.1
+
+* Disable rails forgery protection for the federation controller by default [#127](https://github.com/diaspora/diaspora_federation/pull/127)
+
 # 1.0.0
 
 * Add rails 7 support [#126](https://github.com/diaspora/diaspora_federation/pull/126)

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

@@ -15,8 +15,7 @@ module DiasporaFederation
         # @return [Hash] hydra opts
         def self.hydra_opts
           @hydra_opts ||= {
-            followlocation: true,
-            maxredirs:      DiasporaFederation.http_redirect_limit,
+            followlocation: false,
             timeout:        DiasporaFederation.http_timeout,
             method:         :post,
             verbose:        DiasporaFederation.http_verbose,
@@ -90,10 +89,10 @@ module DiasporaFederation
         # @param [Typhoeus::Request] request
         def prepare_request(request)
           request.on_complete do |response|
-            success = validate_response_and_update_pod(request, response)
-            log_line = "success=#{success} sender=#{@sender_id} obj=#{@obj_str} url=#{response.effective_url} " \
+            DiasporaFederation.callbacks.trigger(:update_pod, request.url, status_from_response(response))
+            log_line = "success=#{response.success?} sender=#{@sender_id} obj=#{@obj_str} url=#{request.url} " \
                        "message=#{response.return_code} code=#{response.response_code} time=#{response.total_time}"
-            if success
+            if response.success?
               logger.info(log_line)
             else
               logger.warn(log_line)
@@ -103,18 +102,6 @@ module DiasporaFederation
           end
         end
 
-        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_from_response(response)
           response.return_code == :ok ? response.response_code : response.return_code
         end

data/lib/diaspora_federation/version.rb

@@ -2,5 +2,5 @@
 
 module DiasporaFederation
   # the gem version
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diaspora_federation
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Benjamin Neff
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-18 00:00:00.000000000 Z
+date: 2023-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -220,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: diaspora* federation library