Compare commits

8 Commits
main ... dev

Author SHA1 Message Date
5bd6f3b312 Merge pull request 'Add HTTP Server' (#6) from feat/http into dev
All checks were successful
build / Go-Build (push) Successful in 27s
Reviewed-on: #6
2026-01-23 21:27:45 +00:00
e9a3e807ec feat(http): add server and auth middleware
All checks were successful
build / Go-Build (pull_request) Successful in 55s
build / Go-Build (push) Successful in 33s
2026-01-23 11:17:58 +01:00
812a19e129 feat(auth): add token caching 2026-01-23 11:15:57 +01:00
d10cd5d223 Merge pull request 'Add database and Bearer token handling' (#2) from feat/auth into dev
Some checks failed
build / Go-Build (push) Failing after 10m7s
Reviewed-on: #2
2026-01-18 13:40:50 +00:00
b8e57cd1fa Merge branch 'dev' into feat/auth
All checks were successful
build / Go-Build (push) Successful in 19s
build / Go-Build (pull_request) Successful in 19s
2026-01-17 22:40:18 +01:00
523072b8c1 Merge branch 'dev' into feat/auth
All checks were successful
build / Go-Build (push) Successful in 52s
2026-01-17 22:35:36 +01:00
b9d321594c Merge branch 'dev' into feat/auth
Some checks failed
build / Go-Build (push) Failing after 6s
2026-01-17 22:29:54 +01:00
98a725caa4 feat(auth): add database and auth token generation + storage
Some checks failed
build / Go-Build (push) Failing after 19s
2026-01-17 21:40:17 +01:00
9 changed files with 278 additions and 6 deletions

52
cmd/svg-templater/main.go Normal file
View File

@@ -0,0 +1,52 @@
package main
import (
"flag"
"fmt"
"log"
"net/http"
"tomatentum.net/svg-templater/internal/database"
svgtemplater "tomatentum.net/svg-templater/internal/svg-templater"
"tomatentum.net/svg-templater/pkg/auth"
)
var (
generateTokenFlag bool
deleteTokenFlag bool
)
func main() {
if err := database.OpenSQLite(); err != nil {
log.Fatal("Failed opening DB:\n", err)
return
}
defer database.Close()
database.InitDB()
prepareCommandLine()
prepareHTTP()
handleCommandline()
}
func prepareCommandLine() {
flag.BoolVar(&generateTokenFlag, "tokengen", false, "svg-templater --tokengen <name> : Generate token with name")
flag.BoolVar(&deleteTokenFlag, "tokendel", false, "svg-templater --tokendel <name> : Delete token with name")
}
func prepareHTTP() {
http.HandleFunc("/", auth.AuthMiddleware(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
fmt.Fprintln(w, "You are authorized!")
})))
}
func handleCommandline() {
flag.Parse()
if generateTokenFlag {
svgtemplater.GenerateTokenCommand()
} else if deleteTokenFlag {
svgtemplater.DeleteTokenCommand()
} else {
log.Println("Starting http server on :3000")
http.ListenAndServe(":3000", nil)
}
}

15
go.mod
View File

@@ -1,3 +1,16 @@
module svg-templater
module tomatentum.net/svg-templater
go 1.24.9
require (
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/glebarez/go-sqlite v1.22.0 // indirect
github.com/google/uuid v1.5.0 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
golang.org/x/sys v0.15.0 // indirect
modernc.org/libc v1.37.6 // indirect
modernc.org/mathutil v1.6.0 // indirect
modernc.org/memory v1.7.2 // indirect
modernc.org/sqlite v1.28.0 // indirect
)

21
go.sum
View File

@@ -0,0 +1,21 @@
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
github.com/glebarez/go-sqlite v1.22.0 h1:uAcMJhaA6r3LHMTFgP0SifzgXg46yJkgxqyuyec+ruQ=
github.com/glebarez/go-sqlite v1.22.0/go.mod h1:PlBIdHe0+aUEFn+r2/uthrWq4FxbzugL0L8Li6yQJbc=
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/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/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
modernc.org/libc v1.37.6 h1:orZH3c5wmhIQFTXF+Nt+eeauyd+ZIt2BX6ARe+kD+aw=
modernc.org/libc v1.37.6/go.mod h1:YAXkAZ8ktnkCKaN9sw/UDeUVkGYJ/YquGO4FTi5nmHE=
modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=
modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo=
modernc.org/memory v1.7.2 h1:Klh90S215mmH8c9gO98QxQFsY+W451E8AnzjoE2ee1E=
modernc.org/memory v1.7.2/go.mod h1:NO4NVCQy0N7ln+T9ngWqOQfi7ley4vpwvARR+Hjw95E=
modernc.org/sqlite v1.28.0 h1:Zx+LyDDmXczNnEQdvPuEfcFVA2ZPyaD7UCZDjef3BHQ=
modernc.org/sqlite v1.28.0/go.mod h1:Qxpazz0zH8Z1xCFyi5GSL3FzbtZ3fvbjmywNogldEW0=

