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
a180695a
Commit
a180695a
authored
Jun 02, 2021
by
George Koltsov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enable validate_import_decompressed_archive_size feature flag by default
Changelog: changed
parent
712f99a7
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
7 deletions
+5
-7
app/services/bulk_imports/file_decompression_service.rb
app/services/bulk_imports/file_decompression_service.rb
+1
-1
config/feature_flags/development/validate_import_decompressed_archive_size.yml
...development/validate_import_decompressed_archive_size.yml
+1
-1
doc/security/project_import_decompressed_archive_size_limits.md
...curity/project_import_decompressed_archive_size_limits.md
+2
-2
lib/gitlab/import_export/file_importer.rb
lib/gitlab/import_export/file_importer.rb
+1
-3
No files found.
app/services/bulk_imports/file_decompression_service.rb
View file @
a180695a
...
...
@@ -16,7 +16,7 @@ module BulkImports
def
execute
validate_dir
validate_decompressed_file_size
if
Feature
.
enabled?
(
:validate_import_decompressed_archive_size
)
validate_decompressed_file_size
if
Feature
.
enabled?
(
:validate_import_decompressed_archive_size
,
default_enabled: :yaml
)
validate_symlink
(
filepath
)
decompress_file
...
...
config/feature_flags/development/validate_import_decompressed_archive_size.yml
View file @
a180695a
...
...
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/282245
milestone
:
'
13.4'
type
:
development
group
:
group::import
default_enabled
:
fals
e
default_enabled
:
tru
e
doc/security/project_import_decompressed_archive_size_limits.md
View file @
a180695a
...
...
@@ -7,7 +7,8 @@ type: reference, howto
# Project Import Decompressed Archive Size Limits
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/31564) in GitLab 13.2.
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/31564) in GitLab 13.2.
> - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63025) in GitLab 14.0.
When using
[
Project Import
](
../user/project/settings/import_export.md
)
, the size of the decompressed project archive is limited to 10Gb.
...
...
@@ -15,7 +16,6 @@ If decompressed size exceeds this limit, `Decompressed archive size validation f
## Enable/disable size validation
Decompressed size validation is enabled by default.
If you have a project with decompressed size exceeding this limit,
it is possible to disable the validation by turning off the
`validate_import_decompressed_archive_size`
feature flag.
...
...
lib/gitlab/import_export/file_importer.rb
View file @
a180695a
...
...
@@ -28,9 +28,7 @@ module Gitlab
copy_archive
wait_for_archived_file
do
# Disable archive validation by default
# See: https://gitlab.com/gitlab-org/gitlab/-/issues/235949
validate_decompressed_archive_size
if
Feature
.
enabled?
(
:validate_import_decompressed_archive_size
)
validate_decompressed_archive_size
if
Feature
.
enabled?
(
:validate_import_decompressed_archive_size
,
default_enabled: :yaml
)
decompress_archive
end
rescue
StandardError
=>
e
...
...
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