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
iv
gitlab-ce
Commits
be834c4d
Commit
be834c4d
authored
Apr 11, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
changed a few things based on feedback
parent
350a9aa9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
22 deletions
+17
-22
app/models/project_import_data.rb
app/models/project_import_data.rb
+6
-2
db/migrate/20160302151724_add_import_credentials_to_project_import_data.rb
...02151724_add_import_credentials_to_project_import_data.rb
+2
-2
db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb
...e/20160302152808_remove_wrong_import_url_from_projects.rb
+9
-12
spec/factories/project_import_data.rb
spec/factories/project_import_data.rb
+0
-6
No files found.
app/models/project_import_data.rb
View file @
be834c4d
...
...
@@ -12,7 +12,11 @@ require 'file_size_validator'
class
ProjectImportData
<
ActiveRecord
::
Base
belongs_to
:project
attr_encrypted
:credentials
,
key:
Gitlab
::
Application
.
secrets
.
db_key_base
,
marshal:
true
,
encode:
true
,
mode: :per_attribute_iv_and_salt
attr_encrypted
:credentials
,
key:
Gitlab
::
Application
.
secrets
.
db_key_base
,
marshal:
true
,
encode:
true
,
mode: :per_attribute_iv_and_salt
serialize
:data
,
JSON
...
...
@@ -21,7 +25,7 @@ class ProjectImportData < ActiveRecord::Base
before_validation
:symbolize_credentials
def
symbolize_credentials
# bang doesn't work here
# bang doesn't work here
- attr_encrypted makes it not to work
self
.
credentials
=
self
.
credentials
.
deep_symbolize_keys
unless
self
.
credentials
.
blank?
end
end
db/migrate/20160302151724_add_import_credentials_to_project_import_data.rb
View file @
be834c4d
class
AddImportCredentialsToProjectImportData
<
ActiveRecord
::
Migration
def
change
add_column
:project_import_data
,
:encrypted_credentials
,
:text
add_column
:project_import_data
,
:encrypted_credentials_iv
,
:
text
add_column
:project_import_data
,
:encrypted_credentials_salt
,
:
text
add_column
:project_import_data
,
:encrypted_credentials_iv
,
:
string
add_column
:project_import_data
,
:encrypted_credentials_salt
,
:
string
end
end
db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb
View file @
be834c4d
...
...
@@ -3,7 +3,7 @@
# #down method not supported
class
RemoveWrongImportUrlFromProjects
<
ActiveRecord
::
Migration
class
FakeProjectImportData
class
ProjectImportDataFake
extend
AttrEncrypted
attr_accessor
:credentials
attr_encrypted
:credentials
,
key:
Gitlab
::
Application
.
secrets
.
db_key_base
,
marshal:
true
,
encode:
true
,
:mode
=>
:per_attribute_iv_and_salt
...
...
@@ -13,14 +13,11 @@ class RemoveWrongImportUrlFromProjects < ActiveRecord::Migration
say
(
"Encrypting and migrating project import credentials..."
)
# This should cover GitHub, GitLab, Bitbucket user:password, token@domain, and other similar URLs.
say
(
"Projects and GitHub projects with a wrong URL. It also migrates GitLab project credentials."
)
in_transaction
{
process_projects_with_wrong_url
}
in_transaction
(
message:
"Projects including GitHub and GitLab projects with an unsecured URL."
)
{
process_projects_with_wrong_url
}
say
(
"Migrating Bitbucket credentials..."
)
in_transaction
{
process_project
(
import_type:
'bitbucket'
,
credentials_keys:
[
'bb_session'
])
}
in_transaction
(
message:
"Migrating Bitbucket credentials..."
)
{
process_project
(
import_type:
'bitbucket'
,
credentials_keys:
[
'bb_session'
])
}
say
(
"Migrating FogBugz credentials..."
)
in_transaction
{
process_project
(
import_type:
'fogbugz'
,
credentials_keys:
[
'fb_session'
])
}
in_transaction
(
message:
"Migrating FogBugz credentials..."
)
{
process_project
(
import_type:
'fogbugz'
,
credentials_keys:
[
'fb_session'
])
}
end
...
...
@@ -33,7 +30,7 @@ class RemoveWrongImportUrlFromProjects < ActiveRecord::Migration
end
end
def
process_project
(
import_type:
,
credentials_keys:
[])
def
process_project
(
import_type
:,
credentials_keys:
[])
unencrypted_import_data
(
import_type:
import_type
).
each
do
|
data
|
replace_data_credentials
(
data
,
credentials_keys
)
end
...
...
@@ -56,8 +53,8 @@ class RemoveWrongImportUrlFromProjects < ActiveRecord::Migration
new_data_hash
.
deep_symbolize_keys
end
def
in_transaction
say_with_time
(
"Processing new transaction..."
)
do
def
in_transaction
(
message
:)
say_with_time
(
message
)
do
ActiveRecord
::
Base
.
transaction
do
yield
end
...
...
@@ -65,7 +62,7 @@ class RemoveWrongImportUrlFromProjects < ActiveRecord::Migration
end
def
update_import_data
(
import_url
,
project
)
fake_import_data
=
FakeProjectImportData
.
new
fake_import_data
=
ProjectImportDataFake
.
new
fake_import_data
.
credentials
=
import_url
.
credentials
import_data_id
=
project
[
'import_data_id'
]
if
import_data_id
...
...
@@ -76,7 +73,7 @@ class RemoveWrongImportUrlFromProjects < ActiveRecord::Migration
end
def
update_with_encrypted_data
(
data_hash
,
import_data_id
,
unencrypted_data
=
' NULL '
)
fake_import_data
=
FakeProjectImportData
.
new
fake_import_data
=
ProjectImportDataFake
.
new
fake_import_data
.
credentials
=
data_hash
execute
(
update_import_data_sql
(
import_data_id
,
fake_import_data
,
unencrypted_data
))
end
...
...
spec/factories/project_import_data.rb
deleted
100644 → 0
View file @
350a9aa9
FactoryGirl
.
define
do
factory
:project_import_data
,
class:
ProjectImportData
do
data
"test"
project
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