From a97f1426db3f521d2fcf699fa106a2ca4eddb801 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 2 Nov 2020 21:09:10 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- CHANGELOG.md | 45 +++++ GITLAB_WORKHORSE_VERSION | 2 +- .../javascripts/jobs/components/job_app.vue | 8 +- .../components/pipelines_list/time_ago.vue | 20 +- .../releases/components/issuable_stats.vue | 4 +- .../release_block_milestone_info.vue | 76 ++++++-- .../settings/access_tokens_controller.rb | 2 +- app/models/packages/package.rb | 1 + app/policies/ci/pipeline_schedule_policy.rb | 1 + app/serializers/build_details_entity.rb | 2 +- .../update_package_from_metadata_service.rb | 2 + app/services/projects/transfer_service.rb | 12 +- .../resource_access_tokens/create_service.rb | 15 +- .../terraform/remote_state_handler.rb | 2 + app/uploaders/gitlab_uploader.rb | 26 +++ app/uploaders/job_artifact_uploader.rb | 5 +- .../packages/package_file_uploader.rb | 2 + app/views/admin/runners/_runner.html.haml | 4 +- app/views/shared/_label_row.html.haml | 6 +- ...mprove-project-labels-page-consistency.yml | 5 + ...-not-show-in-active-project-access-tok.yml | 5 + changelogs/unreleased/mk-workhorse-8-53-0.yml | 5 + config/routes/admin.rb | 4 +- danger/product_analytics/Dangerfile | 2 +- doc/administration/auth/okta.md | 4 +- doc/administration/reply_by_email.md | 2 +- doc/api/epic_issues.md | 2 +- doc/api/epics.md | 2 +- .../merge_trains/index.md | 24 ++- doc/development/README.md | 2 +- doc/development/api_graphql_styleguide.md | 56 ++++++ doc/development/changelog.md | 4 +- doc/development/database_review.md | 2 +- doc/development/experiment_guide/index.md | 2 +- doc/development/graphql_guide/pagination.md | 17 ++ .../img/telemetry_system_overview.png | Bin 103618 -> 0 bytes .../product_analytics/event_dictionary.md | 31 +-- doc/development/product_analytics/index.md | 181 +----------------- doc/development/product_analytics/snowplow.md | 2 +- .../product_analytics/usage_ping.md | 4 +- doc/topics/autodevops/index.md | 24 ++- doc/user/group/epics/index.md | 2 +- doc/user/group/epics/manage_epics.md | 2 +- doc/user/group/roadmap/index.md | 2 +- doc/user/project/requirements/index.md | 2 +- doc/user/project/service_desk.md | 2 +- lib/api/ci/pipeline_schedules.rb | 2 +- .../entities/ci/pipeline_schedule_details.rb | 4 +- lib/api/internal/kubernetes.rb | 2 +- lib/api/terraform/state.rb | 9 +- lib/gitlab/middleware/multipart.rb | 16 ++ lib/gitlab/regex.rb | 6 +- .../issue_activity_unique_counter.rb | 2 + .../usage_data_counters/known_events.yml | 4 + lib/gitlab/utils.rb | 30 +++ locale/gitlab.pot | 3 + .../multipart_invalid_uploads_spec.rb | 52 +++++ .../__snapshots__/issuable_stats_spec.js.snap | 2 +- .../release_block_milestone_info_spec.js | 32 +++- .../gitlab/exclusive_lease_helpers_spec.rb | 8 +- .../import_export/attributes_finder_spec.rb | 2 +- .../group/legacy_tree_saver_spec.rb | 2 +- .../lib/gitlab/import_export/importer_spec.rb | 2 +- .../gitlab/import_export/lfs_restorer_spec.rb | 2 +- ...tipart_with_handler_for_jwt_params_spec.rb | 41 +++- .../middleware/multipart_with_handler_spec.rb | 52 +++++ spec/lib/gitlab/regex_spec.rb | 28 ++- .../issue_activity_unique_counter_spec.rb | 90 +++------ spec/lib/gitlab/utils_spec.rb | 31 +++ spec/models/packages/package_spec.rb | 15 ++ spec/policies/project_policy_spec.rb | 2 +- .../api/ci/pipeline_schedules_spec.rb | 108 +++++++++-- spec/requests/api/internal/kubernetes_spec.rb | 12 +- spec/requests/api/project_export_spec.rb | 2 +- spec/requests/api/terraform/state_spec.rb | 7 +- ...date_package_from_metadata_service_spec.rb | 36 ++-- .../create_service_spec.rb | 56 ++++-- .../terraform/remote_state_handler_spec.rb | 18 +- spec/support/import_export/common_util.rb | 2 +- .../patches/rspec_mocks_prepended_methods.rb | 55 ++++++ ...ccess_tokens_controller_shared_examples.rb | 18 +- .../issue_activity_shared_examples.rb | 35 ++++ .../gitlab_uploader_shared_examples.rb | 12 ++ spec/uploaders/import_export_uploader_spec.rb | 11 +- .../packages/nuget/extraction_worker_spec.rb | 82 ++++---- 85 files changed, 1047 insertions(+), 471 deletions(-) create mode 100644 changelogs/unreleased/241990-improve-project-labels-page-consistency.yml create mode 100644 changelogs/unreleased/271635-new-project-access-tokens-do-not-show-in-active-project-access-tok.yml create mode 100644 changelogs/unreleased/mk-workhorse-8-53-0.yml delete mode 100644 doc/development/img/telemetry_system_overview.png create mode 100644 spec/features/file_uploads/multipart_invalid_uploads_spec.rb create mode 100644 spec/support/patches/rspec_mocks_prepended_methods.rb create mode 100644 spec/support/shared_examples/lib/gitlab/usage_data_counters/issue_activity_shared_examples.rb diff --git a/CHANGELOG.md b/CHANGELOG.md index 1615c30108d..fc7b8b76344 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,21 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 13.5.2 (2020-11-02) + +### Security (9 changes) + +- Add CSRF protection to runner pause and resume. !1021 +- Do not expose Terraform state record in API. +- Path traversal to RCE via LFS upload. +- Update container_repository_name_regex to prevent catastrophic backtracking. +- Validate nuget package names. +- Prevent private repo from being accessed via internal Kubernetes API. +- Validate each upload param key in multipart.rb. +- Fix XSS vulnerability for job build dependencies. +- Fix unauthorized user is able to access schedule pipeline variables and values. + + ## 13.5.1 (2020-10-22) ### Other (1 change) @@ -583,6 +598,21 @@ entry. - Bump cluster applications CI template. !45472 +## 13.4.5 (2020-11-02) + +### Security (9 changes) + +- Add CSRF protection to runner pause and resume. !1021 +- Do not expose Terraform state record in API. +- Path traversal to RCE via LFS upload. +- Update container_repository_name_regex to prevent catastrophic backtracking. +- Validate nuget package names. +- Prevent private repo from being accessed via internal Kubernetes API. +- Validate each upload param key in multipart.rb. +- Fix XSS vulnerability for job build dependencies. +- Fix unauthorized user is able to access schedule pipeline variables and values. + + ## 13.4.4 (2020-10-15) ### Fixed (2 changes) @@ -1241,6 +1271,21 @@ entry. - Expand the visible highlight for collapsed diffs (re: !41393). !42343 +## 13.3.9 (2020-11-02) + +### Security (9 changes) + +- Add CSRF protection to runner pause and resume. !1021 +- Do not expose Terraform state record in API. +- Path traversal to RCE via LFS upload. +- Update container_repository_name_regex to prevent catastrophic backtracking. +- Validate nuget package names. +- Prevent private repo from being accessed via internal Kubernetes API. +- Validate each upload param key in multipart.rb. +- Fix XSS vulnerability for job build dependencies. +- Fix unauthorized user is able to access schedule pipeline variables and values. + + ## 13.3.8 (2020-10-21) ### Fixed (2 changes) diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION index 89a8ef8d8fc..d9b7ec5a2f7 100644 --- a/GITLAB_WORKHORSE_VERSION +++ b/GITLAB_WORKHORSE_VERSION @@ -1 +1 @@ -8.52.0 +8.53.0 diff --git a/app/assets/javascripts/jobs/components/job_app.vue b/app/assets/javascripts/jobs/components/job_app.vue index 00ff3fb939d..c6adf2f231f 100644 --- a/app/assets/javascripts/jobs/components/job_app.vue +++ b/app/assets/javascripts/jobs/components/job_app.vue @@ -1,8 +1,7 @@