diaspora_federation-rails 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bc0f1579572749f536a1c85277a9ae875cb6bae
-  data.tar.gz: ce86ee406e7882fbf924788934dd66bc4ade9e9f
+  metadata.gz: 9b03b6fa1888ffee4dd8ca177375f2e945bb1fae
+  data.tar.gz: 4e11d2005c587ac8ba7eb1c5d47ea60260df22b1
 SHA512:
-  metadata.gz: 3627595c4d7d9c16edbacdbcbc18787f06b1fabf2eff7a9d34603e948fde827b93084ae3165d93c8b0f539e39cc81db11cf23f18665ef84b5957236e46a497fc
-  data.tar.gz: 788dcfc5806e6e0fcdc8210351025078f1e48f9c813b544567b8bcdd8214238a186bd3d4a17104a445cc7a92b53c43bb678b47970a079b0d9a861f6c7df4b4ab
+  metadata.gz: cf5779d3f78cd35095be2d5186397868f6677181403244ef40023557f1d8fef065f49a967675f83d02226f97c12db0c76317c8296969316fa48af2ed90260c5d
+  data.tar.gz: 88b210bf518481fd5c79540d797c1b980a7fdd45b7541aed16db825c357499306e7d57b4514e6e5bf4d8311b748cd7dd2ca590c2d19865fd64d11c7c28c1982a

data/app/controllers/diaspora_federation/fetch_controller.rb

@@ -0,0 +1,36 @@
+require_dependency "diaspora_federation/application_controller"
+
+module DiasporaFederation
+  # this controller processes fetch requests
+  class FetchController < ApplicationController
+    # returns the fetched entity or a redirect
+    #
+    # GET /fetch/:type/:guid
+    def fetch
+      entity = fetch_public_entity
+      if entity
+        magic_env = create_magic_envelope(entity)
+        if magic_env
+          render xml: magic_env, content_type: "application/magic-envelope+xml"
+        else
+          redirect_to DiasporaFederation.callbacks.trigger(:fetch_person_url_to,
+                                                           entity.author, "/fetch/#{params[:type]}/#{params[:guid]}")
+        end
+      else
+        render nothing: true, status: 404
+      end
+    end
+
+    private
+
+    def fetch_public_entity
+      type = DiasporaFederation::Entity.entity_class(params[:type]).to_s.rpartition("::").last
+      DiasporaFederation.callbacks.trigger(:fetch_public_entity, type, params[:guid])
+    end
+
+    def create_magic_envelope(entity)
+      privkey = DiasporaFederation.callbacks.trigger(:fetch_private_key_by_diaspora_id, entity.author)
+      Salmon::MagicEnvelope.new(entity, entity.author).envelop(privkey) if privkey
+    end
+  end
+end

data/app/controllers/diaspora_federation/receive_controller.rb

@@ -1,5 +1,4 @@
 require_dependency "diaspora_federation/application_controller"
-require "diaspora_federation/receiver"
 
 module DiasporaFederation
   # this controller processes receiving messages
@@ -10,11 +9,12 @@ module DiasporaFederation
     #
     # POST /receive/public
     def public
-      logger.info "received a public message"
-      xml = CGI.unescape(params[:xml])
-      logger.debug xml
+      legacy = request.content_type != "application/magic-envelope+xml"
 
-      DiasporaFederation.callbacks.trigger(:queue_public_receive, xml)
+      data = data_for_public_message(legacy)
+      logger.debug data
+
+      DiasporaFederation.callbacks.trigger(:queue_public_receive, data, legacy)
 
       render nothing: true, status: 202
     end
@@ -23,19 +23,43 @@ module DiasporaFederation
     #
     # POST /receive/users/:guid
     def private
-      logger.info "received a private message for #{params[:guid]}"
-      xml = CGI.unescape(params[:xml])
-      logger.debug xml
+      legacy = request.content_type != "application/json"
+
+      data = data_for_private_message(legacy)
+      logger.debug data
 
-      success = DiasporaFederation.callbacks.trigger(:queue_private_receive, params[:guid], xml)
+      success = DiasporaFederation.callbacks.trigger(:queue_private_receive, params[:guid], data, legacy)
 
       render nothing: true, status: success ? 202 : 404
     end
 
     private
 
+    # checks the xml parameter for legacy salmon slaps
+    # @deprecated
     def check_for_xml
-      render nothing: true, status: 422 if params[:xml].nil?
+      legacy_request = request.content_type.nil? || request.content_type == "application/x-www-form-urlencoded"
+      render nothing: true, status: 422 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

@@ -13,7 +13,7 @@ module DiasporaFederation
     #
     # GET /.well-known/host-meta
     def host_meta
-      render body: WebfingerController.host_meta_xml, content_type: "application/xrd+xml"
+      render xml: WebfingerController.host_meta_xml, content_type: "application/xrd+xml"
     end
 
     # @deprecated this is the pre RFC 7033 webfinger
@@ -41,18 +41,18 @@ module DiasporaFederation
         render nothing: true, status: 404
       else
         logger.info "webfinger profile request for: #{person_wf.acct_uri}"
-        render body: person_wf.to_xml, content_type: "application/xrd+xml"
+        render xml: person_wf.to_xml, content_type: "application/xrd+xml"
       end
     end
 
-    private
-
     # 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)
       DiasporaFederation.callbacks.trigger(:fetch_person_for_webfinger, query.strip.downcase.sub("acct:", ""))
     end

data/config/routes.rb

@@ -4,6 +4,10 @@ DiasporaFederation::Engine.routes.draw do
     post "receive/users/:guid" => :private, :as => "receive_private"
   end
 
+  controller :fetch do
+    get "fetch/:type/:guid" => :fetch, :as => "fetch"
+  end
+
   controller :webfinger do
     get ".well-known/host-meta" => :host_meta,        :as => "host_meta"
     get "webfinger"             => :legacy_webfinger, :as => "legacy_webfinger"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diaspora_federation-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Benjamin Neff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-23 00:00:00.000000000 Z
+date: 2016-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 0.0.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 0.0.13
 description: A rails engine that adds the diaspora* federation protocol to a rails
   app
 email:
@@ -49,6 +49,7 @@ files:
 - LICENSE
 - README.md
 - app/controllers/diaspora_federation/application_controller.rb
+- app/controllers/diaspora_federation/fetch_controller.rb
 - app/controllers/diaspora_federation/h_card_controller.rb
 - app/controllers/diaspora_federation/receive_controller.rb
 - app/controllers/diaspora_federation/webfinger_controller.rb