Added basic management interface

Author: SamTV12345

admin.go

@@ -0,0 +1,25 @@
+package main
+
+import (
+	"context"
+	"github.com/ether/etherpad-proxy/ui"
+	"go.uber.org/zap"
+	"net/http"
+)
+
+type AdminPanel struct {
+	DB     *DB
+	logger *zap.SugaredLogger
+}
+
+func (a *AdminPanel) ServeHTTP(w http.ResponseWriter, _ *http.Request) {
+	padIDMap, err := a.DB.getAllPads()
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+	var component = ui.Management(padIDMap)
+	if err := component.Render(context.Background(), w); err != nil {
+		a.logger.Error("Error while rendering template: ", err)
+	}
+}

db.go

@@ -2,11 +2,12 @@ package main
 
 import (
 	"database/sql"
-	"encoding/json"
 	"github.com/ether/etherpad-proxy/models"
 	_ "modernc.org/sqlite"
 )
 
+import sq "github.com/Masterminds/squirrel"
+
 type DB struct {
 	Conn *sql.DB
 }
@@ -24,7 +25,11 @@ func NewDB(filename string) (*DB, error) {
 	if _, err = db.Conn.Exec("PRAGMA foreign_keys = ON"); err != nil {
 		return nil, err
 	}
-	if _, err = db.Conn.Exec("CREATE TABLE IF NOT EXISTS pad (id TEXT, data TEXT)"); err != nil {
+	if _, err = db.Conn.Exec("CREATE TABLE IF NOT EXISTS pad (id TEXT, backend TEXT, PRIMARY KEY (id))"); err != nil {
+		return nil, err
+	}
+
+	if _, err = db.Conn.Exec("CREATE TABLE IF NOT EXISTS clashes (id TEXT, data TEXT, PRIMARY KEY (id, data))"); err != nil {
 		return nil, err
 	}
 
@@ -37,28 +42,95 @@ func (db *DB) Close() error {
 
 func (db *DB) Get(id string) (*models.DBBackend, error) {
 	var data string
-	err := db.Conn.QueryRow("SELECT data FROM pad WHERE id = ?", id).Scan(&data)
+	var sqlGet, args, err = sq.Select("backend").From("pad").Where(sq.Eq{"id": id}).ToSql()
 	if err != nil {
 		return nil, err
 	}
-
-	var actualData models.DBBackend
-
-	if err = json.Unmarshal([]byte(data), &actualData); err != nil {
+	err = db.Conn.QueryRow(sqlGet, args...).Scan(&data)
+	if err != nil {
 		return nil, err
 	}
 
+	var actualData = models.DBBackend{
+		Backend: data,
+	}
+
 	return &actualData, nil
 }
 
-func (db *DB) Set(id string, dbModel models.DBBackend) error {
-	data, err := json.Marshal(&dbModel)
+func (db *DB) CleanUpPads(padIds []string, padPrefix string) error {
+	sqlDelete, args, err := sq.Delete("pad").Where(sq.And{sq.NotEq{"id": padIds},
+		sq.Like{"backend": padPrefix}}).ToSql()
 	if err != nil {
 		return err
 	}
-	_, err = db.Conn.Exec("INSERT OR REPLACE INTO pad (id, data) VALUES (?, ?)", id, string(data))
+
+	_, err = db.Conn.Exec(sqlDelete, args...)
+	return err
+}
+
+func (db *DB) RecordClash(id string, data string) error {
+	_, err := db.Conn.Exec("INSERT OR REPLACE INTO clashes (id, data) VALUES (?, ?)", id, data)
 	if err != nil {
 		return err
 	}
 	return nil
 }
+
+func (db *DB) Set(id string, dbModel models.DBBackend) error {
+
+	_, err := db.Conn.Exec("INSERT OR REPLACE INTO pad (id, backend) VALUES (?, ?)", id, dbModel.Backend)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (db *DB) getAllPads() (map[string]string, error) {
+	var padIDMap = make(map[string]string)
+	var sqlGet, args, err = sq.Select("id, backend").From("pad").ToSql()
+	if err != nil {
+		return nil, err
+	}
+	rows, err := db.Conn.Query(sqlGet, args...)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	for rows.Next() {
+		var padID string
+		var backend string
+		if err := rows.Scan(&padID, &backend); err != nil {
+			return nil, err
+		}
+		padIDMap[padID] = backend
+	}
+
+	return padIDMap, nil
+}
+
+func (db *DB) getClashByPadID(padId string) ([]string, error) {
+	var sqlGet, args, err = sq.Select("data").From("clashes").Where(sq.Eq{"id": padId}).ToSql()
+
+	if err != nil {
+		return nil, err
+	}
+
+	rows, err := db.Conn.Query(sqlGet, args...)
+	if err != nil {
+		return nil, err
+	}
+
+	defer rows.Close()
+	var data = make([]string, 0)
+	for rows.Next() {
+		var clash string
+		if err := rows.Scan(&clash); err != nil {
+			return nil, err
+		}
+		data = append(data, clash)
+	}
+
+	return data, nil
+}

go.mod

@@ -3,16 +3,20 @@ module github.com/ether/etherpad-proxy
 go 1.24.0
 
 require (
+	github.com/PuerkitoBio/goquery v1.10.2
 	github.com/a-h/templ v0.3.857
 	go.uber.org/zap v1.27.0
+	golang.org/x/oauth2 v0.29.0
 	modernc.org/sqlite v1.37.0
 )
 
 require (
-	github.com/PuerkitoBio/goquery v1.10.2 // indirect
+	github.com/Masterminds/squirrel v1.5.4 // indirect
 	github.com/andybalholm/cascadia v1.3.3 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/google/uuid v1.6.0 // indirect
+	github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
+	github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/ncruces/go-strftime v0.1.9 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect

go.sum

@@ -1,3 +1,5 @@
+github.com/Masterminds/squirrel v1.5.4 h1:uUcX/aBc8O7Fg9kaISIUsHXdKuqehiXAMQTYX8afzqM=
+github.com/Masterminds/squirrel v1.5.4/go.mod h1:NNaOrjSoIDfDA40n7sr2tPNZRfjzjA400rg+riTZj10=
 github.com/PuerkitoBio/goquery v1.10.2 h1:7fh2BdHcG6VFZsK7toXBT/Bh1z5Wmy8Q9MV9HqT2AM8=
 github.com/PuerkitoBio/goquery v1.10.2/go.mod h1:0guWGjcLu9AYC7C1GHnpysHy056u9aEkUHwhdnePMCU=
 github.com/a-h/templ v0.3.857 h1:6EqcJuGZW4OL+2iZ3MD+NnIcG7nGkaQeF2Zq5kf9ZGg=
@@ -14,6 +16,10 @@ github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e h1:ijClszYn+mADRFY17k
 github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 h1:SOEGU9fKiNWd/HOJuq6+3iTQz8KNCLtVX6idSoTLdUw=
+github.com/lann/builder v0.0.0-20180802200727-47ae307949d0/go.mod h1:dXGbAdH5GtBTC4WfIxhKZfyBF/HBFgRZSWwZ9g/He9o=
+github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 h1:P6pPBnrTSX3DEVR4fDembhRWSsG5rVo6hYhAB/ADZrk=
+github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod h1:vmVJ0l/dxyfGW6FmdpVm2joNMFikkuWg0EoCKLGUMNw=
 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/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=
@@ -22,6 +28,7 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
@@ -57,6 +64,8 @@ golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
 golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
 golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c=
 golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
+golang.org/x/oauth2 v0.29.0 h1:WdYw2tdTK1S8olAzWHdgeqfy+Mtm9XNhv/xJsY65d98=
+golang.org/x/oauth2 v0.29.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

models/ListAllPadsModel.go

@@ -0,0 +1,9 @@
+package models
+
+type ListAllPadsModel struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+	Data    struct {
+		PadIds []string `json:"padIDs"`
+	} `json:"data"`
+}

models/Settings.go

@@ -13,6 +13,12 @@ type DBSettings struct {
 }
 
 type Backend struct {
-	Host string `json:"host"`
-	Port int    `json:"port"`
+	Host         string   `json:"host"`
+	Port         int      `json:"port"`
+	ClientId     *string  `json:"clientId"`
+	ClientSecret *string  `json:"clientSecret"`
+	Scopes       []string `json:"scopes"`
+	TokenURL     *string  `json:"tokenUrl"`
+	Username     *string  `json:"username"`
+	Password     *string  `json:"password"`
 }

proxyHandler.go

@@ -19,8 +19,6 @@ import (
 import "math/rand/v2"
 import _ "github.com/ether/etherpad-proxy/ui"
 
-const PadPrefix = "padId:"
-
 type ProxyHandler struct {
 	p      map[string]httputil.ReverseProxy
 	logger *zap.SugaredLogger
@@ -42,6 +40,14 @@ func (m *ResourceNotFound) Error() string {
 	return "Resource not found"
 }
 
+type ClashInPadId struct {
+	padId string
+}
+
+func (m *ClashInPadId) Error() string {
+	return "Resource not found"
+}
+
 func ScrapeJSFiles(backends models.Settings) {
 	go func() {
 		for {
@@ -114,24 +120,36 @@ func (ph *ProxyHandler) createRoute(padId *string, r *http.Request) (*httputil.R
 		return &chosenBackend, nil
 	}
 
-	var padRead, err = ph.db.Get(PadPrefix + *padId)
+	var padRead, err = ph.db.Get(*padId)
 	if len(AvailableBackends.Available) == 0 {
 		return nil, errors.New("no backends available")
 	}
 	if errors.Is(err, sql.ErrNoRows) {
 		// if no backend is stored for this pad, create a new connection
-		AvailableBackends.Mutex.Lock()
-		var newBackend = AvailableBackends.Available[rand.IntN(len(AvailableBackends.Available))]
-		AvailableBackends.Mutex.Unlock()
+		result, err := ph.db.getClashByPadID(*padId)
 
-		if err = ph.db.Set(PadPrefix+*padId, models.DBBackend{
-			Backend: newBackend,
-		}); err != nil {
-			ph.logger.Info("Error while setting padId in DB: ", err)
+		if err != nil && errors.Is(err, sql.ErrNoRows) || len(result) == 0 {
+			AvailableBackends.Mutex.Lock()
+			var newBackend = AvailableBackends.Available[rand.IntN(len(AvailableBackends.Available))]
+			AvailableBackends.Mutex.Unlock()
+
+			if err = ph.db.Set(*padId, models.DBBackend{
+				Backend: newBackend,
+			}); err != nil {
+				ph.logger.Info("Error while setting padId in DB: ", err)
+			}
+			var chosenBackend = ph.p[newBackend]
+
+			return &chosenBackend, nil
+		} else if err != nil {
+			return nil, err
 		}
-		var chosenBackend = ph.p[newBackend]
 
-		return &chosenBackend, nil
+		// There is an active clash for this pad
+		ph.logger.Warnf("Pad %s is in a clash with backends: %v", *padId, result)
+		return nil, &ClashInPadId{
+			padId: *padId,
+		}
 	}
 
 	if len(AvailableBackends.Available) == 0 {
@@ -145,7 +163,7 @@ func (ph *ProxyHandler) createRoute(padId *string, r *http.Request) (*httputil.R
 		AvailableBackends.Mutex.Lock()
 		newBackend := AvailableBackends.Up[rand.IntN(len(AvailableBackends.Up))]
 		AvailableBackends.Mutex.Unlock()
-		if err = ph.db.Set(PadPrefix+*padId, models.DBBackend{
+		if err = ph.db.Set(*padId, models.DBBackend{
 			Backend: newBackend,
 		}); err != nil {
 			ph.logger.Info("Error while setting padId in DB: ", err)