[merge-train skip]

[ci skip]

[ci skip]

Update ruby-saml and omniauth-saml

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



Merged-by: Mayra Cabrera <mcabrera@gitlab.com>
Approved-by: Drew Blessing <drew@gitlab.com>
Approved-by: Harsha Muralidhar <hmuralidhar@gitlab.com>
Co-authored-by: Drew Blessing <drew@gitlab.com>

[merge-train skip]

[ci skip]

[ci skip]

Backport add Rake task to show token expiration info

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



Merged-by: John Skarbek <jskarbek@gitlab.com>
Approved-by: Jon Glassman <jglassman@gitlab.com>
Approved-by: Richard Chong <rchong@gitlab.com>
Approved-by: Imre Farkas <ifarkas@gitlab.com>
Reviewed-by: Imre Farkas <ifarkas@gitlab.com>
Co-authored-by: smriti <sgarg@gitlab.com>
Co-authored-by: Stan Hu <stanhu@gmail.com>
Co-authored-by: Jon Glassman <jglassman@gitlab.com>

Add a banner informing about token expiration (16.5)

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



Merged-by: John Skarbek <jskarbek@gitlab.com>
Approved-by: Russell Dickenson <rdickenson@gitlab.com>
Approved-by: Drew Blessing <drew@gitlab.com>
Approved-by: Richard Chong <rchong@gitlab.com>
Reviewed-by: Imre Farkas <ifarkas@gitlab.com>
Reviewed-by: Eduardo Sanz García <esanz-garcia@gitlab.com>
Reviewed-by: Lorenz van Herwaarden <lvanherwaarden@gitlab.com>
Co-authored-by: Eduardo Sanz García <esanz-garcia@gitlab.com>
Co-authored-by: Savas Vedova <svedova@gitlab.com>

Display a banner to all users, similar to broadcast banners, for GitLab
version between 16.0 and 17.0, both included. The banner informs about
upcoming expiration of tokens and how to troubleshoot the expiration.

The banner is dismissable. The data is persisted in the browser cookie
and expires in one year from the date it has been dismissed. Like other
broadcast banners, if the user opens an incognito window the banner
reappears.

Changelog: changed

Do not enqueue PAT expiry enforcement migration

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



Merged-by: John Skarbek <jskarbek@gitlab.com>
Approved-by: Alper Akgun <aakgun@gitlab.com>
Approved-by: Smriti Garg <sgarg@gitlab.com>
Approved-by: Sofia Vistas <svistas@gitlab.com>
Co-authored-by: Imre Farkas <ifarkas@gitlab.com>
Co-authored-by: agius <andrew@atevans.com>

Changelog: changed

Backport token logging improvements

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



Merged-by: John Skarbek <jskarbek@gitlab.com>
Approved-by: Imre Farkas <ifarkas@gitlab.com>
Approved-by: Sofia Vistas <svistas@gitlab.com>
Co-authored-by: Alex Pooley <apooley@gitlab.com>
Co-authored-by: Dylan Griffith <dyl.griffith@gmail.com>
Co-authored-by: Imre Farkas <ifarkas@gitlab.com>
Co-authored-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Co-authored-by: Aboobacker MK <akarakath@gitlab.com>

Fix order-dependent test failure in loose_foreign_keys_spec.rb

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



Merged-by: Mayra Cabrera <mcabrera@gitlab.com>
Approved-by: Mayra Cabrera <mcabrera@gitlab.com>
Co-authored-by: pkanellidis <pkanellidis@gitlab.com>

Added rollback migration

Changelog: other

Stan Hu authored 7 months ago and Smriti Garg committed 7 months ago

https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157277 added the
`meta.auth_fail_reason` and `meta.auth_fail_token_id` log fields to
identify expired access tokens. This commit documents these fields.

Relates to https://gitlab.com/gitlab-org/gitlab/-/issues/464652

Update for failing docs-lint

Jon Glassman authored 7 months ago and Smriti Garg committed 7 months ago

Update for failing docs-lint

Stan Hu authored 7 months ago and Smriti Garg committed 7 months ago

Ideally we would remove these legacy scripts entirely or move
them into another section, but until we are confident that
this tool covers the needs of most users let's keep it for now.
We'll need to update the documentation as to what backported
GitLab versions contains this Rake task.

Stan Hu authored 7 months ago and Smriti Garg committed 7 months ago

This documents the Rake task added in
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157855.

Relates to https://gitlab.com/gitlab-org/gitlab/-/issues/467416

Stan Hu authored 7 months ago and Smriti Garg committed 7 months ago

Now that we've decided that admins can allow tokens to have
no expiration date, bring back the option to remove them.

Stan Hu authored 8 months ago and Smriti Garg committed 7 months ago

Running `rake gitlab:tokens:edit` will provide an interface
to extend/remove tokens.

Stan Hu authored 8 months ago and Smriti Garg committed 7 months ago

This task adds a Rake task `gitlab:tokens:analyze` and gives
a readout to the admin about:

- When the migration in 16.0 for
  https://gitlab.com/gitlab-org/gitlab/-/issues/369123 started and
  finished

- The top 10 expiration dates
  (https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157782)
  https://gitlab.com/gitlab-org/gitlab/-/issues/467313

There should be a strong correlation with the migration dates and the
expiration dates. Seeing both of them together helps focus on the
tokens that were assigned an `expires_at` field in the background
migration.

