feat(fonts): add font endpoints

Reviewed-on: #11

.gitea/workflows/gobuild.yaml

@@ -1,6 +1,7 @@
 name: build
 
 on:
+  pull_request:
   push:
     branches-ignore:
       - main
@@ -11,9 +12,16 @@ jobs:
     steps:
     - name: Set VERSION env var
       run: |
-        VERSION=${GITHUB_REF_NAME}-${GITHUB_SHA::10}
-        echo $VERSION
-        echo "VERSION=${GITHUB_REF_NAME}-${GITHUB_SHA::10}" >> $GITHUB_ENV
+          SANITIZED_REF_NAME=${GITHUB_REF_NAME//\//-}
+
+          if [[ "$GITHUB_REF_TYPE" == "tag" ]]; then
+            VERSION="$SANITIZED_REF_NAME"
+          else
+            VERSION="$SANITIZED_REF_NAME-${GITHUB_SHA::10}"
+          fi
+
+          echo "$VERSION"
+          echo "VERSION=$VERSION" >> "$GITHUB_ENV"''
 
     - name: Checkout code
       uses: actions/checkout@v5
@@ -27,19 +35,19 @@ jobs:
       run: go mod download
 
     - name: Build linux-amd64
-      run: GOOS=linux GOARCH=amd64 go build -v -o out/svg-templater_linux-amd64-${{ env.VERSION }} ./...
+      run: GOOS=linux GOARCH=amd64 go build -v -o out/svg-templater_linux-amd64-${{ env.VERSION }} ./cmd/svg-templater
 
     - name: Build linux-arm64
-      run: GOOS=linux GOARCH=arm64 go build -v -o out/svg-templater_linux-arm64-${{ env.VERSION }} ./...
+      run: GOOS=linux GOARCH=arm64 go build -v -o out/svg-templater_linux-arm64-${{ env.VERSION }} ./cmd/svg-templater
 
     - name: Build win-amd64
-      run: GOOS=windows GOARCH=amd64 go build -v -o out/svg-templater_win-amd64-${{ env.VERSION }}.exe ./...
+      run: GOOS=windows GOARCH=amd64 go build -v -o out/svg-templater_win-amd64-${{ env.VERSION }}.exe ./cmd/svg-templater
 
     - name: Build darwin-amd64
-      run: GOOS=darwin GOARCH=amd64 go build -v -o out/svg-templater_darwin-amd64-${{ env.VERSION }} ./...
+      run: GOOS=darwin GOARCH=amd64 go build -v -o out/svg-templater_darwin-amd64-${{ env.VERSION }} ./cmd/svg-templater
 
     - name: Build darwin-arm64
-      run: GOOS=darwin GOARCH=arm64 go build -v -o out/svg-templater_linux-arm64-${{ env.VERSION }} ./...
+      run: GOOS=darwin GOARCH=arm64 go build -v -o out/svg-templater_darwin-arm64-${{ env.VERSION }} ./cmd/svg-templater
 
     - name: Upload artifact
       uses: christopherhx/gitea-upload-artifact@v4

.gitea/workflows/release-docker.yaml

@@ -1,23 +1,26 @@
 name: docker
 
 on:
-  pull_request:
   push:
     branches:
       - 'main'
 
-env:
-  VERSION: ${{ github.ref_name }}-${{ github.sha }}
-
 jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
       - name: Set VERSION env var
         run: |
-          VERSION=${GITHUB_REF_NAME}-${GITHUB_SHA::10}
-          echo $VERSION
-          echo "VERSION=${GITHUB_REF_NAME}-${GITHUB_SHA::10}" >> $GITHUB_ENV
+          SANITIZED_REF_NAME=${GITHUB_REF_NAME//\//-}
+
+          if [[ "$GITHUB_REF_TYPE" == "tag" ]]; then
+            VERSION="$SANITIZED_REF_NAME"
+          else
+            VERSION="$SANITIZED_REF_NAME-${GITHUB_SHA::10}"
+          fi
+
+          echo "$VERSION"
+          echo "VERSION=$VERSION" >> "$GITHUB_ENV"''
 
       - name: Login to Docker Hub
         uses: docker/login-action@v3

cmd/svg-templater/main.go

@@ -1,16 +1,10 @@
 package main
 
 import (
-	"flag"
 	"log"
 
+	"tomatentum.net/svg-templater/internal/command"
 	"tomatentum.net/svg-templater/internal/database"
-	svgtemplater "tomatentum.net/svg-templater/internal/svg-templater"
-)
-
-var (
-	generateTokenFlag bool
-	deleteTokenFlag   bool
 )
 
 func main() {
@@ -18,25 +12,8 @@ func main() {
 		log.Fatal("Failed opening DB:\n", err)
 		return
 	}
-	database.InitDB()
-	prepareCommandLine()
-	handleCommandline()
 	defer database.Close()
-}
-
-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 handleCommandline() {
-	flag.Parse()
-	if generateTokenFlag {
-		svgtemplater.GenerateTokenCommand()
-	} else if deleteTokenFlag {
-		svgtemplater.DeleteTokenCommand()
-	} else {
-		log.Println("No commend provided!")
-		flag.PrintDefaults()
-	}
+	database.InitDB()
+	command.PrepareCommandLine()
+	command.HandleCommandline()
 }

go.mod

@@ -4,11 +4,13 @@ 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/glebarez/go-sqlite v1.22.0
 	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/image v0.36.0
 	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/text v0.34.0 // indirect
 	modernc.org/libc v1.37.6 // indirect
 	modernc.org/mathutil v1.6.0 // indirect
 	modernc.org/memory v1.7.2 // indirect

go.sum

@@ -8,9 +8,13 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE
 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/image v0.36.0 h1:Iknbfm1afbgtwPTmHnS2gTM/6PPZfH+z2EFuOkSbqwc=
+golang.org/x/image v0.36.0/go.mod h1:YsWD2TyyGKiIX1kZlu9QfKIsQ4nAAK9bdgdrIsE7xy4=
 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=
+golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk=
+golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA=
 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=

internal/command/commandline.go

@@ -0,0 +1,37 @@
+package command
+
+import (
+	"flag"
+
+	"tomatentum.net/svg-templater/internal/server"
+	"tomatentum.net/svg-templater/pkg/svg"
+)
+
+var (
+	help              bool
+	generateTokenFlag bool
+	deleteTokenFlag   bool
+	datapath          string
+)
+
+func PrepareCommandLine() {
+	flag.BoolVar(&help, "help", false, "Displays the help String")
+	flag.BoolVar(&generateTokenFlag, "tokengen", false, "Generate token with name")
+	flag.BoolVar(&deleteTokenFlag, "tokendel", false, "Delete token with name")
+	flag.StringVar(&datapath, "data", "/var/lib/svg-templater", "Override data directory")
+}
+
+func HandleCommandline() {
+	flag.Parse()
+	if generateTokenFlag {
+		GenerateTokenCommand()
+	} else if deleteTokenFlag {
+		DeleteTokenCommand()
+	} else if help {
+		flag.PrintDefaults()
+	} else {
+		svg.Storage = svg.NewFileStorage(datapath, "fonts")
+		server.PrepareHTTP()
+		server.Start()
+	}
+}

internal/command/tokencommands.go

@@ -1,4 +1,4 @@
-package svgtemplater
+package command
 
 import (
 	"flag"

internal/database/database.go

@@ -23,6 +23,7 @@ func OpenSQLite() error {
 
 func InitDB() {
 	_, err := database.Exec(TOKENTABLECREATE)
+	_, err = database.Exec(SVGTABLECREATE)
 	if err != nil {
 		log.Fatal("Failed to init database:\n", err)
 	}

internal/database/svgdb.go

@@ -0,0 +1,28 @@
+package database
+
+import (
+	"encoding/json"
+
+	"tomatentum.net/svg-templater/pkg/svg"
+)
+
+const SVGTABLECREATE string = `
+	CREATE TABLE IF NOT EXISTS svg (
+		name varchar(16) PRIMARY KEY NOT NULL,
+		templatekeys longtext NOT NULL
+	);`
+
+const INSERTSVGSQL string = "INSERT INTO svg VALUES (?, ?);"
+
+func InsertSVG(data *svg.TemplateData) error {
+	json, err := json.Marshal(data.TemplateKeys)
+	if err != nil {
+		return err
+	}
+
+	if _, err := database.Exec(INSERTSVGSQL, data.Id, string(json)); err != nil {
+		return err
+	}
+
+	return nil
+}

internal/database/tokendb.go

@@ -1,5 +1,9 @@
 package database
 
+import (
+	"maps"
+)
+
 const TOKENTABLECREATE string = `
 	CREATE TABLE IF NOT EXISTS tokens (
 		name varchar(32) PRIMARY KEY NOT NULL,
@@ -8,7 +12,9 @@ const TOKENTABLECREATE string = `
 
 const INSERTTOKENSQL string = "INSERT INTO tokens VALUES (?, ?);"
 const DELETETOKENSQL string = "DELETE FROM tokens WHERE name = ?;"
-const QUERYTOKENSQL string = "SELECT token FROM tokens;"
+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)
@@ -20,6 +26,15 @@ func DeleteToken(name string) error {
 	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 {
@@ -27,12 +42,14 @@ func ValidateToken(token string) (bool, error) {
 	}
 	defer result.Close()
 
-	var foundToken string
+	var name, foundToken string
 	for result.Next() {
-		result.Scan(&token)
+		result.Scan(&name, &foundToken)
+		tokenCache[name] = foundToken
 		if token == foundToken {
 			return true, nil
 		}
 	}
-	return false, nil
+	err = result.Err()
+	return false, err
 }

internal/routes/font.go

@@ -0,0 +1,45 @@
+package routes
+
+import (
+	"encoding/json"
+	"log"
+	"net/http"
+	"strings"
+
+	"tomatentum.net/svg-templater/pkg/svg"
+)
+
+func AddFont(w http.ResponseWriter, r *http.Request) {
+	contentType := r.Header.Get("Content-Type")
+	if contentType != "font/ttf" && contentType != "font/otf" {
+		http.Error(w, "", http.StatusUnsupportedMediaType)
+		return
+	}
+	log.Println("Received font add request")
+	format := strings.TrimPrefix(contentType, "font/")
+
+	if err := svg.Storage.AddFont(r.Body, format); err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		log.Println(err)
+		return
+	}
+}
+
+func GetFonts(w http.ResponseWriter, r *http.Request) {
+	log.Println("Serving all available fonts")
+	fonts, err := svg.Storage.GetFonts()
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		log.Println(err)
+		return
+	}
+
+	json, err := json.Marshal(fonts)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		log.Println(err)
+		return
+	}
+	w.Header().Add("Content-Type", "application/json")
+	w.Write(json)
+}

internal/routes/upload.go

@@ -0,0 +1,49 @@
+package routes
+
+import (
+	"bytes"
+	"encoding/json"
+	"io"
+	"log"
+	"net/http"
+
+	"tomatentum.net/svg-templater/pkg/svg/actions"
+)
+
+func CreateSVG(writer http.ResponseWriter, r http.Request) {
+
+	contentType := r.Header.Get("Content-Type")
+	if contentType != "image/svg+xml" {
+		http.Error(writer, "Incorrect Content-Type. Needs image/svg+xml.", http.StatusUnsupportedMediaType)
+		return
+	}
+
+	readsvg, err := io.ReadAll(r.Body)
+	if err != nil {
+		http.Error(writer, err.Error(), http.StatusInternalServerError)
+		log.Println("Error while reading Body\n", err)
+		return
+	}
+
+	if ok, err := validateSVG(readsvg); err != nil || !ok {
+		http.Error(writer, err.Error(), http.StatusUnsupportedMediaType)
+		log.Println("Wrong Media Type was uploaded\n", err)
+		return
+	}
+
+	data, err := actions.Create(readsvg)
+
+	if err != nil {
+		http.Error(writer, err.Error(), http.StatusInternalServerError)
+		log.Println("Failed creating SVG template\n", err)
+		return
+	}
+
+	writer.Header().Add("Content-Type", "application/json")
+	json.NewEncoder(writer).Encode(data)
+	log.Println("Created SVG Template " + data.Id)
+}
+
+func validateSVG(svgbuf []byte) (bool, error) {
+	return bytes.Contains(svgbuf[:512], []byte("<svg")), nil
+}

internal/server/http.go

@@ -0,0 +1,43 @@
+package server
+
+import (
+	"fmt"
+	"log"
+	"net/http"
+
+	"tomatentum.net/svg-templater/internal/routes"
+	"tomatentum.net/svg-templater/pkg/auth"
+)
+
+func PrepareHTTP() {
+	registerAuthorized("/", func(w http.ResponseWriter, r *http.Request) {
+		fmt.Fprintln(w, "You are authorized!")
+	})
+	registerAuthorized("/svg/", func(w http.ResponseWriter, r *http.Request) {
+		if r.Method != "POST" {
+			http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
+			return
+		}
+		routes.CreateSVG(w, *r)
+	})
+	registerAuthorized("/font/", func(w http.ResponseWriter, r *http.Request) {
+		switch r.Method {
+		case "GET":
+			routes.GetFonts(w, r)
+		case "POST":
+			routes.AddFont(w, r)
+		}
+	})
+}
+
+func Start() {
+	log.Println("Starting http server on :3000")
+	if err := http.ListenAndServe(":3000", nil); err != nil {
+		panic(err)
+	}
+}
+
+func registerAuthorized(path string, f func(w http.ResponseWriter, r *http.Request)) {
+	http.HandleFunc(path, auth.AuthMiddleware(http.HandlerFunc(f)))
+	log.Println("Registered authorized handler for", path)
+}

pkg/auth/authmiddleware.go

@@ -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)
+}

