BREAKING CHANGE: the users:/config-based collection setup is gone. All
user, calendar, and address-book data now lives in the SQLite DB
(internal/db) and is managed exclusively via nidusctl or the web UI.
Existing deployments must recreate their users after upgrading:
nidusctl user create <username>
nidusctl calendar create <username> <name>
nidusctl addressbook create <username> <name>
- internal/db: new users, calendars, addressbooks tables with FK cascade
delete; foreign_keys pragma enabled; internal/db/users.go implements
full CRUD + bcrypt auth (CreateUser, VerifyPassword, ListUsers,
CreateCalendar/AddressBook, etc).
- internal/config: removed Users/UserConfig entirely.
- internal/auth: Basic Auth now checks credentials via db.DB instead of
cfg.Users.
- internal/caldav, internal/carddav: ListCalendars/ListAddressBooks and
Create/Delete now backed by the DB.
- internal/web: login uses db.VerifyPassword; new resources.go adds
create/delete handlers for calendars/address books at
/web/resources/{calendar,addressbook}; dashboard gained create forms
and per-card delete buttons (templ + htmx, no hyperscript).
- tools/nidusctl: new user create/delete/list/passwd commands (masked
interactive password prompt via golang.org/x/term) plus create/delete/
list subcommands for calendar/addressbook.
- cmd/server/main.go: pre-creates on-disk collections from the DB at
startup instead of cfg.Users; warns when no users exist yet.
- Updated tests to seed data via the DB; added resources_test.go for the
new web UI handlers.
- README.md and .github/copilot-instructions.md updated to document the
new nidusctl commands and the DB-backed architecture.
Verified end-to-end against a live test server: nidusctl user/calendar/
addressbook create, DAV Basic Auth PROPFIND, web login, dashboard
rendering, and web UI create/delete of resources all confirmed working.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
103 lines
3.3 KiB
Go
103 lines
3.3 KiB
Go
package web
|
|
|
|
import (
|
|
"context"
|
|
"net/http"
|
|
"regexp"
|
|
"strings"
|
|
|
|
"github.com/yourusername/caldav-server/internal/db"
|
|
"github.com/yourusername/caldav-server/internal/web/templates"
|
|
)
|
|
|
|
// resourceNameRe restricts calendar/address book names to characters that
|
|
// are safe as both a URL path segment and a filesystem directory name.
|
|
var resourceNameRe = regexp.MustCompile(`^[a-zA-Z0-9_-]{1,64}$`)
|
|
|
|
// handleCalendarResource handles POST (create) and DELETE (remove) for
|
|
// the current user's own calendars, mounted at /resources/calendar.
|
|
func (s *Server) handleCalendarResource(w http.ResponseWriter, r *http.Request) {
|
|
s.handleResource(w, r, "calendar")
|
|
}
|
|
|
|
func (s *Server) handleAddressBookResource(w http.ResponseWriter, r *http.Request) {
|
|
s.handleResource(w, r, "addressbook")
|
|
}
|
|
|
|
func (s *Server) handleResource(w http.ResponseWriter, r *http.Request, kind string) {
|
|
username := userFromContext(r.Context())
|
|
|
|
// htmx v2 sends DELETE request parameters as URL query parameters, not
|
|
// a request body — unlike POST/PUT/PATCH (see internal/web/shares.go).
|
|
if r.Method == http.MethodDelete {
|
|
r.PostForm = r.URL.Query()
|
|
} else if err := r.ParseForm(); err != nil {
|
|
http.Error(w, "invalid form", http.StatusBadRequest)
|
|
return
|
|
}
|
|
name := strings.TrimSpace(r.PostForm.Get("name"))
|
|
if !resourceNameRe.MatchString(name) {
|
|
http.Error(w, "name must be 1-64 letters, digits, '-' or '_'", http.StatusBadRequest)
|
|
return
|
|
}
|
|
|
|
collPrefix := "cal-"
|
|
if kind == "addressbook" {
|
|
collPrefix = "card-"
|
|
}
|
|
|
|
switch r.Method {
|
|
case http.MethodPost:
|
|
var err error
|
|
if kind == "calendar" {
|
|
err = s.dbase.CreateCalendar(username, name)
|
|
} else {
|
|
err = s.dbase.CreateAddressBook(username, name)
|
|
}
|
|
if err != nil {
|
|
if err == db.ErrResourceExists {
|
|
http.Error(w, "already exists", http.StatusConflict)
|
|
return
|
|
}
|
|
s.logger.Error("creating resource", "kind", kind, "error", err)
|
|
http.Error(w, "internal error", http.StatusInternalServerError)
|
|
return
|
|
}
|
|
if err := s.store.EnsureCollection(username, collPrefix+name); err != nil {
|
|
s.logger.Error("creating resource storage", "kind", kind, "error", err)
|
|
http.Error(w, "internal error", http.StatusInternalServerError)
|
|
return
|
|
}
|
|
case http.MethodDelete:
|
|
var err error
|
|
if kind == "calendar" {
|
|
err = s.dbase.DeleteCalendar(username, name)
|
|
} else {
|
|
err = s.dbase.DeleteAddressBook(username, name)
|
|
}
|
|
if err != nil && err != db.ErrResourceNotFound {
|
|
s.logger.Error("deleting resource", "kind", kind, "error", err)
|
|
http.Error(w, "internal error", http.StatusInternalServerError)
|
|
return
|
|
}
|
|
if err := s.store.DeleteCollection(username, collPrefix+name); err != nil {
|
|
s.logger.Warn("deleting resource storage", "kind", kind, "error", err)
|
|
}
|
|
default:
|
|
w.Header().Set("Allow", "POST, DELETE")
|
|
http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
|
|
return
|
|
}
|
|
|
|
// The set of cards changed (one added/removed), so re-render the
|
|
// whole #resources list rather than a single card.
|
|
resources, err := s.resourceCards(username)
|
|
if err != nil {
|
|
s.logger.Error("listing resources", "error", err)
|
|
http.Error(w, "internal error", http.StatusInternalServerError)
|
|
return
|
|
}
|
|
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
|
_ = templates.ResourceList(resources).Render(context.Background(), w)
|
|
}
|