Commit Graph

34 Commits

Author SHA1 Message Date
GitLab Bot 52f444e8c6 Add latest changes from gitlab-org/gitlab@master 2025-04-25 15:10:08 +00:00
GitLab Bot 329f63356a Add latest changes from gitlab-org/gitlab@master 2024-07-24 18:10:15 +00:00
GitLab Bot 1dace033aa Add latest changes from gitlab-org/gitlab@master 2024-04-30 09:15:33 +00:00
GitLab Bot 03054179b7 Add latest changes from gitlab-org/gitlab@master 2024-01-26 00:07:28 +00:00
GitLab Bot b3432e3b6d Add latest changes from gitlab-org/gitlab@master 2023-08-02 15:07:15 +00:00
GitLab Bot cc77bdd6f5 Add latest changes from gitlab-org/gitlab@master 2023-08-01 21:10:20 +00:00
GitLab Bot ad2d90fb24 Add latest changes from gitlab-org/gitlab@master 2023-03-10 15:11:00 +00:00
GitLab Bot 67fa8362ae Add latest changes from gitlab-org/gitlab@master 2022-05-06 15:09:03 +00:00
GitLab Bot 0ead22f9db Add latest changes from gitlab-org/gitlab@master 2022-03-07 06:15:33 +00:00
GitLab Bot e58ce90f14 Add latest changes from gitlab-org/gitlab@master 2021-06-11 18:10:13 +00:00
GitLab Bot 71a67d17b0 Add latest changes from gitlab-org/gitlab@master 2021-05-12 12:10:24 +00:00
GitLab Bot d1fd19e525 Add latest changes from gitlab-org/gitlab@master 2021-05-05 21:09:59 +00:00
GitLab Bot be4b3134a2 Add latest changes from gitlab-org/gitlab@master 2021-05-04 15:10:36 +00:00
GitLab Bot e5e0589e09 Add latest changes from gitlab-org/gitlab@master 2021-04-26 12:09:44 +00:00
GitLab Bot e7462f7b49 Add latest changes from gitlab-org/gitlab@master 2021-02-09 09:09:19 +00:00
GitLab Bot 316fbf9f95 Add latest changes from gitlab-org/gitlab@master 2020-10-15 18:08:43 +00:00
GitLab Bot 85f7fa54f4 Add latest changes from gitlab-org/gitlab@master 2020-08-18 18:10:10 +00:00
GitLab Bot ad9eb72915 Add latest changes from gitlab-org/gitlab@master 2020-08-05 21:09:40 +00:00
GitLab Bot cfc792b9ca Add latest changes from gitlab-org/gitlab@master 2019-12-10 07:53:40 +00:00
GitLab Bot 0c3f121493 Add latest changes from gitlab-org/gitlab@master 2019-11-11 21:06:20 +00:00
gfyoung 7ec8af5017 Enable even more frozen string for lib/gitlab
Enables frozen string for the following:

* lib/gitlab/hook_data/**/*.rb
* lib/gitlab/i18n/**/*.rb
* lib/gitlab/import/**/*.rb
* lib/gitlab/import_export/**/*.rb
* lib/gitlab/kubernetes/**/*.rb
* lib/gitlab/legacy_github_import/**/*.rb
* lib/gitlab/manifest_import/**/*.rb
* lib/gitlab/metrics/**/*.rb
* lib/gitlab/middleware/**/*.rb

Partially addresses gitlab-org/gitlab-ce#47424.
2018-11-16 17:41:14 -08:00
James Lopez 07009a1f48
Add Object Storage to GitLab project import
- Refactor uploads manager
- Refactor importer, update import spec
- Add more object storage specs
2018-08-02 11:50:19 +02:00
Stan Hu 1025059d1f Rename WHITELISTED_FILENAMES => IGNORED_FILENAMES 2018-07-17 10:30:53 +02:00
Stan Hu eda8156e5c Fix symlink vulnerability in project import
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/49133
2018-07-17 10:30:52 +02:00
Takuya Noguchi 2b6307f6ad Enable RuboCop Style/RegexpLiteral 2018-02-01 02:06:07 +09:00
James Lopez 532a0b6018 Merge branch 'fix/import-rce-10-3' into 'security-10-3'
[10.3] Fix RCE via project import mechanism

See merge request gitlab/gitlabhq!2294

(cherry picked from commit dcfec507d6f9ee119d65a832393e7c593af1d3b2)

86d75812 Fix RCE via project import mechanism
2018-01-16 17:04:51 -08:00
James Edwards-Jones 334915d508 Merge branch 'import-symlinks-9-3' into 'security-9-3'
Fix file disclosure via hidden symlinks using the project import (9.3)

See merge request !2164
2017-08-10 20:42:01 +01:00
Douwe Maan dc9b3db8b0 Merge branch 'fix/import-export-symlink-vulnerability' into 'security'
Fix symlink vulnerability in Import/Export

Replaces https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2018 made by @james

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23822

See merge request !2022

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-03 16:04:18 +01:00
James Lopez 958d9f11e8 fix export project file permissions issue 2016-09-30 16:10:48 +02:00
James Lopez 81495528f9 refactored wait_for_archived_file method 2016-08-01 11:07:06 +02:00
James Lopez dad1d0b864 fix return value and spec 2016-08-01 09:15:11 +02:00
James Lopez 52bb564812 squashed - fix timing issues in prod importing projects
added changelog

fix specs

refactored code based on feedback

fix rubocop warning
2016-08-01 09:15:11 +02:00
James Lopez 46b89a270f Fix tmp file being deleted after the request plus some cleanup and improved erroring for this situation 2016-06-24 10:50:23 +02:00
James Lopez 3f7ed55011 lots of refactoring to reuse import service 2016-06-14 12:47:07 +02:00