Skip to content

Commit 6858da3

Browse files
committed
Store OAuth2 session data in database
1 parent daf70d3 commit 6858da3

File tree

10 files changed

+586
-11
lines changed

10 files changed

+586
-11
lines changed

models/oauth2.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ func GetActiveOAuth2Providers() ([]string, map[string]OAuth2Provider, error) {
9898

9999
// InitOAuth2 initialize the OAuth2 lib and register all active OAuth2 providers in the library
100100
func InitOAuth2() {
101-
oauth2.Init()
101+
oauth2.Init(x)
102102
loginSources, _ := GetActiveOAuth2ProviderLoginSources()
103103

104104
for _, source := range loginSources {

modules/auth/oauth2/oauth2.go

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@ package oauth2
77
import (
88
"math"
99
"net/http"
10-
"os"
11-
"path/filepath"
1210

1311
"code.gitea.io/gitea/modules/log"
1412
"code.gitea.io/gitea/modules/setting"
1513

16-
"github.com/gorilla/sessions"
14+
"github.com/go-xorm/xorm"
15+
"github.com/lafriks/xormstore"
1716
"github.com/markbates/goth"
1817
"github.com/markbates/goth/gothic"
1918
"github.com/markbates/goth/providers/bitbucket"
@@ -41,13 +40,10 @@ type CustomURLMapping struct {
4140
}
4241

4342
// Init initialize the setup of the OAuth2 library
44-
func Init() {
45-
sessionDir := filepath.Join(setting.AppDataPath, "sessions", "oauth2")
46-
if err := os.MkdirAll(sessionDir, 0700); err != nil {
47-
log.Fatal(4, "Fail to create dir %s: %v", sessionDir, err)
48-
}
49-
50-
store := sessions.NewFilesystemStore(sessionDir, []byte(sessionUsersStoreKey))
43+
func Init(x *xorm.Engine) {
44+
store := xormstore.NewOptions(x, xormstore.Options{
45+
TableName: "oauth2_sessions",
46+
}, []byte(sessionUsersStoreKey))
5147
// according to the Goth lib:
5248
// set the maxLength of the cookies stored on the disk to a larger number to prevent issues with:
5349
// securecookie: the value is too long

vendor/github.com/lafriks/xormstore/Gopkg.lock

Lines changed: 75 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/lafriks/xormstore/Gopkg.toml

Lines changed: 50 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/lafriks/xormstore/LICENSE

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/lafriks/xormstore/README.md

Lines changed: 48 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/lafriks/xormstore/test

Lines changed: 70 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/lafriks/xormstore/util/time_stamp.go

Lines changed: 60 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)