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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
69c8292e
Commit
69c8292e
authored
Oct 19, 2021
by
Doug Stull
Committed by
Kerri Miller
Oct 19, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Validate import url viability in projects api before creation
parent
84b103c1
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
87 additions
and
2 deletions
+87
-2
ee/lib/ee/api/projects.rb
ee/lib/ee/api/projects.rb
+1
-0
ee/spec/requests/api/projects_spec.rb
ee/spec/requests/api/projects_spec.rb
+40
-0
lib/api/helpers/projects_helpers.rb
lib/api/helpers/projects_helpers.rb
+11
-0
lib/api/projects.rb
lib/api/projects.rb
+6
-2
spec/requests/api/projects_spec.rb
spec/requests/api/projects_spec.rb
+29
-0
No files found.
ee/lib/ee/api/projects.rb
View file @
69c8292e
...
@@ -82,6 +82,7 @@ module EE
...
@@ -82,6 +82,7 @@ module EE
super
super
verify_mirror_attrs!
(
project
,
attrs
)
verify_mirror_attrs!
(
project
,
attrs
)
validate_git_import_url!
(
attrs
[
:import_url
])
verify_issuable_default_templates_attrs!
(
project
,
attrs
)
verify_issuable_default_templates_attrs!
(
project
,
attrs
)
verify_merge_pipelines_attrs!
(
project
,
attrs
)
verify_merge_pipelines_attrs!
(
project
,
attrs
)
end
end
...
...
ee/spec/requests/api/projects_spec.rb
View file @
69c8292e
...
@@ -4,6 +4,7 @@ require 'spec_helper'
...
@@ -4,6 +4,7 @@ require 'spec_helper'
RSpec
.
describe
API
::
Projects
do
RSpec
.
describe
API
::
Projects
do
include
ExternalAuthorizationServiceHelpers
include
ExternalAuthorizationServiceHelpers
include
StubRequests
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let_it_be
(
:another_user
)
{
create
(
:user
)
}
let_it_be
(
:another_user
)
{
create
(
:user
)
}
...
@@ -627,6 +628,15 @@ RSpec.describe API::Projects do
...
@@ -627,6 +628,15 @@ RSpec.describe API::Projects do
}
}
end
end
before
do
git_response
=
{
status:
200
,
body:
'001e# service=git-upload-pack'
,
headers:
{
'Content-Type'
:
'application/x-git-upload-pack-advertisement'
}
}
stub_full_request
(
"
#{
import_url
}
/info/refs?service=git-upload-pack"
,
method: :get
).
to_return
(
git_response
)
end
it
'creates new project with pull mirroring set up'
do
it
'creates new project with pull mirroring set up'
do
post
api
(
'/projects'
,
user
),
params:
mirror_params
post
api
(
'/projects'
,
user
),
params:
mirror_params
...
@@ -1097,6 +1107,19 @@ RSpec.describe API::Projects do
...
@@ -1097,6 +1107,19 @@ RSpec.describe API::Projects do
}
}
end
end
let
(
:git_response
)
do
{
status:
200
,
body:
'001e# service=git-upload-pack'
,
headers:
{
'Content-Type'
:
'application/x-git-upload-pack-advertisement'
}
}
end
before
do
endpoint_url
=
"
#{
import_url
}
/info/refs?service=git-upload-pack"
stub_full_request
(
endpoint_url
,
method: :get
).
to_return
(
git_response
)
end
context
'when pull mirroring is not available'
do
context
'when pull mirroring is not available'
do
before
do
before
do
stub_ee_application_setting
(
mirror_available:
false
)
stub_ee_application_setting
(
mirror_available:
false
)
...
@@ -1132,6 +1155,23 @@ RSpec.describe API::Projects do
...
@@ -1132,6 +1155,23 @@ RSpec.describe API::Projects do
end
end
end
end
context
'when import_url is not a valid git endpoint'
do
let
(
:git_response
)
do
{
status:
301
,
body:
''
,
headers:
nil
}
end
it
'disallows creating a project with an import_url that is not reachable'
,
:aggregate_failures
do
subject
expect
(
response
).
to
have_gitlab_http_status
(
:unprocessable_entity
)
expect
(
json_response
[
'message'
]).
to
eq
(
"
#{
import_url
}
is not a valid HTTP Git repository"
)
end
end
it
'updates mirror related attributes'
do
it
'updates mirror related attributes'
do
expect_any_instance_of
(
EE
::
ProjectImportState
).
to
receive
(
:force_import_job!
).
once
expect_any_instance_of
(
EE
::
ProjectImportState
).
to
receive
(
:force_import_job!
).
once
...
...
lib/api/helpers/projects_helpers.rb
View file @
69c8292e
...
@@ -177,6 +177,17 @@ module API
...
@@ -177,6 +177,17 @@ module API
def
filter_attributes_using_license!
(
attrs
)
def
filter_attributes_using_license!
(
attrs
)
end
end
def
validate_git_import_url!
(
import_url
,
import_enabled:
true
)
return
if
import_url
.
blank?
return
unless
import_enabled
result
=
Import
::
ValidateRemoteGitEndpointService
.
new
(
url:
import_url
).
execute
# network call
if
result
.
error?
render_api_error!
(
result
.
message
,
422
)
end
end
end
end
end
end
end
end
...
...
lib/api/projects.rb
View file @
69c8292e
...
@@ -91,7 +91,7 @@ module API
...
@@ -91,7 +91,7 @@ module API
end
end
def
check_import_by_url_is_enabled
def
check_import_by_url_is_enabled
forbidden!
unless
Gitlab
::
CurrentSettings
.
import_sources
&
.
include?
(
'git'
)
Gitlab
::
CurrentSettings
.
import_sources
&
.
include?
(
'git'
)
||
forbidden!
end
end
end
end
...
@@ -269,7 +269,9 @@ module API
...
@@ -269,7 +269,9 @@ module API
attrs
=
declared_params
(
include_missing:
false
)
attrs
=
declared_params
(
include_missing:
false
)
attrs
=
translate_params_for_compatibility
(
attrs
)
attrs
=
translate_params_for_compatibility
(
attrs
)
filter_attributes_using_license!
(
attrs
)
filter_attributes_using_license!
(
attrs
)
check_import_by_url_is_enabled
if
params
[
:import_url
].
present?
validate_git_import_url!
(
params
[
:import_url
],
import_enabled:
check_import_by_url_is_enabled
)
project
=
::
Projects
::
CreateService
.
new
(
current_user
,
attrs
).
execute
project
=
::
Projects
::
CreateService
.
new
(
current_user
,
attrs
).
execute
if
project
.
saved?
if
project
.
saved?
...
@@ -307,6 +309,8 @@ module API
...
@@ -307,6 +309,8 @@ module API
attrs
=
declared_params
(
include_missing:
false
)
attrs
=
declared_params
(
include_missing:
false
)
attrs
=
translate_params_for_compatibility
(
attrs
)
attrs
=
translate_params_for_compatibility
(
attrs
)
filter_attributes_using_license!
(
attrs
)
filter_attributes_using_license!
(
attrs
)
validate_git_import_url!
(
params
[
:import_url
])
project
=
::
Projects
::
CreateService
.
new
(
user
,
attrs
).
execute
project
=
::
Projects
::
CreateService
.
new
(
user
,
attrs
).
execute
if
project
.
saved?
if
project
.
saved?
...
...
spec/requests/api/projects_spec.rb
View file @
69c8292e
...
@@ -48,6 +48,7 @@ end
...
@@ -48,6 +48,7 @@ end
RSpec
.
describe
API
::
Projects
do
RSpec
.
describe
API
::
Projects
do
include
ProjectForksHelper
include
ProjectForksHelper
include
StubRequests
let_it_be
(
:user
)
{
create
(
:user
)
}
let_it_be
(
:user
)
{
create
(
:user
)
}
let_it_be
(
:user2
)
{
create
(
:user
)
}
let_it_be
(
:user2
)
{
create
(
:user
)
}
...
@@ -1159,6 +1160,34 @@ RSpec.describe API::Projects do
...
@@ -1159,6 +1160,34 @@ RSpec.describe API::Projects do
expect
(
response
).
to
have_gitlab_http_status
(
:forbidden
)
expect
(
response
).
to
have_gitlab_http_status
(
:forbidden
)
end
end
it
'disallows creating a project with an import_url that is not reachable'
,
:aggregate_failures
do
url
=
'http://example.com'
endpoint_url
=
"
#{
url
}
/info/refs?service=git-upload-pack"
stub_full_request
(
endpoint_url
,
method: :get
).
to_return
({
status:
301
,
body:
''
,
headers:
nil
})
project_params
=
{
import_url:
url
,
path:
'path-project-Foo'
,
name:
'Foo Project'
}
expect
{
post
api
(
'/projects'
,
user
),
params:
project_params
}.
not_to
change
{
Project
.
count
}
expect
(
response
).
to
have_gitlab_http_status
(
:unprocessable_entity
)
expect
(
json_response
[
'message'
]).
to
eq
(
"
#{
url
}
is not a valid HTTP Git repository"
)
end
it
'creates a project with an import_url that is valid'
,
:aggregate_failures
do
url
=
'http://example.com'
endpoint_url
=
"
#{
url
}
/info/refs?service=git-upload-pack"
git_response
=
{
status:
200
,
body:
'001e# service=git-upload-pack'
,
headers:
{
'Content-Type'
:
'application/x-git-upload-pack-advertisement'
}
}
stub_full_request
(
endpoint_url
,
method: :get
).
to_return
(
git_response
)
project_params
=
{
import_url:
url
,
path:
'path-project-Foo'
,
name:
'Foo Project'
}
expect
{
post
api
(
'/projects'
,
user
),
params:
project_params
}.
to
change
{
Project
.
count
}.
by
(
1
)
expect
(
response
).
to
have_gitlab_http_status
(
:created
)
end
it
'sets a project as public'
do
it
'sets a project as public'
do
project
=
attributes_for
(
:project
,
visibility:
'public'
)
project
=
attributes_for
(
:project
,
visibility:
'public'
)
...
...
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