Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
2577cc99
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,发现更多精彩内容 >>
提交
2577cc99
编写于
10月 04, 2017
作者:
R
Rubén Dávila
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Address some feedback from last code review
上级
8be06f20
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
15 addition
and
6 deletion
+15
-6
app/models/gpg_signature.rb
app/models/gpg_signature.rb
+7
-2
changelogs/unreleased/36829-add-ability-to-verify-gpg-subkeys.yml
...gs/unreleased/36829-add-ability-to-verify-gpg-subkeys.yml
+0
-0
db/migrate/20170927161718_create_gpg_key_subkeys.rb
db/migrate/20170927161718_create_gpg_key_subkeys.rb
+2
-2
db/post_migrate/20171002161539_create_gpg_key_subkeys_for_existing_gpg_keys.rb
...002161539_create_gpg_key_subkeys_for_existing_gpg_keys.rb
+3
-1
db/schema.rb
db/schema.rb
+1
-1
lib/gitlab/gpg/commit.rb
lib/gitlab/gpg/commit.rb
+2
-0
未找到文件。
app/models/gpg_signature.rb
浏览文件 @
2577cc99
...
...
@@ -23,8 +23,13 @@ class GpgSignature < ActiveRecord::Base
def
gpg_key
=
(
model
)
case
model
when
GpgKey
then
super
when
GpgKeySubkey
then
self
.
gpg_key_subkey
=
model
when
GpgKey
super
when
GpgKeySubkey
self
.
gpg_key_subkey
=
model
when
NilClass
super
self
.
gpg_key_subkey
=
nil
end
end
...
...
changelogs/unreleased/36829-add-ability-to-verify-gpg-subkeys
→
changelogs/unreleased/36829-add-ability-to-verify-gpg-subkeys
.yml
浏览文件 @
2577cc99
文件已移动
db/migrate/20170927161718_create_gpg_key_subkeys.rb
浏览文件 @
2577cc99
...
...
@@ -3,11 +3,11 @@ class CreateGpgKeySubkeys < ActiveRecord::Migration
def
up
create_table
:gpg_key_subkeys
do
|
t
|
t
.
references
:gpg_key
,
null:
false
,
index:
true
,
foreign_key:
{
on_delete: :cascade
}
t
.
binary
:keyid
t
.
binary
:fingerprint
t
.
references
:gpg_key
,
null:
false
,
index:
true
,
foreign_key:
{
on_delete: :cascade
}
t
.
index
:keyid
,
unique:
true
,
length:
Gitlab
::
Database
.
mysql?
?
20
:
nil
t
.
index
:fingerprint
,
unique:
true
,
length:
Gitlab
::
Database
.
mysql?
?
20
:
nil
end
...
...
db/post_migrate/20171002161539_create_gpg_key_subkeys_for_existing_gpg_keys.rb
浏览文件 @
2577cc99
...
...
@@ -28,8 +28,10 @@ class CreateGpgKeySubkeysForExistingGpgKeys < ActiveRecord::Migration
end
def
up
GpgKey
.
each_batch
do
|
batch
|
GpgKey
.
with_subkeys
.
each_batch
do
|
batch
|
batch
.
each
do
|
gpg_key
|
return
if
gpg_key
.
subkeys
.
any?
create_subkeys
(
gpg_key
)
&&
update_signatures
(
gpg_key
)
end
end
...
...
db/schema.rb
浏览文件 @
2577cc99
...
...
@@ -580,9 +580,9 @@ ActiveRecord::Schema.define(version: 20171004121444) do
add_index
"forked_project_links"
,
[
"forked_to_project_id"
],
name:
"index_forked_project_links_on_forked_to_project_id"
,
unique:
true
,
using: :btree
create_table
"gpg_key_subkeys"
,
force: :cascade
do
|
t
|
t
.
integer
"gpg_key_id"
,
null:
false
t
.
binary
"keyid"
t
.
binary
"fingerprint"
t
.
integer
"gpg_key_id"
,
null:
false
end
add_index
"gpg_key_subkeys"
,
[
"fingerprint"
],
name:
"index_gpg_key_subkeys_on_fingerprint"
,
unique:
true
,
using: :btree
...
...
lib/gitlab/gpg/commit.rb
浏览文件 @
2577cc99
...
...
@@ -43,6 +43,8 @@ module Gitlab
# key belonging to the keyid.
# This way we can add the key to the temporary keychain and extract
# the proper signature.
# NOTE: the invoked method is #fingerprint but it's only returning
# 16 characters (the format used by keyid) instead of 40.
gpg_key
=
find_gpg_key
(
verified_signature
.
fingerprint
)
if
gpg_key
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录