Reuse the super secure session store for Drive! Fixes #36 ^_^

adayoung · Apr 21, 2024 · be010a0 · be010a0
1 parent 9b4670c
commit be010a0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/pastebin/models/gdrive.go b/pastebin/models/gdrive.go
@@ -25,10 +25,8 @@ func init() {
 	gob.Register(&oauth2.Token{})
 }
 
-var sessionStore = sessions.NewCookieStore([]byte(os.Getenv("CSRFAuthKey")))
-
 func SaveOAuthToken(w http.ResponseWriter, r *http.Request, token *oauth2.Token) error {
-	if session, err := sessionStore.Get(r, os.Getenv("CookiePrefix")+"_oauth2_gdrive"); err != nil {
+	if session, err := utils.SessionStore().Get(r, os.Getenv("CookiePrefix")+"_oauth2_gdrive"); err != nil {
 		return err
 	} else {
 		session.Options = &sessions.Options{
@@ -50,7 +48,7 @@ func SaveOAuthToken(w http.ResponseWriter, r *http.Request, token *oauth2.Token)
 }
 
 func GetOAuthToken(r *http.Request) (*oauth2.Token, error) {
-	if session, err := sessionStore.Get(r, os.Getenv("CookiePrefix")+"_oauth2_gdrive"); err != nil {
+	if session, err := utils.SessionStore().Get(r, os.Getenv("CookiePrefix")+"_oauth2_gdrive"); err != nil {
 		return nil, err
 	} else {
 		if token, ok := session.Values["gdrive"].(*oauth2.Token); ok {

diff --git a/pastebin/utils/utils.go b/pastebin/utils/utils.go
@@ -76,6 +76,10 @@ func sessionStore() *sessions.CookieStore {
 	return ss
 }
 
+func SessionStore() *sessions.CookieStore {
+	return sessionStore()
+}
+
 func UpdateSession(w http.ResponseWriter, r *http.Request, paste_id string, remove bool) error {
 	if session, err := sessionStore().Get(r, os.Getenv("CookiePrefix")+"_pb_session"); err != nil {
 		return err