Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
5b925b626041
Commit
325de662
authored
Aug 29, 2016
by
Douglas Barbosa Alexandre
Browse files
Don't create groups for unallowed users when importing projects
parent
18913cfb841f
Changes
12
Hide whitespace changes
Inline
Side-by-side
app/controllers/import/base_controller.rb
View file @
5b925b62
class
Import::BaseController
<
ApplicationController
private
def
get
_or_create_namespace
def
find
_or_create_namespace
(
name
,
owner
)
begin
@target_namespace
=
params
[
:new_namespace
].
presence
||
name
@target_namespace
=
current_user
.
namespace_path
if
name
==
owner
||
!
current_user
.
can_create_group?
namespace
=
Group
.
create!
(
name:
@target_namespace
,
path:
@target_namespace
,
owner:
current_user
)
namespace
.
add_owner
(
current_user
)
rescue
ActiveRecord
::
RecordNotUnique
,
ActiveRecord
::
RecordInvalid
namespace
=
Namespace
.
find_by_path_or_name
(
@target_namespace
)
unless
current_user
.
can?
(
:create_projects
,
namespace
)
@already_been_taken
=
true
return
false
...
...
app/controllers/import/bitbucket_controller.rb
View file @
5b925b62
...
...
@@ -35,15 +35,10 @@ def jobs
end
def
create
@repo_id
=
params
[
:repo_id
]
||
""
repo
=
client
.
project
(
@repo_id
.
gsub
(
"___"
,
"/"
))
@project_name
=
repo
[
"slug"
]
repo_owner
=
repo
[
"owner"
]
repo_owner
=
current_user
.
username
if
repo_owner
==
client
.
user
[
"user"
][
"username"
]
@target_namespace
=
params
[
:new_namespace
].
presence
||
repo_owner
namespace
=
get_or_create_namespace
||
(
render
and
return
)
@repo_id
=
params
[
:repo_id
].
to_s
repo
=
client
.
project
(
@repo_id
.
gsub
(
'___'
,
'/'
))
@project_name
=
repo
[
'slug'
]
namespace
=
find_or_create_namespace
(
repo
[
'owner'
],
client
.
user
[
'user'
][
'username'
])
||
(
render
and
return
)
unless
Gitlab
::
BitbucketImport
::
KeyAdder
.
new
(
repo
,
current_user
,
access_params
).
execute
@access_denied
=
true
...
...
app/controllers/import/github_controller.rb
View file @
5b925b62
...
...
@@ -41,12 +41,7 @@ def create
@repo_id
=
params
[
:repo_id
].
to_i
repo
=
client
.
repo
(
@repo_id
)
@project_name
=
repo
.
name
repo_owner
=
repo
.
owner
.
login
repo_owner
=
current_user
.
username
if
repo_owner
==
client
.
user
.
login
@target_namespace
=
params
[
:new_namespace
].
presence
||
repo_owner
namespace
=
get_or_create_namespace
||
(
render
and
return
)
namespace
=
find_or_create_namespace
(
repo
.
owner
.
login
,
client
.
user
.
login
)
||
(
render
and
return
)
@project
=
Gitlab
::
GithubImport
::
ProjectCreator
.
new
(
repo
,
namespace
,
current_user
,
access_params
).
execute
end
...
...
app/controllers/import/gitlab_controller.rb
View file @
5b925b62
...
...
@@ -26,13 +26,8 @@ def jobs
def
create
@repo_id
=
params
[
:repo_id
].
to_i
repo
=
client
.
project
(
@repo_id
)
@project_name
=
repo
[
"name"
]
repo_owner
=
repo
[
"namespace"
][
"path"
]
repo_owner
=
current_user
.
username
if
repo_owner
==
client
.
user
[
"username"
]
@target_namespace
=
params
[
:new_namespace
].
presence
||
repo_owner
namespace
=
get_or_create_namespace
||
(
render
and
return
)
@project_name
=
repo
[
'name'
]
namespace
=
find_or_create_namespace
(
repo
[
'namespace'
][
'path'
],
client
.
user
[
'username'
])
||
(
render
and
return
)
@project
=
Gitlab
::
GitlabImport
::
ProjectCreator
.
new
(
repo
,
namespace
,
current_user
,
access_params
).
execute
end
...
...
app/helpers/import_helper.rb
View file @
5b925b62
module
ImportHelper
def
import_project_target
(
owner
,
name
)
namespace
=
current_user
.
can_create_group?
?
owner
:
current_user
.
namespace_path
"
#{
namespace
}
/
#{
name
}
"
end
def
github_project_link
(
path_with_namespace
)
link_to
path_with_namespace
,
github_project_url
(
path_with_namespace
),
target:
'_blank'
end
...
...
app/views/import/bitbucket/status.html.haml
View file @
5b925b62
...
...
@@ -51,7 +51,7 @@
%td
=
link_to
"
#{
repo
[
"owner"
]
}
/
#{
repo
[
"slug"
]
}
"
,
"https://bitbucket.org/
#{
repo
[
"owner"
]
}
/
#{
repo
[
"slug"
]
}
"
,
target:
"_blank"
%td
.import-target
=
"
#{
repo
[
"
owner
"
]
}
/
#{
repo
[
"
slug
"
]
}
"
=
import_project_target
(
repo
[
'
owner
'
],
repo
[
'
slug
'
])
%td
.import-actions.job-status
=
button_tag
class:
"btn btn-import js-add-to-import"
do
Import
...
...
app/views/import/github/status.html.haml
View file @
5b925b62
...
...
@@ -45,7 +45,7 @@
%td
=
github_project_link
(
repo
.
full_name
)
%td
.import-target
=
repo
.
full_
name
=
import_project_target
(
repo
.
owner
.
login
,
repo
.
name
)
%td
.import-actions.job-status
=
button_tag
class:
"btn btn-import js-add-to-import"
do
Import
...
...
app/views/import/gitlab/status.html.haml
View file @
5b925b62
...
...
@@ -45,7 +45,7 @@
%td
=
link_to
repo
[
"path_with_namespace"
],
"https://gitlab.com/
#{
repo
[
"path_with_namespace"
]
}
"
,
target:
"_blank"
%td
.import-target
=
repo
[
"path_with_namespace"
]
=
import_project_target
(
repo
[
'namespace'
][
'path'
],
repo
[
'name'
])
%td
.import-actions.job-status
=
button_tag
class:
"btn btn-import js-add-to-import"
do
Import
...
...
spec/controllers/import/bitbucket_controller_spec.rb
View file @
5b925b62
...
...
@@ -146,21 +146,42 @@ def assign_session_tokens
end
context
"when a namespace with the Bitbucket user's username doesn't exist"
do
it
"creates the namespace"
do
expect
(
Gitlab
::
BitbucketImport
::
ProjectCreator
).
to
receive
(
:new
).
and_return
(
double
(
execute:
true
))
context
"when current user can create namespaces"
do
it
"creates the namespace"
do
expect
(
Gitlab
::
BitbucketImport
::
ProjectCreator
).
to
receive
(
:new
).
and_return
(
double
(
execute:
true
))
post
:create
,
format: :js
expect
{
post
:create
,
format: :js
}.
to
change
(
Namespace
,
:count
).
by
(
1
)
end
it
"takes the new namespace"
do
expect
(
Gitlab
::
BitbucketImport
::
ProjectCreator
).
to
receive
(
:new
).
with
(
bitbucket_repo
,
an_instance_of
(
Group
),
user
,
access_params
).
and_return
(
double
(
execute:
true
))
expect
(
Namespace
.
where
(
name:
other_username
).
first
).
not_to
be_nil
post
:create
,
format: :js
end
end
it
"takes the new
namespace"
do
expect
(
Gitlab
::
BitbucketImport
::
ProjectCreator
).
to
receive
(
:new
).
with
(
bitbucket_repo
,
an_instance_of
(
G
roup
)
,
user
,
access_params
).
and_return
(
double
(
execute:
true
))
context
"when current user can't create
namespace
s
"
do
before
do
user
.
update_attribute
(
:can_create_g
roup
,
false
)
end
post
:create
,
format: :js
it
"doesn't create the namespace"
do
expect
(
Gitlab
::
BitbucketImport
::
ProjectCreator
).
to
receive
(
:new
).
and_return
(
double
(
execute:
true
))
expect
{
post
:create
,
format: :js
}.
not_to
change
(
Namespace
,
:count
)
end
it
"takes the current user's namespace"
do
expect
(
Gitlab
::
BitbucketImport
::
ProjectCreator
).
to
receive
(
:new
).
with
(
bitbucket_repo
,
user
.
namespace
,
user
,
access_params
).
and_return
(
double
(
execute:
true
))
post
:create
,
format: :js
end
end
end
end
...
...
spec/controllers/import/github_controller_spec.rb
View file @
5b925b62
...
...
@@ -181,21 +181,42 @@ def assign_session_token
end
context
"when a namespace with the GitHub user's username doesn't exist"
do
it
"creates the namespace"
do
expect
(
Gitlab
::
GithubImport
::
ProjectCreator
).
to
receive
(
:new
).
and_return
(
double
(
execute:
true
))
context
"when current user can create namespaces"
do
it
"creates the namespace"
do
expect
(
Gitlab
::
GithubImport
::
ProjectCreator
).
to
receive
(
:new
).
and_return
(
double
(
execute:
true
))
post
:create
,
format: :js
expect
{
post
:create
,
format: :js
}.
to
change
(
Namespace
,
:count
).
by
(
1
)
end
it
"takes the new namespace"
do
expect
(
Gitlab
::
GithubImport
::
ProjectCreator
).
to
receive
(
:new
).
with
(
github_repo
,
an_instance_of
(
Group
),
user
,
access_params
).
and_return
(
double
(
execute:
true
))
expect
(
Namespace
.
where
(
name:
other_username
).
first
).
not_to
be_nil
post
:create
,
format: :js
end
end
it
"takes the new
namespace"
do
expect
(
Gitlab
::
GithubImport
::
ProjectCreator
).
to
receive
(
:new
).
with
(
github_repo
,
an_instance_of
(
G
roup
)
,
user
,
access_params
).
and_return
(
double
(
execute:
true
))
context
"when current user can't create
namespace
s
"
do
before
do
user
.
update_attribute
(
:can_create_g
roup
,
false
)
end
post
:create
,
format: :js
it
"doesn't create the namespace"
do
expect
(
Gitlab
::
GithubImport
::
ProjectCreator
).
to
receive
(
:new
).
and_return
(
double
(
execute:
true
))
expect
{
post
:create
,
format: :js
}.
not_to
change
(
Namespace
,
:count
)
end
it
"takes the current user's namespace"
do
expect
(
Gitlab
::
GithubImport
::
ProjectCreator
).
to
receive
(
:new
).
with
(
github_repo
,
user
.
namespace
,
user
,
access_params
).
and_return
(
double
(
execute:
true
))
post
:create
,
format: :js
end
end
end
end
...
...
spec/controllers/import/gitlab_controller_spec.rb
View file @
5b925b62
...
...
@@ -136,21 +136,42 @@ def assign_session_token
end
context
"when a namespace with the GitLab.com user's username doesn't exist"
do
it
"creates the namespace"
do
expect
(
Gitlab
::
GitlabImport
::
ProjectCreator
).
to
receive
(
:new
).
and_return
(
double
(
execute:
true
))
context
"when current user can create namespaces"
do
it
"creates the namespace"
do
expect
(
Gitlab
::
GitlabImport
::
ProjectCreator
).
to
receive
(
:new
).
and_return
(
double
(
execute:
true
))
post
:create
,
format: :js
expect
{
post
:create
,
format: :js
}.
to
change
(
Namespace
,
:count
).
by
(
1
)
end
it
"takes the new namespace"
do
expect
(
Gitlab
::
GitlabImport
::
ProjectCreator
).
to
receive
(
:new
).
with
(
gitlab_repo
,
an_instance_of
(
Group
),
user
,
access_params
).
and_return
(
double
(
execute:
true
))
expect
(
Namespace
.
where
(
name:
other_username
).
first
).
not_to
be_nil
post
:create
,
format: :js
end
end
it
"takes the new
namespace"
do
expect
(
Gitlab
::
GitlabImport
::
ProjectCreator
).
to
receive
(
:new
).
with
(
gitlab_repo
,
an_instance_of
(
G
roup
)
,
user
,
access_params
).
and_return
(
double
(
execute:
true
))
context
"when current user can't create
namespace
s
"
do
before
do
user
.
update_attribute
(
:can_create_g
roup
,
false
)
end
post
:create
,
format: :js
it
"doesn't create the namespace"
do
expect
(
Gitlab
::
GitlabImport
::
ProjectCreator
).
to
receive
(
:new
).
and_return
(
double
(
execute:
true
))
expect
{
post
:create
,
format: :js
}.
not_to
change
(
Namespace
,
:count
)
end
it
"takes the current user's namespace"
do
expect
(
Gitlab
::
GitlabImport
::
ProjectCreator
).
to
receive
(
:new
).
with
(
gitlab_repo
,
user
.
namespace
,
user
,
access_params
).
and_return
(
double
(
execute:
true
))
post
:create
,
format: :js
end
end
end
end
...
...
spec/helpers/import_helper_spec.rb
View file @
5b925b62
require
'rails_helper'
describe
ImportHelper
do
describe
'#import_project_target'
do
let
(
:user
)
{
create
(
:user
)
}
before
do
allow
(
helper
).
to
receive
(
:current_user
).
and_return
(
user
)
end
context
'when current user can create namespaces'
do
it
'returns project namespace'
do
user
.
update_attribute
(
:can_create_group
,
true
)
expect
(
helper
.
import_project_target
(
'asd'
,
'vim'
)).
to
eq
'asd/vim'
end
end
context
'when current user can not create namespaces'
do
it
"takes the current user's namespace"
do
user
.
update_attribute
(
:can_create_group
,
false
)
expect
(
helper
.
import_project_target
(
'asd'
,
'vim'
)).
to
eq
"
#{
user
.
namespace_path
}
/vim"
end
end
end
describe
'#github_project_link'
do
context
'when provider does not specify a custom URL'
do
it
'uses default GitHub URL'
do
...
...
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