Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
686ffdc2
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 搜索 >>
提交
686ffdc2
编写于
3月 07, 2019
作者:
M
Matija Čupić
提交者:
Kamil Trzciński
3月 07, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Resolve "Mask the existing variables"
上级
380fa883
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
25 addition
and
20 deletion
+25
-20
app/models/ci/build.rb
app/models/ci/build.rb
+4
-4
app/models/clusters/kubernetes_namespace.rb
app/models/clusters/kubernetes_namespace.rb
+1
-1
app/models/clusters/platforms/kubernetes.rb
app/models/clusters/platforms/kubernetes.rb
+1
-1
app/models/project_services/kubernetes_service.rb
app/models/project_services/kubernetes_service.rb
+1
-1
changelogs/unreleased/58010-mask-the-existing-variables.yml
changelogs/unreleased/58010-mask-the-existing-variables.yml
+5
-0
spec/models/ci/build_spec.rb
spec/models/ci/build_spec.rb
+4
-4
spec/models/clusters/kubernetes_namespace_spec.rb
spec/models/clusters/kubernetes_namespace_spec.rb
+1
-1
spec/models/clusters/platforms/kubernetes_spec.rb
spec/models/clusters/platforms/kubernetes_spec.rb
+5
-5
spec/models/project_services/kubernetes_service_spec.rb
spec/models/project_services/kubernetes_service_spec.rb
+1
-1
spec/models/project_spec.rb
spec/models/project_spec.rb
+2
-2
未找到文件。
app/models/ci/build.rb
浏览文件 @
686ffdc2
...
...
@@ -426,11 +426,11 @@ module Ci
.
concat
(
pipeline
.
persisted_variables
)
.
append
(
key:
'CI_JOB_ID'
,
value:
id
.
to_s
)
.
append
(
key:
'CI_JOB_URL'
,
value:
Gitlab
::
Routing
.
url_helpers
.
project_job_url
(
project
,
self
))
.
append
(
key:
'CI_JOB_TOKEN'
,
value:
token
.
to_s
,
public:
false
)
.
append
(
key:
'CI_JOB_TOKEN'
,
value:
token
.
to_s
,
public:
false
,
masked:
true
)
.
append
(
key:
'CI_BUILD_ID'
,
value:
id
.
to_s
)
.
append
(
key:
'CI_BUILD_TOKEN'
,
value:
token
.
to_s
,
public:
false
)
.
append
(
key:
'CI_BUILD_TOKEN'
,
value:
token
.
to_s
,
public:
false
,
masked:
true
)
.
append
(
key:
'CI_REGISTRY_USER'
,
value:
CI_REGISTRY_USER
)
.
append
(
key:
'CI_REGISTRY_PASSWORD'
,
value:
token
.
to_s
,
public:
false
)
.
append
(
key:
'CI_REGISTRY_PASSWORD'
,
value:
token
.
to_s
,
public:
false
,
masked:
true
)
.
append
(
key:
'CI_REPOSITORY_URL'
,
value:
repo_url
.
to_s
,
public:
false
)
.
concat
(
deploy_token_variables
)
end
...
...
@@ -454,7 +454,7 @@ module Ci
break
variables
unless
gitlab_deploy_token
variables
.
append
(
key:
'CI_DEPLOY_USER'
,
value:
gitlab_deploy_token
.
username
)
variables
.
append
(
key:
'CI_DEPLOY_PASSWORD'
,
value:
gitlab_deploy_token
.
token
,
public:
false
)
variables
.
append
(
key:
'CI_DEPLOY_PASSWORD'
,
value:
gitlab_deploy_token
.
token
,
public:
false
,
masked:
true
)
end
end
...
...
app/models/clusters/kubernetes_namespace.rb
浏览文件 @
686ffdc2
...
...
@@ -37,7 +37,7 @@ module Clusters
variables
.
append
(
key:
'KUBE_SERVICE_ACCOUNT'
,
value:
service_account_name
.
to_s
)
.
append
(
key:
'KUBE_NAMESPACE'
,
value:
namespace
.
to_s
)
.
append
(
key:
'KUBE_TOKEN'
,
value:
service_account_token
.
to_s
,
public:
false
)
.
append
(
key:
'KUBE_TOKEN'
,
value:
service_account_token
.
to_s
,
public:
false
,
masked:
true
)
.
append
(
key:
'KUBECONFIG'
,
value:
kubeconfig
,
public:
false
,
file:
true
)
end
end
...
...
app/models/clusters/platforms/kubernetes.rb
浏览文件 @
686ffdc2
...
...
@@ -95,7 +95,7 @@ module Clusters
# https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22433
variables
.
append
(
key:
'KUBE_URL'
,
value:
api_url
)
.
append
(
key:
'KUBE_TOKEN'
,
value:
token
,
public:
false
)
.
append
(
key:
'KUBE_TOKEN'
,
value:
token
,
public:
false
,
masked:
true
)
.
append
(
key:
'KUBE_NAMESPACE'
,
value:
actual_namespace
)
.
append
(
key:
'KUBECONFIG'
,
value:
kubeconfig
,
public:
false
,
file:
true
)
end
...
...
app/models/project_services/kubernetes_service.rb
浏览文件 @
686ffdc2
...
...
@@ -113,7 +113,7 @@ class KubernetesService < DeploymentService
Gitlab
::
Ci
::
Variables
::
Collection
.
new
.
tap
do
|
variables
|
variables
.
append
(
key:
'KUBE_URL'
,
value:
api_url
)
.
append
(
key:
'KUBE_TOKEN'
,
value:
token
,
public:
false
)
.
append
(
key:
'KUBE_TOKEN'
,
value:
token
,
public:
false
,
masked:
true
)
.
append
(
key:
'KUBE_NAMESPACE'
,
value:
actual_namespace
)
.
append
(
key:
'KUBECONFIG'
,
value:
kubeconfig
,
public:
false
,
file:
true
)
...
...
changelogs/unreleased/58010-mask-the-existing-variables.yml
0 → 100644
浏览文件 @
686ffdc2
---
title
:
Mask all TOKEN and PASSWORD CI variables.
merge_request
:
25868
author
:
type
:
changed
spec/models/ci/build_spec.rb
浏览文件 @
686ffdc2
...
...
@@ -2118,11 +2118,11 @@ describe Ci::Build do
{
key:
'CI_PIPELINE_URL'
,
value:
project
.
web_url
+
"/pipelines/
#{
pipeline
.
id
}
"
,
public:
true
,
masked:
false
},
{
key:
'CI_JOB_ID'
,
value:
build
.
id
.
to_s
,
public:
true
,
masked:
false
},
{
key:
'CI_JOB_URL'
,
value:
project
.
web_url
+
"/-/jobs/
#{
build
.
id
}
"
,
public:
true
,
masked:
false
},
{
key:
'CI_JOB_TOKEN'
,
value:
'my-token'
,
public:
false
,
masked:
fals
e
},
{
key:
'CI_JOB_TOKEN'
,
value:
'my-token'
,
public:
false
,
masked:
tru
e
},
{
key:
'CI_BUILD_ID'
,
value:
build
.
id
.
to_s
,
public:
true
,
masked:
false
},
{
key:
'CI_BUILD_TOKEN'
,
value:
'my-token'
,
public:
false
,
masked:
fals
e
},
{
key:
'CI_BUILD_TOKEN'
,
value:
'my-token'
,
public:
false
,
masked:
tru
e
},
{
key:
'CI_REGISTRY_USER'
,
value:
'gitlab-ci-token'
,
public:
true
,
masked:
false
},
{
key:
'CI_REGISTRY_PASSWORD'
,
value:
'my-token'
,
public:
false
,
masked:
fals
e
},
{
key:
'CI_REGISTRY_PASSWORD'
,
value:
'my-token'
,
public:
false
,
masked:
tru
e
},
{
key:
'CI_REPOSITORY_URL'
,
value:
build
.
repo_url
,
public:
false
,
masked:
false
},
{
key:
'CI'
,
value:
'true'
,
public:
true
,
masked:
false
},
{
key:
'GITLAB_CI'
,
value:
'true'
,
public:
true
,
masked:
false
},
...
...
@@ -2652,7 +2652,7 @@ describe Ci::Build do
let
(
:deploy_token_variables
)
do
[
{
key:
'CI_DEPLOY_USER'
,
value:
deploy_token
.
username
,
public:
true
,
masked:
false
},
{
key:
'CI_DEPLOY_PASSWORD'
,
value:
deploy_token
.
token
,
public:
false
,
masked:
fals
e
}
{
key:
'CI_DEPLOY_PASSWORD'
,
value:
deploy_token
.
token
,
public:
false
,
masked:
tru
e
}
]
end
...
...
spec/models/clusters/kubernetes_namespace_spec.rb
浏览文件 @
686ffdc2
...
...
@@ -115,7 +115,7 @@ RSpec.describe Clusters::KubernetesNamespace, type: :model do
expect
(
kubernetes_namespace
.
predefined_variables
).
to
include
(
{
key:
'KUBE_SERVICE_ACCOUNT'
,
value:
kubernetes_namespace
.
service_account_name
,
public:
true
},
{
key:
'KUBE_NAMESPACE'
,
value:
kubernetes_namespace
.
namespace
,
public:
true
},
{
key:
'KUBE_TOKEN'
,
value:
kubernetes_namespace
.
service_account_token
,
public:
false
},
{
key:
'KUBE_TOKEN'
,
value:
kubernetes_namespace
.
service_account_token
,
public:
false
,
masked:
true
},
{
key:
'KUBECONFIG'
,
value:
kubeconfig
,
public:
false
,
file:
true
}
)
end
...
...
spec/models/clusters/platforms/kubernetes_spec.rb
浏览文件 @
686ffdc2
...
...
@@ -269,7 +269,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
it
'sets KUBE_TOKEN'
do
expect
(
subject
).
to
include
(
{
key:
'KUBE_TOKEN'
,
value:
kubernetes
.
token
,
public:
false
}
{
key:
'KUBE_TOKEN'
,
value:
kubernetes
.
token
,
public:
false
,
masked:
true
}
)
end
end
...
...
@@ -281,7 +281,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
it
'sets KUBE_TOKEN'
do
expect
(
subject
).
to
include
(
{
key:
'KUBE_TOKEN'
,
value:
kubernetes_namespace
.
service_account_token
,
public:
false
}
{
key:
'KUBE_TOKEN'
,
value:
kubernetes_namespace
.
service_account_token
,
public:
false
,
masked:
true
}
)
end
end
...
...
@@ -297,7 +297,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
it
'sets KUBE_TOKEN'
do
expect
(
subject
).
to
include
(
{
key:
'KUBE_TOKEN'
,
value:
kubernetes
.
token
,
public:
false
}
{
key:
'KUBE_TOKEN'
,
value:
kubernetes
.
token
,
public:
false
,
masked:
true
}
)
end
end
...
...
@@ -309,7 +309,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
it
'sets KUBE_TOKEN'
do
expect
(
subject
).
to
include
(
{
key:
'KUBE_TOKEN'
,
value:
kubernetes
.
token
,
public:
false
}
{
key:
'KUBE_TOKEN'
,
value:
kubernetes
.
token
,
public:
false
,
masked:
true
}
)
end
end
...
...
@@ -338,7 +338,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
it
'sets KUBE_TOKEN'
do
expect
(
subject
).
to
include
(
{
key:
'KUBE_TOKEN'
,
value:
kubernetes_namespace
.
service_account_token
,
public:
false
}
{
key:
'KUBE_TOKEN'
,
value:
kubernetes_namespace
.
service_account_token
,
public:
false
,
masked:
true
}
)
end
end
...
...
spec/models/project_services/kubernetes_service_spec.rb
浏览文件 @
686ffdc2
...
...
@@ -276,7 +276,7 @@ describe KubernetesService, :use_clean_rails_memory_store_caching do
it
'sets the variables'
do
expect
(
subject
.
predefined_variables
(
project:
project
)).
to
include
(
{
key:
'KUBE_URL'
,
value:
'https://kube.domain.com'
,
public:
true
},
{
key:
'KUBE_TOKEN'
,
value:
'token'
,
public:
false
},
{
key:
'KUBE_TOKEN'
,
value:
'token'
,
public:
false
,
masked:
true
},
{
key:
'KUBE_NAMESPACE'
,
value:
namespace
,
public:
true
},
{
key:
'KUBECONFIG'
,
value:
kubeconfig
,
public:
false
,
file:
true
},
{
key:
'KUBE_CA_PEM'
,
value:
'CA PEM DATA'
,
public:
true
},
...
...
spec/models/project_spec.rb
浏览文件 @
686ffdc2
...
...
@@ -2607,7 +2607,7 @@ describe Project do
shared_examples
'same behavior between KubernetesService and Platform::Kubernetes'
do
it
'returns variables from this service'
do
expect
(
project
.
deployment_variables
).
to
include
(
{
key:
'KUBE_TOKEN'
,
value:
project
.
deployment_platform
.
token
,
public:
false
}
{
key:
'KUBE_TOKEN'
,
value:
project
.
deployment_platform
.
token
,
public:
false
,
masked:
true
}
)
end
end
...
...
@@ -2632,7 +2632,7 @@ describe Project do
it
'should return token from kubernetes namespace'
do
expect
(
project
.
deployment_variables
).
to
include
(
{
key:
'KUBE_TOKEN'
,
value:
kubernetes_namespace
.
service_account_token
,
public:
false
}
{
key:
'KUBE_TOKEN'
,
value:
kubernetes_namespace
.
service_account_token
,
public:
false
,
masked:
true
}
)
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录