Skip to content
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.

Sign up for GitHub

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

Add support for API keys #4515

Merged
merged 8 commits into from
Aug 25, 2020
Merged

Add support for API keys #4515

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
86b62d6
Add backend support for API keys
ikapelyukhin Aug 18, 2020
96248c0
Add last_used field to API keys
ikapelyukhin Aug 19, 2020
e93d550
Use secure random value as key secret
ikapelyukhin Aug 20, 2020
830fa3a
Add tests for ListAPIKeys and AddAPIKey
ikapelyukhin Aug 20, 2020
9484093
Cover the rest of psql_apikeys.go with tests
ikapelyukhin Aug 21, 2020
541b8f3
Refactor the code a bit
ikapelyukhin Aug 21, 2020
51d82ee
Add route handler tests using gomock
ikapelyukhin Aug 21, 2020
8ab25a4
Actually use skipper in xsrfMiddleware; minor clean-up
ikapelyukhin Aug 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use secure random value as key secret
  • Loading branch information
@ikapelyukhin
ikapelyukhin committed Aug 20, 2020
commit e93d550da2233ef37b0d2b9c7f26be162a63caf0
10 changes: 9 additions & 1 deletion src/jetstream/repository/apikeys/psql_apikeys.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ package apikeys

import (
"database/sql"
"encoding/base64"
"errors"
"time"

"github.com/cloudfoundry-incubator/stratos/src/jetstream/crypto"
"github.com/cloudfoundry-incubator/stratos/src/jetstream/datastore"
"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
uuid "github.com/satori/go.uuid"
Expand Down Expand Up @@ -52,12 +54,18 @@ func (p *PgsqlAPIKeysRepository) AddAPIKey(userID string, comment string) (*inte
log.Debug(msg)
err = errors.New(msg)
}

if err != nil {
return nil, err
}

randomBytes, err := crypto.GenerateRandomBytes(48)
if err != nil {
return nil, err
}

keyGUID := uuid.NewV4().String()
keySecret := uuid.NewV4().String()
keySecret := base64.URLEncoding.EncodeToString(randomBytes)

var result sql.Result
if result, err = p.db.Exec(insertAPIKey, keyGUID, keySecret, userID, comment); err != nil {
Expand Down