diaspora_federation-rails 0.2.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ec3f1dc1e66c06c1f8d58211245bc1bcec268f85ab5d40d18a36d374d7da2c9
-  data.tar.gz: 2aff34f8579c46f20f0bc1b94ff78ee36236199e5e819587ecb51f2d540cfa80
+  metadata.gz: 9c5f12fbe1b968f3a8c758cf4179975b2ff6f267556a5e19a74077a741c8c06b
+  data.tar.gz: 8cbb58eed3e4e77d11016114fe669be7132a9107c55f58daef676e1c30699aa3
 SHA512:
-  metadata.gz: 7aaf397d67ca55c5ad18d1d51a8bf1c0051aad13982e6682a4081d741eadebb384f623ef01c487b05b02361a72c1ad9bb5e71b1ea3707a5237df672e8f7916f6
-  data.tar.gz: e6555bcc78f546d58846d654be703e517418a56008f237bc36705f93509ef4035534b7dfc2f701d50e1d45db890f06a8d4cb3b1560bdacfbebb0b33ae56d3a5c
+  metadata.gz: e4c8f6c3cd1cd66595ab23e2731a93869c47f7076f259b9f6fc14002c643322a8da1c0a80b52acaea36bf9cf79a551131b9d234a0b87689aeebe214e0f6b8fb2
+  data.tar.gz: d33f926bf17537c92074a0630fdfd8518dd336b1fad63fccc24696d66374376188db13f123a2c3207de07f1f031f3e0d4b22f7804c35a8d2abd736edbb9fea88

data/Changelog.md

@@ -1,6 +1,18 @@
-# 0.2.8
+# 0.3.0
 
