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

[v16] fix: Issue DeviceWebToken during Github authn #44808

Merged
merged 3 commits into from
Jul 30, 2024

Conversation

codingllama
Copy link
Contributor

Backport #44656 to branch/v16.

#44598

@codingllama codingllama added the no-changelog Indicates that a PR does not require a changelog entry label Jul 30, 2024
@github-actions github-actions bot requested review from r0mant and rosstimothy July 30, 2024 13:50
Copy link
Contributor Author

Choose a reason for hiding this comment

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

We got various conflicts here related to the split TLS/SSH private keys, all reverted.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Protogen conflicts solved by make grpc.

@codingllama codingllama enabled auto-merge July 30, 2024 13:51
* Move trusted device mode calculation into CreateWebSessionFromReq

* Add the GithubAuthRequest.ClientUserAgent field

* Update generated protos

* Issue DeviceWebToken during Github authn

* Issue DeviceWebToken as part of CreateWebSessionFromReq

* nit: Move methods to sessions.go
@codingllama codingllama force-pushed the codingllama/backport/44656-v16 branch from 418b36e to c41dce3 Compare July 30, 2024 17:12
@codingllama
Copy link
Contributor Author

Rebased and fixed conflicts on lib/auth/sessions.go (imports only).

@codingllama codingllama added this pull request to the merge queue Jul 30, 2024
@public-teleport-github-review-bot public-teleport-github-review-bot bot removed the request for review from r0mant July 30, 2024 19:57
Merged via the queue into branch/v16 with commit a31c2ac Jul 30, 2024
39 checks passed
@codingllama codingllama deleted the codingllama/backport/44656-v16 branch July 30, 2024 20:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport no-changelog Indicates that a PR does not require a changelog entry size/sm
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants