The family-lens hardening: library_visibility was only enforced where file bytes flowed (download/reader/OPDS) — metadata surfaces leaked hidden libraries to any authenticated account, and registration was open by default with no admin-side user creation. - Series are grouped PER LIBRARY now (same name in two libraries = two entries: manga adaptations / LN splits no longer merge); /api/series aggregates only the requester's VISIBLE libraries and /api/series/books REQUIRES a visible library_id (breaking contract; web + app clients updated in the same change). - /api/media-items, item detail, and the reader content endpoints (chapters/panels/outline/THUMBNAILS — page images leaked unguarded next to a gated GetPage) all enforce the visible set; resolveLibrary no longer honors a hand-typed library_id outside the visible set. - Annotation/note/bookmark mutations (update/delete/tombstone, sync LWW paths incl. conflict resolution) carry ownership predicates: another account's bare row id is a 404, not a silent delete. - Admin user creation: POST /api/auth/users (AdminMiddleware) + a Create User card in the admin Users UI — accounts stay creatable with self-service registration OFF, which is now the schema default (fresh installs; the first-admin bootstrap exception is unchanged). - Tests: series contract re-pinned (per-library, visibility 403s), new ownership + admin-create integration suites, OPDS all=1 test now passes an explicit page size (shared-DB growth made the fresh books fall off page 1), device-cap helper switched to the admin endpoint.
177 lines
5.2 KiB
Go
177 lines
5.2 KiB
Go
package handlers
|
|
|
|
import (
|
|
"bookhoard/internal/database"
|
|
"bookhoard/internal/services"
|
|
"bookhoard/internal/utils"
|
|
"context"
|
|
"net/http"
|
|
"strconv"
|
|
|
|
"github.com/google/uuid"
|
|
"github.com/jackc/pgx/v5/pgtype"
|
|
"github.com/labstack/echo/v5"
|
|
)
|
|
|
|
type SeriesHandler struct {
|
|
seriesService *services.SeriesService
|
|
}
|
|
|
|
func NewSeriesHandler(db *database.Queries) *SeriesHandler {
|
|
return &SeriesHandler{
|
|
seriesService: services.NewSeriesService(db),
|
|
}
|
|
}
|
|
|
|
func (h *SeriesHandler) GetSeries(c *echo.Context) error {
|
|
libraryID := c.QueryParam("library_id")
|
|
var libUUID pgtype.UUID
|
|
if libraryID != "" {
|
|
parsed, err := uuid.Parse(libraryID)
|
|
if err != nil {
|
|
return c.JSON(http.StatusBadRequest, map[string]string{"error": "invalid library_id"})
|
|
}
|
|
libUUID = pgtype.UUID{Bytes: parsed, Valid: true}
|
|
}
|
|
|
|
limit := 20
|
|
if l := c.QueryParam("limit"); l != "" {
|
|
if v, err := strconv.Atoi(l); err == nil && v > 0 {
|
|
limit = v
|
|
if limit > 100 {
|
|
limit = 100
|
|
}
|
|
}
|
|
}
|
|
offset := 0
|
|
if o := c.QueryParam("offset"); o != "" {
|
|
if v, err := strconv.Atoi(o); err == nil && v >= 0 {
|
|
offset = v
|
|
}
|
|
}
|
|
|
|
// Visibility scoping: an explicit library_id must be visible to the
|
|
// requester (403 otherwise); the unscoped aggregate covers only the
|
|
// requester's visible libraries.
|
|
visibleSet, visibleIDs, err := h.visibleLibrarySet(c)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if libraryID != "" && !visibleSet[libraryID] {
|
|
return c.JSON(http.StatusForbidden, map[string]string{"error": "library not accessible"})
|
|
}
|
|
|
|
seriesList, total, err := h.seriesService.GetSeriesPage(c.Request().Context(), libUUID, visibleIDs, limit, offset)
|
|
if err != nil {
|
|
return c.JSON(http.StatusInternalServerError, map[string]string{"error": "Failed to load series"})
|
|
}
|
|
|
|
type SeriesResponse struct {
|
|
Name string `json:"name"`
|
|
LibraryID string `json:"library_id"`
|
|
BookCount int64 `json:"book_count"`
|
|
TotalInSeries int `json:"total_in_series"`
|
|
CoverPaths []string `json:"cover_paths"`
|
|
LastEntryAt string `json:"last_entry_at"`
|
|
}
|
|
|
|
response := make([]SeriesResponse, 0, len(seriesList))
|
|
for _, s := range seriesList {
|
|
response = append(response, SeriesResponse{
|
|
Name: s.Name,
|
|
LibraryID: s.LibraryID,
|
|
BookCount: s.BookCount,
|
|
TotalInSeries: s.TotalInSeries,
|
|
CoverPaths: s.CoverPaths,
|
|
LastEntryAt: s.LastEntryAt,
|
|
})
|
|
}
|
|
|
|
return c.JSON(http.StatusOK, map[string]interface{}{
|
|
"series": response,
|
|
"total": total,
|
|
"limit": limit,
|
|
"offset": offset,
|
|
})
|
|
}
|
|
|
|
// visibleLibrarySet loads the requester's visible libraries. Every series
|
|
// path funnels through this: hidden libraries contribute nothing, and an
|
|
// explicit library_id outside the set is a 403, not a silent pass.
|
|
func (h *SeriesHandler) visibleLibrarySet(c *echo.Context) (map[string]bool, []pgtype.UUID, error) {
|
|
user, ok := c.Get("user").(database.Users)
|
|
if !ok {
|
|
return nil, nil, echo.NewHTTPError(http.StatusUnauthorized, "invalid user")
|
|
}
|
|
libraries, err := h.seriesService.VisibleLibraries(c.Request().Context(), user.ID)
|
|
if err != nil {
|
|
return nil, nil, echo.NewHTTPError(http.StatusInternalServerError, "failed to check library access")
|
|
}
|
|
set := make(map[string]bool, len(libraries))
|
|
ids := make([]pgtype.UUID, 0, len(libraries))
|
|
for _, lib := range libraries {
|
|
if !lib.ID.Valid {
|
|
continue
|
|
}
|
|
libUUID, err := uuid.FromBytes(lib.ID.Bytes[0:16])
|
|
if err != nil {
|
|
continue
|
|
}
|
|
set[libUUID.String()] = true
|
|
ids = append(ids, lib.ID)
|
|
}
|
|
return set, ids, nil
|
|
}
|
|
|
|
func (h *SeriesHandler) GetSeriesBooks(c *echo.Context) error {
|
|
seriesName := c.QueryParam("name")
|
|
if seriesName == "" {
|
|
return c.JSON(http.StatusBadRequest, map[string]string{"error": "name required"})
|
|
}
|
|
|
|
libraryID := c.QueryParam("library_id")
|
|
if libraryID == "" {
|
|
return c.JSON(http.StatusBadRequest, map[string]string{"error": "library_id required"})
|
|
}
|
|
libUUID, err := uuid.Parse(libraryID)
|
|
if err != nil {
|
|
return c.JSON(http.StatusBadRequest, map[string]string{"error": "invalid library_id"})
|
|
}
|
|
|
|
visibleSet, _, err := h.visibleLibrarySet(c)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if !visibleSet[libraryID] {
|
|
return c.JSON(http.StatusForbidden, map[string]string{"error": "library not accessible"})
|
|
}
|
|
|
|
books, err := h.seriesService.GetSeriesBooks(c.Request().Context(), pgtype.UUID{Bytes: libUUID, Valid: true}, seriesName)
|
|
if err != nil {
|
|
return c.JSON(http.StatusInternalServerError, map[string]string{"error": "Failed to load series books"})
|
|
}
|
|
|
|
bookCards := make([]BookInfo, 0, len(books))
|
|
for _, item := range books {
|
|
itemUUID, _ := uuid.FromBytes(item.ID.Bytes[0:16])
|
|
bookCards = append(bookCards, BookInfo{
|
|
MediaItemID: itemUUID.String(),
|
|
Title: item.Title,
|
|
Author: textToString(item.Author),
|
|
CoverImagePath: utils.ResolveMediaURL(item.LibraryID, item.CoverImagePath),
|
|
})
|
|
}
|
|
|
|
return c.JSON(http.StatusOK, map[string]interface{}{
|
|
"name": seriesName,
|
|
"library_id": libraryID,
|
|
"books": bookCards,
|
|
"total": len(bookCards),
|
|
})
|
|
}
|
|
|
|
func GetSeriesCardsData(ctx context.Context, db *database.Queries, libraryID pgtype.UUID, visibleLibraryIDs []pgtype.UUID, limit, offset int) ([]services.SeriesInfo, int, error) {
|
|
svc := services.NewSeriesService(db)
|
|
return svc.GetSeriesPage(ctx, libraryID, visibleLibraryIDs, limit, offset)
|
|
}
|