feat: clanker fixxes + postgress

This commit is contained in:
2026-10-18 01:50:08 +02:00
parent 95a25453df
commit 6c3b2bdc1f
18 changed files with 829 additions and 180 deletions
+74
View File
@@ -0,0 +1,74 @@
package routes
import (
"crypto/sha256"
"encoding/hex"
"errors"
"io"
"io/fs"
"mime/multipart"
"os"
)
// saveTemp writes an uploaded file to a new temp file in dir and returns its
// path and SHA-256.
func saveTemp(fh *multipart.FileHeader, dir string) (path, sum string, err error) {
src, err := fh.Open()
if err != nil {
return "", "", err
}
defer src.Close()
dst, err := os.CreateTemp(dir, "upload-*.apk")
if err != nil {
return "", "", err
}
hash := sha256.New()
_, err = io.Copy(io.MultiWriter(dst, hash), src)
if cerr := dst.Close(); err == nil {
err = cerr
}
if err != nil {
os.Remove(dst.Name())
return "", "", err
}
return dst.Name(), hex.EncodeToString(hash.Sum(nil)), nil
}
// moveFile moves src to dst without ever overwriting an existing dst. It
// falls back to a copy when they are on different filesystems (the tmp and
// uploads directories are separate volumes).
func moveFile(src, dst string) error {
// Unlike rename, link fails when dst exists, so a concurrent upload can never replace a published APK
if err := os.Link(src, dst); err == nil {
return os.Remove(src)
} else if errors.Is(err, fs.ErrExist) {
return err
}
in, err := os.Open(src)
if err != nil {
return err
}
defer in.Close()
out, err := os.OpenFile(dst, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0644)
if err != nil {
return err
}
_, err = io.Copy(out, in)
if cerr := out.Close(); err == nil {
err = cerr
}
if err != nil {
os.Remove(dst)
return err
}
return os.Remove(src)
}
+155 -121
View File
@@ -1,79 +1,74 @@
package routes
import (
"crypto/sha256"
"encoding/hex"
"errors"
"fmt"
"io"
"io/fs"
"kooltap-updateserver/internal/apk_util"
"kooltap-updateserver/internal/auth"
"kooltap-updateserver/internal/db"
"kooltap-updateserver/internal/models"
"log"
"net/http"
"os"
"path/filepath"
"regexp"
"strconv"
"github.com/Masterminds/semver/v3"
"github.com/gin-gonic/gin"
"gorm.io/gorm"
)
func Register(r *gin.Engine) {
// Handler serves the release API.
type Handler struct {
DB *gorm.DB
UploadDir string // published APKs, served under /downloads
TmpDir string // incoming uploads while they are inspected
MaxUpload int64 // maximum request body size in bytes for uploads
}
func (h *Handler) Register(r *gin.Engine) {
api := r.Group("/api")
{
api.GET("/update", CheckUpdate)
api.GET("/releases", ListReleases)
api.GET("/update", h.CheckUpdate)
api.GET("/releases", h.ListReleases)
}
r.GET("/download/latest", DownloadLatest)
r.GET("/download/latest", h.DownloadLatest)
admin := r.Group("/admin")
admin.Use(auth.AdminAuth())
{
admin.POST("/releases", UploadRelease)
admin.DELETE("/releases/:id", DeleteRelease)
admin.POST("/releases", h.UploadRelease)
admin.DELETE("/releases/:id", h.DeleteRelease)
}
}
func CheckUpdate(c *gin.Context) {
// CheckUpdate tells a tablet whether a newer release exists. Tablets send their
// versionName as "version" and, optionally, their versionCode as "code"; the
// code is the most reliable comparison, so it wins when present.
func (h *Handler) CheckUpdate(c *gin.Context) {
current := c.Query("version")
var latest models.Release
// The highest Android version code is the latest build, regardless of upload order
if err := latestRelease(&latest); err != nil {
c.JSON(http.StatusOK, gin.H{
"update": false,
})
latest, err := h.latestRelease()
if errors.Is(err, gorm.ErrRecordNotFound) {
c.JSON(http.StatusOK, gin.H{"update": false})
return
}
if err != nil {
internalError(c, err)
return
}
cv, err1 := semver.NewVersion(current)
lv, err2 := semver.NewVersion(latest.Version)
if err1 != nil || err2 != nil {
c.JSON(http.StatusOK, gin.H{
"update": latest.Version != current,
})
return
}
if !lv.GreaterThan(cv) {
c.JSON(http.StatusOK, gin.H{
"update": false,
})
if !isNewer(latest, c.Query("version"), c.Query("code")) {
c.JSON(http.StatusOK, gin.H{"update": false})
return
}
c.JSON(http.StatusOK, gin.H{
"update": true,
"version": latest.Version,
"code": latest.VersionCode,
"notes": latest.Notes,
"mandatory": latest.Mandatory,
"sha256": latest.SHA256,
@@ -81,75 +76,105 @@ func CheckUpdate(c *gin.Context) {
})
}
func isNewer(latest *models.Release, version, code string) bool {
if code != "" {
if cc, err := strconv.ParseInt(code, 10, 64); err == nil {
return latest.VersionCode > cc
}
}
cv, err1 := semver.NewVersion(version)
lv, err2 := semver.NewVersion(latest.Version)
if err1 != nil || err2 != nil {
return latest.Version != version
}
return lv.GreaterThan(cv)
}
// DownloadLatest redirects to the newest APK, for installing on a new tablet from a browser
func DownloadLatest(c *gin.Context) {
func (h *Handler) DownloadLatest(c *gin.Context) {
var latest models.Release
if err := latestRelease(&latest); err != nil {
c.JSON(http.StatusNotFound, gin.H{
"error": "No releases yet",
})
latest, err := h.latestRelease()
if errors.Is(err, gorm.ErrRecordNotFound) {
c.JSON(http.StatusNotFound, gin.H{"error": "No releases yet"})
return
}
if err != nil {
internalError(c, err)
return
}
c.Redirect(http.StatusFound, "/downloads/"+latest.APKFile)
}
func latestRelease(release *models.Release) error {
return db.DB.
Order("version_code desc").
First(release).Error
// latestRelease returns the release with the highest Android version code,
// which is the latest build regardless of upload order.
func (h *Handler) latestRelease() (*models.Release, error) {
var release models.Release
err := h.DB.Order("version_code desc").First(&release).Error
if err != nil {
return nil, err
}
return &release, nil
}
func ListReleases(c *gin.Context) {
func (h *Handler) ListReleases(c *gin.Context) {
var releases []models.Release
releases := []models.Release{}
db.DB.
Order("created_at desc").
Find(&releases)
if err := h.DB.Order("created_at desc").Find(&releases).Error; err != nil {
internalError(c, err)
return
}
c.JSON(http.StatusOK, releases)
}
func UploadRelease(c *gin.Context) {
func (h *Handler) UploadRelease(c *gin.Context) {
if h.MaxUpload > 0 {
c.Request.Body = http.MaxBytesReader(c.Writer, c.Request.Body, h.MaxUpload)
}
notes := c.PostForm("notes")
mandatory := c.PostForm("mandatory") == "true"
file, err := c.FormFile("apk")
if err != nil {
c.JSON(http.StatusBadRequest, gin.H{
"error": "APK required",
})
var tooLarge *http.MaxBytesError
if errors.As(err, &tooLarge) {
c.JSON(http.StatusRequestEntityTooLarge, gin.H{"error": "APK too large"})
return
}
c.JSON(http.StatusBadRequest, gin.H{"error": "APK required"})
return
}
// Save temporarily first because we need to inspect the APK
tempPath := filepath.Join("uploads", "temp-"+file.Filename)
if err := c.SaveUploadedFile(file, tempPath); err != nil {
c.JSON(http.StatusInternalServerError, gin.H{
"error": err.Error(),
})
// Save to a private temp file first because we need to inspect the APK;
// the hash is computed while copying so the file is only read once.
tempPath, sum, err := saveTemp(file, h.TmpDir)
if err != nil {
internalError(c, err)
return
}
defer os.Remove(tempPath)
// Extract version information from APK
info, err := apk_util.Read(tempPath)
if err != nil {
c.JSON(http.StatusBadRequest, gin.H{
"error": "invalid APK: " + err.Error(),
})
c.JSON(http.StatusBadRequest, gin.H{"error": "invalid APK: " + err.Error()})
return
}
// Tablets only see the release with the highest version code, so an older or equal one would never be offered
var latest models.Release
if err := latestRelease(&latest); err == nil && int64(info.VersionCode) <= latest.VersionCode {
latest, err := h.latestRelease()
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
internalError(c, err)
return
}
if latest != nil && int64(info.VersionCode) <= latest.VersionCode {
c.JSON(http.StatusConflict, gin.H{
"error": fmt.Sprintf("version code %d must be higher than the latest release (%s, code %d)",
info.VersionCode, latest.Version, latest.VersionCode),
@@ -157,42 +182,22 @@ func UploadRelease(c *gin.Context) {
return
}
filename := "app-" + info.Version + ".apk"
path := filepath.Join("uploads", filename)
// versionName comes from the uploaded file, so keep it from escaping the upload directory
filename := "app-" + safeName(info.Version) + ".apk"
path := filepath.Join(h.UploadDir, filename)
// Prevent overwriting an existing release
if _, err := os.Stat(path); err == nil {
c.JSON(http.StatusConflict, gin.H{
"error": "version already exists",
})
c.JSON(http.StatusConflict, gin.H{"error": "version already exists"})
return
}
// Move temp APK to final filename
if err := os.Rename(tempPath, path); err != nil {
c.JSON(http.StatusInternalServerError, gin.H{
"error": err.Error(),
})
return
}
// Calculate SHA256
hash := sha256.New()
f, err := os.Open(path)
if err != nil {
c.JSON(http.StatusInternalServerError, gin.H{
"error": err.Error(),
})
return
}
defer f.Close()
if _, err := io.Copy(hash, f); err != nil {
c.JSON(http.StatusInternalServerError, gin.H{
"error": err.Error(),
})
if err := moveFile(tempPath, path); err != nil {
if errors.Is(err, fs.ErrExist) {
c.JSON(http.StatusConflict, gin.H{"error": "version already exists"})
return
}
internalError(c, err)
return
}
@@ -202,41 +207,70 @@ func UploadRelease(c *gin.Context) {
APKFile: filename,
Notes: notes,
Mandatory: mandatory,
SHA256: hex.EncodeToString(hash.Sum(nil)),
SHA256: sum,
}
if err := db.DB.Create(&release).Error; err != nil {
if err := h.DB.Create(&release).Error; err != nil {
// cleanup uploaded file if DB fails
os.Remove(path)
c.JSON(http.StatusInternalServerError, gin.H{
"error": err.Error(),
})
// A concurrent upload of the same version won the race
if errors.Is(err, gorm.ErrDuplicatedKey) {
c.JSON(http.StatusConflict, gin.H{"error": "version already exists"})
return
}
internalError(c, err)
return
}
c.JSON(http.StatusOK, release)
}
func DeleteRelease(c *gin.Context) {
var release models.Release
if err := db.DB.First(&release, c.Param("id")).Error; err != nil {
c.JSON(http.StatusNotFound, gin.H{
"error": "Not found",
})
func (h *Handler) DeleteRelease(c *gin.Context) {
id, err := strconv.ParseUint(c.Param("id"), 10, 64)
if err != nil {
c.JSON(http.StatusNotFound, gin.H{"error": "Not found"})
return
}
os.Remove(filepath.Join("uploads", release.APKFile))
var release models.Release
db.DB.Delete(&release)
if err := h.DB.First(&release, id).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
c.JSON(http.StatusNotFound, gin.H{"error": "Not found"})
return
}
internalError(c, err)
return
}
c.JSON(http.StatusOK, gin.H{
"success": true,
})
// Remove the row first: a leftover file is harmless, a row pointing at a missing file is not
if err := h.DB.Delete(&release).Error; err != nil {
internalError(c, err)
return
}
if err := os.Remove(filepath.Join(h.UploadDir, release.APKFile)); err != nil && !errors.Is(err, os.ErrNotExist) {
log.Printf("release %d deleted but removing %s failed: %v", release.ID, release.APKFile, err)
}
c.JSON(http.StatusOK, gin.H{"success": true})
}
func internalError(c *gin.Context, err error) {
log.Printf("%s %s: %v", c.Request.Method, c.Request.URL.Path, err)
c.JSON(http.StatusInternalServerError, gin.H{"error": "internal server error"})
}
var unsafeChars = regexp.MustCompile(`[^A-Za-z0-9._+-]`)
func safeName(s string) string {
s = unsafeChars.ReplaceAllString(s, "_")
if s == "" || s == "." || s == ".." {
s = "_"
}
return s
}
+171
View File
@@ -0,0 +1,171 @@
package routes
import (
"encoding/json"
"errors"
"io/fs"
"kooltap-updateserver/internal/db"
"kooltap-updateserver/internal/models"
"net/http"
"net/http/httptest"
"os"
"path/filepath"
"testing"
"github.com/gin-gonic/gin"
"github.com/glebarez/sqlite"
"gorm.io/gorm"
"gorm.io/gorm/logger"
)
func newHandler(t *testing.T, releases ...models.Release) (*Handler, *gin.Engine) {
t.Helper()
gin.SetMode(gin.TestMode)
database, err := gorm.Open(sqlite.Open("file:"+t.Name()+"?mode=memory&cache=shared"), &gorm.Config{
TranslateError: true,
Logger: logger.Discard,
})
if err != nil {
t.Fatal(err)
}
if err := db.Migrate(database); err != nil {
t.Fatal(err)
}
for i := range releases {
if err := database.Create(&releases[i]).Error; err != nil {
t.Fatal(err)
}
}
h := &Handler{DB: database, UploadDir: t.TempDir(), TmpDir: t.TempDir()}
r := gin.New()
h.Register(r)
return h, r
}
func do(r *gin.Engine, method, url string) (*httptest.ResponseRecorder, map[string]any) {
req := httptest.NewRequest(method, url, nil)
req.Header.Set("X-Admin-Token", "secret")
w := httptest.NewRecorder()
r.ServeHTTP(w, req)
var body map[string]any
_ = json.Unmarshal(w.Body.Bytes(), &body)
return w, body
}
func TestCheckUpdate(t *testing.T) {
_, r := newHandler(t,
models.Release{Version: "1.2.0", VersionCode: 12, APKFile: "app-1.2.0.apk"},
models.Release{Version: "1.10.0", VersionCode: 110, APKFile: "app-1.10.0.apk", Mandatory: true},
)
cases := []struct {
query string
want bool
}{
{"version=1.2.0", true},
{"version=1.10.0", false},
{"version=2.0.0", false},
{"version=1.2.0&code=12", true},
{"version=1.10.0&code=110", false},
{"version=garbage", true},
{"version=garbage&code=200", false},
}
for _, tc := range cases {
t.Run(tc.query, func(t *testing.T) {
w, body := do(r, http.MethodGet, "/api/update?"+tc.query)
if w.Code != http.StatusOK {
t.Fatalf("status %d", w.Code)
}
if body["update"] != tc.want {
t.Fatalf("update = %v, want %v", body["update"], tc.want)
}
if tc.want && body["download"] != "/downloads/app-1.10.0.apk" {
t.Fatalf("download = %v", body["download"])
}
})
}
}
func TestCheckUpdateNoReleases(t *testing.T) {
_, r := newHandler(t)
_, body := do(r, http.MethodGet, "/api/update?version=1.0.0")
if body["update"] != false {
t.Fatalf("update = %v", body["update"])
}
if w, _ := do(r, http.MethodGet, "/download/latest"); w.Code != http.StatusNotFound {
t.Fatalf("download latest status %d", w.Code)
}
}
func TestListReleasesEmptyIsArray(t *testing.T) {
_, r := newHandler(t)
w, _ := do(r, http.MethodGet, "/api/releases")
if w.Body.String() != "[]" {
t.Fatalf("body = %s", w.Body.String())
}
}
func TestDeleteRelease(t *testing.T) {
t.Setenv("ADMIN_TOKEN", "secret")
h, r := newHandler(t, models.Release{Version: "1.0.0", VersionCode: 1, APKFile: "app-1.0.0.apk"})
apk := filepath.Join(h.UploadDir, "app-1.0.0.apk")
if err := os.WriteFile(apk, []byte("x"), 0644); err != nil {
t.Fatal(err)
}
if w, _ := do(r, http.MethodDelete, "/admin/releases/abc"); w.Code != http.StatusNotFound {
t.Fatalf("bad id status %d", w.Code)
}
if w, _ := do(r, http.MethodDelete, "/admin/releases/1"); w.Code != http.StatusOK {
t.Fatalf("delete status %d", w.Code)
}
if _, err := os.Stat(apk); !errors.Is(err, fs.ErrNotExist) {
t.Fatalf("apk still exists: %v", err)
}
if w, _ := do(r, http.MethodDelete, "/admin/releases/1"); w.Code != http.StatusNotFound {
t.Fatalf("second delete status %d", w.Code)
}
}
func TestMoveFileNeverOverwrites(t *testing.T) {
dir := t.TempDir()
src := filepath.Join(dir, "src")
dst := filepath.Join(dir, "dst")
os.WriteFile(src, []byte("new"), 0644)
os.WriteFile(dst, []byte("old"), 0644)
if err := moveFile(src, dst); !errors.Is(err, fs.ErrExist) {
t.Fatalf("err = %v, want ErrExist", err)
}
if b, _ := os.ReadFile(dst); string(b) != "old" {
t.Fatalf("dst overwritten: %q", b)
}
os.Remove(dst)
if err := moveFile(src, dst); err != nil {
t.Fatal(err)
}
if b, _ := os.ReadFile(dst); string(b) != "new" {
t.Fatalf("dst = %q", b)
}
}
func TestSafeName(t *testing.T) {
cases := map[string]string{
"1.2.3": "1.2.3",
"1.0.0-beta+7": "1.0.0-beta+7",
"../../etc/x": ".._.._etc_x",
"..": "_",
"": "_",
`1.0\..\evil`: "1.0_.._evil",
"1.0 (release)": "1.0__release_",
}
for in, want := range cases {
if got := safeName(in); got != want {
t.Errorf("safeName(%q) = %q, want %q", in, got, want)
}
}
}