Skip to content
GitLab
菜单
为什么选择 GitLab
定价
联系销售
探索
为什么选择 GitLab
定价
联系销售
探索
登录
获取免费试用
主导航
搜索或转到…
项目
GitLab
管理
动态
成员
标记
计划
议题
议题看板
里程碑
迭代
需求
代码
合并请求
仓库
分支
提交
标签
仓库图
比较修订版本
代码片段
锁定的文件
构建
流水线
作业
流水线计划
测试用例
产物
部署
发布
Package registry
Container registry
模型注册表
运维
环境
Terraform 模块
监控
事件
服务台
分析
价值流分析
贡献者分析
CI/CD 分析
仓库分析
代码评审分析
议题分析
洞察
模型实验
效能分析
帮助
帮助
支持
GitLab 文档
比较 GitLab 各版本
社区论坛
为极狐GitLab 提交贡献
提交反馈
隐私声明
快捷键
?
新增功能
4
代码片段
群组
项目
显示更多面包屑
gitlab-cn
GitLab
提交
842044fd
未验证
提交
842044fd
编辑于
5 months ago
作者:
Imre Farkas
提交者:
GitLab
5 months ago
浏览文件
操作
下载
补丁
差异文件
Change default factory for resource access tokens
...to include rotated token chain to extend test coverage.
上级
bd621cf1
No related branches found
分支 包含提交
No related tags found
标签 包含提交
无相关合并请求
变更
2
隐藏空白变更内容
行内
左右并排
显示
2 个更改的文件
spec/factories/personal_access_tokens.rb
+30
-0
30 个添加, 0 个删除
spec/factories/personal_access_tokens.rb
spec/workers/resource_access_tokens/inactive_tokens_deletion_cron_worker_spec.rb
+13
-2
13 个添加, 2 个删除
...ccess_tokens/inactive_tokens_deletion_cron_worker_spec.rb
有
43 个添加
和
2 个删除
spec/factories/personal_access_tokens.rb
+
30
−
0
浏览文件 @
842044fd
...
@@ -47,5 +47,35 @@
...
@@ -47,5 +47,35 @@
factory
:resource_access_token
,
parent: :personal_access_token
do
factory
:resource_access_token
,
parent: :personal_access_token
do
user
{
association
:user
,
:project_bot
}
user
{
association
:user
,
:project_bot
}
transient
do
rotated_at
{
6
.
months
.
ago
}
resource
{
create
(
:group
)
}
# rubocop:disable RSpec/FactoryBot/InlineAssociation -- this is not direct association of the factory created here
access_level
{
Gitlab
::
Access
::
DEVELOPER
}
end
after
(
:create
)
do
|
token
,
evaluator
|
if
Feature
.
enabled?
(
:retain_resource_access_token_user_after_revoke
,
evaluator
.
resource
.
root_ancestor
)
evaluator
.
resource
.
add_member
(
token
.
user
,
evaluator
.
access_level
)
else
evaluator
.
resource
.
add_member
(
token
.
user
,
evaluator
.
access_level
,
expires_at:
token
.
expires_at
)
end
end
trait
:with_rotated_token
do
after
(
:create
)
do
|
token
,
evaluator
|
rotated_at
=
evaluator
.
rotated_at
previous_access_token
=
create
(
# rubocop:disable RSpec/FactoryBot/StrategyInCallback -- this is not direct association of the factory created here
:personal_access_token
,
:revoked
,
user:
token
.
user
,
created_at:
rotated_at
-
6
.
months
,
expires_at:
rotated_at
,
updated_at:
rotated_at
)
token
.
update!
(
previous_personal_access_token_id:
previous_access_token
.
id
)
end
end
end
end
end
end
此差异已折叠。
点击以展开。
spec/workers/resource_access_tokens/inactive_tokens_deletion_cron_worker_spec.rb
+
13
−
2
浏览文件 @
842044fd
...
@@ -101,6 +101,12 @@
...
@@ -101,6 +101,12 @@
create
(
:resource_access_token
,
updated_at:
cut_off
)
create
(
:resource_access_token
,
updated_at:
cut_off
)
non_revoked_resource_access_token_updated_after_cut_off
=
non_revoked_resource_access_token_updated_after_cut_off
=
create
(
:personal_access_token
,
updated_at:
cut_off
+
1
.
second
)
create
(
:personal_access_token
,
updated_at:
cut_off
+
1
.
second
)
resource_access_token_with_rotated_token_before_cut_off
=
create
(
:resource_access_token
,
:with_rotated_token
,
rotated_at:
cut_off
-
1
.
second
)
resource_access_token_with_rotated_token_at_cut_off
=
create
(
:resource_access_token
,
:with_rotated_token
,
rotated_at:
cut_off
)
resource_access_token_with_rotated_token_after_cut_off
=
create
(
:resource_access_token
,
:with_rotated_token
,
rotated_at:
cut_off
+
1
.
second
)
tokens_to_keep
=
[
tokens_to_keep
=
[
active_personal_access_token
,
active_personal_access_token
,
...
@@ -121,13 +127,18 @@
...
@@ -121,13 +127,18 @@
resource_access_token_revoked_after_cut_off
,
resource_access_token_revoked_after_cut_off
,
non_revoked_resource_access_token_updated_before_cut_off
,
non_revoked_resource_access_token_updated_before_cut_off
,
non_revoked_resource_access_token_updated_at_cut_off
,
non_revoked_resource_access_token_updated_at_cut_off
,
non_revoked_resource_access_token_updated_after_cut_off
non_revoked_resource_access_token_updated_after_cut_off
,
resource_access_token_with_rotated_token_at_cut_off
,
resource_access_token_with_rotated_token_after_cut_off
]
]
users_to_keep
=
tokens_to_keep
.
map
(
&
:user
)
users_to_keep
=
tokens_to_keep
.
map
(
&
:user
)
tokens_to_delete
=
[
tokens_to_delete
=
[
resource_access_token_expired_before_cut_off
,
resource_access_token_expired_before_cut_off
,
resource_access_token_revoked_before_cut_off
resource_access_token_revoked_before_cut_off
,
# This token should be kept.
# See bug related to https://gitlab.com/gitlab-org/gitlab/-/issues/492871
resource_access_token_with_rotated_token_before_cut_off
]
]
users_to_delete
=
tokens_to_delete
.
map
(
&
:user
)
users_to_delete
=
tokens_to_delete
.
map
(
&
:user
)
...
...
此差异已折叠。
点击以展开。
预览
0%
加载中
请重试
或
添加新附件
.
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
保存评论
取消
想要评论请
注册
或
登录