feat(backend): update and delete users
The title says most of it. For authentication, the token gotten from the POST method can be put as a 'Token' header. It's then validated before being used. Other changes caused by this update are: - Fixed a bug where the creation token was unusable due to lacking the user password hash - Changed the signing method to HMAC, requiring a string for encryption This is mentioned in the README.md
This commit is contained in:
parent
52002e8f1e
commit
8cf3bbda1f
|
@ -8,5 +8,8 @@ and initialize it with the `sql/init.sql` script:
|
||||||
$ cat sql/init.sql | sqlite3 users.db
|
$ cat sql/init.sql | sqlite3 users.db
|
||||||
```
|
```
|
||||||
|
|
||||||
You can optionally provide the `PORT` environment variable to override the
|
You also need to create a `.env` file with the following variables:
|
||||||
default port of 7741
|
|
||||||
|
- `JWT_SECRET`: Required. A cryptographically secure string used to encode
|
||||||
|
tokens.
|
||||||
|
- `PORT`: Optional. Overrides the default port of `7741`
|
|
@ -2,6 +2,7 @@ package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
_ "github.com/joho/godotenv/autoload"
|
||||||
"log"
|
"log"
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
|
|
213
backend/user.go
213
backend/user.go
|
@ -5,11 +5,9 @@ import (
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
|
"os"
|
||||||
|
|
||||||
// Encryption
|
// Encryption
|
||||||
"crypto/ecdsa"
|
|
||||||
"crypto/elliptic"
|
|
||||||
"crypto/rand"
|
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
|
@ -21,18 +19,30 @@ import (
|
||||||
_ "github.com/mattn/go-sqlite3"
|
_ "github.com/mattn/go-sqlite3"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Define the user handler struct
|
|
||||||
type UserHandler struct {
|
|
||||||
db *sql.DB
|
|
||||||
jwt_secret *ecdsa.PrivateKey
|
|
||||||
}
|
|
||||||
|
|
||||||
// Define the user request struct
|
// Define the user request struct
|
||||||
type UserRequest struct {
|
type UserRequest struct {
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
Password string `json:"password"`
|
Password string `json:"password"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (ur *UserRequest) Parse(req *http.Request) error {
|
||||||
|
// Can't unmarshal the actual req.Body so must read first
|
||||||
|
body, err := io.ReadAll(req.Body)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := json.Unmarshal(body, &ur); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Define the user handler struct
|
||||||
|
type UserHandler struct {
|
||||||
|
db *sql.DB
|
||||||
|
jwt_secret []byte
|
||||||
|
}
|
||||||
|
|
||||||
// Define the function to create user handlers
|
// Define the function to create user handlers
|
||||||
func NewUserHandler() (*UserHandler, error) {
|
func NewUserHandler() (*UserHandler, error) {
|
||||||
// Initialise the database using the database file
|
// Initialise the database using the database file
|
||||||
|
@ -42,11 +52,12 @@ func NewUserHandler() (*UserHandler, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Define the JSON web token
|
// Define the JSON web token
|
||||||
jwt_secret, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
|
jwt_secret_str := os.Getenv("JWT_SECRET")
|
||||||
// Return any errors
|
// Return any errors
|
||||||
if err != nil {
|
if jwt_secret_str == "" {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
jwt_secret := []byte(jwt_secret_str)
|
||||||
|
|
||||||
// Return the user handler struct
|
// Return the user handler struct
|
||||||
return &UserHandler{
|
return &UserHandler{
|
||||||
|
@ -55,6 +66,33 @@ func NewUserHandler() (*UserHandler, error) {
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// JWT Utilities
|
||||||
|
func (h *UserHandler) ParseUserToken(token_string string) (*jwt.Token, error) {
|
||||||
|
token, err := jwt.Parse(token_string, func(token *jwt.Token) (interface{}, error) {
|
||||||
|
if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {
|
||||||
|
return nil, errors.New("jwt: incorrect token signing method")
|
||||||
|
}
|
||||||
|
return h.jwt_secret, nil
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return token, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *UserHandler) GenerateUserToken(name, pwdhash string) (string, error) {
|
||||||
|
token := jwt.New(jwt.SigningMethodHS256)
|
||||||
|
claims := token.Claims.(jwt.MapClaims)
|
||||||
|
claims["name"] = name
|
||||||
|
claims["pwdhash"] = pwdhash
|
||||||
|
|
||||||
|
token_string, err := token.SignedString(h.jwt_secret)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return token_string, nil
|
||||||
|
}
|
||||||
|
|
||||||
func (h *UserHandler) Handle(res http.ResponseWriter, req *http.Request) {
|
func (h *UserHandler) Handle(res http.ResponseWriter, req *http.Request) {
|
||||||
switch req.Method {
|
switch req.Method {
|
||||||
case "POST":
|
case "POST":
|
||||||
|
@ -72,19 +110,11 @@ func (h *UserHandler) Handle(res http.ResponseWriter, req *http.Request) {
|
||||||
// NOTE(midnadimple): This function could be considered to do too much stuff, but
|
// NOTE(midnadimple): This function could be considered to do too much stuff, but
|
||||||
// I think this is the best implementation
|
// I think this is the best implementation
|
||||||
func (h *UserHandler) createUser(res http.ResponseWriter, req *http.Request) {
|
func (h *UserHandler) createUser(res http.ResponseWriter, req *http.Request) {
|
||||||
// Can't unmarshal the actual req.Body so must read first
|
user_request := new(UserRequest)
|
||||||
body, err := io.ReadAll(req.Body)
|
if err := user_request.Parse(req); err != nil {
|
||||||
if err != nil {
|
http.Error(res, fmt.Sprintf("user: failed to parse request (%s)", err), http.StatusBadRequest)
|
||||||
http.Error(res, fmt.Sprintf("user: failed to read request (%s)", err), http.StatusBadRequest)
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
var user_request UserRequest
|
|
||||||
if err := json.Unmarshal(body, &user_request); err != nil {
|
|
||||||
http.Error(res, "user: json request body doesn't match schema", http.StatusBadRequest)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
name := user_request.Name
|
name := user_request.Name
|
||||||
password := []byte(user_request.Password)
|
password := []byte(user_request.Password)
|
||||||
|
|
||||||
|
@ -92,7 +122,7 @@ func (h *UserHandler) createUser(res http.ResponseWriter, req *http.Request) {
|
||||||
row := h.db.QueryRow("SELECT pwdhash FROM users WHERE name=?", name)
|
row := h.db.QueryRow("SELECT pwdhash FROM users WHERE name=?", name)
|
||||||
var db_pwdhash string
|
var db_pwdhash string
|
||||||
|
|
||||||
if err = row.Scan(&db_pwdhash); err != nil {
|
if err := row.Scan(&db_pwdhash); err != nil {
|
||||||
// If no user is found with the requested name, create the user
|
// If no user is found with the requested name, create the user
|
||||||
if errors.Is(err, sql.ErrNoRows) {
|
if errors.Is(err, sql.ErrNoRows) {
|
||||||
pwdhash_bytes, err := bcrypt.GenerateFromPassword(password, 12)
|
pwdhash_bytes, err := bcrypt.GenerateFromPassword(password, 12)
|
||||||
|
@ -101,9 +131,9 @@ func (h *UserHandler) createUser(res http.ResponseWriter, req *http.Request) {
|
||||||
http.Error(res, fmt.Sprintf("user: failed to generate password hash (%s)", err), http.StatusInternalServerError)
|
http.Error(res, fmt.Sprintf("user: failed to generate password hash (%s)", err), http.StatusInternalServerError)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
pwdhash := string(pwdhash_bytes)
|
db_pwdhash = string(pwdhash_bytes)
|
||||||
|
|
||||||
_, err = h.db.Exec("INSERT INTO users VALUES (?,?)", name, pwdhash)
|
_, err = h.db.Exec("INSERT INTO users VALUES (?,?)", name, db_pwdhash)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
http.Error(res, fmt.Sprintf("db: failed to create user (%s)", err), http.StatusInternalServerError)
|
http.Error(res, fmt.Sprintf("db: failed to create user (%s)", err), http.StatusInternalServerError)
|
||||||
return
|
return
|
||||||
|
@ -117,21 +147,132 @@ func (h *UserHandler) createUser(res http.ResponseWriter, req *http.Request) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// JWT generation
|
// JWT Generation
|
||||||
token := jwt.New(jwt.SigningMethodES256)
|
token_string, err := h.GenerateUserToken(name, db_pwdhash)
|
||||||
claims := token.Claims.(jwt.MapClaims)
|
|
||||||
claims["name"] = name
|
|
||||||
claims["pwdhash"] = db_pwdhash
|
|
||||||
|
|
||||||
token_string, err := token.SignedString(h.jwt_secret)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
http.Error(res, fmt.Sprintf("jwt: failed to generate token (%s)", err), http.StatusInternalServerError)
|
http.Error(res, fmt.Sprintf("jwt: failed to generate token (%s)", err), http.StatusInternalServerError)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt.Fprintf(res, "%s", token_string)
|
fmt.Fprintf(res, "%s", token_string)
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO(midnadimple): implement:
|
func (h *UserHandler) updateUser(res http.ResponseWriter, req *http.Request) {
|
||||||
func (h *UserHandler) updateUser(res http.ResponseWriter, req *http.Request) {}
|
user_request := new(UserRequest)
|
||||||
func (h *UserHandler) deleteUser(res http.ResponseWriter, req *http.Request) {}
|
if err := user_request.Parse(req); err != nil {
|
||||||
|
http.Error(res, fmt.Sprintf("user: failed to parse request (%s)", err), http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
req_name := user_request.Name
|
||||||
|
req_password := []byte(user_request.Password)
|
||||||
|
|
||||||
|
if req.Header["Authorization"] == nil {
|
||||||
|
http.Error(res, "jwt: missing token", http.StatusUnauthorized)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
token, err := h.ParseUserToken(req.Header["Token"][0])
|
||||||
|
if err != nil {
|
||||||
|
http.Error(res, fmt.Sprintf("jwt: error during parsing (%s)", err), http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if !token.Valid {
|
||||||
|
http.Error(res, "jwt: invalid token", http.StatusUnauthorized)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
claims, ok := token.Claims.(jwt.MapClaims)
|
||||||
|
if !ok {
|
||||||
|
http.Error(res, "jwt: failed to get claims", http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
claim_name := claims["name"].(string)
|
||||||
|
claim_pwdhash := claims["pwdhash"].(string)
|
||||||
|
|
||||||
|
var db_name, db_pwdhash string
|
||||||
|
row := h.db.QueryRow("SELECT * FROM users WHERE name=?", claim_name)
|
||||||
|
if err := row.Scan(&db_name, &db_pwdhash); err != nil {
|
||||||
|
if errors.Is(err, sql.ErrNoRows) {
|
||||||
|
http.Error(res, "user: authorized user doesn't exist", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
} else {
|
||||||
|
http.Error(res, fmt.Sprintf("db: failed to find user (%s)", err), http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if claim_pwdhash != db_pwdhash {
|
||||||
|
http.Error(res, "user: invalid password", http.StatusForbidden)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if req_name == claim_name && bcrypt.CompareHashAndPassword([]byte(claim_pwdhash), req_password) == nil {
|
||||||
|
http.Error(res, "user: requested credentials are the same as current credentials", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
req_pwdhash_bytes, err := bcrypt.GenerateFromPassword(req_password, 12)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(res, fmt.Sprintf("user: failed to generate password hash (%s)", err), http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
req_pwdhash := string(req_pwdhash_bytes)
|
||||||
|
|
||||||
|
_, err = h.db.Exec("UPDATE users SET name=?, pwdhash=? WHERE name=? AND pwdhash=?",
|
||||||
|
req_name, req_pwdhash, claim_name, claim_pwdhash)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(res, fmt.Sprintf("db: failed to update user (%s)", err), http.StatusInternalServerError)
|
||||||
|
}
|
||||||
|
|
||||||
|
token_string, err := h.GenerateUserToken(req_name, req_pwdhash)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(res, fmt.Sprintf("jwt: failed to generate token (%s)", err), http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
fmt.Fprintf(res, "%s", token_string)
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO(midnadimple): Implement:
|
||||||
|
func (h *UserHandler) deleteUser(res http.ResponseWriter, req *http.Request) {
|
||||||
|
token, err := h.ParseUserToken(req.Header["Token"][0])
|
||||||
|
if err != nil {
|
||||||
|
http.Error(res, fmt.Sprintf("jwt: error during parsing (%s)", err), http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if !token.Valid {
|
||||||
|
http.Error(res, "jwt: invalid token", http.StatusUnauthorized)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
claims, ok := token.Claims.(jwt.MapClaims)
|
||||||
|
if !ok {
|
||||||
|
http.Error(res, "jwt: failed to get claims", http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
claim_name := claims["name"].(string)
|
||||||
|
claim_pwdhash := claims["pwdhash"].(string)
|
||||||
|
|
||||||
|
var db_name, db_pwdhash string
|
||||||
|
row := h.db.QueryRow("SELECT * FROM users WHERE name=?", claim_name)
|
||||||
|
if err := row.Scan(&db_name, &db_pwdhash); err != nil {
|
||||||
|
if errors.Is(err, sql.ErrNoRows) {
|
||||||
|
http.Error(res, "user: authorized user doesn't exist", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
} else {
|
||||||
|
http.Error(res, fmt.Sprintf("db: failed to find user (%s)", err), http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if claim_pwdhash != db_pwdhash {
|
||||||
|
http.Error(res, "user: invalid password", http.StatusForbidden)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := h.db.Exec("DELETE FROM users WHERE name=? AND pwdhash=?", db_name, db_pwdhash); err != nil {
|
||||||
|
http.Error(res, fmt.Sprintf("db: failed to delete user (%s)", err), http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
Reference in a new issue