Skip to content

Sync with upstream master #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
cruizen wants to merge 1,378 commits into
base: master
Choose a base branch
from
Open

Sync with upstream master #6

cruizen wants to merge 1,378 commits into from

Conversation

@cruizen
Copy link

@cruizen cruizen commented Oct 17, 2022 •
edited
Loading

Overview

Sync the pf9 fork with dexidp/dex master to bring in all the changes from https://github.com/dexidp/dex/releases/tag/v2.35.3 + this PR dexidp#2708 from master

What this PR does / why we need it

Bring in the upstream fixes to improve security (there is a known CVE), bring in fixes / optimisations
ArgoCD has now released patches for v2.2 and v2.4 that fix this in ArgoCD's dex server pod (by upgrading to v2.25.3 of upstream dex).
We are missing this (just upgrading ArgoCD will not help) since we use our own forked dex

Special notes for your reviewer

Does this PR introduce a user-facing change?

@cruizen cruizen changed the title Merge master Sync with upstream master Oct 17, 2022
@cruizen cruizen marked this pull request as ready for review October 17, 2022 21:26
@cruizen
Copy link
Author

cruizen commented Oct 17, 2022 •
edited
Loading

Hi @erwinvaneyk , @pshanbhag I don't have write access to the repo and therefore cannot ask for review and / or resolve merge conflicts, it seems.

This PR is in draft state since I see a message that "This branch has conflicts that must be resolved".

@cruizen
Copy link
Author

cruizen commented Oct 4, 2023

This branch has conflicts that must be resolved :-/

@cruizen cruizen marked this pull request as draft October 4, 2023 21:17
mithilarun
mithilarun previously approved these changes Oct 4, 2023
View reviewed changes
@cruizen cruizen marked this pull request as ready for review March 12, 2024 12:47
@cruizen cruizen requested review from a team, gauravgavhane05 and mithilarun March 13, 2024 09:23
mithilarun
mithilarun previously approved these changes Mar 13, 2024
View reviewed changes
@bito-code-review
Copy link

bito-code-review bot commented Feb 1, 2025 •
edited
Loading

Code Review Agent Run Status

  • Limitations and other issues: ❌ Failure - Bito Code Review Agent didn't review this pull request automatically because it exceeded the size limit. No action is needed if you didn't intend for the agent to review it. Otherwise, you can initiate the review by typing /review in a comment below.

14 similar comments
@bito-code-review
Copy link

bito-code-review bot commented Feb 3, 2025 •
edited
Loading

Code Review Agent Run Status

  • Limitations and other issues: ❌ Failure - Bito Code Review Agent didn't review this pull request automatically because it exceeded the size limit. No action is needed if you didn't intend for the agent to review it. Otherwise, you can initiate the review by typing /review in a comment below.

@bito-code-review
Copy link

bito-code-review bot commented Feb 4, 2025 •
edited
Loading

Code Review Agent Run Status

  • Limitations and other issues: ❌ Failure - Bito Code Review Agent didn't review this pull request automatically because it exceeded the size limit. No action is needed if you didn't intend for the agent to review it. Otherwise, you can initiate the review by typing /review in a comment below.

@bito-code-review
Copy link

bito-code-review bot commented Feb 4, 2025 •
edited
Loading

Code Review Agent Run Status

  • Limitations and other issues: ❌ Failure - Bito Code Review Agent didn't review this pull request automatically because it exceeded the size limit. No action is needed if you didn't intend for the agent to review it. Otherwise, you can initiate the review by typing /review in a comment below.

@bito-code-review
Copy link

bito-code-review bot commented Feb 6, 2025 •
edited
Loading

Code Review Agent Run Status

  • Limitations and other issues: ❌ Failure - Bito Code Review Agent didn't review this pull request automatically because it exceeded the size limit. No action is needed if you didn't intend for the agent to review it. Otherwise, you can initiate the review by typing /review in a comment below.

@bito-code-review
Copy link

bito-code-review bot commented Feb 6, 2025 •
edited
Loading

