Skip to content
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.

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

Add option to allow client redirects from IPs in specified CIDR ranges in SSO client logins #44556

Merged
merged 1 commit into from
Jul 30, 2024

Conversation

capnspacehook
Copy link
Contributor

@capnspacehook capnspacehook commented Jul 23, 2024

Fixes #44535.

changelog: Add option to allow client redirects from IPs in specified CIDR ranges in SSO client logins

api/types/oidc.go Outdated Show resolved Hide resolved
lib/auth/github.go Outdated Show resolved Hide resolved
lib/auth/github.go Outdated Show resolved Hide resolved
@capnspacehook capnspacehook force-pushed the capnspacehook/sso-insecure-cidr-redirects branch from ac1563a to 73c651f Compare July 23, 2024 16:27
lib/auth/github.go Outdated Show resolved Hide resolved
lib/auth/github.go Outdated Show resolved Hide resolved
lib/auth/github.go Outdated Show resolved Hide resolved
lib/auth/github.go Outdated Show resolved Hide resolved
@capnspacehook capnspacehook force-pushed the capnspacehook/sso-insecure-cidr-redirects branch 2 times, most recently from 48fe0fe to 816b776 Compare July 24, 2024 13:57
espadolini
espadolini previously approved these changes Jul 24, 2024
Copy link
Contributor

@espadolini espadolini left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's still maybe a point to ignoring invalid CIDRs (and invalid regexps, too, which utils.SliceMatchesRegex already hard fails on) since the rules are purely additive and there's no chance of potentially failing open, but as long as "standard" logins are guaranteed to not break, it's probably fine

lib/auth/github.go Outdated Show resolved Hide resolved
lib/auth/github.go Outdated Show resolved Hide resolved
@capnspacehook capnspacehook force-pushed the capnspacehook/sso-insecure-cidr-redirects branch from e3fd04e to fa59038 Compare July 24, 2024 14:41
@capnspacehook
Copy link
Contributor Author

I opted to log errors when dealing with invalid CIDRs and while I was at it regexes as well

@capnspacehook capnspacehook force-pushed the capnspacehook/sso-insecure-cidr-redirects branch 2 times, most recently from 101e14c to 45cce5c Compare July 25, 2024 14:28
Copy link

🤖 Vercel preview here: https://docs-dxanxmz4a-goteleport.vercel.app/docs/ver/preview

@espadolini espadolini dismissed their stale review July 26, 2024 08:15

waiting for the client-side change to --callback

@r0mant r0mant force-pushed the capnspacehook/sso-insecure-cidr-redirects branch from a7ca727 to 2e2cc41 Compare July 30, 2024 20:12
@r0mant r0mant changed the title add option to allow client redirects from IPs in specified CIDR ranges in SSO client logins Add option to allow client redirects from IPs in specified CIDR ranges in SSO client logins Jul 30, 2024
@r0mant r0mant enabled auto-merge July 30, 2024 20:12
Copy link

🤖 Vercel preview here: https://docs-m7xvqj2rr-goteleport.vercel.app/docs/ver/preview

@r0mant r0mant added this pull request to the merge queue Jul 30, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jul 30, 2024
@r0mant r0mant added this pull request to the merge queue Jul 30, 2024
Merged via the queue into master with commit bca2943 Jul 30, 2024
42 of 43 checks passed
@r0mant r0mant deleted the capnspacehook/sso-insecure-cidr-redirects branch July 30, 2024 21:21
@public-teleport-github-review-bot

@capnspacehook See the table below for backport results.

Branch Result
branch/v14 Failed
branch/v15 Failed
branch/v16 Failed

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

Successfully merging this pull request may close these issues.

Add insecure_allow_http_bind_ips to client redirect settings
4 participants