Skip to content

G
gitlab-ce
Commit 51a8811e authored by Kamil Trzcinski's avatar Kamil Trzcinski
Browse files
Options

Revert "Eager load `lib/api`" 

This reverts commit 0a280158.
parent 71da2e0b
Hide whitespace changes
Inline Side-by-side
Showing with 140 additions and 141 deletions
config/application.rb
View file @ 51a8811e
...@@ -102,8 +102,6 @@ module Gitlab ...@@ -102,8 +102,6 @@ module Gitlab
# This is needed for gitlab-shell # This is needed for gitlab-shell
ENV['GITLAB_PATH_OUTSIDE_HOOK'] = ENV['PATH'] ENV['GITLAB_PATH_OUTSIDE_HOOK'] = ENV['PATH']
config.eager_load_paths += ["#{Rails.root}/lib"]
config.generators do |g| config.generators do |g|
g.factory_girl false g.factory_girl false
end end
......
config/routes.rb
View file @ 51a8811e
require 'sidekiq/web' require 'sidekiq/web'
require 'sidekiq/cron/web' require 'sidekiq/cron/web'
require 'api/api'
Rails.application.routes.draw do Rails.application.routes.draw do
if Gitlab::Sherlock.enabled? if Gitlab::Sherlock.enabled?
......
lib/api/api.rb
View file @ 51a8811e
Dir["#{Rails.root}/lib/api/*.rb"].each {|file| require file}
module API module API
class API < Grape::API class API < Grape::API
include ::API::APIGuard include APIGuard
version 'v3', using: :path version 'v3', using: :path
rescue_from ActiveRecord::RecordNotFound do rescue_from ActiveRecord::RecordNotFound do
......
lib/api/api_guard.rb
View file @ 51a8811e
...@@ -2,173 +2,171 @@ ...@@ -2,173 +2,171 @@
require 'rack/oauth2' require 'rack/oauth2'
module API module APIGuard
module APIGuard extend ActiveSupport::Concern
extend ActiveSupport::Concern
included do |base| included do |base|
# OAuth2 Resource Server Authentication # OAuth2 Resource Server Authentication
use Rack::OAuth2::Server::Resource::Bearer, 'The API' do |request| use Rack::OAuth2::Server::Resource::Bearer, 'The API' do |request|
# The authenticator only fetches the raw token string # The authenticator only fetches the raw token string
# Must yield access token to store it in the env # Must yield access token to store it in the env
request.access_token request.access_token
end end
helpers HelperMethods helpers HelperMethods
install_error_responders(base) install_error_responders(base)
end end
# Helper Methods for Grape Endpoint # Helper Methods for Grape Endpoint
module HelperMethods module HelperMethods
# Invokes the doorkeeper guard. # Invokes the doorkeeper guard.
# #
# If token is presented and valid, then it sets @current_user. # If token is presented and valid, then it sets @current_user.
# #
# If the token does not have sufficient scopes to cover the requred scopes, # If the token does not have sufficient scopes to cover the requred scopes,
# then it raises InsufficientScopeError. # then it raises InsufficientScopeError.
# #
# If the token is expired, then it raises ExpiredError. # If the token is expired, then it raises ExpiredError.
# #
# If the token is revoked, then it raises RevokedError. # If the token is revoked, then it raises RevokedError.
# #
# If the token is not found (nil), then it raises TokenNotFoundError. # If the token is not found (nil), then it raises TokenNotFoundError.
# #
# Arguments: # Arguments:
# #
# scopes: (optional) scopes required for this guard. # scopes: (optional) scopes required for this guard.
# Defaults to empty array. # Defaults to empty array.
# #
def doorkeeper_guard!(scopes: []) def doorkeeper_guard!(scopes: [])
if (access_token = find_access_token).nil? if (access_token = find_access_token).nil?
raise TokenNotFoundError raise TokenNotFoundError
else else
case validate_access_token(access_token, scopes) case validate_access_token(access_token, scopes)
when Oauth2::AccessTokenValidationService::INSUFFICIENT_SCOPE when Oauth2::AccessTokenValidationService::INSUFFICIENT_SCOPE
raise InsufficientScopeError.new(scopes) raise InsufficientScopeError.new(scopes)
when Oauth2::AccessTokenValidationService::EXPIRED when Oauth2::AccessTokenValidationService::EXPIRED
raise ExpiredError raise ExpiredError
when Oauth2::AccessTokenValidationService::REVOKED when Oauth2::AccessTokenValidationService::REVOKED
raise RevokedError raise RevokedError
when Oauth2::AccessTokenValidationService::VALID when Oauth2::AccessTokenValidationService::VALID
@current_user = User.find(access_token.resource_owner_id) @current_user = User.find(access_token.resource_owner_id)
end
end end
end end
end
def doorkeeper_guard(scopes: []) def doorkeeper_guard(scopes: [])
if access_token = find_access_token if access_token = find_access_token
case validate_access_token(access_token, scopes) case validate_access_token(access_token, scopes)
when Oauth2::AccessTokenValidationService::INSUFFICIENT_SCOPE when Oauth2::AccessTokenValidationService::INSUFFICIENT_SCOPE
raise InsufficientScopeError.new(scopes) raise InsufficientScopeError.new(scopes)
when Oauth2::AccessTokenValidationService::EXPIRED when Oauth2::AccessTokenValidationService::EXPIRED
raise ExpiredError raise ExpiredError
when Oauth2::AccessTokenValidationService::REVOKED when Oauth2::AccessTokenValidationService::REVOKED
raise RevokedError raise RevokedError
when Oauth2::AccessTokenValidationService::VALID when Oauth2::AccessTokenValidationService::VALID
@current_user = User.find(access_token.resource_owner_id) @current_user = User.find(access_token.resource_owner_id)
end
end end
end end
end
def current_user def current_user
@current_user @current_user
end end
private private
def find_access_token def find_access_token
@access_token ||= Doorkeeper.authenticate(doorkeeper_request, Doorkeeper.configuration.access_token_methods) @access_token ||= Doorkeeper.authenticate(doorkeeper_request, Doorkeeper.configuration.access_token_methods)
end end
def doorkeeper_request def doorkeeper_request
@doorkeeper_request ||= ActionDispatch::Request.new(env) @doorkeeper_request ||= ActionDispatch::Request.new(env)
end end
def validate_access_token(access_token, scopes) def validate_access_token(access_token, scopes)
Oauth2::AccessTokenValidationService.validate(access_token, scopes: scopes) Oauth2::AccessTokenValidationService.validate(access_token, scopes: scopes)
end
end end
end
module ClassMethods module ClassMethods
# Installs the doorkeeper guard on the whole Grape API endpoint. # Installs the doorkeeper guard on the whole Grape API endpoint.
# #
# Arguments: # Arguments:
# #
# scopes: (optional) scopes required for this guard. # scopes: (optional) scopes required for this guard.
# Defaults to empty array. # Defaults to empty array.
# #
def guard_all!(scopes: []) def guard_all!(scopes: [])
before do before do
guard! scopes: scopes guard! scopes: scopes
end
end end
end
private private
def install_error_responders(base) def install_error_responders(base)
error_classes = [ MissingTokenError, TokenNotFoundError, error_classes = [ MissingTokenError, TokenNotFoundError,
ExpiredError, RevokedError, InsufficientScopeError] ExpiredError, RevokedError, InsufficientScopeError]
base.send :rescue_from, *error_classes, oauth2_bearer_token_error_handler base.send :rescue_from, *error_classes, oauth2_bearer_token_error_handler
end end
def oauth2_bearer_token_error_handler def oauth2_bearer_token_error_handler
Proc.new do |e| Proc.new do |e|
response = response =
case e case e
when MissingTokenError when MissingTokenError
Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new
when TokenNotFoundError when TokenNotFoundError
Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new( Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new(
:invalid_token, :invalid_token,
"Bad Access Token.") "Bad Access Token.")
when ExpiredError when ExpiredError
Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new( Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new(
:invalid_token, :invalid_token,
"Token is expired. You can either do re-authorization or token refresh.") "Token is expired. You can either do re-authorization or token refresh.")
when RevokedError when RevokedError
Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new( Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new(
:invalid_token, :invalid_token,
"Token was revoked. You have to re-authorize from the user.") "Token was revoked. You have to re-authorize from the user.")
when InsufficientScopeError when InsufficientScopeError
# FIXME: ForbiddenError (inherited from Bearer::Forbidden of Rack::Oauth2) # FIXME: ForbiddenError (inherited from Bearer::Forbidden of Rack::Oauth2)
# does not include WWW-Authenticate header, which breaks the standard. # does not include WWW-Authenticate header, which breaks the standard.
Rack::OAuth2::Server::Resource::Bearer::Forbidden.new( Rack::OAuth2::Server::Resource::Bearer::Forbidden.new(
:insufficient_scope, :insufficient_scope,
Rack::OAuth2::Server::Resource::ErrorMethods::DEFAULT_DESCRIPTION[:insufficient_scope], Rack::OAuth2::Server::Resource::ErrorMethods::DEFAULT_DESCRIPTION[:insufficient_scope],
{ scope: e.scopes }) { scope: e.scopes })
end end
response.finish response.finish
end
end end
end end
end
# #
# Exceptions # Exceptions
# #
class MissingTokenError < StandardError; end class MissingTokenError < StandardError; end
class TokenNotFoundError < StandardError; end class TokenNotFoundError < StandardError; end
class ExpiredError < StandardError; end class ExpiredError < StandardError; end
class RevokedError < StandardError; end class RevokedError < StandardError; end
class InsufficientScopeError < StandardError class InsufficientScopeError < StandardError
attr_reader :scopes attr_reader :scopes
def initialize(scopes) def initialize(scopes)
@scopes = scopes @scopes = scopes
end
end end
end end
end end
\ No newline at end of file
lib/ci/api/api.rb
View file @ 51a8811e
...@@ -3,7 +3,7 @@ Dir["#{Rails.root}/lib/ci/api/*.rb"].each {|file| require file} ...@@ -3,7 +3,7 @@ Dir["#{Rails.root}/lib/ci/api/*.rb"].each {|file| require file}
module Ci module Ci
module API module API
class API < Grape::API class API < Grape::API
include ::API::APIGuard include APIGuard
version 'v1', using: :path version 'v1', using: :path
rescue_from ActiveRecord::RecordNotFound do rescue_from ActiveRecord::RecordNotFound do
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7