pkg/svg/actions/upload.go

@@ -0,0 +1,50 @@
+package actions
+
+import (
+	"bytes"
+	"crypto/rand"
+	"encoding/hex"
+	"log"
+	"regexp"
+
+	"tomatentum.net/svg-templater/internal/database"
+	"tomatentum.net/svg-templater/pkg/svg"
+)
+
+func Create(svgbuf []byte) (svg.TemplateData, error) {
+	data := svg.TemplateData{Id: generateId(), TemplateKeys: nil}
+	populateKeys(&data, svgbuf)
+
+	_, err := svg.Storage.Create(data.Id, bytes.NewReader(svgbuf))
+	if err != nil {
+		return svg.TemplateData{}, err
+	}
+
+	if err := database.InsertSVG(&data); err != nil {
+		return svg.TemplateData{}, err
+	}
+
+	return data, nil
+}
+
+func populateKeys(data *svg.TemplateData, svg []byte) {
+	regex := regexp.MustCompile(`\{\{\s*(.*?)\s*\}\}`)
+	result := regex.FindAllSubmatch(svg, -1)
+	templateKeys := make([]string, len(result))
+
+	for i, matches := range result {
+		varname := matches[1] // first capture group
+		templateKeys[i] = string(varname)
+	}
+	data.TemplateKeys = templateKeys
+	log.Println("Found keys:\n", templateKeys)
+}
+
+func generateId() string {
+	token := make([]byte, 16)
+	if _, err := rand.Read(token); err != nil {
+		log.Fatal("Failed to generate Token:\n", err)
+		return ""
+	}
+	return hex.EncodeToString(token)
+}

