Merge remote-tracking branch 'upstream/pull/5386'

[rails.git] / config / initializers / oauth.rb

diff --git a/config/initializers/oauth.rb b/config/initializers/oauth.rb
index 122c2e6513838eb90b609c15701592193a65c049..b0b993e90da722048e1856962386b86bdfe56a6f 100644 (file)
--- a/config/initializers/oauth.rb
+++ b/config/initializers/oauth.rb
@@ -1,72 +1,19 @@
-require "oauth/controllers/provider_controller"
-require "oauth/rack/oauth_filter"
-
-Rails.configuration.middleware.use OAuth::Rack::OAuthFilter
+require "oauth/helper"
 
 module OAuth
-  module RequestProxy
-    class RackRequest
-      def method
-        request.request_method
-      end
-    end
-  end
-end
-
-module OpenStreetMap
-  module ProviderController
-    def self.prepended(mod)
-      mod.singleton_class.prepend(OpenStreetMap::ProviderController::ClassMethods)
-    end
-
-    def render(options = {})
-      text = options.delete(:text)
-      if text
-        super options.merge(:plain => text)
-      elsif options.delete(:nothing)
-        status = options.delete(:status) || :ok
-        head status, options
-      else
-        super options
-      end
+  module Helper
+    def escape(value)
+      value.to_s.gsub(OAuth::RESERVED_CHARACTERS) do |c|
+        c.bytes.map do |b|
+          format("%%%02X", b)
+        end.join
+      end.force_encoding(Encoding::US_ASCII)
     end
 
-    module ClassMethods
-      def included(controller)
-        controller.class_eval do
-          def self.before_filter(*names, &blk)
-            before_action(*names, &blk)
-          end
-
-          def self.skip_before_filter(*names, &blk)
-            skip_before_action(*names, &blk)
-          end
-        end
-
-        super controller
-      end
-    end
-  end
-
-  module OAuthFilter
-    def oauth1_verify(request, options = {}, &block)
-      signature = OAuth::Signature.build(request, options, &block)
-      return false unless OauthNonce.remember(signature.request.nonce, signature.request.timestamp)
-
-      value = signature.verify
-      if request.ssl? && !value
-        http_request = request.dup
-        http_request.define_singleton_method(:scheme) { "http" }
-        http_request.define_singleton_method(:port) { 80 }
-        signature = OAuth::Signature.build(http_request, options, &block)
-        value = signature.verify
-      end
-      value
-    rescue OAuth::Signature::UnknownSignatureMethod
-      false
+    def unescape(value)
+      value.to_s.gsub(/%\h{2}/) do |c|
+        c[1..].to_i(16).chr
+      end.force_encoding(Encoding::UTF_8)
     end
   end
 end
-
-OAuth::Controllers::ProviderController.prepend(OpenStreetMap::ProviderController)
-OAuth::Rack::OAuthFilter.prepend(OpenStreetMap::OAuthFilter)