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

Fix conflicts #1

Merged
merged 9 commits into from
Jan 15, 2021
Merged

Fix conflicts #1

merged 9 commits into from
Jan 15, 2021

Conversation

maxisme
Copy link
Owner

@maxisme maxisme commented Jan 12, 2021

No description provided.

thomseddon and others added 8 commits September 23, 2020 14:48
…n#187)

* Support concurrent CSRF cookies by using a prefix of nonce.
* Move ValidateState out and make CSRF cookies last 1h
* add tests to check csrf cookie nam + minor tweaks

Co-authored-by: Michal Witkowski <michal@cerberus>
Co-authored-by: Mathieu Cantin <mcantin@petalmd.com>
Co-authored-by: Pete Shaw <lozlow@users.noreply.github.com>
…d-auth

� Conflicts:
�	internal/auth.go
�	internal/auth_test.go
�	internal/server.go
@maxisme maxisme merged commit a98e568 into master Jan 15, 2021
@maxisme maxisme deleted the fix-conflicts branch January 15, 2021 14:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants