leash_provider 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c0be375cbb6253ccc5da502a1a99ae947a35374
-  data.tar.gz: 632504ad3d0dc3cfc9dc572c97821c5b040b8487
+  metadata.gz: 719aa56e5c33922ca6caed10ca92a02ae808a864
+  data.tar.gz: 50e40b8c38cdb84f49862fb8798b2b95cf994920
 SHA512:
-  metadata.gz: 11b1cee0a728b76afe7b9ad1111e3644efda0ee25dde08d6d33ae87766c088ab35e96cad127368fea7d23a81ba04df6e1e1aa2056a4a950df57af3fdead22a9f
-  data.tar.gz: 8245c45f44f494691f2df264471feee46d72925999e99779af3235f6ea82de0561560af0b10f356817e62c982822d9b48d77157df9a0a8af6e7b5769f2bfdb9f
+  metadata.gz: a6f8662caac58d9057afa3d84458e4cc3e1120a5424376c6b2f16b1cbc5ff8f2f84a7100bd665035dd134557c17b667cf1964c8c11525eeb84a99fbed4a9ff70
+  data.tar.gz: de659561c9cae229f1d9a7278148699f03578d040a6571140d6eed40f3c44b386d5b8fe8b6606c7194ffda2f9608b53427652886d7e7594f8960c261b27d3c27

data/app/controllers/leash/provider/authorize_controller.rb

@@ -24,15 +24,21 @@ class Leash::Provider::AuthorizeController < Leash::ProviderController
         access_token = Leash::Provider::AccessToken.assign! @app_name, current_owner
       end
 
-      Rails.logger.info "[Leash::Provider] Authorize ok: response_type=#{@response_type} app_name=#{@app_name} current_owner=#{current_owner} access_token=#{access_token} request_ip=#{request.remote_ip} request_user_agent=#{request.user_agent}"
+      Rails.logger.info "[Leash::Provider] Authorize ok: response_type=#{@response_type} app_name=#{@app_name} current_owner=#{current_owner.class.name}##{current_owner.id} access_token=#{access_token} request_ip=#{request.remote_ip} request_user_agent=#{request.user_agent}"
       redirect_to params[:redirect_uri] + "#access_token=#{URI.encode(access_token)}"
 
     when "code"
       auth_code = Leash::Provider::AuthCode.assign! @app_name, current_owner
-  
-      Rails.logger.info "[Leash::Provider] Authorize ok: response_type=#{@response_type} current_owner=#{current_owner} auth_code=#{auth_code} request_ip=#{request.remote_ip} request_user_agent=#{request.user_agent}"
-      redirect_to params[:redirect_uri] + "?code=#{URI.encode(auth_code)}"
 
+      Rails.logger.info "[Leash::Provider] Authorize ok: response_type=#{@response_type} current_owner=#{current_owner.class.name}##{current_owner.id} auth_code=#{auth_code} request_ip=#{request.remote_ip} request_user_agent=#{request.user_agent}"
+
+      if params.has_key? :state
+        redirect_to params[:redirect_uri] + "?code=#{URI.encode(auth_code)}&state=#{URI.encode(params[:state])}"
+
+      else
+        redirect_to params[:redirect_uri] + "?code=#{URI.encode(auth_code)}"
+      end
+      
     else
       fail "Should not be reached"
     end
@@ -55,7 +61,7 @@ class Leash::Provider::AuthorizeController < Leash::ProviderController
 
     when "code"
       render text: error_code, status: :unprocessable_entity
-    
+
     else
       fail "Should not be reached"
     end
@@ -89,4 +95,4 @@ class Leash::Provider::AuthorizeController < Leash::ProviderController
   def authenticate_user_by_role!
     send "authenticate_#{@user_role_underscored}!"
   end
-end
+end

data/app/controllers/leash/provider/token_controller.rb

@@ -2,8 +2,6 @@ class Leash::Provider::TokenController < Leash::ProviderController
   GRANT_TYPES = [ "authorization_code" ].freeze
 
   before_action :determine_grant_type!
-  before_action :determine_client_id!
-  before_action :determine_client_secret!
 
 
   def token
@@ -11,10 +9,10 @@ class Leash::Provider::TokenController < Leash::ProviderController
     when "authorization_code"
       params.require("code")
 
-      if Leash::AuthCode.valid?(params[:code])
+      if Leash::Provider::AuthCode.valid?(params[:code])
         access_token = Leash::Provider::AccessToken.assign_from_auth_code! Leash::Provider::AuthCode.find_by_auth_code(params[:code])
-        
-        render json: { access_token: access_token }
+
+        render json: { access_token: access_token, token_type: "bearer" }
       end
 
     else
@@ -28,7 +26,7 @@ class Leash::Provider::TokenController < Leash::ProviderController
 
   def callback_with_error(error_code, message)
     Rails.logger.warn "[Leash::Provider] Token error: #{error_code} (#{message})"
-    
+
     case @grant_type
     when "authorization_code"
       render json: { error: error_code }, status: :unprocessable_entity
@@ -45,4 +43,4 @@ class Leash::Provider::TokenController < Leash::ProviderController
       callback_with_error "unknown_grant_type", "Unknown grant type of '#{params[:grant_type]}'"
     end
   end
-end
+end

data/app/controllers/leash/provider/user_info_controller.rb

@@ -0,0 +1,25 @@
+class Leash::Provider::UserInfoController < Leash::ProviderController
+  def info
+    render text: "missing_authorization_header", status: :unauthorized unless request.headers["Authorization"]
+    render text: "missing_authorization_bearer", status: :unauthorized unless request.headers["Authorization"].starts_with? "Bearer "
+
+    access_token_raw = request.headers["Authorization"].split(" ", 2).last
+
+    render text: "invalid_access_token", status: :forbidden unless Leash::Provider::AccessToken.valid?(access_token_raw)
+
+    access_token =  Leash::Provider::AccessToken.find_by_access_token(access_token_raw)
+    owner = access_token.owner_instance
+
+    if owner.respond_to? :for_leash_provider
+      data = owner.for_leash_provider
+    else
+      data = owner
+    end
+
+    respond_to do |format|
+      format.json do
+        render json: data
+      end
+    end
+  end
+end

data/app/controllers/leash/provider_controller.rb

@@ -1,6 +1,6 @@
 class Leash::ProviderController < LeashController
   include Devise::Controllers::Helpers
-
+  
   CLIENT_ID_REGEXP = /\AAPP\_([A-Z0-9\_]+)\_OAUTH2\_CLIENT\_ID\z/.freeze
 
   protected
@@ -36,7 +36,7 @@ class Leash::ProviderController < LeashController
       unless @redirect_urls.include? params[:redirect_uri]
         callback_with_error "invalid_redirect_uri", "Redirect URL mismatch (should be '#{@redirect_url}', given '#{params[:redirect_uri]}'"
       end
-    
+
     else
       callback_with_error "unknown_redirect_uri", "Unable to find redirect URL associated with app '#{@app_name}'"
     end
@@ -50,7 +50,7 @@ class Leash::ProviderController < LeashController
     if @client_secret
       unless @client_secret == params[:client_secret]
         callback_with_error "invalid_secret", "Secret mismatch"
-      end      
+      end
     else
       callback_with_error "unknown_secret", "Unable to find secret associated with app '#{@app_name}'"
     end
@@ -60,4 +60,4 @@ class Leash::ProviderController < LeashController
   def callback_with_error(error_code, message)
     fail "Please override this method"
   end
-end
+end

data/app/models/leash/provider/access_token.rb

@@ -20,7 +20,7 @@ class Leash::Provider::AccessToken < Ohm::Model
 
     loop do
       begin
-        access_token = SecureRandom.hex(24)
+        access_token = SecureRandom.urlsafe_base64(32)
         timestamp = Time.now.to_i
         self.create app_name: app_name, owner: owner_key(owner), access_token: access_token, created_at: timestamp, accessed_at: timestamp
         break
@@ -65,4 +65,16 @@ class Leash::Provider::AccessToken < Ohm::Model
       owner
     end
   end
+
+
+  def owner_instance
+    owner_klass, owner_id = owner.split("#", 2)
+
+    owner_klass.classify.constantize.find(owner_id)
+  end
+
+
+  def touch!
+    update accessed_at: Time.now.to_i
+  end
 end

data/app/models/leash/provider/auth_code.rb

@@ -17,11 +17,11 @@ class Leash::Provider::AuthCode < Ohm::Model
 
     loop do
       begin
-        auth_code = SecureRandom.hex(24)
+        auth_code = SecureRandom.urlsafe_base64(32)
         timestamp = Time.now.to_i
-        self.create app_name: app_name, owner: owner, auth_code: auth_code, created_at: timestamp
+        self.create app_name: app_name, owner: owner_key(owner), auth_code: auth_code, created_at: timestamp
         break
-      
+
       rescue Ohm::UniqueIndexViolation => e
         tries += 1
 
@@ -41,4 +41,20 @@ class Leash::Provider::AuthCode < Ohm::Model
   def self.find_by_auth_code(auth_code)
     self.find(auth_code: auth_code).first
   end
