Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
f1896575
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
f1896575
编写于
11月 10, 2017
作者:
F
Francisco Lopez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Added some more comments
上级
2d5397d9
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
14 addition
and
15 deletion
+14
-15
lib/api/api_guard.rb
lib/api/api_guard.rb
+8
-7
lib/gitlab/auth/request_authenticator.rb
lib/gitlab/auth/request_authenticator.rb
+1
-1
lib/gitlab/auth/user_auth_finders.rb
lib/gitlab/auth/user_auth_finders.rb
+4
-6
spec/lib/gitlab/auth/request_authenticator_spec.rb
spec/lib/gitlab/auth/request_authenticator_spec.rb
+1
-1
未找到文件。
lib/api/api_guard.rb
浏览文件 @
f1896575
...
...
@@ -139,13 +139,14 @@ module API
# Exceptions
#
MissingTokenError
=
Class
.
new
(
StandardError
)
TokenNotFoundError
=
Class
.
new
(
StandardError
)
ExpiredError
=
Class
.
new
(
StandardError
)
RevokedError
=
Class
.
new
(
StandardError
)
UnauthorizedError
=
Class
.
new
(
StandardError
)
class
InsufficientScopeError
<
StandardError
AuthenticationException
=
Class
.
new
(
StandardError
)
MissingTokenError
=
Class
.
new
(
AuthenticationException
)
TokenNotFoundError
=
Class
.
new
(
AuthenticationException
)
ExpiredError
=
Class
.
new
(
AuthenticationException
)
RevokedError
=
Class
.
new
(
AuthenticationException
)
UnauthorizedError
=
Class
.
new
(
AuthenticationException
)
class
InsufficientScopeError
<
AuthenticationException
attr_reader
:scopes
def
initialize
(
scopes
)
@scopes
=
scopes
.
map
{
|
s
|
s
.
try
(
:name
)
||
s
}
...
...
lib/gitlab/auth/request_authenticator.rb
浏览文件 @
f1896575
...
...
@@ -17,7 +17,7 @@ module Gitlab
def
find_sessionless_user
find_user_from_access_token
||
find_user_from_rss_token
rescue
StandardError
rescue
API
::
APIGuard
::
AuthenticationException
nil
end
end
...
...
lib/gitlab/auth/user_auth_finders.rb
浏览文件 @
f1896575
...
...
@@ -47,13 +47,11 @@ module Gitlab
@access_token
=
find_oauth_access_token
||
find_personal_access_token
end
def
private_token
current_request
.
params
[
PRIVATE_TOKEN_PARAM
].
presence
||
def
find_personal_access_token
token
=
current_request
.
params
[
PRIVATE_TOKEN_PARAM
].
presence
||
current_request
.
env
[
PRIVATE_TOKEN_HEADER
].
presence
end
def
find_personal_access_token
token
=
private_token
return
unless
token
# Expiration, revocation and scopes are verified in `validate_access_token!`
...
...
@@ -66,7 +64,7 @@ module Gitlab
# Expiration, revocation and scopes are verified in `validate_access_token!`
oauth_token
=
OauthAccessToken
.
by_token
(
token
)
raise
(
API
::
APIGuard
::
UnauthorizedError
)
unless
oauth_token
raise
API
::
APIGuard
::
UnauthorizedError
unless
oauth_token
oauth_token
.
revoke_previous_refresh_token!
oauth_token
...
...
spec/lib/gitlab/auth/request_authenticator_spec.rb
浏览文件 @
f1896575
...
...
@@ -58,7 +58,7 @@ describe Gitlab::Auth::RequestAuthenticator do
expect
(
subject
.
find_sessionless_user
).
to
be_blank
end
it
'rescue
StandardError
exceptions'
do
it
'rescue
API::APIGuard::AuthenticationException
exceptions'
do
allow_any_instance_of
(
described_class
).
to
receive
(
:find_user_from_access_token
).
and_raise
(
API
::
APIGuard
::
UnauthorizedError
)
expect
(
subject
.
find_sessionless_user
).
to
be_blank
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录