mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-17 00:26:07 +10:00
Make sure private_token for API is a string
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
committed by
Jacob Vosmaer
parent
b490fded36
commit
62a27f38b5
+6
-1
@@ -6,19 +6,23 @@ module API
|
||||
SUDO_PARAM = :sudo
|
||||
|
||||
def current_user
|
||||
@current_user ||= User.find_by_authentication_token(params[PRIVATE_TOKEN_PARAM] || env[PRIVATE_TOKEN_HEADER])
|
||||
private_token = (params[PRIVATE_TOKEN_PARAM] || env[PRIVATE_TOKEN_HEADER]).to_s
|
||||
@current_user ||= User.find_by_authentication_token(private_token)
|
||||
identifier = sudo_identifier()
|
||||
|
||||
# If the sudo is the current user do nothing
|
||||
if (identifier && !(@current_user.id == identifier || @current_user.username == identifier))
|
||||
render_api_error!('403 Forbidden: Must be admin to use sudo', 403) unless @current_user.is_admin?
|
||||
@current_user = User.by_username_or_id(identifier)
|
||||
not_found!("No user id or username for: #{identifier}") if @current_user.nil?
|
||||
end
|
||||
|
||||
@current_user
|
||||
end
|
||||
|
||||
def sudo_identifier()
|
||||
identifier ||= params[SUDO_PARAM] ||= env[SUDO_HEADER]
|
||||
|
||||
# Regex for integers
|
||||
if (!!(identifier =~ /^[0-9]+$/))
|
||||
identifier.to_i
|
||||
@@ -29,6 +33,7 @@ module API
|
||||
|
||||
def set_current_user_for_thread
|
||||
Thread.current[:current_user] = current_user
|
||||
|
||||
begin
|
||||
yield
|
||||
ensure
|
||||
|
||||
Reference in New Issue
Block a user