From 24ca498f62d56d3d24fa55e4f19498973f381cdc Mon Sep 17 00:00:00 2001 From: Keiran Date: Wed, 6 Aug 2025 05:50:24 +0100 Subject: [PATCH] add auth to the server, and use echo --- .env.example | 5 +++ Makefile | 2 + cmd/termbox_server/main.go | 27 ++++++++++++ go.mod | 24 +++++++++++ go.sum | 53 +++++++++++++++++++++++ internal/db/database.go | 80 +++++++++++++++++++++++++++++++++++ internal/db/schema.sql | 13 ++++++ internal/db/user.go | 72 +++++++++++++++++++++++++++++++ internal/handlers/handlers.go | 54 +++++++++++++++++++++++ 9 files changed, 330 insertions(+) create mode 100644 .env.example create mode 100644 cmd/termbox_server/main.go create mode 100644 go.sum create mode 100644 internal/db/database.go create mode 100644 internal/db/schema.sql create mode 100644 internal/db/user.go create mode 100644 internal/handlers/handlers.go diff --git a/.env.example b/.env.example new file mode 100644 index 0000000..94f7eac --- /dev/null +++ b/.env.example @@ -0,0 +1,5 @@ +DB_HOST=localhost +DB_PORT=5432 +DB_NAME=termbox +DB_USER=your_username +DB_PASSWORD=your_password \ No newline at end of file diff --git a/Makefile b/Makefile index 4fc3e23..7cd4138 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ BINARY = termbox +SRV_BINARY = termbox_server GO_ENV = GOOS=linux GOARCH=amd64 .PHONY: build clean @@ -6,6 +7,7 @@ all: build build: clean go build -o build/${BINARY} cmd/termbox/main.go + go build -o build/${SRV_BINARY} cmd/termbox_server/main.go clean: rm -rf build diff --git a/cmd/termbox_server/main.go b/cmd/termbox_server/main.go new file mode 100644 index 0000000..01848c2 --- /dev/null +++ b/cmd/termbox_server/main.go @@ -0,0 +1,27 @@ +package main + +import ( + "log" + + "git.keircn.com/keiran/termbox/internal/db" + "git.keircn.com/keiran/termbox/internal/handlers" + "github.com/labstack/echo/v4" + "github.com/labstack/echo/v4/middleware" +) + +func main() { + db.InitDB() + defer db.Close() + + e := echo.New() + + e.Use(middleware.Logger()) + e.Use(middleware.Recover()) + e.Use(middleware.CORS()) + + e.GET("/", handlers.HandleRoot) + e.POST("/auth/register", handlers.HandleRegister) + e.POST("/auth/login", handlers.HandleLogin) + + log.Fatal(e.Start(":8080")) +} diff --git a/go.mod b/go.mod index e9ad57f..0873619 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,27 @@ module git.keircn.com/keiran/termbox go 1.24.5 + +require ( + github.com/jackc/pgx/v5 v5.7.5 + github.com/joho/godotenv v1.5.1 + github.com/labstack/echo/v4 v4.12.0 + golang.org/x/crypto v0.37.0 +) + +require ( + github.com/golang-jwt/jwt v3.2.2+incompatible // indirect + github.com/jackc/pgpassfile v1.0.0 // indirect + github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect + github.com/jackc/puddle/v2 v2.2.2 // indirect + github.com/labstack/gommon v0.4.2 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/valyala/bytebufferpool v1.0.0 // indirect + github.com/valyala/fasttemplate v1.2.2 // indirect + golang.org/x/net v0.24.0 // indirect + golang.org/x/sync v0.13.0 // indirect + golang.org/x/sys v0.32.0 // indirect + golang.org/x/text v0.24.0 // indirect + golang.org/x/time v0.5.0 // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..886caa0 --- /dev/null +++ b/go.sum @@ -0,0 +1,53 @@ +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= +github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= +github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= +github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= +github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo= +github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= +github.com/jackc/pgx/v5 v5.7.5 h1:JHGfMnQY+IEtGM63d+NGMjoRpysB2JBwDr5fsngwmJs= +github.com/jackc/pgx/v5 v5.7.5/go.mod h1:aruU7o91Tc2q2cFp5h4uP3f6ztExVpyVv88Xl/8Vl8M= +github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo= +github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= +github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= +github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= +github.com/labstack/echo/v4 v4.12.0 h1:IKpw49IMryVB2p1a4dzwlhP1O2Tf2E0Ir/450lH+kI0= +github.com/labstack/echo/v4 v4.12.0/go.mod h1:UP9Cr2DJXbOK3Kr9ONYzNowSh7HP0aG0ShAyycHSJvM= +github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0= +github.com/labstack/gommon v0.4.2/go.mod h1:QlUFxVM+SNXhDL/Z7YhocGIBYOiwB0mXm1+1bAPHPyU= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= +github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo= +github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= +golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE= +golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc= +golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= +golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= +golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610= +golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20= +golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0= +golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU= +golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= +golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/internal/db/database.go b/internal/db/database.go new file mode 100644 index 0000000..0a2b241 --- /dev/null +++ b/internal/db/database.go @@ -0,0 +1,80 @@ +package db + +import ( + "context" + "fmt" + "log" + "os" + + "github.com/jackc/pgx/v5/pgxpool" + "github.com/joho/godotenv" +) + +var Pool *pgxpool.Pool + +func InitDB() { + err := godotenv.Load() + if err != nil { + log.Fatalf("Error loading .env file: %v", err) + } + + connString := fmt.Sprintf("postgresql://%s:%s@%s:%s/%s", + os.Getenv("DB_USER"), + os.Getenv("DB_PASSWORD"), + os.Getenv("DB_HOST"), + os.Getenv("DB_PORT"), + os.Getenv("DB_NAME"), + ) + + ctx := context.Background() + + config, err := pgxpool.ParseConfig(connString) + if err != nil { + log.Fatalf("Unable to parse database config: %v", err) + } + + Pool, err = pgxpool.NewWithConfig(ctx, config) + if err != nil { + log.Fatalf("Unable to create connection pool: %v", err) + } + + err = Pool.Ping(ctx) + if err != nil { + log.Fatalf("Unable to ping database: %v", err) + } + + fmt.Println("Database connection established successfully") + + if err := CreateTables(); err != nil { + log.Fatalf("Failed to create tables: %v", err) + } +} + +func CreateTables() error { + ctx := context.Background() + + _, err := Pool.Exec(ctx, ` + CREATE TABLE IF NOT EXISTS users ( + id SERIAL PRIMARY KEY, + username VARCHAR(50) UNIQUE NOT NULL, + password_hash VARCHAR(255) NOT NULL, + created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP + ); + + CREATE TABLE IF NOT EXISTS messages ( + id SERIAL PRIMARY KEY, + sender_id INT REFERENCES users(id), + receiver_id INT REFERENCES users(id), + content TEXT NOT NULL, + sent_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP + ); + `) + + return err +} + +func Close() { + if Pool != nil { + Pool.Close() + } +} diff --git a/internal/db/schema.sql b/internal/db/schema.sql new file mode 100644 index 0000000..18c5741 --- /dev/null +++ b/internal/db/schema.sql @@ -0,0 +1,13 @@ +CREATE TABLE users ( + id SERIAL PRIMARY KEY, + username VARCHAR(50) UNIQUE NOT NULL, + password_hash VARCHAR(255) NOT NULL +); + +CREATE TABLE messages ( + id SERIAL PRIMARY KEY, + sender_id INT REFERENCES users(id), + receiver_id INT REFERENCES users(id), + content TEXT NOT NULL, + sent_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP +); diff --git a/internal/db/user.go b/internal/db/user.go new file mode 100644 index 0000000..b23b64c --- /dev/null +++ b/internal/db/user.go @@ -0,0 +1,72 @@ +package db + +import ( + "context" + "time" + + "golang.org/x/crypto/bcrypt" +) + +type User struct { + ID int `json:"id"` + Username string `json:"username"` + PasswordHash string `json:"-"` + CreatedAt time.Time `json:"created_at"` +} + +type CreateUserRequest struct { + Username string `json:"username"` + Password string `json:"password"` +} + +type LoginRequest struct { + Username string `json:"username"` + Password string `json:"password"` +} + +func CreateUser(ctx context.Context, req CreateUserRequest) (*User, error) { + hashedPassword, err := bcrypt.GenerateFromPassword([]byte(req.Password), bcrypt.DefaultCost) + if err != nil { + return nil, err + } + + var user User + err = Pool.QueryRow(ctx, + "INSERT INTO users (username, password_hash) VALUES ($1, $2) RETURNING id, username, created_at", + req.Username, string(hashedPassword), + ).Scan(&user.ID, &user.Username, &user.CreatedAt) + + if err != nil { + return nil, err + } + + return &user, nil +} + +func GetUserByUsername(ctx context.Context, username string) (*User, error) { + var user User + err := Pool.QueryRow(ctx, + "SELECT id, username, password_hash, created_at FROM users WHERE username = $1", + username, + ).Scan(&user.ID, &user.Username, &user.PasswordHash, &user.CreatedAt) + + if err != nil { + return nil, err + } + + return &user, nil +} + +func ValidateUserCredentials(ctx context.Context, username, password string) (*User, error) { + user, err := GetUserByUsername(ctx, username) + if err != nil { + return nil, err + } + + err = bcrypt.CompareHashAndPassword([]byte(user.PasswordHash), []byte(password)) + if err != nil { + return nil, err + } + + return user, nil +} diff --git a/internal/handlers/handlers.go b/internal/handlers/handlers.go new file mode 100644 index 0000000..a8e7055 --- /dev/null +++ b/internal/handlers/handlers.go @@ -0,0 +1,54 @@ +package handlers + +import ( + "net/http" + + "git.keircn.com/keiran/termbox/internal/db" + "github.com/labstack/echo/v4" +) + +func HandleRoot(c echo.Context) error { + return c.String(http.StatusOK, "Hello, World!") +} + +func HandleRegister(c echo.Context) error { + var req db.CreateUserRequest + if err := c.Bind(&req); err != nil { + return c.JSON(http.StatusBadRequest, map[string]string{"error": "Invalid request body"}) + } + + if req.Username == "" || req.Password == "" { + return c.JSON(http.StatusBadRequest, map[string]string{"error": "Username and password are required"}) + } + + user, err := db.CreateUser(c.Request().Context(), req) + if err != nil { + return c.JSON(http.StatusConflict, map[string]string{"error": "Username already exists"}) + } + + return c.JSON(http.StatusCreated, map[string]any{ + "message": "User created successfully", + "user": user, + }) +} + +func HandleLogin(c echo.Context) error { + var req db.LoginRequest + if err := c.Bind(&req); err != nil { + return c.JSON(http.StatusBadRequest, map[string]string{"error": "Invalid request body"}) + } + + if req.Username == "" || req.Password == "" { + return c.JSON(http.StatusBadRequest, map[string]string{"error": "Username and password are required"}) + } + + user, err := db.ValidateUserCredentials(c.Request().Context(), req.Username, req.Password) + if err != nil { + return c.JSON(http.StatusUnauthorized, map[string]string{"error": "Invalid credentials"}) + } + + return c.JSON(http.StatusOK, map[string]any{ + "message": "Login successful", + "user": user, + }) +}