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,412 commits into
base: master
Choose a base branch
from
Open

Sync with upstream master #6

cruizen wants to merge 1,412 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 30 commits December 10, 2025 04:01
@dependabot
build(deps): bump actions/checkout from 5.0.0 to 6.0.1
71b893e 
Bumps [actions/checkout](https://github.com/actions/checkout) from 5.0.0 to 6.0.1.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@08c6903...8e8c483)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 6.0.1
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
build(deps): bump golang.org/x/net from 0.47.0 to 0.48.0
95bf3d0 
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.47.0 to 0.48.0.
- [Commits](golang/net@v0.47.0...v0.48.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
build(deps): bump github.com/spf13/cobra from 1.10.1 to 1.10.2
ab8306c 
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>
@dependabot
build(deps): bump github/codeql-action from 4.31.3 to 4.31.7
78363ec 
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.31.3 to 4.31.7.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@014f16e...cf1bb45)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.31.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
build(deps): bump github.com/coreos/go-oidc/v3 from 3.14.1 to 3.17.0
8be9fc3 
Bumps [github.com/coreos/go-oidc/v3](https://github.com/coreos/go-oidc) from 3.14.1 to 3.17.0.
- [Release notes](https://github.com/coreos/go-oidc/releases)
- [Commits](coreos/go-oidc@v3.14.1...v3.17.0)

---
updated-dependencies:
- dependency-name: github.com/coreos/go-oidc/v3
  dependency-version: 3.17.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/protobuf from 1.36.10 to 1.36.11
a023784 
Bumps google.golang.org/protobuf from 1.36.10 to 1.36.11.

---
updated-dependencies:
- dependency-name: google.golang.org/protobuf
  dependency-version: 1.36.11
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
build(deps): bump google.golang.org/grpc in /examples
2c5f06e 
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.77.0 to 1.78.0.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](grpc/grpc-go@v1.77.0...v1.78.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
@loosebazooka
Update distroless base image to debian13 (#4453)
895a748 
Signed-off-by: Appu Goundan <appu@google.com>
@cardoe
fix: device callback URL needs to handle a / (#4448)
dcbb7bb 
If the issuer path ends with a / the URL will be built wrong so we
should instead use the helper function to ensure the path is built
correctly. fixes #4242.

Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
@dependabot
build(deps): bump alpine from 3.23.0 to 3.23.2 (#4455)
2d7ecd3 
Bumps alpine from 3.23.0 to 3.23.2.

---
updated-dependencies:
- dependency-name: alpine
  dependency-version: 3.23.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@Jabejixo
feat: support groups and preferred_username for staticPasswords (#4456)
d1b2722 
Signed-off-by: Ivan Zvyagintsev <ivan.zvyagintsev@flant.com>
@Jabejixo
fix: hide internal server error details from users
debcb5c 
Signed-off-by: Ivan Zvyagintsev <ivan.zvyagintsev@flant.com>
@Jabejixo
fix: hide internal server error details from users
b0a6ee9 
Signed-off-by: Ivan Zvyagintsev <ivan.zvyagintsev@flant.com>
@sagikazarmark
Merge pull request #4457 from Jabejixo/fix/hide-internal-500-error-de…
701c83a 
…tails

fix: hide internal server error details from users
@sagikazarmark
Merge pull request #4460 from dexidp/dependabot/go_modules/examples/g…
6a65189 
…oogle.golang.org/grpc-1.78.0

build(deps): bump google.golang.org/grpc from 1.77.0 to 1.78.0 in /examples
@sagikazarmark
Merge pull request #4449 from dexidp/dependabot/go_modules/google.gol…
e8f5eeb 
…ang.org/protobuf-1.36.11

build(deps): bump google.golang.org/protobuf from 1.36.10 to 1.36.11
@sagikazarmark
Merge pull request #4440 from dexidp/dependabot/github_actions/github…
30d89fd 
…/codeql-action-4.31.7

build(deps): bump github/codeql-action from 4.31.3 to 4.31.7
@sagikazarmark
Merge pull request #4439 from dexidp/dependabot/go_modules/github.com…
3b06f75 
…/spf13/cobra-1.10.2

build(deps): bump github.com/spf13/cobra from 1.10.1 to 1.10.2
@sagikazarmark
Merge pull request #4438 from dexidp/dependabot/go_modules/golang.org…
2b15108 
…/x/net-0.48.0

build(deps): bump golang.org/x/net from 0.47.0 to 0.48.0
@sagikazarmark
Merge pull request #4437 from dexidp/dependabot/github_actions/action…
1c0c0b0 
…s/checkout-6.0.1

build(deps): bump actions/checkout from 5.0.0 to 6.0.1
@sagikazarmark
Merge pull request #4435 from dexidp/dependabot/github_actions/anchor…
a03588a 
…e/sbom-action-0.20.11

build(deps): bump anchore/sbom-action from 0.20.9 to 0.20.11
@sagikazarmark
Merge pull request #4434 from dexidp/dependabot/github_actions/docker…
4646f9f 
…/metadata-action-5.10.0

build(deps): bump docker/metadata-action from 5.9.0 to 5.10.0
@sagikazarmark
Merge pull request #4433 from dexidp/dependabot/github_actions/action…
0257f55 
…s/setup-go-6.1.0

build(deps): bump actions/setup-go from 6.0.0 to 6.1.0
@dependabot
build(deps): bump google.golang.org/protobuf in /api/v2
4bd5919 
Bumps google.golang.org/protobuf from 1.36.10 to 1.36.11.

---
updated-dependencies:
- dependency-name: google.golang.org/protobuf
  dependency-version: 1.36.11
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@sagikazarmark
fix: failing go-oidc test after 3.15
bce74e7 
Signed-off-by: Mark Sagi-Kazar <mark.sagikazar@gmail.com>
@sagikazarmark
Merge pull request #4441 from dexidp/dependabot/go_modules/github.com…
8fc1f97 
…/coreos/go-oidc/v3-3.17.0

build(deps): bump github.com/coreos/go-oidc/v3 from 3.14.1 to 3.17.0
@sagikazarmark
Merge pull request #4450 from dexidp/dependabot/go_modules/api/v2/goo…
4ffb7a2 
…gle.golang.org/protobuf-1.36.11

build(deps): bump google.golang.org/protobuf from 1.36.10 to 1.36.11 in /api/v2
@sagikazarmark
Merge pull request #4420 from dexidp/dependabot/go_modules/examples/g…
adf3c82 
…ithub.com/coreos/go-oidc/v3-3.17.0

build(deps): bump github.com/coreos/go-oidc/v3 from 3.16.0 to 3.17.0 in /examples
@dependabot
build(deps): bump the etcd group with 2 updates
c44f771 
Bumps the etcd group with 2 updates: [go.etcd.io/etcd/client/pkg/v3](https://github.com/etcd-io/etcd) and [go.etcd.io/etcd/client/v3](https://github.com/etcd-io/etcd).


Updates `go.etcd.io/etcd/client/pkg/v3` from 3.6.5 to 3.6.6
- [Release notes](https://github.com/etcd-io/etcd/releases)
- [Commits](etcd-io/etcd@v3.6.5...v3.6.6)

Updates `go.etcd.io/etcd/client/v3` from 3.6.5 to 3.6.6
- [Release notes](https://github.com/etcd-io/etcd/releases)
- [Commits](etcd-io/etcd@v3.6.5...v3.6.6)

---
updated-dependencies:
- dependency-name: go.etcd.io/etcd/client/pkg/v3
  dependency-version: 3.6.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: etcd
- dependency-name: go.etcd.io/etcd/client/v3
  dependency-version: 3.6.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: etcd
...

Signed-off-by: dependabot[bot] <support@github.com>
@sagikazarmark
Merge pull request #4436 from dexidp/dependabot/go_modules/etcd-4fbb4…
e674097 
…66fd8

build(deps): bump the etcd group with 2 updates
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.