remove log

.gitignore

@@ -2,3 +2,5 @@
 server.log
 mem.go
 nxcaldav
+in/
+out/

.ignore

@@ -2,3 +2,5 @@
 # server.log
 mem.go
 nxcaldav
+in/
+out/

README.md

@@ -33,3 +33,56 @@ UPDATE calendar_objects SET path = regexp_replace(path, '/old/', '/new/')' WHERE
 ```sql
 select id, path, linecut from calendar_objects, LATERAL regexp_split_to_table(data, E'\r\n') AS linecut where linecut ~ 'CLASS';
 ```
+
+
+---
+
+# Helpers
+
+## Prerequisites
+The scripts require psycopg2 (or psycopg2-binary) and PyYAML.
+
+```shell
+pip install psycopg2-binary pyyaml
+```
+
+## Exporting Events
+The `export_events.py` script extracts events from the database and saves them as `.ics` files in a structured directory format: `username/calendarID/filename.ics`.
+
+### Examples:
+- Export everything:
+```shell
+python export_events.py --output ./my_backup
+```
+
+- Export only one user:
+```shell
+python export_events.py --user alice --output ./alice_backup
+```
+
+- Export a specific calendar:
+```shell
+python export_events.py --user alice --calendar preservation --output ./preservation_backup
+```
+
+
+## Importing Events
+The `import_events.py` script uploads events back into the database. It can either walk a structured directory (like the one created by the export script) or upload a flat directory of files to a specific target calendar.
+
+### Examples:
+- Restore everything from a backup:
+```shell
+python import_events.py --input ./my_backup
+```
+
+- Upload a directory of .ics files to a specific calendar:
+```shell
+python import_events.py --input ./some_events/ --user alice --calendar work
+```
+
+- Upload a single file to a specific calendar:
+```shell
+python import_events.py --input ./event.ics --user bob --calendar bob
+```
+
+

export_events.py

@@ -0,0 +1,77 @@
+#!/usr/bin/env python3
+import os
+import argparse
+import psycopg2
+import yaml
+from urllib.parse import urlparse
+
+def get_db_url(config_path):
+    with open(config_path, 'r') as f:
+        cfg = yaml.safe_load(f)
+    return cfg.get('database', {}).get('url')
+
+def export_events():
+    parser = argparse.ArgumentParser(description='Export CalDAV events from database to files.')
+    parser.add_argument('--config', default='config.yaml', help='Path to config.yaml')
+    parser.add_argument('--output', default='export', help='Output directory')
+    parser.add_argument('--user', help='Filter by user name')
+    parser.add_argument('--calendar', help='Filter by calendar ID (name in DB)')
+    
+    args = parser.parse_args()
+    
+    db_url = get_db_url(args.config)
+    if not db_url:
+        print("Error: Could not find database URL in config.")
+        return
+
+    try:
+        conn = psycopg2.connect(db_url)
+        cur = conn.cursor()
+    except Exception as e:
+        print(f"Error connecting to database: {e}")
+        return
+
+    query = """
+        SELECT u.name as user_name, c.name as cal_name, co.path, co.data
+        FROM calendar_objects co
+        JOIN calendars c ON co.calendar_id = c.id
+        JOIN users u ON c.owner_id = u.id
+        WHERE 1=1
+    """
+    params = []
+    if args.user:
+        query += " AND u.name = %s"
+        params.append(args.user)
+    if args.calendar:
+        query += " AND c.name = %s"
+        params.append(args.calendar)
+
+    cur.execute(query, params)
+    rows = cur.fetchall()
+
+    if not rows:
+        print("No events found matching the filters.")
+        return
+
+    for user_name, cal_name, obj_path, data in rows:
+        # Create directory structure: output/user/calendar/
+        target_dir = os.path.join(args.output, user_name, cal_name)
+        os.makedirs(target_dir, exist_ok=True)
+        
+        # Filename from the path (the last part after /)
+        filename = os.path.basename(obj_path)
+        if not filename: # Should not happen with valid paths
+            continue
+            
+        file_path = os.path.join(target_dir, filename)
+        with open(file_path, 'w') as f:
+            f.write(data)
+        
+        print(f"Exported: {user_name}/{cal_name}/{filename}")
+
+    cur.close()
+    conn.close()
+    print(f"Done. Exported {len(rows)} events to '{args.output}'.")
+
+if __name__ == "__main__":
+    export_events()