-end
+
+
+  def self.owner_key(owner)
+    if owner.is_a? ActiveRecord::Base
+      "#{owner.class.name}##{owner.id}"
+    else
+      owner
+    end
+  end
+
+
+  def owner_instance
+    owner_klass, owner_id = owner.split("#", 2)
+
+    owner_klass.classify.constantize.find(owner_id)
+  end
+end

data/leash_provider.gemspec

@@ -8,8 +8,9 @@ Gem::Specification.new do |s|
   s.authors     = ["Marcin Lewandowski"]
   s.email       = ["marcin@saepia.net"]
   s.homepage    = "http://github.com/mspanc/leash-provider"
-  s.summary     = "High-performance OAuth2 provider for a closed set of trusted apps with multiple roles support"
-  s.description = "Leash allows you to build an OAuth2 provider for closed set of trusted apps. I can support multiple user types and is designed with high load in mind."
+  s.summary     = "High-performance Ruby on Rails OAuth2 provider for a closed set of trusted apps with multiple user roles."
+  s.description = "Leash allows you to build an OAuth2 provider for a closed set of trusted client apps. It can support multiple user roles and is designed to handle high load."
+  s.license     = "MIT"
 
   s.add_dependency "rails", "~> 4.2"
   s.add_dependency "ohm"

data/lib/generators/leash/provider/install_generator.rb

@@ -4,7 +4,7 @@ module Leash
   module Provider
     module Generators
       class InstallGenerator < Rails::Generators::Base
-        source_root File.expand_path("../../templates", __FILE__)
+        source_root File.expand_path("../../../templates", __FILE__)
 
         desc "Creates a Leash initializer and route."
 

data/lib/leash/provider/routing.rb

@@ -2,10 +2,10 @@ module ActionDispatch::Routing
   class Mapper
     def leash_provider
       scope :oauth do
-        get  "authorize", to: "leash/provider/authorize#authorize", as: "leash_provider_authorize"
-        post "token",     to: "leash/provider/token#token",         as: "leash_provider_token"
+        get  "authorize/:user_role", to: "leash/provider/authorize#authorize", as: "leash_provider_authorize"
+        post "token",                to: "leash/provider/token#token",         as: "leash_provider_token"
+        get  "user_info",            to: "leash/provider/user_info#info",      as: "leash_provider_user_info"
       end
     end
   end
 end
-

data/lib/leash/provider/version.rb

@@ -1,5 +1,5 @@
 module Leash
   module Provider
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: leash_provider
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Marcin Lewandowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-14 00:00:00.000000000 Z
+date: 2015-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -136,8 +136,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.3
-description: Leash allows you to build an OAuth2 provider for closed set of trusted
-  apps. I can support multiple user types and is designed with high load in mind.
+description: Leash allows you to build an OAuth2 provider for a closed set of trusted
+  client apps. It can support multiple user roles and is designed to handle high load.
 email:
 - marcin@saepia.net
 executables: []
@@ -153,13 +153,13 @@ files:
 - Rakefile
 - app/controllers/leash/provider/authorize_controller.rb
 - app/controllers/leash/provider/token_controller.rb
+- app/controllers/leash/provider/user_info_controller.rb
 - app/controllers/leash/provider_controller.rb
 - app/controllers/leash_controller.rb
 - app/models/leash/provider/access_token.rb
 - app/models/leash/provider/auth_code.rb
 - config.ru
 - leash_provider.gemspec
-- lib/generators/leash/install_generator.rb
 - lib/generators/leash/provider/install_generator.rb
 - lib/generators/templates/leash_provider.rb
 - lib/leash/provider/engine.rb
@@ -177,7 +177,8 @@ files:
 - spec/internal/public/favicon.ico
 - spec/spec_helper.rb
 homepage: http://github.com/mspanc/leash-provider
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -198,6 +199,6 @@ rubyforge_project:
 rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
-summary: High-performance OAuth2 provider for a closed set of trusted apps with multiple
-  roles support
+summary: High-performance Ruby on Rails OAuth2 provider for a closed set of trusted
+  apps with multiple user roles.
 test_files: []

data/lib/generators/leash/install_generator.rb

@@ -1,20 +0,0 @@
-require 'rails/generators/base'
-
-module Leash
-  module Generators
-    class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path("../../templates", __FILE__)
-
-      desc "Creates a Leash initializer and copy locale files to your application."
-
-      def copy_initializer
-        template "leash.rb", "config/initializers/leash.rb"
-      end
-
-
-      def add_route
-        route "leash"
-      end
-    end
-  end
-end