pkg/svg/storage.go

@@ -0,0 +1,123 @@
+package svg
+
+import (
+	"errors"
+	"io"
+	"log"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"golang.org/x/image/font/sfnt"
+)
+
+type SvgStorage interface {
+	Create(id string, svg io.Reader) (string, error)
+	Get(id string) (io.Reader, error)
+	AddFont(reader io.Reader, format string) error
+	GetFonts() ([]string, error)
+	GetFontsDir() (string, error)
+}
+
+type FileSvgStorage struct {
+	basepath     string
+	fontssubpath string
+}
+
+func NewFileStorage(path string, fontssubpath string) *FileSvgStorage {
+	err := os.MkdirAll(path, 0755)
+	if err != nil {
+		panic(err)
+	}
+	err = os.MkdirAll(filepath.Join(path, fontssubpath), 0755)
+	if err != nil {
+		panic(err)
+	}
+	log.Println("Initialized file storage handler")
+	return &FileSvgStorage{path, fontssubpath}
+}
+
+func (f FileSvgStorage) Create(id string, svg io.Reader) (string, error) {
+	file, err := os.Create(filepath.Join(f.basepath, id+".svg"))
+
+	if err != nil {
+		return "", err
+	}
+	defer file.Close()
+
+	_, err = io.Copy(file, svg)
+	if err != nil {
+		return "", err
+	}
+
+	log.Println("Created File: ", file.Name())
+	return file.Name(), nil
+}
+
+func (f FileSvgStorage) Get(id string) (io.Reader, error) {
+	file, err := os.Open(filepath.Join(f.basepath, "svg", id+".svg"))
+	if err != nil {
+		return nil, err
+	}
+	return file, nil
+}
+
+func (f FileSvgStorage) AddFont(fontreader io.Reader, format string) error {
+	if format != "ttf" && format != "otf" {
+		return errors.New("Format not supported")
+	}
+	file, err := os.CreateTemp(filepath.Join(f.basepath, f.fontssubpath), "*."+format)
+	if err != nil {
+		return err
+	}
+	defer file.Close()
+	log.Printf("Writing %s font to %s\n", format, file.Name())
+	_, err = io.Copy(file, fontreader)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (f FileSvgStorage) GetFonts() ([]string, error) {
+	path := filepath.Join(f.basepath, f.fontssubpath)
+	entries, err := os.ReadDir(path)
+	if err != nil {
+		return nil, err
+	}
+	fonts := make([]string, len(entries))
+	for i, entry := range entries {
+		if entry.IsDir() {
+			continue
+		}
+		if strings.HasSuffix(entry.Name(), ".ttf") || strings.HasSuffix(entry.Name(), ".otf") {
+			fontblob, err := os.ReadFile(filepath.Join(path, entry.Name()))
+			if err != nil {
+				return nil, err
+			}
+			fontname, err := getFontName(fontblob)
+			if err != nil {
+				return nil, err
+			}
+			fonts[i] = fontname
+		}
+	}
+	log.Printf("Got fonts \n%s\n", strings.Join(fonts, "\n"))
+	return fonts, nil
+}
+
+func (f FileSvgStorage) GetFontsDir() (string, error) {
+	return filepath.Join(f.basepath, f.fontssubpath), nil
+}
+
+func getFontName(svgblob []byte) (string, error) {
+	font, err := sfnt.Parse(svgblob)
+	if err != nil {
+		return "", err
+	}
+	name, err := font.Name(nil, sfnt.NameIDFull)
+	if err != nil {
+		return "", err
+	}
+	return name, nil
+}

pkg/svg/templates.go

@@ -0,0 +1,8 @@
+package svg
+
+type TemplateData struct {
+	Id           string
+	TemplateKeys []string
+}
+
+var Storage SvgStorage