Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
8e665140
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,发现更多精彩内容 >>
提交
8e665140
编写于
3月 07, 2017
作者:
M
Markus Koller
提交者:
Alexis Reigel
4月 06, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rename check_2fa_requirement to check_two_factor_requirement
上级
7140e09e
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
8 addition
and
8 deletion
+8
-8
app/controllers/concerns/enforces_two_factor_authentication.rb
...ontrollers/concerns/enforces_two_factor_authentication.rb
+4
-4
app/controllers/profiles/two_factor_auths_controller.rb
app/controllers/profiles/two_factor_auths_controller.rb
+1
-1
app/controllers/sessions_controller.rb
app/controllers/sessions_controller.rb
+1
-1
spec/controllers/application_controller_spec.rb
spec/controllers/application_controller_spec.rb
+2
-2
未找到文件。
app/controllers/concerns/enforces_two_factor_authentication.rb
浏览文件 @
8e665140
...
...
@@ -2,18 +2,18 @@
#
# Controller concern to enforce two-factor authentication requirements
#
# Upon inclusion, adds `check_
2fa_requirement` as a before_action, and
# makes `two_factor_grace_period_expired?` and `two_factor_skippable?`
# Upon inclusion, adds `check_
two_factor_requirement` as a before_action,
#
and
makes `two_factor_grace_period_expired?` and `two_factor_skippable?`
# available as view helpers.
module
EnforcesTwoFactorAuthentication
extend
ActiveSupport
::
Concern
included
do
before_action
:check_
2fa
_requirement
before_action
:check_
two_factor
_requirement
helper_method
:two_factor_grace_period_expired?
,
:two_factor_skippable?
end
def
check_
2fa
_requirement
def
check_
two_factor
_requirement
if
two_factor_authentication_required?
&&
current_user
&&
!
current_user
.
two_factor_enabled?
&&
!
skip_two_factor?
redirect_to
profile_two_factor_auth_path
end
...
...
app/controllers/profiles/two_factor_auths_controller.rb
浏览文件 @
8e665140
class
Profiles::TwoFactorAuthsController
<
Profiles
::
ApplicationController
skip_before_action
:check_
2fa
_requirement
skip_before_action
:check_
two_factor
_requirement
def
show
unless
current_user
.
otp_secret
...
...
app/controllers/sessions_controller.rb
浏览文件 @
8e665140
...
...
@@ -3,7 +3,7 @@ class SessionsController < Devise::SessionsController
include
Devise
::
Controllers
::
Rememberable
include
Recaptcha
::
ClientHelper
skip_before_action
:check_
2fa
_requirement
,
only:
[
:destroy
]
skip_before_action
:check_
two_factor
_requirement
,
only:
[
:destroy
]
prepend_before_action
:check_initial_setup
,
only:
[
:new
]
prepend_before_action
:authenticate_with_two_factor
,
...
...
spec/controllers/application_controller_spec.rb
浏览文件 @
8e665140
...
...
@@ -117,8 +117,8 @@ describe ApplicationController do
context
'two-factor authentication'
do
let
(
:controller
)
{
ApplicationController
.
new
}
describe
'#check_
2fa
_requirement'
do
subject
{
controller
.
send
:check_
2fa
_requirement
}
describe
'#check_
two_factor
_requirement'
do
subject
{
controller
.
send
:check_
two_factor
_requirement
}
it
'does not redirect if 2FA is not required'
do
allow
(
controller
).
to
receive
(
:two_factor_authentication_required?
).
and_return
(
false
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录