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

Use crypto/rand in place of math/rand for token generation #257

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use crypto/rand in place of math/rand for token generation #257

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b499b73
Use crypto/rand in place of math/rand for token generation
Feb 14, 2020
8445e3d
Fix identifier capitalization
Feb 14, 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
19 changes: 13 additions & 6 deletions db/sqldb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"encoding/json"
"fmt"
"log"
"math/rand"
"crypto/rand"
"net/url"
"strings"
"time"
Expand Down Expand Up @@ -52,10 +52,13 @@ func InitSQLDatabase(cfg Config) (*SQLDatabase, error) {
// TOKEN DB FUNCTIONS

// randToken generates a random token.
func randToken() string {
func randToken() (string, error) {
b := make([]byte, 8)
rand.Read(b)
return fmt.Sprintf("%x", b)
_, err := rand.Read(b)
if err != nil {
return "", err
}
return fmt.Sprintf("%x", b), nil
}

// UseToken sets the `used` flag on a particular email validation token to
Expand All @@ -80,13 +83,17 @@ func (db *SQLDatabase) GetTokenByDomain(domain string) (string, error) {
// PutToken generates and inserts a token into the database for a particular
// domain, and returns the resulting token row.
func (db *SQLDatabase) PutToken(domain string) (models.Token, error) {
tokenID, err := randToken()
if err != nil {
return models.Token{}, err
}
token := models.Token{
Domain: domain,
Token: randToken(),
Token: tokenID,
Expires: time.Now().Add(time.Duration(time.Hour * 72)),
Used: false,
}
_, err := db.conn.Exec("INSERT INTO tokens(domain, token, expires) VALUES($1, $2, $3) "+
_, err = db.conn.Exec("INSERT INTO tokens(domain, token, expires) VALUES($1, $2, $3) "+
"ON CONFLICT (domain) DO UPDATE SET token=$2, expires=$3, used=FALSE",
domain, token.Token, token.Expires.UTC().Format(sqlTimeFormat))
if err != nil {
Expand Down