View File

@@ -0,0 +1,34 @@
package database
import (
"database/sql"
"log"
_ "github.com/glebarez/go-sqlite"
)
const FILENAME string = "storage.db"
var database *sql.DB
func OpenSQLite() error {
db, err := sql.Open("sqlite", FILENAME)
if err != nil {
return err
}
log.Println("Successfully connected to SQLite Database")
database = db
return nil
}
func InitDB() {
_, err := database.Exec(TOKENTABLECREATE)
if err != nil {
log.Fatal("Failed to init database:\n", err)
}
log.Println("Successfully initiated the Database!")
}
func Close() error {
return database.Close()
}

View File

@@ -0,0 +1,55 @@
package database
import (
"maps"
)
const TOKENTABLECREATE string = `
CREATE TABLE IF NOT EXISTS tokens (
name varchar(32) PRIMARY KEY NOT NULL,
token varchar(32) NOT NULL
);`
const INSERTTOKENSQL string = "INSERT INTO tokens VALUES (?, ?);"
const DELETETOKENSQL string = "DELETE FROM tokens WHERE name = ?;"
const QUERYTOKENSQL string = "SELECT * FROM tokens;"
var tokenCache map[string]string = make(map[string]string)
func InsertToken(name string, token string) error {
_, err := database.Exec(INSERTTOKENSQL, name, token)
return err
}
func DeleteToken(name string) error {
_, err := database.Exec(DELETETOKENSQL, name)
return err
}
func ValidateTokenCache(token string) (bool, error) {
for v := range maps.Values(tokenCache) {
if token == v {
return true, nil
}
}
return ValidateToken(token)
}
func ValidateToken(token string) (bool, error) {
result, err := database.Query(QUERYTOKENSQL)
if err != nil {
return false, err
}
defer result.Close()
var name, foundToken string
for result.Next() {
result.Scan(&name, &foundToken)
tokenCache[name] = foundToken
if token == foundToken {
return true, nil
}
}
err = result.Err()
return false, err
}

View File

@@ -0,0 +1,34 @@
package svgtemplater
import (
"flag"
"log"
"tomatentum.net/svg-templater/pkg/auth"
)
func GenerateTokenCommand() {
name := flag.Arg(0)
if name == "" {
log.Fatal("No Token Name was provided!")
}
token, err := auth.CreateToken(name)
if err != nil {
log.Fatal("Failed to generate token:\n", err)
}
log.Println(token)
}
func DeleteTokenCommand() {
name := flag.Arg(0)
if name == "" {
log.Fatal("No Token Name was provided!")
}
err := auth.DeleteToken(name)
if err != nil {
log.Fatal("Failed to delete token:\n", err)
}
log.Println("Deleted token " + name)
}

View File

@@ -1,5 +0,0 @@
package main
func main() {
println("Hello World")
}

28
pkg/auth/auth.go Normal file
View File

@@ -0,0 +1,28 @@
package auth
import (
"crypto/rand"
"encoding/hex"
"log"
"tomatentum.net/svg-templater/internal/database"
)
func generateToken() string {
token := make([]byte, 32)
if _, err := rand.Read(token); err != nil {
log.Fatal("Failed to generate Token:\n", err)
return ""
}
return hex.EncodeToString(token)
}
func CreateToken(name string) (string, error) {
token := generateToken()
err := database.InsertToken(name, token)
return token, err
}
func DeleteToken(name string) error {
return database.DeleteToken(name)
}

View File

@@ -0,0 +1,40 @@
package auth
import (
"log"
"net/http"
"strings"
"tomatentum.net/svg-templater/internal/database"
)
func AuthMiddleware(next http.Handler) http.HandlerFunc {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
valid, err := validateAuthHeader(r)
if err != nil {
http.Error(w, "Internal Server Error", http.StatusInternalServerError)
log.Println("Database Query for token validation failed.\n", r)
return
}
if valid {
next.ServeHTTP(w, r)
} else {
http.Error(w, "Unauthorized", http.StatusUnauthorized)
}
})
}
// Accepts ("Authorization": "BEARER <TOKEN>"), returns database error if query failed
func validateAuthHeader(r *http.Request) (bool, error) {
header := strings.Split(r.Header.Get("Authorization"), " ")
if len(header) < 2 {
return false, nil
}
token := header[1]
if len(strings.TrimSpace(token)) < 1 {
return false, nil
}
return database.ValidateTokenCache(token)
}