import_events.py

@@ -0,0 +1,124 @@
+#!/usr/bin/env python3
+import os
+import argparse
+import psycopg2
+import yaml
+from urllib.parse import urlparse
+
+def get_config(config_path):
+    with open(config_path, 'r') as f:
+        return yaml.safe_load(f)
+
+def count_events(data):
+    return data.count('BEGIN:VEVENT')
+
+def import_events():
+    parser = argparse.ArgumentParser(description='Import CalDAV events from files to database.')
+    parser.add_argument('--config', default='config.yaml', help='Path to config.yaml')
+    parser.add_argument('--input', default='export', help='Input directory or file')
+    parser.add_argument('--user', help='Target user (filter or override)')
+    parser.add_argument('--calendar', help='Target calendar (filter or override)')
+    
+    args = parser.parse_args()
+    
+    cfg = get_config(args.config)
+    db_url = cfg.get('database', {}).get('url')
+    if not db_url:
+        print("Error: Could not find database URL in config.")
+        return
+
+    try:
+        conn = psycopg2.connect(db_url)
+        cur = conn.cursor()
+    except Exception as e:
+        print(f"Error connecting to database: {e}")
+        return
+
+    def upload_file(file_path, user_name, cal_name):
+        cur.execute("""
+            SELECT c.id, c.path 
+            FROM calendars c 
+            JOIN users u ON c.owner_id = u.id 
+            WHERE u.name = %s AND c.name = %s
+        """, (user_name, cal_name))
+        res = cur.fetchone()
+        if not res:
+            print(f"Warning: Calendar '{cal_name}' for user '{user_name}' not found in DB. Skipping {file_path}")
+            return False
+        
+        cal_id, cal_base_path = res
+        with open(file_path, 'r') as f:
+            data = f.read()
+        
+        filename = os.path.basename(file_path)
+        obj_path = os.path.join(cal_base_path, filename)
+        etag = f'"{count_events(data)}"'
+        
+        cur.execute("""
+            INSERT INTO calendar_objects (calendar_id, path, data, etag) 
+            VALUES (%s, %s, %s, %s)
+            ON CONFLICT (calendar_id, path) DO UPDATE 
+            SET data = EXCLUDED.data, etag = EXCLUDED.etag
+        """, (cal_id, obj_path, data, etag))
+        return True
+
+    # Gather all files
+    files_to_process = []
+    if os.path.isfile(args.input):
+        files_to_process.append(args.input)
+    elif os.path.isdir(args.input):
+        for root, _, filenames in os.walk(args.input):
+            for f in filenames:
+                if f.endswith('.ics'):
+                    files_to_process.append(os.path.join(root, f))
+    else:
+        print(f"Error: Input '{args.input}' not found.")
+        return
+
+    success_count = 0
+    for f_path in files_to_process:
+        # Determine source structure
+        # If input is a dir, rel_path is relative to it. If file, it's just the filename.
+        if os.path.isdir(args.input):
+            rel_path = os.path.relpath(f_path, args.input)
+        else:
+            rel_path = os.path.basename(f_path)
+            
+        parts = rel_path.split(os.sep)
+        
+        source_user = None
+        source_cal = None
+        
+        # Structure: user/calendar/file.ics (len 3)
+        if len(parts) >= 3:
+            source_user = parts[-3]
+            source_cal = parts[-2]
+        # Structure: calendar/file.ics (len 2)
+        elif len(parts) == 2:
+            source_cal = parts[-2]
+            
+        # 1. Apply Filtering: If flag is set and we have a source value, they must match.
+        if args.user and source_user and args.user != source_user:
+            continue
+        if args.calendar and source_cal and args.calendar != source_cal:
+            continue
+            
+        # 2. Determine Target: Flag overrides source.
+        target_user = args.user or source_user
+        target_cal = args.calendar or source_cal
+        
+        if not target_user or not target_cal:
+            print(f"Skipping {f_path}: Cannot determine user/calendar. Use --user and --calendar flags.")
+            continue
+            
+        if upload_file(f_path, target_user, target_cal):
+            print(f"Imported: {target_user}/{target_cal}/{os.path.basename(f_path)}")
+            success_count += 1
+
+    conn.commit()
+    cur.close()
+    conn.close()
+    print(f"Done. Successfully imported {success_count} events.")
+
+if __name__ == "__main__":
+    import_events()

internal/backend/db.go

@@ -1,7 +1,6 @@
 package backend
 
 import (
-	"slices"
 	"bytes"
 	"context"
 	"errors"
@@ -11,6 +10,7 @@ import (
 	"net/url"
 	"os/exec"
 	"path"
+	"slices"
 	"strings"
 	"time"
 
@@ -26,31 +26,26 @@ import (
 	"nxcaldav/internal/config"
 )
 
+// for ICS access
 type publicInfo struct {
 	InternalPath string
 	Mode         string // e.g., "future-only"
 }
 
-// DBBackend implements the caldav.Backend interface using a PostgreSQL database.
+// DBBackend = caldav.Backend interface (PostgreSQL) 
-// It manages users, calendars, and their events/tasks with built-in support for
-// access control, privacy redaction, and aggregate (virtual) calendars.
 type DBBackend struct {
 	pool          *pgxpool.Pool                // Connection pool to PostgreSQL
 	prefix        string                       // Public URL base path prefix
-	publicURL     string                       // Full public URL base (e.g. http://nxc.nx2.site/)
+	publicURL     string                       // Full public URL base (e.g. http://dav.example.com/)
 	redactionText string                       // Text used to hide confidential event details (e.g. "[REDACED]")
 	defaultClass  string                       // Class assumed if non is set ("PUBLIC", "PRIVATE", "CONFIDENTIAL")
-	emailDomain   string                       // Domain for email addresses (e.g., "nx2.site")
+	emailDomain   string                       // Domain for email addresses (e.g., "example.com" if email is tony@example.com)
-	smtp          config.SMTPConfig            // SMTP server configuration
+	smtp          config.SMTPConfig            
-	aggregates    map[string]*config.Aggregate // In-memory map of path -> virtual calendar definitions
+	aggregates    map[string]*config.Aggregate // In-memory maps...
-	userAggs      map[string][]string          // In-memory map of user -> list of aggregate paths they can see
+	userAggs      map[string][]string
-	publicAccess  map[string]publicInfo        // In-memory map of public path -> internal info
+	publicAccess  map[string]publicInfo
 }
 
-// NewDBBackend creates a new database-backed CalDAV provider.
-// It is called once during main.go startup.
-// It initializes the database connection, ensures the tables exist (Schema),
-// and synchronizes the config.yaml data into the database tables.
 func NewDBBackend(ctx context.Context, cfg *config.Config) (*DBBackend, error) {
 	pool, err := pgxpool.New(ctx, cfg.Database.URL)
 	if err != nil {
@@ -84,8 +79,7 @@ func NewDBBackend(ctx context.Context, cfg *config.Config) (*DBBackend, error) {
 }
 
 // initSchema runs the DDL queries to create the necessary tables if they don't exist.
-// We use ON DELETE CASCADE extensively so that deleting a user or calendar
+// it uses ON DELETE CASCADE extensively
-// automatically wipes all related events and access rules in the DB.
 func (b *DBBackend) initSchema(ctx context.Context) error {
 	queries := []string{
 		`CREATE TABLE IF NOT EXISTS users (
@@ -145,14 +139,10 @@ func (b *DBBackend) initSchema(ctx context.Context) error {
 	return nil
 }
 
-// resolvePassword prepares a password for storage.
-// It is called by syncConfig for every user.
-// 1. If PasswordCmd is set, it runs the bash command to get the password.
-// 2. If the password is not already a bcrypt hash, it hashes it.
 func (b *DBBackend) resolvePassword(u config.User) (string, error) {
 	var raw string
 	if u.PasswordCmd != "" {
-		cmd := exec.Command("bash", "-c", u.PasswordCmd)
+		cmd := exec.Command("sh", "-c", u.PasswordCmd)
 		out, err := cmd.Output()
 		if err != nil {
 			return "", fmt.Errorf("failed to run password command for %s: %v", u.Name, err)
@@ -175,12 +165,6 @@ func (b *DBBackend) resolvePassword(u config.User) (string, error) {
 	return string(hash), nil
 }
 
-// syncConfig reconciles the YAML configuration with the PostgreSQL state.
-// It is called once at server startup.
-// 1. Inserts/Updates all users and their hashed passwords.
-// 2. Inserts/Updates all calendars and their access/group rules.
-// 3. Builds the in-memory Aggregate maps for fast lookup during requests.
-// 4. Performs an 'Orphan Check' to warn the user about DB entries not in config.
 func (b *DBBackend) syncConfig(ctx context.Context, cfg *config.Config) error {
 	tx, err := b.pool.Begin(ctx)
 	if err != nil {
@@ -199,6 +183,7 @@ func (b *DBBackend) syncConfig(ctx context.Context, cfg *config.Config) error {
 	prefix := cfg.Server.BasePath()
 
 	// --- Phase 1: User Sync ---
+	// Inserts/Updates all users and their hashed passwords.
 	for _, u := range cfg.Users {
 		configUserNames[u.Name] = true
 		for _, g := range u.Groups {
@@ -219,6 +204,7 @@ func (b *DBBackend) syncConfig(ctx context.Context, cfg *config.Config) error {
 	}
 
 	// --- Phase 2: Calendar & Access Sync ---
+	// Inserts/Updates all calendars and their access/group rules.
 	for _, c := range cfg.Calendars {
 		path := prefix + fmt.Sprintf("/%s/calendars/%s/", c.Owner, c.ID)
 		configCalendarPaths[path] = true
@@ -409,7 +395,6 @@ func (b *DBBackend) syncConfig(ctx context.Context, cfg *config.Config) error {
 		}
 		calRows.Close()
 	}
-	
 	return tx.Commit(ctx)
 }
 
@@ -448,9 +433,8 @@ func (b *DBBackend) getUsername(ctx context.Context) (string, error) {
 
 // --- Internal Security & Privacy Helpers ---
 
-// checkAccess verifies if the current user has the required permission for a real calendar.
+// for a real calendars
-// It returns the internal database ID of the calendar and the granted mode if access is granted.
+// returns internal database ID if granted
-// It is called before any read (PROPFIND, GET, REPORT) or write (PUT, DELETE) operation.
 func (b *DBBackend) checkAccess(ctx context.Context, calendarPath string, requiredMode string) (int, string, error) {
 	username, err := b.getUsername(ctx)
 	if err != nil {
@@ -501,13 +485,7 @@ func (b *DBBackend) checkAccess(ctx context.Context, calendarPath string, requir
 	return calID, mode, nil
 }
 
-// filterCalendar is the privacy enforcement engine of the server.
+// Privacy engine
-// It is called every time a calendar object is retrieved from the database
-// for a user who is NOT the owner (unless they have read-write access).
-// It applies the following rules based on the 'CLASS' property of an event/task:
-// 1. PRIVATE: Removes the object entirely.
-// 2. CONFIDENTIAL: Redacts the summary to the configured 'redactionText' while keeping time data.
-// 3. PUBLIC: Passes the object through unchanged.
 func (b *DBBackend) filterCalendar(ctx context.Context, ownerName string, mode string, original *ical.Calendar) (*ical.Calendar, error) {
 	username, err := b.getUsername(ctx)
 	if err != nil {
@@ -529,7 +507,7 @@ func (b *DBBackend) filterCalendar(ctx context.Context, ownerName string, mode s
 			continue
 		}
 
-		class := b.defaultClass;
+		class := b.defaultClass
 		if prop := child.Props.Get("CLASS"); prop != nil {
 			class = strings.ToUpper(prop.Value)
 		}
@@ -1143,11 +1121,15 @@ func (b *DBBackend) propagateStatusToOrganizer(orgEmail, attendeeEmail, uid, sta
 	for rows.Next() {
 		var p, dataStr string
 		var calID int
-		if err := rows.Scan(&p, &dataStr, &calID); err != nil { continue }
+		if err := rows.Scan(&p, &dataStr, &calID); err != nil {
+			continue
+		}
 
 		// Verify UID (LIKE is just a hint)
 		calendar, err := ical.NewDecoder(strings.NewReader(dataStr)).Decode()
-		if err != nil { continue }
+		if err != nil {
+			continue
+		}
 
 		found := false
 		for _, event := range calendar.Events() {
@@ -1266,7 +1248,7 @@ func (b *DBBackend) GetColor(ctx context.Context, p string) string {
 	return ""
 }
 
-	// --- CardDAV Backend Implementation ---
+// --- CardDAV ---
 
 func (b *DBBackend) AddressBookHomeSetPath(ctx context.Context) (string, error) {
 	username, err := b.getUsername(ctx)
@@ -1491,4 +1473,3 @@ func (b *DBBackend) DeleteAddressObject(ctx context.Context, p string) error {
 func (b *DBBackend) QueryAddressObjects(ctx context.Context, p string, query *carddav.AddressBookQuery) ([]carddav.AddressObject, error) {
 	return b.ListAddressObjects(ctx, p, nil)
 }
-

internal/config/config.go

@@ -31,7 +31,6 @@ type AddressBook struct {
 }
 
 type Aggregate struct {
-
 	ID      string   `yaml:"id"`
 	Owner   string   `yaml:"owner"`
 	Color   string   `yaml:"color,omitempty"`
@@ -54,18 +53,16 @@ type ServerConfig struct {
 	BindAddress  string `yaml:"bind_address"`
 	PublicURL    string `yaml:"public_url"`
 	EmailDomain  string `yaml:"email_domain"`
-	Redaction    string `yaml:"redaction_text"`
+	Redaction    string `yaml:"redaction_text"` // "[-]"
-	DefaultClass string `yaml:"default_class"`
+	DefaultClass string `yaml:"default_class"` // CONFIDENTIAL/PRIVATE/PUBLIC
 }
-
 func (s ServerConfig) BasePath() string {
 	u, err := url.Parse(s.PublicURL)
-	if err != nil {
+	if err != nil { return "" }
-		return ""
-	}
 	return strings.TrimSuffix(u.Path, "/")
 }
 
+
 type SMTPConfig struct {
 	Host     string `yaml:"host"`
 	Port     int    `yaml:"port"`
@@ -82,6 +79,21 @@ type Config struct {
 	AddressBooks []AddressBook  `yaml:"address_books"`
 	Aggregates   []Aggregate    `yaml:"aggregates"`
 }
+func (c *Config) setDefaults() {
+	if c.Server.BindAddress == ""  { c.Server.BindAddress = ":8080" }
+	if c.Server.Redaction == ""    { c.Server.Redaction = "Busy" }
+	if c.Server.DefaultClass == "" { c.Server.DefaultClass = "CONFIDENTIAL" }
+	if c.Server.EmailDomain == ""  { c.Server.EmailDomain = "nx2.site" }
+	if c.Database.URL == ""        { c.Database.URL = "postgres://nxcaldav@localhost:5432/nxcaldav?sslmode=disable" }
+	if c.SMTP.Host == ""           { c.SMTP.Host = "localhost" }
+	if c.SMTP.Port == 0            { c.SMTP.Port = 25 }
+}
+func (c *Config) checkConfig() {
+	if !(slices.Contains([]string{"PUBLIC", "PRIVATE", "CONFIDENTIAL"}, c.Server.DefaultClass)) {
+		panic("Invaldi Config, default_class")
+	}
+}
+
 func Load(path string) (*Config, error) {
 	f, err := os.Open(path)
 	if err != nil {
@@ -100,32 +112,3 @@ func Load(path string) (*Config, error) {
 	return &cfg, nil
 }
 
-func (c *Config) checkConfig() {
-	if !(slices.Contains([]string{"PUBLIC", "PRIVATE", "CONFIDENTIAL"}, c.Server.DefaultClass)) {
-		panic("Invaldi Config, default_class")
-	}
-}
-
-func (c *Config) setDefaults() {
-	if c.Server.BindAddress == "" {
-		c.Server.BindAddress = ":8080"
-	}
-	if c.Server.Redaction == "" {
-		c.Server.Redaction = "Busy"
-	}
-	if c.Server.DefaultClass == "" {
-		c.Server.DefaultClass = "CONFIDENTIAL"
-	}
-	if c.Server.EmailDomain == "" {
-		c.Server.EmailDomain = "nx2.site"
-	}
-	if c.Database.URL == "" {
-		c.Database.URL = "postgres://nxcaldav@localhost:5432/nxcaldav?sslmode=disable"
-	}
-	if c.SMTP.Host == "" {
-		c.SMTP.Host = "localhost"
-	}
-	if c.SMTP.Port == 0 {
-		c.SMTP.Port = 25
-	}
-}

internal/extra/injector.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"context"
 	"io"
-	"log"
 	"net/http"
 
 	"nxcaldav/internal/backend"
@@ -28,7 +27,8 @@ func (rw *responseWriter) WriteHeader(status int) {
 	rw.status = status
 }
 
-func AddColorToCalendarPropfind(r *http.Request, ctx context.Context, handler http.Handler, w http.ResponseWriter, be *backend.DBBackend) {
+// Add Color To Calendar Propfind
+func InjectColor(r *http.Request, ctx context.Context, handler http.Handler, w http.ResponseWriter, be *backend.DBBackend) {
 	reqBody, _ := io.ReadAll(r.Body)
 	r.Body = io.NopCloser(bytes.NewBuffer(reqBody))
 
@@ -38,6 +38,7 @@ func AddColorToCalendarPropfind(r *http.Request, ctx context.Context, handler ht
 
 	body := buf.Bytes()
 	
+	// this models after the Radicale Response, largely AI code
 	// 1. Add namespaces to the root multistatus tag
 	reMultistatus := regexp.MustCompile(`(<[a-zA-Z0-9]*:?multistatus)`)
 	body = reMultistatus.ReplaceAll(body, []byte(`$1 xmlns:ICAL="http://apple.com/ns/ical/" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:CS="http://calendarserver.org/ns/"`))
@@ -89,7 +90,7 @@ func AddColorToCalendarPropfind(r *http.Request, ctx context.Context, handler ht
 			return ps
 		})
 
-		// 3. If no 200 OK propstat was found, create one!
+		// 3. If no 200 OK propstat was found, create one
 		if !has200 {
 			newPropstat := fmt.Sprintf("<propstat xmlns=\"DAV:\"><prop>%s</prop><status>HTTP/1.1 200 OK</status></propstat>", props)
 			reResponseClose := regexp.MustCompile(`</[a-zA-Z0-9]*:?response>`)
@@ -106,6 +107,10 @@ func AddColorToCalendarPropfind(r *http.Request, ctx context.Context, handler ht
 	w.Write(body)
 }
 
+// modify caledar probfind
+//
+// this again modeled after the Radicale response
+// Largly AI generated agian
 func HandleDiscoveryPropfind(r *http.Request, ctx context.Context, handler http.Handler, w http.ResponseWriter, be *backend.DBBackend) {
 	reqBody, _ := io.ReadAll(r.Body)
 	r.Body = io.NopCloser(bytes.NewBuffer(reqBody))
@@ -158,6 +163,7 @@ func HandleDiscoveryPropfind(r *http.Request, ctx context.Context, handler http.
 			return resp
 		}
 
+		// 2. Try to inject into an existing 200 OK propstat
 		has200 := false
 		resp = rePropstat.ReplaceAllFunc(resp, func(ps []byte) []byte {
 			if reStatusOk.Match(ps) {
@@ -171,6 +177,7 @@ func HandleDiscoveryPropfind(r *http.Request, ctx context.Context, handler http.
 			return ps
 		})
 
+		// 3. If no 200 OK propstat was found, create one
 		if !has200 {
 			newPropstat := fmt.Sprintf("<propstat xmlns=\"DAV:\"><prop>%s</prop><status>HTTP/1.1 200 OK</status></propstat>", props)
 			reResponseClose := regexp.MustCompile(`</[a-zA-Z0-9]*:?response>`)
@@ -178,7 +185,6 @@ func HandleDiscoveryPropfind(r *http.Request, ctx context.Context, handler http.
 				return append([]byte(newPropstat), closeTag...)
 			})
 		}
-
 		return resp
 	})
 

main.go

@@ -4,24 +4,25 @@ import (
 	"context"
 	"fmt"
 	"log"
-        "os"
-
 	"net/http"
 	"net/url"
+	"os"
+	"slices"
 	"strings"
 	"time"
 
 	"github.com/emersion/go-webdav/caldav"
 	"github.com/emersion/go-webdav/carddav"
-	"nxcaldav/internal/backend"
 
-	"nxcaldav/internal/extra"
+	"nxcaldav/internal/backend"
 	"nxcaldav/internal/config"
+	"nxcaldav/internal/extra"
 )
 
 
 
 func main() {
+	// -- GET CONFIG
 	path := "config.yaml";
 	if len(os.Args) == 3 {
 		if os.Args[1] == "-c" {
@@ -33,51 +34,39 @@ func main() {
 		log.Fatalf("failed to load config: %v", err)
 	}
 
+	// -- GET CONTEXT AND DB
 	ctx := context.Background()
 	be, err := backend.NewDBBackend(ctx, cfg)
 	if err != nil {
 		log.Fatalf("failed to initialize database backend: %v", err)
 	}
 
+
+	// -- GET CONTEXT AND DB
 	caldavHandler := &caldav.Handler{Backend: be}
 	carddavHandler := &carddav.Handler{Backend: be}
 	publicURL, _ := url.Parse(cfg.Server.PublicURL)
 
-	http.HandleFunc("/respond", func(w http.ResponseWriter, r *http.Request) {
-		p := r.URL.Query().Get("path")
-		attendee := r.URL.Query().Get("attendee")
-		status := r.URL.Query().Get("status")
-
-		if p == "" || attendee == "" || status == "" {
-			http.Error(w, "Missing parameters", http.StatusBadRequest)
-			return
-		}
-
-		err := be.RespondToInvitation(r.Context(), p, attendee, status)
-		if err != nil {
-			log.Printf("[email] Error handling response: %v", err)
-			http.Error(w, fmt.Sprintf("Error: %v", err), http.StatusInternalServerError)
-			return
-		}
-
-		w.Header().Set("Content-Type", "text/html")
-		fmt.Fprintf(w, "<h1>Response recorded</h1><p>You have %s the invitation for %s.</p>", strings.ToLower(status), attendee)
-	})
 
+	// -- DISCOVERIES
 	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
-		// Proxy-aware normalization:
+
+	    scheme := r.URL.Scheme
+	    if scheme == "" { scheme = "http" }
+
+		// set host (because reverse proxies exist)
 		if publicURL != nil && publicURL.Host != "" {
 			r.Host = publicURL.Host
 			r.URL.Host = publicURL.Host
 			
-			// Detect scheme: prioritize X-Forwarded-Proto, then PublicURL
+			// prioritize X-Forwarded-Proto, then PublicURL (e.g. Cloudfalre proxy)
 			scheme := publicURL.Scheme
 			if proto := r.Header.Get("X-Forwarded-Proto"); proto != "" {
 				scheme = proto
 			}
 			r.URL.Scheme = scheme
 
-			// Also rewrite WebDAV Destination header (used for MOVE/COPY)
+			// Also rewrite WebDAV Destination header (for MOVE/COPY)
 			if dest := r.Header.Get("Destination"); dest != "" {
 				destURL, err := url.Parse(dest)
 				if err == nil {
@@ -95,22 +84,19 @@ func main() {
 			return
 		}
 
-		// caldav access needs auth
+		// DAV needs auth
 		user, password, ok := r.BasicAuth()
 		if !ok {
 			w.Header().Set("WWW-Authenticate", `Basic realm="CalDAV Server"`)
 			http.Error(w, "Unauthorized", http.StatusUnauthorized)
 			return
 		}
-
-		// Verify via Database (bcrypt)
 		valid, err := be.VerifyUser(r.Context(), user, password)
 		if err != nil {
 			log.Printf("auth error for %s: %v", user, err)
 			http.Error(w, "Internal Server Error", http.StatusInternalServerError)
 			return
 		}
-
 		if !valid {
 			log.Printf("auth failed for %s", user)
 			http.Error(w, "Unauthorized", http.StatusUnauthorized)
@@ -120,48 +106,44 @@ func main() {
         log.Printf("[user: %s] %s %s", user, r.Method, r.URL.Path)
 
         principalPath := prefix + fmt.Sprintf("/%s/", user)
+        ctx := context.WithValue(r.Context(), "principal", principalPath)
 
-                // Add addressbook to DAV header for discovery/access paths
+        // set header for carddav
-                // This includes principal path and .well-known
+		if slices.Contains([]string{
-                isCardDAVPath := strings.Contains(r.URL.Path, "/addressbooks/") ||
+		    "/.well-known/carddav",
-                        r.URL.Path == "/.well-known/carddav" ||
+		    prefix + "/.well-known/carddav",
-                        r.URL.Path == prefix+"/.well-known/carddav" ||
+		    principalPath,
-                        r.URL.Path == principalPath ||
+		    strings.TrimSuffix(principalPath, "/"),
-                        r.URL.Path == strings.TrimSuffix(principalPath, "/")
+		}, r.URL.Path) || strings.Contains(r.URL.Path, "/addressbooks/") {
-                
-                if isCardDAVPath {
             w.Header().Add("DAV", "addressbook")
 		}
 
-                ctx := context.WithValue(r.Context(), "principal", principalPath)
+        // for caldav discovery
-
+        if slices.Contains([]string{
-                if r.URL.Path == "/.well-known/caldav" || r.URL.Path == prefix+"/.well-known/caldav" ||
+        	"/.well-known/caldav",
-                        r.URL.Path == "/.well-known/carddav" || r.URL.Path == prefix+"/.well-known/carddav" {
+        	prefix+"/.well-known/caldav",
-                        // If normalized request, use normalized host/scheme for redirect
+        }, r.URL.Path) {
-                        if publicURL != nil && publicURL.Host != "" {
+            http.Redirect(w, r, fmt.Sprintf( "%s://%s%s", scheme, r.Host, principalPath), http.StatusMovedPermanently)
-                                scheme := r.URL.Scheme
-                                if scheme == "" {
-                                        scheme = "http"
-                                }
-                                target := fmt.Sprintf("%s://%s%s", scheme, r.Host, principalPath)
-                                http.Redirect(w, r, target, http.StatusMovedPermanently)
-                        } else {
-                                http.Redirect(w, r, principalPath, http.StatusMovedPermanently)
-                        }
             return
         }
 
-                // needed because color info is not RFC, so regex hack
+        // serve caldav
         if strings.Contains(r.URL.Path, "/calendars/") { 
             if r.Method == "PROPFIND" {
-                                extra.AddColorToCalendarPropfind(r, ctx, caldavHandler, w, be)
+		        // Calendar colors
+		        // needed because color info is not RFC, so I hacked it in with regex, to look like Radicales response
+                extra.InjectColor(r, ctx, caldavHandler, w, be)
             } else {
                 caldavHandler.ServeHTTP(w, r.WithContext(ctx))
             }
+
+    	// serve carddav
         } else if strings.Contains(r.URL.Path, "/addressbooks/") {
             carddavHandler.ServeHTTP(w, r.WithContext(ctx))
+
+        // catch weird requests
         } else {
-                        // Fallback: try both or default to caldav for principal path etc.
+
             if strings.HasSuffix(r.URL.Path, user+"/") || strings.HasSuffix(r.URL.Path, user) {
                 // For principal path, use merged discovery handler
                 if r.Method == "PROPFIND" {
@@ -180,7 +162,6 @@ func main() {
                 http.NotFound(w, r)
             }
         }
-        })
 
         fmt.Printf("Starting CalDAV/CardDAV server on %s...\n", cfg.Server.BindAddress)
 	server := &http.Server{

shell.nix

@@ -5,6 +5,7 @@
     ics
     caldav
     pyyaml
+    psycopg2
   ]);
 in pkgs.mkShell {
   buildInputs = [ python-with-my-packages ];