Commit 487b0a02 authored by Grzegorz Bizon's avatar Grzegorz Bizon

Improvements, readability for artifacts browser

parent 2be76355
class Projects::ArtifactsController < Projects::ApplicationController class Projects::ArtifactsController < Projects::ApplicationController
layout 'project' layout 'project'
before_action :authorize_download_build_artifacts! before_action :authorize_read_build_artifacts!
def download def download
unless artifacts_file.file_storage? unless artifacts_file.file_storage?
...@@ -24,11 +24,11 @@ class Projects::ArtifactsController < Projects::ApplicationController ...@@ -24,11 +24,11 @@ class Projects::ArtifactsController < Projects::ApplicationController
end end
def file def file
file = build.artifacts_metadata_path(params[:path]) file_path = build.artifacts_metadata_path(params[:path])
if file.exists? if file_path.exists?
render json: { repository: build.artifacts_file.path, render json: { archive: build.artifacts_file.path,
path: Base64.encode64(file.path) } path: Base64.encode64(file_path.path) }
else else
render json: {}, status: 404 render json: {}, status: 404
end end
...@@ -44,8 +44,8 @@ class Projects::ArtifactsController < Projects::ApplicationController ...@@ -44,8 +44,8 @@ class Projects::ArtifactsController < Projects::ApplicationController
@artifacts_file ||= build.artifacts_file @artifacts_file ||= build.artifacts_file
end end
def authorize_download_build_artifacts! def authorize_read_build_artifacts!
unless can?(current_user, :download_build_artifacts, @project) unless can?(current_user, :read_build_artifacts, @project)
if current_user.nil? if current_user.nil?
return authenticate_user! return authenticate_user!
else else
......
...@@ -175,7 +175,7 @@ class Ability ...@@ -175,7 +175,7 @@ class Ability
:create_merge_request, :create_merge_request,
:create_wiki, :create_wiki,
:manage_builds, :manage_builds,
:download_build_artifacts, :read_build_artifacts,
:push_code :push_code
] ]
end end
......
...@@ -344,7 +344,7 @@ module Ci ...@@ -344,7 +344,7 @@ module Ci
end end
def artifacts_browser_supported? def artifacts_browser_supported?
artifacts? && artifacts_file.path.end_with?('zip') && artifacts_metadata.exists? artifacts? && artifacts_metadata.exists?
end end
def artifacts_metadata_path(path) def artifacts_metadata_path(path)
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
%td %td
.pull-right .pull-right
- if current_user && can?(current_user, :download_build_artifacts, project) && build.artifacts? - if current_user && can?(current_user, :read_build_artifacts, project) && build.artifacts?
= link_to build.artifacts_download_url, title: 'Download artifacts' do = link_to build.artifacts_download_url, title: 'Download artifacts' do
%i.fa.fa-download %i.fa.fa-download
- if current_user && can?(current_user, :manage_builds, build.project) - if current_user && can?(current_user, :manage_builds, build.project)
......
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
Test coverage Test coverage
%h1 #{@build.coverage}% %h1 #{@build.coverage}%
- if current_user && can?(current_user, :download_build_artifacts, @project) && @build.artifacts? - if current_user && can?(current_user, :read_build_artifacts, @project) && @build.artifacts?
.build-widget.artifacts .build-widget.artifacts
%h4.title Build artifacts %h4.title Build artifacts
......
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
%td %td
.pull-right .pull-right
- if current_user && can?(current_user, :download_build_artifacts, commit_status.project) && commit_status.artifacts? - if current_user && can?(current_user, :read_build_artifacts, commit_status.project) && commit_status.artifacts?
= link_to commit_status.artifacts_download_url, title: 'Download artifacts' do = link_to commit_status.artifacts_download_url, title: 'Download artifacts' do
%i.fa.fa-download %i.fa.fa-download
- if current_user && can?(current_user, :manage_builds, commit_status.project) - if current_user && can?(current_user, :manage_builds, commit_status.project)
......
...@@ -56,7 +56,7 @@ module Gitlab ...@@ -56,7 +56,7 @@ module Gitlab
next if path =~ invalid_pattern next if path =~ invalid_pattern
paths.push(path) paths.push(path)
metadata.push(JSON.parse(meta.chomp, symbolize_names: true)) metadata.push(JSON.parse(meta, symbolize_names: true))
rescue JSON::ParserError, Encoding::CompatibilityError rescue JSON::ParserError, Encoding::CompatibilityError
next next
end end
...@@ -66,7 +66,7 @@ module Gitlab ...@@ -66,7 +66,7 @@ module Gitlab
end end
def read_version def read_version
gzip do|gz| gzip do |gz|
version_string = read_string(gz) version_string = read_string(gz)
unless version_string unless version_string
...@@ -95,9 +95,11 @@ module Gitlab ...@@ -95,9 +95,11 @@ module Gitlab
def gzip def gzip
open do |file| open do |file|
gzip = Zlib::GzipReader.new(file) gzip = Zlib::GzipReader.new(file)
result = yield gzip begin
gzip.close yield gzip
result ensure
gzip.close
end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment