Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
9ab50c86
Commit
9ab50c86
authored
Nov 23, 2018
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add specs for runners tokens encryption migration
parent
718ea942
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
86 additions
and
3 deletions
+86
-3
lib/gitlab/background_migration/models/encrypt_columns/settings.rb
...b/background_migration/models/encrypt_columns/settings.rb
+7
-3
spec/lib/gitlab/background_migration/encrypt_runners_tokens_spec.rb
...itlab/background_migration/encrypt_runners_tokens_spec.rb
+79
-0
No files found.
lib/gitlab/background_migration/models/encrypt_columns/settings.rb
View file @
9ab50c86
...
@@ -13,13 +13,17 @@ module Gitlab
...
@@ -13,13 +13,17 @@ module Gitlab
self
.
table_name
=
'application_settings'
self
.
table_name
=
'application_settings'
self
.
inheritance_column
=
:_type_disabled
self
.
inheritance_column
=
:_type_disabled
def
runners_token
=
(
value
)
def
runners_
registration_
token
=
(
value
)
self
.
runners_token_encrypted
=
self
.
runners_
registration_
token_encrypted
=
::
Gitlab
::
CryptoHelper
.
aes256_gcm_encrypt
(
value
)
::
Gitlab
::
CryptoHelper
.
aes256_gcm_encrypt
(
value
)
end
end
def
self
.
encrypted_attributes
def
self
.
encrypted_attributes
{
runners_token:
{
attribute: :runners_token_encrypted
}
}
{
runners_registration_token:
{
attribute: :runners_registration_token_encrypted
}
}
end
end
end
end
end
end
...
...
spec/lib/gitlab/background_migration/encrypt_runners_tokens_spec.rb
0 → 100644
View file @
9ab50c86
require
'spec_helper'
describe
Gitlab
::
BackgroundMigration
::
EncryptRunnersTokens
,
:migration
,
schema:
20181121111200
do
let
(
:settings
)
{
table
(
:application_settings
)
}
let
(
:namespaces
)
{
table
(
:namespaces
)
}
let
(
:projects
)
{
table
(
:projects
)
}
let
(
:runners
)
{
table
(
:ci_runners
)
}
context
'when migrating application settings'
do
before
do
settings
.
create!
(
id:
1
,
runners_registration_token:
'plain-text-token1'
)
end
it
'migrates runners registration tokens'
do
migrate!
(
:settings
,
:runners_registration_token
,
1
,
1
)
encrypted_token
=
settings
.
first
.
runners_registration_token_encrypted
decrypted_token
=
::
Gitlab
::
CryptoHelper
.
aes256_gcm_decrypt
(
encrypted_token
)
expect
(
decrypted_token
).
to
eq
'plain-text-token1'
expect
(
settings
.
first
.
runners_registration_token
).
to
be_nil
end
end
context
'when migrating namespaces'
do
before
do
namespaces
.
create!
(
id:
11
,
name:
'gitlab'
,
path:
'gitlab-org'
,
runners_token:
'my-token1'
)
namespaces
.
create!
(
id:
12
,
name:
'gitlab'
,
path:
'gitlab-org'
,
runners_token:
'my-token2'
)
namespaces
.
create!
(
id:
22
,
name:
'gitlab'
,
path:
'gitlab-org'
,
runners_token:
'my-token3'
)
end
it
'migrates runners registration tokens'
do
migrate!
(
:namespace
,
:runners_token
,
11
,
22
)
expect
(
namespaces
.
all
.
reload
).
to
all
(
have_attributes
(
runners_token:
nil
,
runners_token_encrypted:
be_a
(
String
))
)
end
end
context
'when migrating projects'
do
before
do
namespaces
.
create!
(
id:
11
,
name:
'gitlab'
,
path:
'gitlab-org'
)
projects
.
create!
(
id:
111
,
namespace_id:
11
,
name:
'gitlab'
,
path:
'gitlab-ce'
,
runners_token:
'my-token1'
)
projects
.
create!
(
id:
114
,
namespace_id:
11
,
name:
'gitlab'
,
path:
'gitlab-ce'
,
runners_token:
'my-token2'
)
projects
.
create!
(
id:
116
,
namespace_id:
11
,
name:
'gitlab'
,
path:
'gitlab-ce'
,
runners_token:
'my-token3'
)
end
it
'migrates runners registration tokens'
do
migrate!
(
:project
,
:runners_token
,
111
,
116
)
expect
(
projects
.
all
.
reload
).
to
all
(
have_attributes
(
runners_token:
nil
,
runners_token_encrypted:
be_a
(
String
))
)
end
end
context
'when migrating runners'
do
before
do
runners
.
create!
(
id:
201
,
runner_type:
1
,
token:
'plain-text-token1'
)
runners
.
create!
(
id:
202
,
runner_type:
1
,
token:
'plain-text-token2'
)
runners
.
create!
(
id:
203
,
runner_type:
1
,
token:
'plain-text-token3'
)
end
it
'migrates runners communication tokens'
do
migrate!
(
:runner
,
:token
,
201
,
203
)
expect
(
runners
.
all
.
reload
).
to
all
(
have_attributes
(
token:
nil
,
token_encrypted:
be_a
(
String
))
)
end
end
def
migrate!
(
model
,
attribute
,
from
,
to
)
model
=
"::Gitlab::BackgroundMigration::Models::EncryptColumns::
#{
model
.
to_s
.
capitalize
}
"
subject
.
perform
(
model
,
[
attribute
],
from
,
to
)
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment