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
67f59293
Commit
67f59293
authored
Feb 24, 2021
by
Steve Abrams
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Gem download route
Gem download route for rubygems package registry
parent
0f600368
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
106 additions
and
6 deletions
+106
-6
app/models/packages/package_file.rb
app/models/packages/package_file.rb
+4
-0
lib/api/rubygem_packages.rb
lib/api/rubygem_packages.rb
+9
-2
spec/models/packages/package_file_spec.rb
spec/models/packages/package_file_spec.rb
+15
-0
spec/requests/api/rubygem_packages_spec.rb
spec/requests/api/rubygem_packages_spec.rb
+61
-4
spec/support/shared_examples/requests/api/rubygems_packages_shared_examples.rb
...xamples/requests/api/rubygems_packages_shared_examples.rb
+17
-0
No files found.
app/models/packages/package_file.rb
View file @
67f59293
...
@@ -30,6 +30,10 @@ class Packages::PackageFile < ApplicationRecord
...
@@ -30,6 +30,10 @@ class Packages::PackageFile < ApplicationRecord
scope
:preload_conan_file_metadata
,
->
{
preload
(
:conan_file_metadatum
)
}
scope
:preload_conan_file_metadata
,
->
{
preload
(
:conan_file_metadatum
)
}
scope
:preload_debian_file_metadata
,
->
{
preload
(
:debian_file_metadatum
)
}
scope
:preload_debian_file_metadata
,
->
{
preload
(
:debian_file_metadatum
)
}
scope
:for_rubygem_with_file_name
,
->
(
project
,
file_name
)
do
joins
(
:package
).
merge
(
project
.
packages
.
rubygems
).
with_file_name
(
file_name
)
end
scope
:with_conan_file_type
,
->
(
file_type
)
do
scope
:with_conan_file_type
,
->
(
file_type
)
do
joins
(
:conan_file_metadatum
)
joins
(
:conan_file_metadatum
)
.
where
(
packages_conan_file_metadata:
{
conan_file_type:
::
Packages
::
Conan
::
FileMetadatum
.
conan_file_types
[
file_type
]
})
.
where
(
packages_conan_file_metadata:
{
conan_file_type:
::
Packages
::
Conan
::
FileMetadatum
.
conan_file_types
[
file_type
]
})
...
...
lib/api/rubygem_packages.rb
View file @
67f59293
...
@@ -64,8 +64,15 @@ module API
...
@@ -64,8 +64,15 @@ module API
requires
:file_name
,
type:
String
,
desc:
'Package file name'
requires
:file_name
,
type:
String
,
desc:
'Package file name'
end
end
get
"gems/:file_name"
,
requirements:
FILE_NAME_REQUIREMENTS
do
get
"gems/:file_name"
,
requirements:
FILE_NAME_REQUIREMENTS
do
# To be implemented in https://gitlab.com/gitlab-org/gitlab/-/issues/299283
authorize!
(
:read_package
,
user_project
)
not_found!
package_file
=
::
Packages
::
PackageFile
.
for_rubygem_with_file_name
(
user_project
,
params
[
:file_name
]
).
last!
track_package_event
(
'pull_package'
,
:rubygems
)
present_carrierwave_file!
(
package_file
.
file
)
end
end
namespace
'api/v1'
do
namespace
'api/v1'
do
...
...
spec/models/packages/package_file_spec.rb
View file @
67f59293
...
@@ -62,6 +62,21 @@ RSpec.describe Packages::PackageFile, type: :model do
...
@@ -62,6 +62,21 @@ RSpec.describe Packages::PackageFile, type: :model do
end
end
end
end
describe
'.for_rubygem_with_file_name'
do
let_it_be
(
:project
)
{
create
(
:project
)
}
let_it_be
(
:non_ruby_package
)
{
create
(
:nuget_package
,
project:
project
,
package_type: :nuget
)
}
let_it_be
(
:ruby_package
)
{
create
(
:rubygems_package
,
project:
project
,
package_type: :rubygems
)
}
let_it_be
(
:file_name
)
{
'other.gem'
}
let_it_be
(
:non_ruby_file
)
{
create
(
:package_file
,
:nuget
,
package:
non_ruby_package
,
file_name:
file_name
)
}
let_it_be
(
:gem_file1
)
{
create
(
:package_file
,
:gem
,
package:
ruby_package
)
}
let_it_be
(
:gem_file2
)
{
create
(
:package_file
,
:gem
,
package:
ruby_package
,
file_name:
file_name
)
}
it
'returns the matching gem file only for ruby packages'
do
expect
(
described_class
.
for_rubygem_with_file_name
(
project
,
file_name
)).
to
contain_exactly
(
gem_file2
)
end
end
describe
'#update_file_store callback'
do
describe
'#update_file_store callback'
do
let_it_be
(
:package_file
)
{
build
(
:package_file
,
:nuget
,
size:
nil
)
}
let_it_be
(
:package_file
)
{
build
(
:package_file
,
:nuget
,
size:
nil
)
}
...
...
spec/requests/api/rubygem_packages_spec.rb
View file @
67f59293
...
@@ -108,11 +108,68 @@ RSpec.describe API::RubygemPackages do
...
@@ -108,11 +108,68 @@ RSpec.describe API::RubygemPackages do
end
end
describe
'GET /api/v4/projects/:project_id/packages/rubygems/gems/:file_name'
do
describe
'GET /api/v4/projects/:project_id/packages/rubygems/gems/:file_name'
do
let
(
:url
)
{
api
(
"/projects/
#{
project
.
id
}
/packages/rubygems/gems/my_gem-1.0.0.gem"
)
}
let_it_be
(
:package_name
)
{
'package'
}
let_it_be
(
:version
)
{
'0.0.1'
}
let_it_be
(
:package
)
{
create
(
:rubygems_package
,
project:
project
,
name:
package_name
,
version:
version
)
}
let_it_be
(
:file_name
)
{
"
#{
package_name
}
-
#{
version
}
.gem"
}
let
(
:url
)
{
api
(
"/projects/
#{
project
.
id
}
/packages/rubygems/gems/
#{
file_name
}
"
)
}
subject
{
get
(
url
,
headers:
headers
)
}
subject
{
get
(
url
,
headers:
headers
)
}
it_behaves_like
'an unimplemented route'
context
'with valid project'
do
where
(
:visibility
,
:user_role
,
:member
,
:token_type
,
:valid_token
,
:shared_examples_name
,
:expected_status
)
do
:public
|
:developer
|
true
|
:personal_access_token
|
true
|
'Rubygems gem download'
|
:success
:public
|
:guest
|
true
|
:personal_access_token
|
true
|
'Rubygems gem download'
|
:success
:public
|
:developer
|
true
|
:personal_access_token
|
false
|
'rejects rubygems packages access'
|
:unauthorized
:public
|
:guest
|
true
|
:personal_access_token
|
false
|
'rejects rubygems packages access'
|
:unauthorized
:public
|
:developer
|
false
|
:personal_access_token
|
true
|
'Rubygems gem download'
|
:success
:public
|
:guest
|
false
|
:personal_access_token
|
true
|
'Rubygems gem download'
|
:success
:public
|
:developer
|
false
|
:personal_access_token
|
false
|
'rejects rubygems packages access'
|
:unauthorized
:public
|
:guest
|
false
|
:personal_access_token
|
false
|
'rejects rubygems packages access'
|
:unauthorized
:public
|
:anonymous
|
false
|
:personal_access_token
|
true
|
'Rubygems gem download'
|
:success
:private
|
:developer
|
true
|
:personal_access_token
|
true
|
'Rubygems gem download'
|
:success
:private
|
:guest
|
true
|
:personal_access_token
|
true
|
'rejects rubygems packages access'
|
:forbidden
:private
|
:developer
|
true
|
:personal_access_token
|
false
|
'rejects rubygems packages access'
|
:unauthorized
:private
|
:guest
|
true
|
:personal_access_token
|
false
|
'rejects rubygems packages access'
|
:unauthorized
:private
|
:developer
|
false
|
:personal_access_token
|
true
|
'rejects rubygems packages access'
|
:not_found
:private
|
:guest
|
false
|
:personal_access_token
|
true
|
'rejects rubygems packages access'
|
:not_found
:private
|
:developer
|
false
|
:personal_access_token
|
false
|
'rejects rubygems packages access'
|
:unauthorized
:private
|
:guest
|
false
|
:personal_access_token
|
false
|
'rejects rubygems packages access'
|
:unauthorized
:private
|
:anonymous
|
false
|
:personal_access_token
|
true
|
'rejects rubygems packages access'
|
:not_found
:public
|
:developer
|
true
|
:job_token
|
true
|
'Rubygems gem download'
|
:success
:public
|
:guest
|
true
|
:job_token
|
true
|
'Rubygems gem download'
|
:success
:public
|
:developer
|
true
|
:job_token
|
false
|
'rejects rubygems packages access'
|
:unauthorized
:public
|
:guest
|
true
|
:job_token
|
false
|
'rejects rubygems packages access'
|
:unauthorized
:public
|
:developer
|
false
|
:job_token
|
true
|
'Rubygems gem download'
|
:success
:public
|
:guest
|
false
|
:job_token
|
true
|
'Rubygems gem download'
|
:success
:public
|
:developer
|
false
|
:job_token
|
false
|
'rejects rubygems packages access'
|
:unauthorized
:public
|
:guest
|
false
|
:job_token
|
false
|
'rejects rubygems packages access'
|
:unauthorized
:private
|
:developer
|
true
|
:job_token
|
true
|
'Rubygems gem download'
|
:success
:private
|
:guest
|
true
|
:job_token
|
true
|
'rejects rubygems packages access'
|
:forbidden
:private
|
:developer
|
true
|
:job_token
|
false
|
'rejects rubygems packages access'
|
:unauthorized
:private
|
:guest
|
true
|
:job_token
|
false
|
'rejects rubygems packages access'
|
:unauthorized
:private
|
:developer
|
false
|
:job_token
|
true
|
'rejects rubygems packages access'
|
:not_found
:private
|
:guest
|
false
|
:job_token
|
true
|
'rejects rubygems packages access'
|
:not_found
:private
|
:developer
|
false
|
:job_token
|
false
|
'rejects rubygems packages access'
|
:unauthorized
:private
|
:guest
|
false
|
:job_token
|
false
|
'rejects rubygems packages access'
|
:unauthorized
:public
|
:developer
|
true
|
:deploy_token
|
true
|
'Rubygems gem download'
|
:success
:public
|
:developer
|
true
|
:deploy_token
|
false
|
'rejects rubygems packages access'
|
:unauthorized
:private
|
:developer
|
true
|
:deploy_token
|
true
|
'Rubygems gem download'
|
:success
:private
|
:developer
|
true
|
:deploy_token
|
false
|
'rejects rubygems packages access'
|
:unauthorized
end
with_them
do
let
(
:token
)
{
valid_token
?
tokens
[
token_type
]
:
'invalid-token123'
}
let
(
:headers
)
{
user_role
==
:anonymous
?
{}
:
{
'HTTP_AUTHORIZATION'
=>
token
}
}
before
do
project
.
update_column
(
:visibility_level
,
Gitlab
::
VisibilityLevel
.
level_value
(
visibility
.
to_s
))
end
it_behaves_like
params
[
:shared_examples_name
],
params
[
:user_role
],
params
[
:expected_status
],
params
[
:member
]
end
end
end
end
describe
'POST /api/v4/projects/:project_id/packages/rubygems/api/v1/gems/authorize'
do
describe
'POST /api/v4/projects/:project_id/packages/rubygems/api/v1/gems/authorize'
do
...
@@ -171,7 +228,7 @@ RSpec.describe API::RubygemPackages do
...
@@ -171,7 +228,7 @@ RSpec.describe API::RubygemPackages do
let
(
:headers
)
{
user_headers
.
merge
(
workhorse_headers
)
}
let
(
:headers
)
{
user_headers
.
merge
(
workhorse_headers
)
}
before
do
before
do
project
.
update
!
(
visibility:
visibility
.
to_s
)
project
.
update
_column
(
:visibility_level
,
Gitlab
::
VisibilityLevel
.
level_value
(
visibility
.
to_s
)
)
end
end
it_behaves_like
params
[
:shared_examples_name
],
params
[
:user_role
],
params
[
:expected_status
],
params
[
:member
]
it_behaves_like
params
[
:shared_examples_name
],
params
[
:user_role
],
params
[
:expected_status
],
params
[
:member
]
...
@@ -249,7 +306,7 @@ RSpec.describe API::RubygemPackages do
...
@@ -249,7 +306,7 @@ RSpec.describe API::RubygemPackages do
let
(
:headers
)
{
user_headers
.
merge
(
workhorse_headers
)
}
let
(
:headers
)
{
user_headers
.
merge
(
workhorse_headers
)
}
before
do
before
do
project
.
update
!
(
visibility:
visibility
.
to_s
)
project
.
update
_column
(
:visibility_level
,
Gitlab
::
VisibilityLevel
.
level_value
(
visibility
.
to_s
)
)
end
end
it_behaves_like
params
[
:shared_examples_name
],
params
[
:user_role
],
params
[
:expected_status
],
params
[
:member
]
it_behaves_like
params
[
:shared_examples_name
],
params
[
:user_role
],
params
[
:expected_status
],
params
[
:member
]
...
...
spec/support/shared_examples/requests/api/rubygems_packages_shared_examples.rb
View file @
67f59293
...
@@ -175,3 +175,20 @@ RSpec.shared_examples 'dependency endpoint success' do |user_type, status, add_m
...
@@ -175,3 +175,20 @@ RSpec.shared_examples 'dependency endpoint success' do |user_type, status, add_m
end
end
end
end
end
end
RSpec
.
shared_examples
'Rubygems gem download'
do
|
user_type
,
status
,
add_member
=
true
|
context
"for user type
#{
user_type
}
"
do
before
do
project
.
send
(
"add_
#{
user_type
}
"
,
user
)
if
add_member
&&
user_type
!=
:anonymous
end
it
'returns the gem'
,
:aggregate_failures
do
subject
expect
(
response
.
media_type
).
to
eq
(
'application/octet-stream'
)
expect
(
response
).
to
have_gitlab_http_status
(
status
)
end
it_behaves_like
'a package tracking event'
,
described_class
.
name
,
'pull_package'
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