[merge-train skip]

Improve OpenSSL callout message

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/166183



Merged-by: Stan Hu <stanhu@gmail.com>
Approved-by: Drew Blessing <drew@gitlab.com>
Co-authored-by: Drew Blessing <drew@gitlab.com>

The previous message made it sound like everything needed to use
OpenSSL 3. Revise this message to make it clear that TLS 1.2+
is needed for TLS connections, and ensure that we mention ciphers
and bits of encryption.

[merge-train skip]

[ci skip]

[ci skip]

[merge-train skip]

[ci skip]

[ci skip]

Bump ruby dependencies

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/166043



Merged-by: Ahmad Tolba <atolba@gitlab.com>
Approved-by: Aboobacker MK <akarakath@gitlab.com>
Approved-by: Jim Baumgardner <jbaumgardner@gitlab.com>
Approved-by: Mayra Cabrera <mcabrera@gitlab.com>
Co-authored-by: Drew Blessing <drew@gitlab.com>

[merge-train skip]

[ci skip]

[ci skip]

Revert "Merge branch 'security-psk-fix-external-wiki-integration-dos-17-2' into '17-2-stable-ee'"

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4454



Merged-by: Mayra Cabrera <mcabrera@gitlab.com>
Approved-by: Mayra Cabrera <mcabrera@gitlab.com>
Co-authored-by: John T Skarbek <jtslear@gmail.com>

Ameya Darshan authored 5 months ago and Mayra Cabrera committed 5 months ago

Merge branch 'revert-7bad7451' into '17-2-stable-ee'

See merge request gitlab-org/security/gitlab!4454

Changelog: security

Improve OpenSSL 3 upgrading warning notes

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/165587



Merged-by: Stan Hu <stanhu@gmail.com>
Approved-by: Eduardo Sanz García <esanz-garcia@gitlab.com>

Fix the vulnerability in the glm_source parameter

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4435



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Gabriel Mazetto <gabriel@gitlab.com>
Co-authored-by: Doug Stull <dstull@gitlab.com>

Doug Stull authored 5 months ago and GitLab Release Tools Bot committed 5 months ago

Merge branch 'cherry-pick-98bf5baa-2' into '17-2-stable-ee'

See merge request gitlab-org/security/gitlab!4435

Changelog: security

Improve GraphQL log security

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4349



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Greg Myers <gmyers@gitlab.com>
Approved-by: Dzmitry (Dima) Meshcharakou <12459192-dmeshcharakou@users.noreply.gitlab.com>
Reviewed-by: Dzmitry (Dima) Meshcharakou <12459192-dmeshcharakou@users.noreply.gitlab.com>
Co-authored-by: Radamanthus Batnag <rbatnag@gitlab.com>

Rad Batnag authored 5 months ago and GitLab Release Tools Bot committed 5 months ago

Merge branch 'security-460289-confidential-issue-17-2' into '17-2-stable-ee'

See merge request gitlab-org/security/gitlab!4349

Changelog: security

Add permissions check to project creations from a project template

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4444



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Gavin Hinfey <ghinfey@gitlab.com>
Co-authored-by: Fred Reinink <freinink@gitlab.com>

Fred Reinink authored 5 months ago and GitLab Release Tools Bot committed 5 months ago

Merge branch 'security-custom-templates-source-code-disclosure-17-2' into '17-2-stable-ee'

See merge request gitlab-org/security/gitlab!4444

Changelog: security

Fix credentials disclosure in mirroring failure

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4447



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Vasilii Iakliushin <viakliushin@gitlab.com>
Co-authored-by: Olaoluwa Oluro <olaoluro@gitlab.com>

Ola Oluro authored 5 months ago and GitLab Release Tools Bot committed 5 months ago

Merge branch 'security-scp-url-sanitizer-17-2' into '17-2-stable-ee'

See merge request gitlab-org/security/gitlab!4447

Changelog: security

Redirect url in the link validated for being external

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4441



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Drew Blessing <drew@gitlab.com>
Co-authored-by: smriti <sgarg@gitlab.com>

Smriti Garg authored 5 months ago and GitLab Release Tools Bot committed 5 months ago

Merge branch 'security-sg-redirect-check-for-releases-17-2' into '17-2-stable-ee'

See merge request gitlab-org/security/gitlab!4441

Changelog: security

[17.2] Update edit permissions for DAST profiles

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4356



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Alejandro Rodríguez <alejandro@gitlab.com>
Co-authored-by: Arpit Gogia <12347103-arpitgogia@users.noreply.gitlab.com>

Arpit Gogia authored 5 months ago and GitLab Release Tools Bot committed 5 months ago

Merge branch 'security-451014-dast-profile-permissions-17-2' into '17-2-stable-ee'

See merge request gitlab-org/security/gitlab!4356

Changelog: security

Commit information visible through release atom endpoint for guest users

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4438



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Tomas Bulva <tbulva@gitlab.com>
Approved-by: Kevin Morrison <kmorrison@gitlab.com>
Co-authored-by: Anna Vovchenko <avovchenko@gitlab.com>

Anna Vovchenko authored 5 months ago and GitLab Release Tools Bot committed 5 months ago

Merge branch 'security-469367-commit-info-visible-though-atom-17-2' into '17-2-stable-ee'

See merge request gitlab-org/security/gitlab!4438

Changelog: security

Execute environment stop actions as the owner of the action

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4405



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Fabio Pitino <fpitino@gitlab.com>
Co-authored-by: Tiger <twatson@gitlab.com>

Tiger Watson authored 5 months ago and GitLab Release Tools Bot committed 5 months ago

Merge branch 'security-run-stop-actions-as-job-owner-17-2' into '17-2-stable-ee'

See merge request gitlab-org/security/gitlab!4405

Changelog: security

Prevent code injection in Product Analytics funnels YAML

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4430



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Halil Coban <hcoban@gitlab.com>
Co-authored-by: Robert Hunt <rhunt@gitlab.com>

Robert Hunt authored 5 months ago and GitLab Release Tools Bot committed 5 months ago

Merge branch 'security-prevent-code-injection-in-pa-funnels-17-2' into '17-2-stable-ee'

See merge request gitlab-org/security/gitlab!4430

Changelog: security

Prevent users with admin_group_member custom ab. to manage custom roles

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4426



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: charlie ablett <cablett@gitlab.com>
Co-authored-by: Jarka Košanová <jarka@gitlab.com>

Jarka Kadlecova authored 5 months ago and GitLab Release Tools Bot committed 5 months ago

Merge branch 'security-fix-cr-edit-17-2' into '17-2-stable-ee'

See merge request gitlab-org/security/gitlab!4426

Changelog: security

Fixed frontend regex to parse URI

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4420



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Drew Blessing <drew@gitlab.com>
Co-authored-by: smriti <sgarg@gitlab.com>