Code Review Agent Run Status

  • Limitations and other issues: ❌ Failure - Bito Code Review Agent didn't review this pull request automatically because it exceeded the size limit. No action is needed if you didn't intend for the agent to review it. Otherwise, you can initiate the review by typing /review in a comment below.

@bito-code-review
Copy link

bito-code-review bot commented Feb 14, 2025 •
edited
Loading

Code Review Agent Run Status

  • Limitations and other issues: ❌ Failure - Bito Code Review Agent didn't review this pull request automatically because it exceeded the size limit. No action is needed if you didn't intend for the agent to review it. Otherwise, you can initiate the review by typing /review in a comment below.

@bito-code-review
Copy link

bito-code-review bot commented Feb 15, 2025 •
edited
Loading

Code Review Agent Run Status

  • Limitations and other issues: ❌ Failure - Bito Code Review Agent didn't review this pull request automatically because it exceeded the size limit. No action is needed if you didn't intend for the agent to review it. Otherwise, you can initiate the review by typing /review in a comment below.

@bito-code-review
Copy link

bito-code-review bot commented Feb 16, 2025 •
edited
Loading

Code Review Agent Run Status

  • Limitations and other issues: ❌ Failure - Bito Code Review Agent didn't review this pull request automatically because it exceeded the size limit. No action is needed if you didn't intend for the agent to review it. Otherwise, you can initiate the review by typing /review in a comment below.

@bito-code-review
Copy link

bito-code-review bot commented Feb 17, 2025 •
edited
Loading

Code Review Agent Run Status

  • Limitations and other issues: ❌ Failure - Bito Code Review Agent didn't review this pull request automatically because it exceeded the size limit. No action is needed if you didn't intend for the agent to review it. Otherwise, you can initiate the review by typing /review in a comment below.

@bito-code-review
Copy link

bito-code-review bot commented Feb 18, 2025 •
edited
Loading

Code Review Agent Run Status

  • Limitations and other issues: ❌ Failure - Bito Code Review Agent didn't review this pull request automatically because it exceeded the size limit. No action is needed if you didn't intend for the agent to review it. Otherwise, you can initiate the review by typing /review in a comment below.

@bito-code-review
Copy link

bito-code-review bot commented Feb 19, 2025 •
edited
Loading

Code Review Agent Run Status

  • Limitations and other issues: ❌ Failure - Bito Code Review Agent didn't review this pull request automatically because it exceeded the size limit. No action is needed if you didn't intend for the agent to review it. Otherwise, you can initiate the review by typing /review in a comment below.

@bito-code-review
Copy link

bito-code-review bot commented Feb 20, 2025 •
edited
Loading

Code Review Agent Run Status

  • Limitations and other issues: ❌ Failure - Bito Code Review Agent didn't review this pull request automatically because it exceeded the size limit. No action is needed if you didn't intend for the agent to review it. Otherwise, you can initiate the review by typing /review in a comment below.

@bito-code-review
Copy link

bito-code-review bot commented Feb 28, 2025 •
edited
Loading

Code Review Agent Run Status

  • Limitations and other issues: ❌ Failure - Bito Code Review Agent didn't review this pull request automatically because it exceeded the size limit. No action is needed if you didn't intend for the agent to review it. Otherwise, you can initiate the review by typing /review in a comment below.

@bito-code-review
Copy link

bito-code-review bot commented Mar 5, 2025 •
edited
Loading

Code Review Agent Run Status

  • Limitations and other issues: ❌ Failure - Bito Code Review Agent didn't review this pull request automatically because it exceeded the size limit. No action is needed if you didn't intend for the agent to review it. Otherwise, you can initiate the review by typing /review in a comment below.

dependabot bot and others added 29 commits December 5, 2025 04:02
@dependabot
build(deps): bump distroless/static-debian12 from e8a4044 to 2b7c93f
7300d82 
Bumps distroless/static-debian12 from `e8a4044` to `2b7c93f`.

---
updated-dependencies:
- dependency-name: distroless/static-debian12
  dependency-version: nonroot
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
build(deps): bump tonistiigi/xx from 1.8.0 to 1.9.0
3e09c4a 
Bumps tonistiigi/xx from 1.8.0 to 1.9.0.

