-
-
Notifications
You must be signed in to change notification settings - Fork 5.9k
Simplify Gothic to use our session store instead of creating a different store #17507
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
Merged
+110
−934
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
3c2e609
Simplify Gothic to use our session store instead of creating a differ…
zeripath ae63560
as per review
zeripath d377426
as per review
zeripath b25fcf6
Merge branch 'main' into chi-store-for-oauth2
techknowlogick eae3178
Handle MaxTokenLength
zeripath 433fe80
oops
zeripath 3b41726
Merge branch 'main' into chi-store-for-oauth2
zeripath aeec7bb
Merge branch 'main' into chi-store-for-oauth2
lafriks File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| // Copyright 2021 The Gitea Authors. All rights reserved. | ||
| // Use of this source code is governed by a MIT-style | ||
| // license that can be found in the LICENSE file. | ||
|
|
||
| package oauth2 | ||
|
|
||
| import ( | ||
| "encoding/gob" | ||
| "fmt" | ||
| "net/http" | ||
|
|
||
| "code.gitea.io/gitea/modules/log" | ||
| chiSession "gitea.com/go-chi/session" | ||
| "github.com/gorilla/sessions" | ||
| ) | ||
|
|
||
| // SessionsStore creates a gothic store from our session | ||
| type SessionsStore struct { | ||
| maxLength int64 | ||
| } | ||
|
|
||
| // Get should return a cached session. | ||
| func (st *SessionsStore) Get(r *http.Request, name string) (*sessions.Session, error) { | ||
| return st.getOrNew(r, name, false) | ||
| } | ||
|
|
||
| // New should create and return a new session. | ||
| // | ||
| // Note that New should never return a nil session, even in the case of | ||
| // an error if using the Registry infrastructure to cache the session. | ||
| func (st *SessionsStore) New(r *http.Request, name string) (*sessions.Session, error) { | ||
| return st.getOrNew(r, name, true) | ||
| } | ||
|
|
||
| // getOrNew gets the session from the chi-session if it exists. Override permits the overriding of an unexpected object. | ||
| func (st *SessionsStore) getOrNew(r *http.Request, name string, override bool) (*sessions.Session, error) { | ||
| chiStore := chiSession.GetSession(r) | ||
|
|
||
| session := sessions.NewSession(st, name) | ||
|
|
||
| rawData := chiStore.Get(name) | ||
| if rawData != nil { | ||
| oldSession, ok := rawData.(*sessions.Session) | ||
| if ok { | ||
| session.ID = oldSession.ID | ||
| session.IsNew = oldSession.IsNew | ||
| session.Options = oldSession.Options | ||
| session.Values = oldSession.Values | ||
|
|
||
| return session, nil | ||
| } else if !override { | ||
| log.Error("Unexpected object in session at name: %s: %v", name, rawData) | ||
| return nil, fmt.Errorf("unexpected object in session at name: %s", name) | ||
| } | ||
| } | ||
|
|
||
| session.ID = chiStore.ID() // Simply copy the session id from the chi store | ||
|
|
||
| return session, chiStore.Set(name, session) | ||
| } | ||
|
|
||
| // Save should persist session to the underlying store implementation. | ||
| func (st *SessionsStore) Save(r *http.Request, w http.ResponseWriter, session *sessions.Session) error { | ||
| chiStore := chiSession.GetSession(r) | ||
|
|
||
| if err := chiStore.Set(session.Name(), session); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if st.maxLength > 0 { | ||
| sizeWriter := &sizeWriter{} | ||
|
|
||
| _ = gob.NewEncoder(sizeWriter).Encode(session) | ||
| if sizeWriter.size > st.maxLength { | ||
| return fmt.Errorf("encode session: Data too long: %d > %d", sizeWriter.size, st.maxLength) | ||
| } | ||
| } | ||
|
|
||
| return chiStore.Release() | ||
| } | ||
|
|
||
| type sizeWriter struct { | ||
| size int64 | ||
| } | ||
|
|
||
| func (s *sizeWriter) Write(data []byte) (int, error) { | ||
| s.size += int64(len(data)) | ||
| return len(data), nil | ||
| } | ||
|
|
||
| var _ (sessions.Store) = &SessionsStore{} | ||
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.