arnefandCopilot
7d4f28de3c
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>
100 lines
2.1 KiB
Go
100 lines
2.1 KiB
Go
package config
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
|
|
"gopkg.in/yaml.v3"
|
|
)
|
|
|
|
// Config is the top-level server configuration.
|
|
type Config struct {
|
|
Server ServerConfig `yaml:"server"`
|
|
Auth AuthConfig `yaml:"auth"`
|
|
Storage StorageConfig `yaml:"storage"`
|
|
TLS TLSConfig `yaml:"tls"`
|
|
Logging LoggingConfig `yaml:"logging"`
|
|
}
|
|
|
|
type ServerConfig struct {
|
|
Host string `yaml:"host"`
|
|
Port int `yaml:"port"`
|
|
// Base URL used in DAV responses (e.g. https://dav.example.com)
|
|
BaseURL string `yaml:"base_url"`
|
|
}
|
|
|
|
type AuthConfig struct {
|
|
// Realm shown in WWW-Authenticate header
|
|
Realm string `yaml:"realm"`
|
|
}
|
|
|
|
type StorageConfig struct {
|
|
// Root directory for all data
|
|
DataDir string `yaml:"data_dir"`
|
|
}
|
|
|
|
type TLSConfig struct {
|
|
Enabled bool `yaml:"enabled"`
|
|
CertFile string `yaml:"cert_file"`
|
|
KeyFile string `yaml:"key_file"`
|
|
}
|
|
|
|
type LoggingConfig struct {
|
|
Level string `yaml:"level"` // debug | info | warn | error
|
|
Format string `yaml:"format"` // text | json
|
|
}
|
|
|
|
// Load reads and parses a YAML config file.
|
|
func Load(path string) (*Config, error) {
|
|
data, err := os.ReadFile(path)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("reading config %q: %w", path, err)
|
|
}
|
|
|
|
cfg := &Config{}
|
|
if err := yaml.Unmarshal(data, cfg); err != nil {
|
|
return nil, fmt.Errorf("parsing config %q: %w", path, err)
|
|
}
|
|
|
|
cfg.applyDefaults()
|
|
|
|
return cfg, cfg.validate()
|
|
}
|
|
|
|
func (c *Config) applyDefaults() {
|
|
if c.Server.Host == "" {
|
|
c.Server.Host = "0.0.0.0"
|
|
}
|
|
if c.Server.Port == 0 {
|
|
c.Server.Port = 8080
|
|
}
|
|
if c.Server.BaseURL == "" {
|
|
scheme := "http"
|
|
if c.TLS.Enabled {
|
|
scheme = "https"
|
|
}
|
|
c.Server.BaseURL = fmt.Sprintf("%s://%s:%d", scheme, c.Server.Host, c.Server.Port)
|
|
}
|
|
if c.Auth.Realm == "" {
|
|
c.Auth.Realm = "DAV Server"
|
|
}
|
|
if c.Storage.DataDir == "" {
|
|
c.Storage.DataDir = "./data"
|
|
}
|
|
if c.Logging.Level == "" {
|
|
c.Logging.Level = "info"
|
|
}
|
|
if c.Logging.Format == "" {
|
|
c.Logging.Format = "text"
|
|
}
|
|
}
|
|
|
|
func (c *Config) validate() error {
|
|
if c.TLS.Enabled {
|
|
if c.TLS.CertFile == "" || c.TLS.KeyFile == "" {
|
|
return fmt.Errorf("tls.cert_file and tls.key_file are required when tls is enabled")
|
|
}
|
|
}
|
|
return nil
|
|
}
|