back round 1 view raw

appview: cache/session: init redis session store #211

merged

opened by

anirudh.fi 6 months ago targeting master from push-ruoqnsmttnxx

And a high-level cache package for future use.

Signed-off-by: Anirudh Oppiliappan anirudh@tangled.sh

options

unified split

Changed files

+186

appview

cache

cache.go

session

store.go

+14

appview/cache/cache.go

···

       1
       1
       +
       package cache

     

       2
       2
       +
       

     

       3
       3
       +
       import "github.com/redis/go-redis/v9"

     

       4
       4
       +
       

     

       5
       5
       +
       type Cache struct {

     

       6
       6
       +
       	*redis.Client

     

       7
       7
       +
       }

     

       8
       8
       +
       

     

       9
       9
       +
       func New(addr string) *Cache {

     

       10
       10
       +
       	rdb := redis.NewClient(&redis.Options{

     

       11
       11
       +
       		Addr: addr,

     

       12
       12
       +
       	})

     

       13
       13
       +
       	return &Cache{rdb}

     

       14
       14
       +
       }

+172

appview/cache/session/store.go

···

       1
       1
       +
       package session

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"context"

     

       5
       5
       +
       	"encoding/json"

     

       6
       6
       +
       	"fmt"

     

       7
       7
       +
       	"time"

     

       8
       8
       +
       

     

       9
       9
       +
       	"tangled.sh/tangled.sh/core/appview/cache"

     

       10
       10
       +
       )

     

       11
       11
       +
       

     

       12
       12
       +
       type OAuthSession struct {

     

       13
       13
       +
       	Handle              string

     

       14
       14
       +
       	Did                 string

     

       15
       15
       +
       	PdsUrl              string

     

       16
       16
       +
       	AccessJwt           string

     

       17
       17
       +
       	RefreshJwt          string

     

       18
       18
       +
       	AuthServerIss       string

     

       19
       19
       +
       	DpopPdsNonce        string

     

       20
       20
       +
       	DpopAuthserverNonce string

     

       21
       21
       +
       	DpopPrivateJwk      string

     

       22
       22
       +
       	Expiry              string

     

       23
       23
       +
       }

     

       24
       24
       +
       

     

       25
       25
       +
       type OAuthRequest struct {

     

       26
       26
       +
       	AuthserverIss       string

     

       27
       27
       +
       	Handle              string

     

       28
       28
       +
       	State               string

     

       29
       29
       +
       	Did                 string

     

       30
       30
       +
       	PdsUrl              string

     

       31
       31
       +
       	PkceVerifier        string

     

       32
       32
       +
       	DpopAuthserverNonce string

     

       33
       33
       +
       	DpopPrivateJwk      string

     

       34
       34
       +
       }

     

       35
       35
       +
       

     

       36
       36
       +
       type SessionStore struct {

     

       37
       37
       +
       	cache *cache.Cache

     

       38
       38
       +
       }

     

       39
       39
       +
       

     

       40
       40
       +
       const (

     

       41
       41
       +
       	stateKey   = "oauthstate:%s"

     

       42
       42
       +
       	requestKey = "oauthrequest:%s"

     

       43
       43
       +
       	sessionKey = "oauthsession:%s"

     

       44
       44
       +
       )

     

       45
       45
       +
       

     

       46
       46
       +
       func New(cache *cache.Cache) *SessionStore {

     

       47
       47
       +
       	return &SessionStore{cache: cache}

     

       48
       48
       +
       }

     

       49
       49
       +
       

     

       50
       50
       +
       func (s *SessionStore) SaveSession(ctx context.Context, session OAuthSession) error {

     

       51
       51
       +
       	key := fmt.Sprintf(sessionKey, session.Did)

     

       52
       52
       +
       	data, err := json.Marshal(session)

     

       53
       53
       +
       	if err != nil {

     

       54
       54
       +
       		return err

     

       55
       55
       +
       	}

     

       56
       56
       +
       

     

       57
       57
       +
       	// set with ttl (expires in + buffer)

     

       58
       58
       +
       	expiry, _ := time.Parse(time.RFC3339, session.Expiry)

     

       59
       59
       +
       	ttl := time.Until(expiry) + time.Minute

     

       60
       60
       +
       

     

       61
       61
       +
       	return s.cache.Set(ctx, key, data, ttl).Err()

     

       62
       62
       +
       }

     

       63
       63
       +
       

     

       64
       64
       +
       // SaveRequest stores the OAuth request to be later fetched in the callback. Since

     

       65
       65
       +
       // the fetching happens by comparing the state we get in the callback params, we

     

       66
       66
       +
       // store an additional state->did mapping which then lets us fetch the whole OAuth request.

     

       67
       67
       +
       func (s *SessionStore) SaveRequest(ctx context.Context, request OAuthRequest) error {

     

       68
       68
       +
       	key := fmt.Sprintf(requestKey, request.Did)

     

       69
       69
       +
       	data, err := json.Marshal(request)

     

       70
       70
       +
       	if err != nil {

     

       71
       71
       +
       		return err

     

       72
       72
       +
       	}

     

       73
       73
       +
       

     

       74
       74
       +
       	// oauth flow must complete within 30 minutes

     

       75
       75
       +
       	err = s.cache.Set(ctx, key, data, 30*time.Minute).Err()

     

       76
       76
       +
       	if err != nil {

     

       77
       77
       +
       		return fmt.Errorf("error saving request: %w", err)

     

       78
       78
       +
       	}

     

       79
       79
       +
       

     

       80
       80
       +
       	stateKey := fmt.Sprintf(stateKey, request.State)

     

       81
       81
       +
       	err = s.cache.Set(ctx, stateKey, request.Did, 30*time.Minute).Err()

     

       82
       82
       +
       	if err != nil {

     

       83
       83
       +
       		return fmt.Errorf("error saving state->did mapping: %w", err)

     

       84
       84
       +
       	}

     

       85
       85
       +
       

     

       86
       86
       +
       	return nil

     

       87
       87
       +
       }

     

       88
       88
       +
       

     

       89
       89
       +
       func (s *SessionStore) GetSession(ctx context.Context, did string) (*OAuthSession, error) {

     

       90
       90
       +
       	key := fmt.Sprintf(sessionKey, did)

     

       91
       91
       +
       	val, err := s.cache.Get(ctx, key).Result()

     

       92
       92
       +
       	if err != nil {

     

       93
       93
       +
       		return nil, err

     

       94
       94
       +
       	}

     

       95
       95
       +
       

     

       96
       96
       +
       	var session OAuthSession

     

       97
       97
       +
       	err = json.Unmarshal([]byte(val), &session)

     

       98
       98
       +
       	if err != nil {

     

       99
       99
       +
       		return nil, err

     

       100
       100
       +
       	}

     

       101
       101
       +
       	return &session, nil

     

       102
       102
       +
       }

     

       103
       103
       +
       

     

       104
       104
       +
       func (s *SessionStore) GetRequestByState(ctx context.Context, state string) (*OAuthRequest, error) {

     

       105
       105
       +
       	didKey, err := s.getRequestKey(ctx, state)

     

       106
       106
       +
       	if err != nil {

     

       107
       107
       +
       		return nil, err

     

       108
       108
       +
       	}

     

       109
       109
       +
       

     

       110
       110
       +
       	val, err := s.cache.Get(ctx, didKey).Result()

     

       111
       111
       +
       	if err != nil {

     

       112
       112
       +
       		return nil, err

     

       113
       113
       +
       	}

     

       114
       114
       +
       

     

       115
       115
       +
       	var request OAuthRequest

     

       116
       116
       +
       	err = json.Unmarshal([]byte(val), &request)

     

       117
       117
       +
       	if err != nil {

     

       118
       118
       +
       		return nil, err

     

       119
       119
       +
       	}

     

       120
       120
       +
       

     

       121
       121
       +
       	return &request, nil

     

       122
       122
       +
       }

     

       123
       123
       +
       

     

       124
       124
       +
       func (s *SessionStore) DeleteSession(ctx context.Context, did string) error {

     

       125
       125
       +
       	key := fmt.Sprintf(sessionKey, did)

     

       126
       126
       +
       	return s.cache.Del(ctx, key).Err()

     

       127
       127
       +
       }

     

       128
       128
       +
       

     

       129
       129
       +
       func (s *SessionStore) DeleteRequestByState(ctx context.Context, state string) error {

     

       130
       130
       +
       	didKey, err := s.getRequestKey(ctx, state)

     

       131
       131
       +
       	if err != nil {

     

       132
       132
       +
       		return err

     

       133
       133
       +
       	}

     

       134
       134
       +
       

     

       135
       135
       +
       	err = s.cache.Del(ctx, fmt.Sprintf(stateKey, "state")).Err()

     

       136
       136
       +
       	if err != nil {

     

       137
       137
       +
       		return err

     

       138
       138
       +
       	}

     

       139
       139
       +
       

     

       140
       140
       +
       	return s.cache.Del(ctx, didKey).Err()

     

       141
       141
       +
       }

     

       142
       142
       +
       

     

       143
       143
       +
       func (s *SessionStore) RefreshSession(ctx context.Context, did, access, refresh, expiry string) error {

     

       144
       144
       +
       	session, err := s.GetSession(ctx, did)

     

       145
       145
       +
       	if err != nil {

     

       146
       146
       +
       		return err

     

       147
       147
       +
       	}

     

       148
       148
       +
       	session.AccessJwt = access

     

       149
       149
       +
       	session.RefreshJwt = refresh

     

       150
       150
       +
       	session.Expiry = expiry

     

       151
       151
       +
       	return s.SaveSession(ctx, *session)

     

       152
       152
       +
       }

     

       153
       153
       +
       

     

       154
       154
       +
       func (s *SessionStore) UpdateNonce(ctx context.Context, did, nonce string) error {

     

       155
       155
       +
       	session, err := s.GetSession(ctx, did)

     

       156
       156
       +
       	if err != nil {

     

       157
       157
       +
       		return err

     

       158
       158
       +
       	}

     

       159
       159
       +
       	session.DpopAuthserverNonce = nonce

     

       160
       160
       +
       	return s.SaveSession(ctx, *session)

     

       161
       161
       +
       }

     

       162
       162
       +
       

     

       163
       163
       +
       func (s *SessionStore) getRequestKeyFromState(ctx context.Context, state string) (string, error) {

     

       164
       164
       +
       	key := fmt.Sprintf(stateKey, state)

     

       165
       165
       +
       	did, err := s.cache.Get(ctx, key).Result()

     

       166
       166
       +
       	if err != nil {

     

       167
       167
       +
       		return "", err

     

       168
       168
       +
       	}

     

       169
       169
       +
       

     

       170
       170
       +
       	didKey := fmt.Sprintf(requestKey, did)

     

       171
       171
       +
       	return didKey, nil

     

       172
       172
       +
       }