diff --git a/go.mod b/go.mod index cfc2768..0261276 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,9 @@ module git.adyxax.org/adyxax/tfstated -go 1.24.1 +go 1.23.5 require ( github.com/mattn/go-sqlite3 v1.14.24 go.n16f.net/uuid v0.0.0-20240707135755-e4fd26b968ad - golang.org/x/crypto v0.36.0 + golang.org/x/crypto v0.32.0 ) diff --git a/go.sum b/go.sum index 2a16b38..0626106 100644 --- a/go.sum +++ b/go.sum @@ -2,5 +2,5 @@ github.com/mattn/go-sqlite3 v1.14.24 h1:tpSp2G2KyMnnQu99ngJ47EIkWVmliIizyZBfPrBW github.com/mattn/go-sqlite3 v1.14.24/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= go.n16f.net/uuid v0.0.0-20240707135755-e4fd26b968ad h1:QYbHaaFqx6hMor1L6iMSmyhMFvXQXhKaNk9nefug07M= go.n16f.net/uuid v0.0.0-20240707135755-e4fd26b968ad/go.mod h1:hvPEWZmyP50in1DH72o5vUvoXFFyfRU6oL+p2tAcbgU= -golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34= -golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc= +golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc= +golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc= diff --git a/pkg/database/accounts.go b/pkg/database/accounts.go index dcd7159..e6363f1 100644 --- a/pkg/database/accounts.go +++ b/pkg/database/accounts.go @@ -25,10 +25,6 @@ func (db *DB) InitAdminAccount() error { return fmt.Errorf("failed to select if there is an admin account in the database: %w", err) } if !hasAdminAccount { - var accountId uuid.UUID - if err := accountId.Generate(uuid.V7); err != nil { - return fmt.Errorf("failed to generate account id: %w", err) - } var password uuid.UUID if err := password.Generate(uuid.V4); err != nil { return fmt.Errorf("failed to generate initial admin password: %w", err) @@ -36,14 +32,13 @@ func (db *DB) InitAdminAccount() error { salt := helpers.GenerateSalt() hash := helpers.HashPassword(password.String(), salt) if _, err := tx.ExecContext(db.ctx, - `INSERT INTO accounts(id, username, salt, password_hash, is_admin, settings) - VALUES (:id, "admin", :salt, :hash, TRUE, :settings) + `INSERT INTO accounts(username, salt, password_hash, is_admin, settings) + VALUES ("admin", :salt, :hash, TRUE, :settings) ON CONFLICT DO UPDATE SET password_hash = :hash WHERE username = "admin";`, - sql.Named("id", accountId), - sql.Named("hash", hash), sql.Named("salt", salt), - sql.Named("settings", []byte("{}")), + sql.Named("hash", hash), + []byte("{}"), ); err == nil { AdvertiseAdminPassword(password.String()) } else { @@ -54,53 +49,17 @@ func (db *DB) InitAdminAccount() error { }) } -func (db *DB) LoadAccounts() ([]model.Account, error) { - rows, err := db.Query( - `SELECT id, username, salt, password_hash, is_admin, created, last_login, settings FROM accounts;`) - if err != nil { - return nil, fmt.Errorf("failed to load accounts from database: %w", err) - } - defer rows.Close() - accounts := make([]model.Account, 0) - for rows.Next() { - var ( - account model.Account - created int64 - lastLogin int64 - ) - err = rows.Scan( - &account.Id, - &account.Username, - &account.Salt, - &account.PasswordHash, - &account.IsAdmin, - &created, - &lastLogin, - &account.Settings) - if err != nil { - return nil, fmt.Errorf("failed to load account from row: %w", err) - } - account.Created = time.Unix(created, 0) - account.LastLogin = time.Unix(lastLogin, 0) - accounts = append(accounts, account) - } - if err := rows.Err(); err != nil { - return nil, fmt.Errorf("failed to load accounts from rows: %w", err) - } - return accounts, nil -} - -func (db *DB) LoadAccountUsernames() (map[string]string, error) { +func (db *DB) LoadAccountUsernames() (map[int]string, error) { rows, err := db.Query( `SELECT id, username FROM accounts;`) if err != nil { return nil, fmt.Errorf("failed to load accounts from database: %w", err) } defer rows.Close() - accounts := make(map[string]string) + accounts := make(map[int]string) for rows.Next() { var ( - id string + id int username string ) err = rows.Scan(&id, &username) @@ -115,7 +74,7 @@ func (db *DB) LoadAccountUsernames() (map[string]string, error) { return accounts, nil } -func (db *DB) LoadAccountById(id string) (*model.Account, error) { +func (db *DB) LoadAccountById(id int) (*model.Account, error) { account := model.Account{ Id: id, } @@ -140,7 +99,7 @@ func (db *DB) LoadAccountById(id string) (*model.Account, error) { if errors.Is(err, sql.ErrNoRows) { return nil, nil } - return nil, fmt.Errorf("failed to load account by id %s: %w", id, err) + return nil, fmt.Errorf("failed to load account by id %d: %w", id, err) } account.Created = time.Unix(created, 0) account.LastLogin = time.Unix(lastLogin, 0) diff --git a/pkg/database/db.go b/pkg/database/db.go index c155ecc..eac31eb 100644 --- a/pkg/database/db.go +++ b/pkg/database/db.go @@ -104,10 +104,7 @@ func (db *DB) Close() error { _ = db.writeDB.Close() return fmt.Errorf("failed to close read database connection: %w", err) } - if err := db.writeDB.Close(); err != nil { - return fmt.Errorf("failed to close write database connection: %w", err) - } - return nil + return db.writeDB.Close() } func (db *DB) Exec(query string, args ...any) (sql.Result, error) { diff --git a/pkg/database/locks.go b/pkg/database/locks.go index 6c0bdfb..e78fd0c 100644 --- a/pkg/database/locks.go +++ b/pkg/database/locks.go @@ -4,9 +4,6 @@ import ( "database/sql" "encoding/json" "errors" - "fmt" - - "go.n16f.net/uuid" ) // Atomically check the lock status of a state and lock it if unlocked. Returns @@ -21,11 +18,7 @@ func (db *DB) SetLockOrGetExistingLock(path string, lock any) (bool, error) { if lockData, err = json.Marshal(lock); err != nil { return err } - var stateId uuid.UUID - if err := stateId.Generate(uuid.V7); err != nil { - return fmt.Errorf("failed to generate state id: %w", err) - } - _, err = tx.ExecContext(db.ctx, `INSERT INTO states(id, path, lock) VALUES (?, ?, json(?))`, stateId, path, lockData) + _, err = tx.ExecContext(db.ctx, `INSERT INTO states(path, lock) VALUES (?, json(?))`, path, lockData) ret = true return err } else { diff --git a/pkg/database/sql/000_init.sql b/pkg/database/sql/000_init.sql index 0e52c60..80e8c8c 100644 --- a/pkg/database/sql/000_init.sql +++ b/pkg/database/sql/000_init.sql @@ -3,7 +3,7 @@ CREATE TABLE schema_version ( ) STRICT; CREATE TABLE accounts ( - id TEXT PRIMARY KEY, + id INTEGER PRIMARY KEY, username TEXT NOT NULL, salt BLOB NOT NULL, password_hash BLOB NOT NULL, @@ -16,7 +16,7 @@ CREATE UNIQUE INDEX accounts_username on accounts(username); CREATE TABLE sessions ( id TEXT PRIMARY KEY, - account_id TEXT NOT NULL, + account_id INTEGER NOT NULL, created INTEGER NOT NULL DEFAULT (unixepoch()), updated INTEGER NOT NULL DEFAULT (unixepoch()), data TEXT NOT NULL, @@ -24,7 +24,7 @@ CREATE TABLE sessions ( ) STRICT; CREATE TABLE states ( - id TEXT PRIMARY KEY, + id INTEGER PRIMARY KEY, path TEXT NOT NULL, lock TEXT, created INTEGER DEFAULT (unixepoch()), @@ -33,9 +33,9 @@ CREATE TABLE states ( CREATE UNIQUE INDEX states_path on states(path); CREATE TABLE versions ( - id TEXT PRIMARY KEY, - account_id TEXT NOT NULL, - state_id TEXT, + id INTEGER PRIMARY KEY, + account_id INTEGER NOT NULL, + state_id INTEGER, data BLOB, lock TEXT, created INTEGER DEFAULT (unixepoch()), diff --git a/pkg/database/states.go b/pkg/database/states.go index e213d2c..d65dd7c 100644 --- a/pkg/database/states.go +++ b/pkg/database/states.go @@ -8,54 +8,8 @@ import ( "time" "git.adyxax.org/adyxax/tfstated/pkg/model" - "github.com/mattn/go-sqlite3" - "go.n16f.net/uuid" ) -func (db *DB) CreateState(path string, accountId string, data []byte) (*model.Version, error) { - encryptedData, err := db.dataEncryptionKey.EncryptAES256(data) - if err != nil { - return nil, fmt.Errorf("failed to encrypt state data: %w", err) - } - var stateId uuid.UUID - if err := stateId.Generate(uuid.V7); err != nil { - return nil, fmt.Errorf("failed to generate state id: %w", err) - } - var versionId uuid.UUID - if err := versionId.Generate(uuid.V7); err != nil { - return nil, fmt.Errorf("failed to generate version id: %w", err) - } - version := &model.Version{ - AccountId: accountId, - Id: versionId, - StateId: stateId, - } - return version, db.WithTransaction(func(tx *sql.Tx) error { - _, err := tx.ExecContext(db.ctx, `INSERT INTO states(id, path) VALUES (?, ?)`, stateId, path) - if err != nil { - var sqliteErr sqlite3.Error - if errors.As(err, &sqliteErr) { - if sqliteErr.Code == sqlite3.ErrNo(sqlite3.ErrConstraint) { - version = nil - return nil - } - } - return fmt.Errorf("failed to insert new state: %w", err) - } - _, err = tx.ExecContext(db.ctx, - `INSERT INTO versions(id, account_id, data, state_id) - VALUES (:id, :accountID, :data, :stateID)`, - sql.Named("accountID", accountId), - sql.Named("data", encryptedData), - sql.Named("id", versionId), - sql.Named("stateID", stateId)) - if err != nil { - return fmt.Errorf("failed to insert new state version: %w", err) - } - return nil - }) -} - // returns true in case of successful deletion func (db *DB) DeleteState(path string) (bool, error) { result, err := db.Exec(`DELETE FROM states WHERE path = ?;`, path) @@ -91,7 +45,7 @@ func (db *DB) GetState(path string) ([]byte, error) { return db.dataEncryptionKey.DecryptAES256(encryptedData) } -func (db *DB) LoadStateById(stateId uuid.UUID) (*model.State, error) { +func (db *DB) LoadStateById(stateId int) (*model.State, error) { state := model.State{ Id: stateId, } @@ -122,8 +76,8 @@ func (db *DB) LoadStates() ([]model.State, error) { defer rows.Close() states := make([]model.State, 0) for rows.Next() { + var state model.State var ( - state model.State created int64 updated int64 ) @@ -141,8 +95,8 @@ func (db *DB) LoadStates() ([]model.State, error) { return states, nil } -// returns true in case of lock mismatch -func (db *DB) SetState(path string, accountId string, data []byte, lock string) (bool, error) { +// returns true in case of id mismatch +func (db *DB) SetState(path string, accountID int, data []byte, lockID string) (bool, error) { encryptedData, err := db.dataEncryptionKey.EncryptAES256(data) if err != nil { return false, fmt.Errorf("failed to encrypt state data: %w", err) @@ -150,50 +104,45 @@ func (db *DB) SetState(path string, accountId string, data []byte, lock string) ret := false return ret, db.WithTransaction(func(tx *sql.Tx) error { var ( - stateId string + stateID int64 lockData []byte ) - if err = tx.QueryRowContext(db.ctx, `SELECT id, lock->>'ID' FROM states WHERE path = ?;`, path).Scan(&stateId, &lockData); err != nil { + if err = tx.QueryRowContext(db.ctx, `SELECT id, lock->>'ID' FROM states WHERE path = ?;`, path).Scan(&stateID, &lockData); err != nil { if errors.Is(err, sql.ErrNoRows) { - var stateUUID uuid.UUID - if err := stateUUID.Generate(uuid.V7); err != nil { - return fmt.Errorf("failed to generate state id: %w", err) - } - _, err = tx.ExecContext(db.ctx, `INSERT INTO states(id, path) VALUES (?, ?)`, stateUUID, path) + var result sql.Result + result, err = tx.ExecContext(db.ctx, `INSERT INTO states(path) VALUES (?)`, path) if err != nil { return fmt.Errorf("failed to insert new state: %w", err) } - stateId = stateUUID.String() + stateID, err = result.LastInsertId() + if err != nil { + return fmt.Errorf("failed to get last insert id for new state: %w", err) + } } else { return err } } - if lock != "" && slices.Compare([]byte(lock), lockData) != 0 { - err = fmt.Errorf("failed to update state: lock ID mismatch") + if lockID != "" && slices.Compare([]byte(lockID), lockData) != 0 { + err = fmt.Errorf("failed to update state, lock ID does not match") ret = true return err } - var versionId uuid.UUID - if err := versionId.Generate(uuid.V7); err != nil { - return fmt.Errorf("failed to generate version id: %w", err) - } _, err = tx.ExecContext(db.ctx, - `INSERT INTO versions(id, account_id, state_id, data, lock) - SELECT :versionId, :accountId, :stateId, :data, lock + `INSERT INTO versions(account_id, state_id, data, lock) + SELECT :accountID, :stateID, :data, lock FROM states - WHERE states.id = :stateId;`, - sql.Named("accountId", accountId), - sql.Named("data", encryptedData), - sql.Named("stateId", stateId), - sql.Named("versionId", versionId)) + WHERE states.id = :stateID;`, + sql.Named("accountID", accountID), + sql.Named("stateID", stateID), + sql.Named("data", encryptedData)) if err != nil { return fmt.Errorf("failed to insert new state version: %w", err) } _, err = tx.ExecContext(db.ctx, `UPDATE states SET updated = ? WHERE id = ?;`, time.Now().UTC().Unix(), - stateId) + stateID) if err != nil { return fmt.Errorf("failed to touch updated for state: %w", err) } diff --git a/pkg/database/versions.go b/pkg/database/versions.go index d636b6b..f05d230 100644 --- a/pkg/database/versions.go +++ b/pkg/database/versions.go @@ -7,10 +7,9 @@ import ( "time" "git.adyxax.org/adyxax/tfstated/pkg/model" - "go.n16f.net/uuid" ) -func (db *DB) LoadVersionById(id uuid.UUID) (*model.Version, error) { +func (db *DB) LoadVersionById(id int) (*model.Version, error) { version := model.Version{ Id: id, } @@ -30,12 +29,12 @@ func (db *DB) LoadVersionById(id uuid.UUID) (*model.Version, error) { if errors.Is(err, sql.ErrNoRows) { return nil, nil } - return nil, fmt.Errorf("failed to load version id %s from database: %w", id, err) + return nil, fmt.Errorf("failed to load version id %d from database: %w", id, err) } version.Created = time.Unix(created, 0) version.Data, err = db.dataEncryptionKey.DecryptAES256(encryptedData) if err != nil { - return nil, fmt.Errorf("failed to decrypt version %s data: %w", id, err) + return nil, fmt.Errorf("failed to decrypt version %d data: %w", id, err) } return &version, nil } diff --git a/pkg/model/account.go b/pkg/model/account.go index d47668a..5055943 100644 --- a/pkg/model/account.go +++ b/pkg/model/account.go @@ -11,7 +11,7 @@ import ( type AccountContextKey struct{} type Account struct { - Id string + Id int Username string Salt []byte PasswordHash []byte diff --git a/pkg/model/session.go b/pkg/model/session.go index 8b2bb01..afa6a77 100644 --- a/pkg/model/session.go +++ b/pkg/model/session.go @@ -8,7 +8,7 @@ type SessionContextKey struct{} type Session struct { Id string - AccountId string + AccountId int Created time.Time Updated time.Time Data any diff --git a/pkg/model/state.go b/pkg/model/state.go index 12f9e83..8e1c277 100644 --- a/pkg/model/state.go +++ b/pkg/model/state.go @@ -2,13 +2,11 @@ package model import ( "time" - - "go.n16f.net/uuid" ) type State struct { Created time.Time - Id uuid.UUID + Id int Lock *string Path string Updated time.Time diff --git a/pkg/model/version.go b/pkg/model/version.go index 1d15bd1..d8c3603 100644 --- a/pkg/model/version.go +++ b/pkg/model/version.go @@ -1,17 +1,14 @@ package model import ( - "encoding/json" "time" - - "go.n16f.net/uuid" ) type Version struct { - AccountId string + AccountId int Created time.Time - Data json.RawMessage - Id uuid.UUID + Data []byte + Id int Lock *string - StateId uuid.UUID + StateId int } diff --git a/pkg/webui/accounts.go b/pkg/webui/accounts.go deleted file mode 100644 index 7ca9d39..0000000 --- a/pkg/webui/accounts.go +++ /dev/null @@ -1,31 +0,0 @@ -package webui - -import ( - "html/template" - "net/http" - - "git.adyxax.org/adyxax/tfstated/pkg/database" - "git.adyxax.org/adyxax/tfstated/pkg/model" -) - -type AccountsPage struct { - ActiveTab int - Page *Page - Accounts []model.Account -} - -var accountsTemplates = template.Must(template.ParseFS(htmlFS, "html/base.html", "html/accounts.html")) - -func handleAccountsGET(db *database.DB) http.Handler { - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - accounts, err := db.LoadAccounts() - if err != nil { - errorResponse(w, http.StatusInternalServerError, err) - return - } - render(w, accountsTemplates, http.StatusOK, AccountsPage{ - Page: makePage(r, &Page{Title: "User Accounts", Section: "accounts"}), - Accounts: accounts, - }) - }) -} diff --git a/pkg/webui/admin.go b/pkg/webui/admin.go deleted file mode 100644 index 54682d7..0000000 --- a/pkg/webui/admin.go +++ /dev/null @@ -1,28 +0,0 @@ -package webui - -import ( - "fmt" - "net/http" - - "git.adyxax.org/adyxax/tfstated/pkg/database" - "git.adyxax.org/adyxax/tfstated/pkg/model" -) - -func adminMiddleware(db *database.DB, requireLogin func(http.Handler) http.Handler) func(http.Handler) http.Handler { - return func(next http.Handler) http.Handler { - return requireLogin(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - account := r.Context().Value(model.AccountContextKey{}) - if account == nil { - // this could happen if the account was deleted in the short - // time between retrieving the session and here - http.Redirect(w, r, "/login", http.StatusFound) - return - } - if !account.(*model.Account).IsAdmin { - errorResponse(w, http.StatusForbidden, fmt.Errorf("Only administrators can perform this request.")) - return - } - next.ServeHTTP(w, r) - })) - } -} diff --git a/pkg/webui/html/accounts.html b/pkg/webui/html/accounts.html deleted file mode 100644 index f1ded93..0000000 --- a/pkg/webui/html/accounts.html +++ /dev/null @@ -1,35 +0,0 @@ -{{ define "main" }} -
-
-
- User Accounts - Create New User Account -
-
- - - - - - - - - - - {{ range .Accounts }} - - - - - - - {{ end }} - -
UsernameCreatedLast LoginIs Admin
{{ .Username }}{{ .Created }}{{ .LastLogin }}{{ .IsAdmin }}
-
-
-

TODO

-
-
-
-{{ end }} diff --git a/pkg/webui/html/base.html b/pkg/webui/html/base.html index 0d19cf5..4ec6565 100644 --- a/pkg/webui/html/base.html +++ b/pkg/webui/html/base.html @@ -20,12 +20,6 @@ settings Settings -{{ if .Page.IsAdmin }} - - person - User Accounts - -{{ end }} logout Logout diff --git a/pkg/webui/html/login.html b/pkg/webui/html/login.html index bdc8fa7..4ff0265 100644 --- a/pkg/webui/html/login.html +++ b/pkg/webui/html/login.html @@ -2,9 +2,8 @@
-
- + {{ range .Versions }} - {{ index $.Usernames .AccountId }} - {{ .Created }} + {{ index $.Usernames .AccountId }} + {{ .Created }} {{ end }} diff --git a/pkg/webui/html/states.html b/pkg/webui/html/states.html index b56dcd8..787ac73 100644 --- a/pkg/webui/html/states.html +++ b/pkg/webui/html/states.html @@ -1,71 +1,32 @@ {{ define "main" }}
-
-
- States - Create New State -
-
- - - - - - - - - - {{ range .States }} - - - - - - {{ end }} - -
PathUpdatedLocked
{{ .Path }}{{ .Updated }} - - {{ if eq .Lock nil }}no{{ else }} - yes -
- Lock -

{{ .Lock }}

-
- {{ end }} - -
-
-
- -
-
- - - {{ if .PathDuplicate }} - This path already exist - {{ else if .PathError }} - Invalid path - {{ else }} - Valid URL path beginning with a / + + + + + + + + + + {{ range .States }} + + + + + + {{ end }} + +
PathUpdatedLocked
{{ .Path }}{{ .Updated }} + + {{ if eq .Lock nil }}no{{ else }} + yes +
+ Lock +

{{ .Lock }}

+
{{ end }} - -
- - - - JSON state file -
- - - - - + +
{{ end }} diff --git a/pkg/webui/html/version.html b/pkg/webui/html/version.html new file mode 100644 index 0000000..b849783 --- /dev/null +++ b/pkg/webui/html/version.html @@ -0,0 +1,10 @@ +{{ define "main" }} +
+

+ Created by + {{ .Account.Username }} + at {{ .Version.Created }} +

+ 
{{ .VersionData }}
+
+{{ end }} diff --git a/pkg/webui/html/versions.html b/pkg/webui/html/versions.html deleted file mode 100644 index 8adab56..0000000 --- a/pkg/webui/html/versions.html +++ /dev/null @@ -1,23 +0,0 @@ -{{ define "main" }} -
-

- Created by - {{ .Account.Username }} - at {{ .Version.Created }} -

-
-
- Explorer - Raw -
-
-
- -
-
-
- 
{{ .VersionData }}
-
-
-
-{{ end }} diff --git a/pkg/webui/index.go b/pkg/webui/index.go index 28a4964..1168098 100644 --- a/pkg/webui/index.go +++ b/pkg/webui/index.go @@ -8,7 +8,6 @@ import ( ) type Page struct { - IsAdmin bool LightMode bool Precedent string Section string @@ -16,8 +15,6 @@ type Page struct { } func makePage(r *http.Request, page *Page) *Page { - account := r.Context().Value(model.AccountContextKey{}).(*model.Account) - page.IsAdmin = account.IsAdmin settings := r.Context().Value(model.SettingsContextKey{}).(*model.Settings) page.LightMode = settings.LightMode return page diff --git a/pkg/webui/routes.go b/pkg/webui/routes.go index 2037df6..e84f33a 100644 --- a/pkg/webui/routes.go +++ b/pkg/webui/routes.go @@ -12,8 +12,6 @@ func addRoutes( ) { requireSession := sessionsMiddleware(db) requireLogin := loginMiddleware(db, requireSession) - requireAdmin := adminMiddleware(db, requireLogin) - mux.Handle("GET /accounts", requireAdmin(handleAccountsGET(db))) mux.Handle("GET /healthz", handleHealthz()) mux.Handle("GET /login", requireSession(handleLoginGET())) mux.Handle("POST /login", requireSession(handleLoginPOST(db))) @@ -21,9 +19,8 @@ func addRoutes( mux.Handle("GET /settings", requireLogin(handleSettingsGET(db))) mux.Handle("POST /settings", requireLogin(handleSettingsPOST(db))) mux.Handle("GET /states", requireLogin(handleStatesGET(db))) - mux.Handle("POST /states", requireLogin(handleStatesPOST(db))) - mux.Handle("GET /states/{id}", requireLogin(handleStatesIdGET(db))) + mux.Handle("GET /state/{id}", requireLogin(handleStateGET(db))) mux.Handle("GET /static/", cache(http.FileServer(http.FS(staticFS)))) - mux.Handle("GET /versions/{id}", requireLogin(handleVersionsGET(db))) + mux.Handle("GET /version/{id}", requireLogin(handleVersionGET(db))) mux.Handle("GET /", requireLogin(handleIndexGET())) } diff --git a/pkg/webui/state.go b/pkg/webui/state.go new file mode 100644 index 0000000..141d2d8 --- /dev/null +++ b/pkg/webui/state.go @@ -0,0 +1,54 @@ +package webui + +import ( + "html/template" + "net/http" + "strconv" + + "git.adyxax.org/adyxax/tfstated/pkg/database" + "git.adyxax.org/adyxax/tfstated/pkg/model" +) + +var stateTemplate = template.Must(template.ParseFS(htmlFS, "html/base.html", "html/state.html")) + +func handleStateGET(db *database.DB) http.Handler { + type StatesData struct { + Page *Page + State *model.State + Usernames map[int]string + Versions []model.Version + } + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + stateIdStr := r.PathValue("id") + stateId, err := strconv.Atoi(stateIdStr) + if err != nil { + errorResponse(w, http.StatusBadRequest, err) + return + } + state, err := db.LoadStateById(stateId) + if err != nil { + errorResponse(w, http.StatusInternalServerError, err) + return + } + versions, err := db.LoadVersionsByState(state) + if err != nil { + errorResponse(w, http.StatusInternalServerError, err) + return + } + usernames, err := db.LoadAccountUsernames() + if err != nil { + errorResponse(w, http.StatusInternalServerError, err) + return + } + render(w, stateTemplate, http.StatusOK, StatesData{ + Page: makePage(r, &Page{ + Precedent: "/states", + Section: "states", + Title: state.Path, + }), + State: state, + Usernames: usernames, + Versions: versions, + }) + }) +} diff --git a/pkg/webui/states.go b/pkg/webui/states.go index 64b7967..a0d16ca 100644 --- a/pkg/webui/states.go +++ b/pkg/webui/states.go @@ -1,135 +1,29 @@ package webui import ( - "fmt" "html/template" - "io" "net/http" - "net/url" - "path" "git.adyxax.org/adyxax/tfstated/pkg/database" "git.adyxax.org/adyxax/tfstated/pkg/model" - "go.n16f.net/uuid" ) -type StatesPage struct { - ActiveTab int - Page *Page - Path string - PathError bool - PathDuplicate bool - States []model.State -} - var statesTemplates = template.Must(template.ParseFS(htmlFS, "html/base.html", "html/states.html")) -var statesIdTemplate = template.Must(template.ParseFS(htmlFS, "html/base.html", "html/statesId.html")) func handleStatesGET(db *database.DB) http.Handler { + type StatesData struct { + Page *Page + States []model.State + } return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { states, err := db.LoadStates() if err != nil { errorResponse(w, http.StatusInternalServerError, err) return } - render(w, statesTemplates, http.StatusOK, StatesPage{ + render(w, statesTemplates, http.StatusOK, StatesData{ Page: makePage(r, &Page{Title: "States", Section: "states"}), States: states, }) }) } - -func handleStatesPOST(db *database.DB) http.Handler { - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - // file upload limit of 20MB - if err := r.ParseMultipartForm(20 << 20); err != nil { - errorResponse(w, http.StatusBadRequest, err) - return - } - file, _, err := r.FormFile("file") - if err != nil { - errorResponse(w, http.StatusBadRequest, err) - return - } - defer file.Close() - statePath := r.FormValue("path") - parsedStatePath, err := url.Parse(statePath) - if err != nil || path.Clean(parsedStatePath.Path) != statePath || statePath[0] != '/' { - render(w, statesTemplates, http.StatusBadRequest, StatesPage{ - ActiveTab: 1, - Page: makePage(r, &Page{Title: "New State", Section: "states"}), - Path: statePath, - PathError: true, - }) - return - } - data, err := io.ReadAll(file) - if err != nil { - errorResponse(w, http.StatusBadRequest, fmt.Errorf("failed to read uploaded file: %w", err)) - return - } - fileType := http.DetectContentType(data) - if fileType != "text/plain; charset=utf-8" { - errorResponse(w, http.StatusBadRequest, fmt.Errorf("invalid file type: expected \"text/plain; charset=utf-8\" but got \"%s\"", fileType)) - return - } - account := r.Context().Value(model.AccountContextKey{}).(*model.Account) - version, err := db.CreateState(statePath, account.Id, data) - if err != nil { - errorResponse(w, http.StatusInternalServerError, err) - return - } - if version == nil { - render(w, statesTemplates, http.StatusBadRequest, StatesPage{ - ActiveTab: 1, - Page: makePage(r, &Page{Title: "New State", Section: "states"}), - Path: statePath, - PathDuplicate: true, - }) - return - } - destination := path.Join("/versions", version.Id.String()) - http.Redirect(w, r, destination, http.StatusFound) - }) -} - -func handleStatesIdGET(db *database.DB) http.Handler { - type StatesData struct { - Page *Page - State *model.State - Usernames map[string]string - Versions []model.Version - } - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - var stateId uuid.UUID - if err := stateId.Parse(r.PathValue("id")); err != nil { - errorResponse(w, http.StatusBadRequest, err) - return - } - state, err := db.LoadStateById(stateId) - if err != nil { - errorResponse(w, http.StatusInternalServerError, err) - return - } - versions, err := db.LoadVersionsByState(state) - if err != nil { - errorResponse(w, http.StatusInternalServerError, err) - return - } - usernames, err := db.LoadAccountUsernames() - if err != nil { - errorResponse(w, http.StatusInternalServerError, err) - return - } - render(w, statesIdTemplate, http.StatusOK, StatesData{ - Page: makePage(r, &Page{ - Precedent: "/states", - Section: "states", - Title: state.Path, - }), - State: state, - Usernames: usernames, - Versions: versions, - }) - }) -} diff --git a/pkg/webui/versions.go b/pkg/webui/version.go similarity index 70% rename from pkg/webui/versions.go rename to pkg/webui/version.go index 8cb0a8b..2aa1422 100644 --- a/pkg/webui/versions.go +++ b/pkg/webui/version.go @@ -1,18 +1,18 @@ package webui import ( + "fmt" "html/template" "net/http" - "path" + "strconv" "git.adyxax.org/adyxax/tfstated/pkg/database" "git.adyxax.org/adyxax/tfstated/pkg/model" - "go.n16f.net/uuid" ) -var versionsTemplate = template.Must(template.ParseFS(htmlFS, "html/base.html", "html/versions.html")) +var versionTemplate = template.Must(template.ParseFS(htmlFS, "html/base.html", "html/version.html")) -func handleVersionsGET(db *database.DB) http.Handler { +func handleVersionGET(db *database.DB) http.Handler { type VersionsData struct { Page *Page Account *model.Account @@ -21,8 +21,9 @@ func handleVersionsGET(db *database.DB) http.Handler { VersionData string } return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - var versionId uuid.UUID - if err := versionId.Parse(r.PathValue("id")); err != nil { + versionIdStr := r.PathValue("id") + versionId, err := strconv.Atoi(versionIdStr) + if err != nil { errorResponse(w, http.StatusBadRequest, err) return } @@ -31,10 +32,6 @@ func handleVersionsGET(db *database.DB) http.Handler { errorResponse(w, http.StatusInternalServerError, err) return } - if version == nil { - errorResponse(w, http.StatusNotFound, err) - return - } state, err := db.LoadStateById(version.StateId) if err != nil { errorResponse(w, http.StatusInternalServerError, err) @@ -46,9 +43,9 @@ func handleVersionsGET(db *database.DB) http.Handler { return } versionData := string(version.Data[:]) - render(w, versionsTemplate, http.StatusOK, VersionsData{ + render(w, versionTemplate, http.StatusOK, VersionsData{ Page: makePage(r, &Page{ - Precedent: path.Join("/states/", state.Id.String()), + Precedent: fmt.Sprintf("/state/%d", state.Id), Section: "states", Title: state.Path, }),