Relates to https://gitlab.com/gitlab-org/gitlab/-/issues/467313

Changelog: added

Add more log fields in 401 Unauthorized requests

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



Merged-by: Alex Pooley <apooley@gitlab.com>
Approved-by: Tarun Vellishetty <tvellishetty@gitlab.com>
Approved-by: Shreyas Agarwal <sagarwal@gitlab.com>
Approved-by: Alex Pooley <apooley@gitlab.com>
Approved-by: Imre Farkas <ifarkas@gitlab.com>
Reviewed-by: Alex Pooley <apooley@gitlab.com>
Reviewed-by: Shreyas Agarwal <sagarwal@gitlab.com>
Co-authored-by: smriti <sgarg@gitlab.com>
Co-authored-by: Stan Hu <stanhu@gmail.com>

Log token info for GraphQL requests

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



Merged-by: Dylan Griffith <dyl.griffith@gmail.com>
Approved-by: Dmytro Biryukov <dbiryukov@gitlab.com>
Approved-by: Greg Myers <gmyers@gitlab.com>
Approved-by: Imre Farkas <ifarkas@gitlab.com>
Approved-by: Dylan Griffith <dyl.griffith@gmail.com>
Reviewed-by: Dmytro Biryukov <dbiryukov@gitlab.com>
Co-authored-by: unset <fveillette@gitlab.com>
Co-authored-by: Dominic Couture <dcouture@gitlab.com>

Fix 500 errors during ActionCable connect

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



Merged-by: Imre Farkas <ifarkas@gitlab.com>
Approved-by: Heinrich Lee Yu <heinrich@gitlab.com>
Approved-by: Imre Farkas <ifarkas@gitlab.com>
Co-authored-by: Manoj M J <mmj@gitlab.com>

Ensure PAT scope is validated everywhere for GraphQL/ActionCable

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Luke Duncalfe <lduncalfe@gitlab.com>
Co-authored-by: Dylan Griffith <dyl.griffith@gmail.com>

Add token authorization to ActionCable

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



Merged-by: Aboobacker MK <akarakath@gitlab.com>
Approved-by: Serena Fang <sfang@gitlab.com>
Approved-by: Allison Browne <abrowne@gitlab.com>
Approved-by: Ottilia Westerlund <12746880-ottilia_westerlund@users.noreply.gitlab.com>
Approved-by: Aboobacker MK <akarakath@gitlab.com>
Co-authored-by: Pavel Shutsin <pshutsin@gitlab.com>

Remove build-gdk-image, e2e:test-on-gdk, and retag-gdk-image jobs

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



Merged-by: Stan Hu <stanhu@gmail.com>
Approved-by: Mayra Cabrera <mcabrera@gitlab.com>
Reviewed-by: Rémy Coutable <remy@rymai.me>
Co-authored-by: Nao Hashizume <nhashizume@gitlab.com>

Prevent starting multiple Capybara proxy servers

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



Merged-by: Mayra Cabrera <mcabrera@gitlab.com>
Approved-by: Mayra Cabrera <mcabrera@gitlab.com>
Co-authored-by: Heinrich Lee Yu <heinrich@gitlab.com>

Update an expired test certificate

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



Merged-by: Mayra Cabrera <mcabrera@gitlab.com>
Approved-by: Mayra Cabrera <mcabrera@gitlab.com>
Co-authored-by: Vasilii Iakliushin <viakliushin@gitlab.com>

This code is run every time a new Capybara browser session is started.
Running this code multiple times causes subsequent feature specs to slow
down considerably.

Contributes to
https://gitlab.com/gitlab-org/quality/engineering-productivity/master-broken-incidents/-/issues/6747

**Problem**

The previous certificate that was used in tests got expired. As a result
tests started failing with "tls: failed to verify certificate: x509:
certificate has expired or is not yet valid: current time
2024-06-07T06:16:03Z is after 2024-06-07T04:31:24Z"

**Solution**

Reissue a certificate with an expiration date "Aug 24 09:26:29 2032 GMT"

Changelog: fixed

Fix slow spec in 16-5-stable-ee

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



Merged-by: Stan Hu <stanhu@gmail.com>
Co-authored-by: Lin Jen-Shin <jen-shin@gitlab.com>

This should properly shutdown webrick so that we don't need to
forcefully kill the thread to shutdown webrick in the tests.

Without properly shutting down webrick, we leak threads and other
resources to each test cases, eventually causing everything to slow down
and timing out the CI jobs.

This is discovered in
https://gitlab.com/gitlab-org/gitlab/-/issues/462928#note_1916591506

A quick fix was proposed in the above thread and merged in
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/153887

This should properly shutdown webrick instead.

* It should be safe to shutdown webrick regardless
* In a test, we use a thread to wrap around `WEBrick::HTTPServer`,
  turning the blocking server into a non-blocking server. This means
  the daemon thread will stop immediately because everything is
  wrapped inside another thread. If we only shutdown webrick when
  the thread is alive, we're not shutting it down in this test case
  either, leaking resources.

This preserves similar performance comparing to killing the thread.

This partially reverts
https://gitlab.com/gitlab-org/gitlab/-/commit/f5b1317af8aad2d8b7d098c0e4dada25ccfd924b

Fix Geo migration spec

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



Merged-by: Stan Hu <stanhu@gmail.com>
Approved-by: Rémy Coutable <remy@rymai.me>
Co-authored-by: agius <andrew@atevans.com>