k-space/dex
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Activity

Merge pull request #1056 from ericchiang/fix-api-panic

Browse Source 
server: fix panic caused by deleting refresh token twice through api
This commit is contained in:
Eric Chiang 2017-09-06 09:56:06 -07:00 committed by GitHub
commit 38d0de20e3
2 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
server/api.go
View File

@ -266,12 +266,20 @@ func (d dexAPI) RevokeRefresh(ctx context.Context, req *api.RevokeRefreshReq) (*
return nil, err return nil, err
} }
var refreshID string var (
refreshID string
notFound bool
)
updater := func(old storage.OfflineSessions) (storage.OfflineSessions, error) { updater := func(old storage.OfflineSessions) (storage.OfflineSessions, error) {
if refreshID = old.Refresh[req.ClientId].ID; refreshID == "" { refreshRef := old.Refresh[req.ClientId]
return old, fmt.Errorf("user does not have a refresh token for the client = %s", req.ClientId) if refreshRef == nil || refreshRef.ID == "" {
d.logger.Errorf("api: refresh token issued to client %q for user %q not found for deletion", req.ClientId, id.UserId)
notFound = true
return old, storage.ErrNotFound
} }
refreshID = refreshRef.ID
// Remove entry from Refresh list of the OfflineSession object. // Remove entry from Refresh list of the OfflineSession object.
delete(old.Refresh, req.ClientId) delete(old.Refresh, req.ClientId)
@ -286,7 +294,14 @@ func (d dexAPI) RevokeRefresh(ctx context.Context, req *api.RevokeRefreshReq) (*
return nil, err return nil, err
} }
if notFound {
return &api.RevokeRefreshResp{NotFound: true}, nil
}
// Delete the refresh token from the storage // Delete the refresh token from the storage
//
// TODO(ericchiang): we don't have any good recourse if this call fails.
// Consider garbage collection of refresh tokens with no associated ref.
if err := d.s.DeleteRefresh(refreshID); err != nil { if err := d.s.DeleteRefresh(refreshID); err != nil {
d.logger.Errorf("failed to delete refresh token: %v", err) d.logger.Errorf("failed to delete refresh token: %v", err)
return nil, err return nil, err

16
server/api_test.go
View File

@ -267,9 +267,23 @@ func TestRefreshToken(t *testing.T) {
} }
resp, err := client.RevokeRefresh(ctx, &revokeReq) resp, err := client.RevokeRefresh(ctx, &revokeReq)
if err != nil || resp.NotFound { if err != nil {
t.Fatalf("Unable to revoke refresh tokens for user: %v", err) t.Fatalf("Unable to revoke refresh tokens for user: %v", err)
} }
if resp.NotFound {
t.Errorf("refresh token session wasn't found")
}
// Try to delete again.
//
// See https://github.com/coreos/dex/issues/1055
resp, err = client.RevokeRefresh(ctx, &revokeReq)
if err != nil {
t.Fatalf("Unable to revoke refresh tokens for user: %v", err)
}
if !resp.NotFound {
t.Errorf("refresh token session was found")
}
if resp, _ := client.ListRefresh(ctx, &listReq); len(resp.RefreshTokens) != 0 { if resp, _ := client.ListRefresh(ctx, &listReq); len(resp.RefreshTokens) != 0 {
t.Fatalf("Refresh token returned inspite of revoking it.") t.Fatalf("Refresh token returned inspite of revoking it.")