---
updated-dependencies:
- dependency-name: tonistiigi/xx
  dependency-version: 1.9.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
build(deps): bump golang.org/x/oauth2 from 0.32.0 to 0.34.0 in /examples
a72ac95 
Bumps [golang.org/x/oauth2](https://github.com/golang/oauth2) from 0.32.0 to 0.34.0.
- [Commits](golang/oauth2@v0.32.0...v0.34.0)

---
updated-dependencies:
- dependency-name: golang.org/x/oauth2
  dependency-version: 0.34.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@sagikazarmark
Merge pull request #4430 from dexidp/dependabot/docker/tonistiigi/xx-…
356f207 
…1.9.0

build(deps): bump tonistiigi/xx from 1.8.0 to 1.9.0
@sagikazarmark
Merge pull request #4427 from dexidp/dependabot/docker/distroless/sta…
bf77fcf 
…tic-debian12-2b7c93f

build(deps): bump distroless/static-debian12 from `e8a4044` to `2b7c93f`
@dependabot
build(deps): bump golang from 1.25.3-alpine3.22 to 1.25.5-alpine3.22
c301f78 
Bumps golang from 1.25.3-alpine3.22 to 1.25.5-alpine3.22.

---
updated-dependencies:
- dependency-name: golang
  dependency-version: 1.25.5-alpine3.22
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
build(deps): bump alpine from 3.22.2 to 3.23.0
cfa31c4 
Bumps alpine from 3.22.2 to 3.23.0.

---
updated-dependencies:
- dependency-name: alpine
  dependency-version: 3.23.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@sagikazarmark
Merge pull request #4419 from dexidp/dependabot/go_modules/golang.org…
719e405 
…/x/crypto-0.45.0

build(deps): bump golang.org/x/crypto from 0.43.0 to 0.45.0
@sagikazarmark
Merge pull request #4414 from dexidp/dependabot/github_actions/github…
24cd880 
…/codeql-action-4.31.3

build(deps): bump github/codeql-action from 4.31.2 to 4.31.3
@sagikazarmark
Merge pull request #4411 from dexidp/dependabot/github_actions/action…
7fd0ba9 
…s/dependency-review-action-4.8.2

build(deps): bump actions/dependency-review-action from 4.8.1 to 4.8.2
@sagikazarmark
Merge pull request #4405 from dexidp/dependabot/github_actions/docker…
1dac07d 
…/setup-qemu-action-3.7.0

build(deps): bump docker/setup-qemu-action from 3.6.0 to 3.7.0
@sagikazarmark
Merge pull request #4402 from dexidp/dependabot/github_actions/docker…
a1e5d58 
…/metadata-action-5.9.0

build(deps): bump docker/metadata-action from 5.8.0 to 5.9.0
@dependabot
build(deps): bump google.golang.org/api from 0.252.0 to 0.256.0
7b3063d 
Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.252.0 to 0.256.0.
- [Release notes](https://github.com/googleapis/google-api-go-client/releases)
- [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md)
- [Commits](googleapis/google-api-go-client@v0.252.0...v0.256.0)

---
updated-dependencies:
- dependency-name: google.golang.org/api
  dependency-version: 0.256.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@sagikazarmark
Merge pull request #4399 from dexidp/dependabot/github_actions/helm/k…
30b1d6e 
…ind-action-1.13.0

build(deps): bump helm/kind-action from 1.12.0 to 1.13.0
@sagikazarmark
Merge pull request #4425 from dexidp/dependabot/docker/alpine-3.23.0
f9d49f7 
build(deps): bump alpine from 3.22.2 to 3.23.0
@sagikazarmark
Merge pull request #4424 from dexidp/dependabot/docker/golang-1.25.5-…
1fa99f3 
…alpine3.22

build(deps): bump golang from 1.25.3-alpine3.22 to 1.25.5-alpine3.22
@sagikazarmark
Merge pull request #4413 from dexidp/dependabot/go_modules/google.gol…
a6b3152 
…ang.org/api-0.256.0

build(deps): bump google.golang.org/api from 0.252.0 to 0.256.0
@dependabot
build(deps): bump golang.org/x/oauth2 from 0.32.0 to 0.33.0
06c5a3d 
Bumps [golang.org/x/oauth2](https://github.com/golang/oauth2) from 0.32.0 to 0.33.0.
- [Commits](golang/oauth2@v0.32.0...v0.33.0)

---
updated-dependencies:
- dependency-name: golang.org/x/oauth2
  dependency-version: 0.33.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
build(deps): bump golang.org/x/crypto from 0.43.0 to 0.44.0
9a93f64 
Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.43.0 to 0.44.0.
- [Commits](golang/crypto@v0.43.0...v0.44.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-version: 0.44.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@sagikazarmark
Merge pull request #4409 from dexidp/dependabot/go_modules/golang.org…
93a3732 
…/x/oauth2-0.33.0

build(deps): bump golang.org/x/oauth2 from 0.32.0 to 0.33.0
@sagikazarmark
Merge pull request #4412 from dexidp/dependabot/go_modules/golang.org…
be38c21 
…/x/crypto-0.44.0

build(deps): bump golang.org/x/crypto from 0.43.0 to 0.44.0
@sagikazarmark
Merge pull request #4401 from dexidp/dependabot/go_modules/github.com…
99df040 
…/go-ldap/ldap/v3-3.4.12

build(deps): bump github.com/go-ldap/ldap/v3 from 3.4.11 to 3.4.12
@sagikazarmark
Merge pull request #4431 from dexidp/dependabot/go_modules/examples/g…
7953b07 
…olang.org/x/oauth2-0.34.0

build(deps): bump golang.org/x/oauth2 from 0.32.0 to 0.34.0 in /examples
@dependabot
build(deps): bump google.golang.org/grpc in /examples
c0c4408 
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.76.0 to 1.77.0.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](grpc/grpc-go@v1.76.0...v1.77.0)

---
updated-dependencies:
- dependency-name: google.golang.org/grpc
  dependency-version: 1.77.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
build(deps): bump google.golang.org/grpc in /api/v2
c71068f 
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.76.0 to 1.77.0.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](grpc/grpc-go@v1.76.0...v1.77.0)

---
updated-dependencies:
- dependency-name: google.golang.org/grpc
  dependency-version: 1.77.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@sagikazarmark
Merge pull request #4417 from dexidp/dependabot/go_modules/examples/g…
8b10369 
…oogle.golang.org/grpc-1.77.0

build(deps): bump google.golang.org/grpc from 1.76.0 to 1.77.0 in /examples
@sagikazarmark
Merge pull request #4416 from dexidp/dependabot/go_modules/api/v2/goo…
31cfdd7 
…gle.golang.org/grpc-1.77.0

build(deps): bump google.golang.org/grpc from 1.76.0 to 1.77.0 in /api/v2
@dependabot
build(deps): bump github.com/spf13/cobra in /examples
cfdf8d4 
Bumps [github.com/spf13/cobra](https://github.com/spf13/cobra) from 1.10.1 to 1.10.2.
- [Release notes](https://github.com/spf13/cobra/releases)
- [Commits](spf13/cobra@v1.10.1...v1.10.2)

---
updated-dependencies:
- dependency-name: github.com/spf13/cobra
  dependency-version: 1.10.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@sagikazarmark
Merge pull request #4426 from dexidp/dependabot/go_modules/examples/g…
8ab38eb 
…ithub.com/spf13/cobra-1.10.2

build(deps): bump github.com/spf13/cobra from 1.10.1 to 1.10.2 in /examples
@bito-code-review
Copy link

bito-code-review bot commented Dec 9, 2025

Bito Automatic Review Skipped - Large PR

Bito didn't auto-review this change because the pull request exceeded the line limit. No action is needed if you didn't intend for the agent to review it. Otherwise, to manually trigger a review, type /review in a comment and save.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mithilarun mithilarun mithilarun left review comments

@jayanth-tjvrr jayanth-tjvrr Awaiting requested review from jayanth-tjvrr

@gauravgavhane05 gauravgavhane05 Awaiting requested review from gauravgavhane05

At least 1 approving review is required to merge this pull request.

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.