-* Re-release which allows rails 6 to be used
+## Breaking changes
+
+* Drop support for rails 5.1 and older [4b4375c](https://github.com/diaspora/diaspora_federation/commit/4b4375cf787e09537f53aff92b054a0386681747) [ecfe0ea](https://github.com/diaspora/diaspora_federation/commit/ecfe0ea850d203e8144adab744c4b43263200902)
+* Drop support for ruby 2.6 and older [68df3cf](https://github.com/diaspora/diaspora_federation/commit/68df3cf555efafc72942cfec2c8fb3e8852ddec1) [#121](https://github.com/diaspora/diaspora_federation/pull/121)
+* Drop support for faraday 0.x [#116](https://github.com/diaspora/diaspora_federation/pull/116)
+* Remove support to receive old federation protocol [#114](https://github.com/diaspora/diaspora_federation/pull/114)
+* Remove support for old non-RFC WebFinger [#122](https://github.com/diaspora/diaspora_federation/pull/122)
+
+## Features
+
+* Add rails 6 support [afee784](https://github.com/diaspora/diaspora_federation/commit/afee78476b1715ba32e2b97d7cbf2584d57718dd)
+* Add faraday 1.x support [#116](https://github.com/diaspora/diaspora_federation/pull/116)
+* Add support for up to ruby 3.1 [#121](https://github.com/diaspora/diaspora_federation/pull/121)
 
 # 0.2.7
 

data/app/controllers/diaspora_federation/application_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   # Base controller for all DiasporaFederation controllers
   class ApplicationController < ActionController::Base

data/app/controllers/diaspora_federation/fetch_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "diaspora_federation/application_controller"
 
 module DiasporaFederation

data/app/controllers/diaspora_federation/h_card_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "diaspora_federation/application_controller"
 
 module DiasporaFederation

data/app/controllers/diaspora_federation/receive_controller.rb

@@ -1,20 +1,18 @@
+# frozen_string_literal: true
+
 require_dependency "diaspora_federation/application_controller"
 
 module DiasporaFederation
   # This controller processes receiving messages.
   class ReceiveController < ApplicationController
-    before_action :check_for_xml
-
     # Receives public messages
     #
     # POST /receive/public
     def public
-      legacy = request.content_type != "application/magic-envelope+xml"
-
-      data = data_for_public_message(legacy)
+      data = request.body.read
       logger.debug data
 
-      DiasporaFederation.callbacks.trigger(:queue_public_receive, data, legacy)
+      DiasporaFederation.callbacks.trigger(:queue_public_receive, data)
 
       head :accepted
     end
@@ -23,43 +21,12 @@ module DiasporaFederation
     #
     # POST /receive/users/:guid
     def private
-      legacy = request.content_type != "application/json"
-
-      data = data_for_private_message(legacy)
+      data = request.body.read
       logger.debug data
 
-      success = DiasporaFederation.callbacks.trigger(:queue_private_receive, params[:guid], data, legacy)
+      success = DiasporaFederation.callbacks.trigger(:queue_private_receive, params[:guid], data)
 
       head success ? :accepted : :not_found
     end
-
-    private
-
-    # Checks the xml parameter for legacy salmon slaps
-    # @deprecated
-    def check_for_xml
-      legacy_request = request.content_type.nil? || request.content_type == "application/x-www-form-urlencoded"
-      head :unprocessable_entity if params[:xml].nil? && legacy_request
-    end
-
-    def data_for_public_message(legacy)
-      if legacy
-        logger.info "received a public salmon slap"
-        CGI.unescape(params[:xml])
-      else
-        logger.info "received a public magic envelope"
-        request.body.read
-      end
-    end
-
-    def data_for_private_message(legacy)
-      if legacy
-        logger.info "received a private salmon slap for #{params[:guid]}"
-        CGI.unescape(params[:xml])
-      else
-        logger.info "received a private encrypted magic envelope for #{params[:guid]}"
-        request.body.read
-      end
-    end
   end
 end

data/app/controllers/diaspora_federation/webfinger_controller.rb

@@ -1,22 +1,10 @@
+# frozen_string_literal: true
+
 require_dependency "diaspora_federation/application_controller"
 
 module DiasporaFederation
   # This controller handles all webfinger-specific requests.
   class WebfingerController < ApplicationController
-    # Returns the host-meta xml
-    #
-    # example:
-    #   <?xml version="1.0" encoding="UTF-8"?>
-    #   <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
-    #        <Link rel="lrdd" type="application/xrd+xml"
-    #              template="https://server.example/.well-known/webfinger.xml?resource={uri}"/>
-    #   </XRD>
-    #
-    # GET /.well-known/host-meta
-    def host_meta
-      render xml: WebfingerController.host_meta_xml, content_type: "application/xrd+xml"
-    end
-
     # Returns the webfinger as RFC 7033 JRD or XRD.
     #
     # JSON example:
@@ -57,20 +45,6 @@ module DiasporaFederation
     #     ]
     #   }
     #
-    # XML example:
-    #   <?xml version="1.0" encoding="UTF-8"?>
-    #   <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
-    #     <Subject>acct:alice@localhost:3000</Subject>
-    #     <Alias>http://localhost:3000/people/c8e87290f6a20132963908fbffceb188</Alias>
-    #     <Link rel="http://microformats.org/profile/hcard" type="text/html"
-    #           href="http://localhost:3000/hcard/users/c8e87290f6a20132963908fbffceb188"/>
-    #     <Link rel="http://joindiaspora.com/seed_location" type="text/html" href="http://localhost:3000/"/>
-    #     <Link rel="http://webfinger.net/rel/profile-page" type="text/html" href="http://localhost:3000/u/alice"/>
-    #     <Link rel="http://schemas.google.com/g/2010#updates-from" type="application/atom+xml"
-    #           href="http://localhost:3000/public/alice.atom"/>
-    #     <Link rel="salmon" href="http://localhost:3000/receive/users/c8e87290f6a20132963908fbffceb188"/>
-    #   </XRD>
-    #
     # GET /.well-known/webfinger?resource=<uri>
     def webfinger
       person_wf = find_person_webfinger(params.require(:resource))
@@ -78,26 +52,13 @@ module DiasporaFederation
       if person_wf.nil?
         head :not_found
       else
-        logger.info "webfinger profile request for: #{person_wf.acct_uri}"
+        logger.info "Webfinger profile request for: #{person_wf.acct_uri}"
 
-        respond_to do |format|
-          format.any(:jrd, :json, :html) do
-            headers["Access-Control-Allow-Origin"] = "*"
-            render json: JSON.pretty_generate(person_wf.to_json), content_type: "application/jrd+json"
-          end
-          format.any(:xrd, :xml) do
-            render xml: person_wf.to_xml, content_type: "application/xrd+xml"
-          end
-        end
+        headers["Access-Control-Allow-Origin"] = "*"
+        render json: JSON.pretty_generate(person_wf.to_json), content_type: "application/jrd+json"
       end
     end
 
-    # Creates the host-meta xml with the configured server_uri and caches it
-    # @return [String] XML string
-    def self.host_meta_xml
-      @host_meta_xml ||= Discovery::HostMeta.from_base_url(DiasporaFederation.server_uri.to_s).to_xml
-    end
-
     private
 
     def find_person_webfinger(query)

data/config/initializers/filter_parameter_logging.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 # Don't log received xml data.
 Rails.application.config.filter_parameters += %i[xml aes_key encrypted_magic_envelope]

data/config/initializers/mime_types.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # mime types for webfinger
 Mime::Type.register "application/jrd+json", :jrd
 Mime::Type.register "application/xrd+xml", :xrd

data/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 DiasporaFederation::Engine.routes.draw do
   controller :receive do
     post "receive/public"      => :public,  :as => "receive_public"
@@ -9,7 +11,6 @@ DiasporaFederation::Engine.routes.draw do
   end
 
   controller :webfinger do
-    get ".well-known/host-meta" => :host_meta, :as => "host_meta"
     get ".well-known/webfinger" => :webfinger, :as => "webfinger"
   end
 

data/lib/diaspora_federation/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   # diaspora* federation rails engine
   class Engine < ::Rails::Engine

data/lib/diaspora_federation/rails.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "diaspora_federation/engine"
 
 require "diaspora_federation"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diaspora_federation-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors:
 - Benjamin Neff
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-17 00:00:00.000000000 Z
+date: 2022-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.8
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.8
+        version: 0.3.0
 description: A rails engine that adds the diaspora* federation protocol to a rails
   app
 email:
@@ -76,16 +76,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: diaspora* federation rails engine