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

Cryptographically Secure IDs #38

Merged
merged 5 commits into from
Apr 9, 2024
Merged

Cryptographically Secure IDs #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c9b7113
deps: install google.com/uuid
zeim839 Apr 9, 2024
98d8fd6
pkg/authdb: cryptographically random IDs
zeim839 Apr 9, 2024
82ca65a
pkg/common: added uuid.go
zeim839 Apr 9, 2024
4334e83
pkg/authapi: added cryptographically random IDs
zeim839 Apr 9, 2024
0976973
BUMP v0.2.0
zeim839 Apr 9, 2024
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
2 changes: 1 addition & 1 deletion dashboard/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "oauth2-fe",
"version": "0.1.4",
"version": "0.2.0",
"private": true,
"scripts": {
"dev": "next dev",
Expand Down
2 changes: 1 addition & 1 deletion oauth2/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ require (
github.com/go-playground/validator/v10 v10.15.5 // indirect
github.com/goccy/go-json v0.10.2 // indirect
github.com/golang/snappy v0.0.1 // indirect
github.com/google/uuid v1.5.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.13.6 // indirect
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
Expand Down
4 changes: 2 additions & 2 deletions oauth2/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
Expand Down
2 changes: 1 addition & 1 deletion pkg/authapi/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ require (
github.com/go-playground/validator/v10 v10.14.0 // indirect
github.com/goccy/go-json v0.10.2 // indirect
github.com/golang/snappy v0.0.1 // indirect
github.com/google/uuid v1.5.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.13.6 // indirect
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
Expand Down
4 changes: 2 additions & 2 deletions pkg/authapi/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc=
Expand Down
6 changes: 6 additions & 0 deletions pkg/authapi/oauth2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/ufosc/OpenWebServices/pkg/authdb"
"github.com/ufosc/OpenWebServices/pkg/authmw"
"github.com/ufosc/OpenWebServices/pkg/common"
"net/http"
"net/url"
"time"
Expand Down Expand Up @@ -84,6 +85,7 @@ func (cntrl *DefaultAPIController) AuthorizationRoute() gin.HandlerFunc {
// Create implicit token.
if client.ResponseType == "token" {
token := authdb.TokenModel{
ID: common.UUID(),
ClientID: client.ID,
UserID: user.ID,
CreatedAt: time.Now().Unix(),
Expand All @@ -109,6 +111,7 @@ func (cntrl *DefaultAPIController) AuthorizationRoute() gin.HandlerFunc {

// Create authorization code.
code := authdb.TokenModel{
ID: common.UUID(),
ClientID: client.ID,
UserID: user.ID,
CreatedAt: time.Now().Unix(),
Expand Down Expand Up @@ -264,6 +267,7 @@ func (cntrl *DefaultAPIController) handleAuthCode(c *gin.Context) {

// Create access token.
atoken := authdb.TokenModel{
ID: common.UUID(),
ClientID: client.ID,
UserID: codeExists.UserID,
CreatedAt: time.Now().Unix(),
Expand All @@ -282,6 +286,7 @@ func (cntrl *DefaultAPIController) handleAuthCode(c *gin.Context) {

// Create refresh token.
rtoken := authdb.TokenModel{
ID: common.UUID(),
ClientID: client.ID,
UserID: codeExists.UserID,
CreatedAt: time.Now().Unix(),
Expand Down Expand Up @@ -394,6 +399,7 @@ func (cntrl *DefaultAPIController) handleRefreshToken(c *gin.Context) {

// Create new access token.
atoken := authdb.TokenModel{
ID: common.UUID(),
ClientID: client.ID,
UserID: token.UserID,
CreatedAt: time.Now().Unix(),
Expand Down
2 changes: 2 additions & 0 deletions pkg/authapi/session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ func (cntrl *DefaultAPIController) SignUpRoute() gin.HandlerFunc {

// Create pending user instance.
pendingUser := authdb.PendingUserModel{
ID: common.UUID(),
Email: req.Email,
User: authdb.UserModel{
ID: "",
Expand Down Expand Up @@ -175,6 +176,7 @@ func (cntrl *DefaultAPIController) SignInRoute() gin.HandlerFunc {

// Generate access token.
tk, err := cntrl.db.Tokens().CreateAccess(authdb.TokenModel{
ID: common.UUID(),
ClientID: "0",
UserID: userExists.ID,
CreatedAt: time.Now().Unix(),
Expand Down
44 changes: 41 additions & 3 deletions pkg/authdb/authdb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@ func NewDatabase(uri, name string) (*MongoDatabase, error) {
}
db.users = users

addTTL(db)
initIndices(db)
return db, nil
}

// Add TTL indices.
func addTTL(db *MongoDatabase) {
// initIndices initializes database indices.
func initIndices(db *MongoDatabase) {
index := func(ttl int32) mongo.IndexModel {
return mongo.IndexModel{
Keys: bson.M{"createdAt": 1},
Expand Down Expand Up @@ -126,6 +126,44 @@ func addTTL(db *MongoDatabase) {
fmt.Println("unable to apply TTL to pending_users collection:", err)
os.Exit(1)
}

// Create a custom identifier index for tokens and verification
// emails. Default indices are not cryptographically random.
_, err = refcol.Indexes().CreateOne(context.TODO(), mongo.IndexModel{
Keys: bson.M{"ID": 1},
})

if err != nil {
fmt.Println("cannot apply index to refresh_token collection", err)
os.Exit(1)
}

_, err = acccol.Indexes().CreateOne(context.TODO(), mongo.IndexModel{
Keys: bson.M{"ID": 1},
})

if err != nil {
fmt.Println("cannot apply index to access_token collection", err)
os.Exit(1)
}

_, err = autcol.Indexes().CreateOne(context.TODO(), mongo.IndexModel{
Keys: bson.M{"ID": 1},
})

if err != nil {
fmt.Println("cannot apply index to auth_token collection", err)
os.Exit(1)
}

_, err = pencol.Indexes().CreateOne(context.TODO(), mongo.IndexModel{
Keys: bson.M{"ID": 1},
})

if err != nil {
fmt.Println("cannot apply index to pending_users collection", err)
os.Exit(1)
}
}

// Stop the database.
Expand Down
73 changes: 23 additions & 50 deletions pkg/authdb/tokens.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ package authdb
import (
"context"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/bson/primitive"
"go.mongodb.org/mongo-driver/mongo"
)

// The Token schema is used for authentication codes, access tokens, and
// refresh tokens.
type TokenModel struct {
ID string `bson:"_id,omitempty"`
_id string `bson:"_id,omitempty"`
ID string `bson:"ID"`
ClientID string `bson:"client_id"`
UserID string `bson:"user_id"`
CreatedAt int64 `bson:"createdAt"`
Expand Down Expand Up @@ -73,15 +73,11 @@ func (cc *MongoTokenController) FindRefreshByID(id string) (TokenModel, error) {
cc.state.Wg.Add(1)
defer cc.state.Wg.Done()

// Extract primitive object ID.
objID, err := primitive.ObjectIDFromHex(id)
if err != nil {
return TokenModel{}, err
}

// Find model.
var token TokenModel
err = cc.refreshColl.FindOne(context.TODO(), bson.D{{Key: "_id", Value: objID}}).Decode(&token)
err := cc.refreshColl.FindOne(context.TODO(),
bson.D{{Key: "ID", Value: id}}).Decode(&token)

if err != nil {
return TokenModel{}, err
}
Expand All @@ -98,12 +94,12 @@ func (cc *MongoTokenController) CreateRefresh(tk TokenModel) (string, error) {
defer cc.state.Wg.Done()

// Insert.
res, err := cc.refreshColl.InsertOne(context.TODO(), tk)
_, err := cc.refreshColl.InsertOne(context.TODO(), tk)
if err != nil {
return "", err
}

return res.InsertedID.(primitive.ObjectID).Hex(), nil
return tk.ID, nil
}

func (cc *MongoTokenController) DeleteRefreshByID(id string) error {
Expand All @@ -113,14 +109,9 @@ func (cc *MongoTokenController) DeleteRefreshByID(id string) error {

cc.state.Wg.Add(1)
defer cc.state.Wg.Done()
_, err := cc.refreshColl.DeleteOne(context.TODO(),
bson.D{{Key: "ID", Value: id}})

// Extract primitive object ID.
objID, err := primitive.ObjectIDFromHex(id)
if err != nil {
return err
}

_, err = cc.refreshColl.DeleteOne(context.TODO(), bson.D{{Key: "_id", Value: objID}})
return err
}

Expand All @@ -132,15 +123,11 @@ func (cc *MongoTokenController) FindAccessByID(id string) (TokenModel, error) {
cc.state.Wg.Add(1)
defer cc.state.Wg.Done()

// Extract primitive object ID.
objID, err := primitive.ObjectIDFromHex(id)
if err != nil {
return TokenModel{}, err
}

// Find model.
var token TokenModel
err = cc.accessColl.FindOne(context.TODO(), bson.D{{Key: "_id", Value: objID}}).Decode(&token)
err := cc.accessColl.FindOne(context.TODO(),
bson.D{{Key: "ID", Value: id}}).Decode(&token)

if err != nil {
return TokenModel{}, err
}
Expand All @@ -157,12 +144,12 @@ func (cc *MongoTokenController) CreateAccess(tk TokenModel) (string, error) {
defer cc.state.Wg.Done()

// Insert.
res, err := cc.accessColl.InsertOne(context.TODO(), tk)
_, err := cc.accessColl.InsertOne(context.TODO(), tk)
if err != nil {
return "", err
}

return res.InsertedID.(primitive.ObjectID).Hex(), nil
return tk.ID, nil
}

func (cc *MongoTokenController) DeleteAccessByID(id string) error {
Expand All @@ -172,14 +159,9 @@ func (cc *MongoTokenController) DeleteAccessByID(id string) error {

cc.state.Wg.Add(1)
defer cc.state.Wg.Done()
_, err := cc.accessColl.DeleteOne(context.TODO(),
bson.D{{Key: "ID", Value: id}})

// Extract primitive object ID.
objID, err := primitive.ObjectIDFromHex(id)
if err != nil {
return err
}

_, err = cc.accessColl.DeleteOne(context.TODO(), bson.D{{Key: "_id", Value: objID}})
return err
}

Expand All @@ -191,15 +173,11 @@ func (cc *MongoTokenController) FindAuthByID(id string) (TokenModel, error) {
cc.state.Wg.Add(1)
defer cc.state.Wg.Done()

// Extract primitive object ID.
objID, err := primitive.ObjectIDFromHex(id)
if err != nil {
return TokenModel{}, err
}

// Find model.
var token TokenModel
err = cc.authColl.FindOne(context.TODO(), bson.D{{Key: "_id", Value: objID}}).Decode(&token)
err := cc.authColl.FindOne(context.TODO(),
bson.D{{Key: "ID", Value: id}}).Decode(&token)

if err != nil {
return TokenModel{}, err
}
Expand All @@ -216,12 +194,12 @@ func (cc *MongoTokenController) CreateAuth(tk TokenModel) (string, error) {
defer cc.state.Wg.Done()

// Insert.
res, err := cc.authColl.InsertOne(context.TODO(), tk)
_, err := cc.authColl.InsertOne(context.TODO(), tk)
if err != nil {
return "", err
}

return res.InsertedID.(primitive.ObjectID).Hex(), nil
return tk.ID, nil
}

func (cc *MongoTokenController) DeleteAuthByID(id string) error {
Expand All @@ -231,13 +209,8 @@ func (cc *MongoTokenController) DeleteAuthByID(id string) error {

cc.state.Wg.Add(1)
defer cc.state.Wg.Done()
_, err := cc.authColl.DeleteOne(context.TODO(),
bson.D{{Key: "ID", Value: id}})

// Extract primitive object ID.
objID, err := primitive.ObjectIDFromHex(id)
if err != nil {
return err
}

_, err = cc.authColl.DeleteOne(context.TODO(), bson.D{{Key: "_id", Value: objID}})
return err
}
Loading
Loading