remoteRF-server 1.7.20__tar.gz → 1.7.22__tar.gz

{remoterf_server-1.7.20 → remoterf_server-1.7.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoteRF-server
-Version: 1.7.20
+Version: 1.7.22
 Summary: RemoteRF server-side control package
 License: GPL-3.0-or-later
 Classifier: Programming Language :: Python :: 3

{remoterf_server-1.7.20 → remoterf_server-1.7.22}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "remoteRF-server"
-version = "1.7.20"
+version = "1.7.22"
 description = "RemoteRF server-side control package"
 license = { text = "GPL-3.0-or-later" }
 requires-python = ">=3.10"

{remoterf_server-1.7.20 → remoterf_server-1.7.22}/src/remoteRF_server/remote_admin_shell.py

@@ -75,7 +75,7 @@ TIERS = {
 DENY_FLAGS = {"--secrets"}
 # Destructive commands whose own confirmation -y answers (the step-up asked already).
 TAKES_YES = {"devices wipe", "stats purge", "hosts wipe", "certs wipe", "users prune-proxies",
-             "hosts tokens", "certs reset"}
+             "hosts tokens", "certs reset", "groups remove"}
 KEEP_BACKUPS = 10
 PAIR_CODE = re.compile(r"[A-Z2-7]{4}-[A-Z2-7]{4}-[A-Z2-7]{4}-[A-Z2-7]{4}")
 BUILTINS = ("help", "me", "revoke", "passwd", "log", "clear", "exit")

{remoterf_server-1.7.20 → remoterf_server-1.7.22}/src/remoteRF_server/server/acc_perms.py

@@ -243,14 +243,16 @@ class perms_db:
             )
 
     @db_connection
-    def set_admin(self, username:str):
-        print(f"Setting {username} as an admin")
-        from .control import prompt
-
-        inpu = prompt(f"Are you sure you want to set {username} as an admin? \nThis gives them unrestricted access. (Y/N): ") 
-        if inpu != 'Y' and inpu != 'y':
-            print(f"Admin set is canceled for user: {username}.")
-            return
+    def set_admin(self, username:str, *, confirm: bool = True, quiet: bool = False):
+        if not quiet:
+            print(f"Setting {username} as an admin")
+        if confirm:
+            from .control import prompt
+
+            inpu = prompt(f"Are you sure you want to set {username} as an admin? \nThis gives them unrestricted access. (Y/N): ")
+            if inpu != 'Y' and inpu != 'y':
+                print(f"Admin set is canceled for user: {username}.")
+                return
         
         
         # SQL command to insert a new user
@@ -260,7 +262,8 @@ class perms_db:
             # Execute the SQL command
             self.remove_user(username)
             self.cursor.execute(insert_query, (username,))
-            print("Admin added successfully")
+            if not quiet:
+                print("Admin added successfully")
             
         except sqlite3.Error as e:
             print("An error occurred:", e)

{remoterf_server-1.7.20 → remoterf_server-1.7.22}/src/remoteRF_server/server/commands.py

@@ -120,7 +120,7 @@ def _table() -> list[Command]:
         Command(("devices wipe",), "Remove ALL devices [-y]", _shell("cmd_devices_wipe"), "Devices", after="reload_devices"),
         # ---- users ----
         Command(("users list",), "List accounts", _daemon("cmd_users_list"), "Users", where=D),
-        Command(("users manage",), "Change a user's role (interactive)", _daemon("cmd_users_manage"), "Users", where=D, interactive=True),
+        Command(("users manage",), "Change a user's role: users manage <user> --role <user|power-user|admin> --yes [--json]; no arguments is interactive", _daemon("cmd_users_manage"), "Users", where=D, interactive=True),
         Command(("users perms",), "Show permissions", _daemon("cmd_users_perms"), "Users", where=D),
         Command(("users purge",), "Remove ALL accounts", _daemon("cmd_users_purge"), "Users", where=D),
         Command(("users prune-proxies",), "Partner-deployment visitors whose home is gone: list them, -y removes [--stale DAYS]", _daemon("cmd_users_prune_proxies"), "Users", where=D),
@@ -131,15 +131,15 @@ def _table() -> list[Command]:
         # ---- groups ----
         Command(("groups list",), "List user groups", _shell("cmd_groups_list"), "Groups"),
         Command(("groups create",), "Create a group: groups create <name> --devices <ids> [--max-reservations 3 --max-time 1800 --horizon 604800 --lifetime 0 --lan-only --public --share <clusters>] --yes [--json]; no name is interactive", _shell("cmd_groups_create"), "Groups"),
-        Command(("groups edit",), "Edit a user group (interactive)", _shell("cmd_groups_edit"), "Groups"),
-        Command(("groups remove",), "Delete a user group (interactive)", _shell("cmd_groups_remove"), "Groups"),
+        Command(("groups edit",), "Edit a group: groups edit <id|name> [--name N --devices 0,1 --max-reservations N --max-time SEC --lifetime SEC --horizon SEC --lan-only|--no-lan-only --share a,b|none] --yes [--json]; no arguments is interactive", _shell("cmd_groups_edit"), "Groups"),
+        Command(("groups remove",), "Delete a group: groups remove <id|name> --yes [--json]; no arguments is interactive", _shell("cmd_groups_remove"), "Groups"),
         Command(("groups public",), "Share a group with anyone on RemoteRF Global, or stop: groups public <group> on|off", _federation("public"), "Groups"),
         Command(("groups share",), "Where a group is shared, or change it: groups share <group> [<cluster> on|off]", _federation("share"), "Groups"),
         Command(("groups csv",), "Export ALL user groups as CSV to Downloads", _shell("cmd_groups_csv"), "Groups"),
         # ---- enrollment codes ----
         Command(("codes list",), "List enrollment codes", _shell("cmd_codes_list"), "Enrollment codes"),
         Command(("codes create",), "Create codes: codes create <group name|id|none> --count N [--length 10 --uses 1 --duration 3600] --yes [--json]; no group is interactive", _shell("cmd_codes_create"), "Enrollment codes"),
-        Command(("codes remove",), "Delete an enrollment code (interactive)", _shell("cmd_codes_remove"), "Enrollment codes"),
+        Command(("codes remove",), "Delete codes: codes remove <code-or-invite> --yes [--json] | codes remove --group <id> --yes [--json]; no arguments is interactive", _shell("cmd_codes_remove"), "Enrollment codes"),
         Command(("codes csv",), "Export ALL enrollment codes as CSV to Downloads", _shell("cmd_codes_csv"), "Enrollment codes"),
         # ---- hosts ----
         Command(("hosts status",), "Live host online/last_seen/devices", _daemon("cmd_hosts_status"), "Hosts", where=D),
@@ -353,7 +353,11 @@ def _run_in_daemon(command: Command, rest: list[str]) -> int:
     if command.console_only and remote:
         print(f"`{command.names[0]}` works only at the lab console.", file=sys.stderr)
         return 1
-    if command.console_only or (command.interactive and not remote):
+    users_manage_flags = command.names[0] == "users manage" and bool(rest)
+    if command.names[0] == "users manage" and not rest and not remote and not sys.stdin.isatty():
+        print("ERROR: non-interactive users manage requires a user, --role, and --yes", file=sys.stderr)
+        return 1
+    if command.console_only or (command.interactive and not remote and not users_manage_flags):
         # Prompts need the console's terminal: type it there and attach. Never
         # for a remote admin: that would hand them the live console, past the policy.
         return console.run_in_console([*command.names[0].split(), *rest])

{remoterf_server-1.7.20 → remoterf_server-1.7.22}/src/remoteRF_server/server/grpc_server.py

@@ -1371,7 +1371,13 @@ def cmd_clear(argv): clear()
 def cmd_hosts_status(argv): _cmd_hosts_status(json_output="--json" in argv)
 def cmd_hosts_wipe(argv): _cmd_hosts_wipe(yes=("-y" in argv or "--yes" in argv))
 def cmd_users_list(argv): reservation_handler.print_all_accounts()
-def cmd_users_manage(argv): set_acc()
+def cmd_users_manage(argv):
+    if not argv:
+        set_acc()
+        return 0
+    from remoteRF_server.serverrf_cli import _cmd_users_manage_noninteractive
+
+    return _cmd_users_manage_noninteractive(argv, perms)
 def cmd_users_perms(argv): perms.print_perms()
 def cmd_users_purge(argv): reservation_handler.remove_all_users()
 def cmd_reservations_list(argv): reservation_handler.print_all_reservations(json_output="--json" in argv)

{remoterf_server-1.7.20 → remoterf_server-1.7.22}/src/remoteRF_server/server/reservation.py

@@ -226,7 +226,8 @@ class ReservationHandler:
         DROP TRIGGER IF EXISTS reserved_total_del;
         CREATE TRIGGER reserved_total_ins AFTER INSERT ON Reservations
         WHEN NEW.device_id < 1000000 BEGIN
-            UPDATE ReservedTotal SET seconds = seconds + (julianday(NEW.end_time) - julianday(NEW.start_time)) * 86400;
+            UPDATE ReservedTotal SET seconds = seconds + MAX(0,
+                (julianday(NEW.end_time) - julianday(MAX(NEW.start_time, datetime('now', 'localtime')))) * 86400);
         END;
         CREATE TRIGGER reserved_total_del AFTER DELETE ON Reservations
         WHEN OLD.device_id < 1000000 BEGIN
@@ -264,6 +265,8 @@ class ReservationHandler:
         day = lambda r: f"'d' || ((CAST(strftime('%w', {r}.start_time, 'utc') AS INTEGER) + 6) % 7)"  # noqa: E731
         utc_date = lambda r: f"date({r}.start_time, 'utc')"  # noqa: E731
         length = lambda r: f"(julianday({r}.end_time) - julianday({r}.start_time)) * 86400"  # noqa: E731
+        # A booking made after its start counts only from now on.
+        held = '''MAX(0, (julianday(NEW.end_time) - julianday(MAX(NEW.start_time, datetime('now', 'localtime')))) * 86400)'''
         cancel = '''reservations = MAX(reservations - (OLD.start_time > datetime('now', 'localtime')), 0),
                 seconds = MAX(seconds - MAX(0,
                     (julianday(OLD.end_time) - julianday(MAX(OLD.start_time, datetime('now', 'localtime')))) * 86400), 0)'''
@@ -278,12 +281,13 @@ class ReservationHandler:
                 UNION ALL SELECT device_id, {day("r")}, {length("r")} FROM Reservations r)
             WHERE device_id < 1000000 AND NOT EXISTS (SELECT 1 FROM ReservationBuckets)
             GROUP BY device_id, bucket;
-        CREATE TRIGGER IF NOT EXISTS reservation_buckets_ins AFTER INSERT ON Reservations
+        DROP TRIGGER IF EXISTS reservation_buckets_ins;
+        CREATE TRIGGER reservation_buckets_ins AFTER INSERT ON Reservations
         WHEN NEW.device_id < 1000000 BEGIN
             INSERT INTO ReservationBuckets VALUES
-                (NEW.device_id, 'all', 1, {length("NEW")}),
-                (NEW.device_id, {hour("NEW")}, 1, {length("NEW")}),
-                (NEW.device_id, {day("NEW")}, 1, {length("NEW")})
+                (NEW.device_id, 'all', 1, {held}),
+                (NEW.device_id, {hour("NEW")}, 1, {held}),
+                (NEW.device_id, {day("NEW")}, 1, {held})
             ON CONFLICT (device_id, bucket) DO UPDATE
                 SET reservations = reservations + 1, seconds = seconds + excluded.seconds;
         END;
@@ -298,9 +302,10 @@ class ReservationHandler:
             SELECT device_id, {utc_date("r")} AS day, COUNT(*), SUM({length("r")}) FROM Reservations r
             WHERE device_id < 1000000 AND NOT EXISTS (SELECT 1 FROM ReservationDays)
             GROUP BY device_id, day;
-        CREATE TRIGGER IF NOT EXISTS reservation_days_ins AFTER INSERT ON Reservations
+        DROP TRIGGER IF EXISTS reservation_days_ins;
+        CREATE TRIGGER reservation_days_ins AFTER INSERT ON Reservations
         WHEN NEW.device_id < 1000000 BEGIN
-            INSERT INTO ReservationDays VALUES (NEW.device_id, {utc_date("NEW")}, 1, {length("NEW")})
+            INSERT INTO ReservationDays VALUES (NEW.device_id, {utc_date("NEW")}, 1, {held})
             ON CONFLICT (device_id, day) DO UPDATE
                 SET reservations = reservations + 1, seconds = seconds + excluded.seconds;
         END;

{remoterf_server-1.7.20 → remoterf_server-1.7.22}/src/remoteRF_server/server/user_group_handler.py

@@ -395,7 +395,7 @@ class UserGroupHandler:
                     v = int(lifetime_sec)
                 except Exception:
                     return False
-                if v <= 0:
+                if v < 0:
                     return False
                 sets.append("lifetime_sec = ?")
                 params.append(v)

{remoterf_server-1.7.20 → remoterf_server-1.7.22}/src/remoteRF_server/serverrf_cli.py

@@ -1449,11 +1449,15 @@ def _yes(argv: List[str]) -> bool:
 
 
 def _parse_create_args(argv, *, value_flags, bool_flags):
-    """Small strict parser for the two forced-command-safe create forms."""
+    """Small strict parser for forced-command-safe flag forms."""
     positional, values = [], {}
     i = 0
     while i < len(argv):
         token = argv[i]
+        if token == "-y" and "yes" in bool_flags:
+            values["yes"] = True
+            i += 1
+            continue
         if not token.startswith("--"):
             positional.append(token)
             i += 1
@@ -2204,15 +2208,141 @@ def cmd_groups_create(argv):
 
 
 def cmd_groups_edit(argv):
-    from remoteRF_server.server.user_group_cli import edit_user_group_local
+    from remoteRF_server.server import user_group_cli as groups
 
-    edit_user_group_local(_prompt_session())
+    if not argv:
+        if sys.stdin.isatty():
+            groups.edit_user_group_local(_prompt_session())
+            return 0
+        print("ERROR: non-interactive groups edit requires a group and change flags", file=sys.stderr)
+        return 1
+    if not _yes(argv):
+        print("ERROR: non-interactive groups edit requires --yes", file=sys.stderr)
+        return 1
+    parsed, error = _parse_create_args(
+        argv,
+        value_flags={"name", "devices", "max-reservations", "max-time", "lifetime", "horizon", "share"},
+        bool_flags={"yes", "json", "lan-only", "no-lan-only"},
+    )
+    if error:
+        print(f"ERROR: {error}", file=sys.stderr)
+        return 1
+    pos, flags = parsed
+    if len(pos) != 1:
+        print("ERROR: groups edit requires exactly one group id or name", file=sys.stderr)
+        return 1
+    if "lan-only" in flags and "no-lan-only" in flags:
+        print("ERROR: --lan-only and --no-lan-only are mutually exclusive", file=sys.stderr)
+        return 1
+    change_flags = set(flags) - {"yes", "json"}
+    if not change_flags:
+        print("ERROR: groups edit requires at least one change flag", file=sys.stderr)
+        return 1
+
+    all_groups = groups.user_group_handler.get_all_user_groups(include_users=False) or []
+    ref = pos[0].strip()
+    selected = next((g for g in all_groups if str(g.get("group_id")) == ref), None)
+    if selected is None:
+        selected = next((g for g in all_groups if str(g.get("group_name")) == ref), None)
+    if selected is None:
+        print(f"ERROR: unknown group {ref!r}", file=sys.stderr)
+        return 1
+    group_id = int(selected["group_id"])
+
+    try:
+        devices = _comma_ints(flags["devices"]) if "devices" in flags else None
+        max_reservations = (_bounded_int(flags["max-reservations"], "--max-reservations", minimum=1)
+                            if "max-reservations" in flags else None)
+        max_time = (_bounded_int(flags["max-time"], "--max-time", minimum=1)
+                    if "max-time" in flags else None)
+        lifetime = (_bounded_int(flags["lifetime"], "--lifetime", minimum=0)
+                    if "lifetime" in flags else None)
+        horizon = (_bounded_int(flags["horizon"], "--horizon", minimum=0)
+                   if "horizon" in flags else None)
+    except ValueError as exc:
+        print(f"ERROR: {exc}", file=sys.stderr)
+        return 1
+    name = flags.get("name")
+    if name is not None and not str(name).strip():
+        print("ERROR: --name must not be empty", file=sys.stderr)
+        return 1
+    lan_only = True if flags.get("lan-only") else False if flags.get("no-lan-only") else None
+
+    sharing = None
+    if "share" in flags:
+        from remoteRF_server.server.federation import cluster
+
+        sharing = groups._names(str(flags["share"]))
+        try:
+            cluster.share_group(str(group_id), sharing)
+        except cluster.ClusterError as exc:
+            print(f"ERROR: sharing unchanged: {exc}", file=sys.stderr)
+            return 1
+
+    fields = (name, devices, max_time, max_reservations, lifetime, horizon, lan_only)
+    if any(value is not None for value in fields):
+        ok = groups.user_group_handler.edit_user_group(
+            group_id=group_id,
+            group_name=name,
+            devices_whitelist=devices,
+            max_reservation_time_sec=max_time,
+            max_reservations=max_reservations,
+            lifetime_sec=lifetime,
+            lan_only=lan_only,
+            max_horizon_sec=horizon,
+        )
+        if not ok:
+            print(f"ERROR: failed to update group {ref!r}", file=sys.stderr)
+            return 1
+
+    updated = next((g for g in groups.user_group_handler.get_all_user_groups(include_users=False) or []
+                    if int(g.get("group_id", -1)) == group_id), selected)
+    if flags.get("json"):
+        result = dict(updated)
+        if sharing is not None:
+            result["shared_with"] = sharing
+        print(json.dumps(result, separators=(",", ":"), default=str))
+    else:
+        print(f"Updated group {updated.get('group_name', ref)} (id {group_id})")
+    return 0
 
 
 def cmd_groups_remove(argv):
-    from remoteRF_server.server.user_group_cli import remove_user_group_local
+    from remoteRF_server.server import user_group_cli as groups
 
-    remove_user_group_local(_prompt_session())
+    if not argv:
+        if sys.stdin.isatty():
+            groups.remove_user_group_local(_prompt_session())
+            return 0
+        print("ERROR: non-interactive groups remove requires a group and --yes", file=sys.stderr)
+        return 1
+    if not _yes(argv):
+        print("ERROR: non-interactive groups remove requires --yes", file=sys.stderr)
+        return 1
+    parsed, error = _parse_create_args(argv, value_flags=set(), bool_flags={"yes", "json"})
+    if error:
+        print(f"ERROR: {error}", file=sys.stderr)
+        return 1
+    pos, flags = parsed
+    if len(pos) != 1:
+        print("ERROR: groups remove requires exactly one group id or name", file=sys.stderr)
+        return 1
+    ref = pos[0].strip()
+    all_groups = groups.user_group_handler.get_all_user_groups(include_users=False) or []
+    selected = next((g for g in all_groups if str(g.get("group_id")) == ref), None)
+    if selected is None:
+        selected = next((g for g in all_groups if str(g.get("group_name")) == ref), None)
+    if selected is None:
+        print(f"ERROR: unknown group {ref!r}", file=sys.stderr)
+        return 1
+    if not groups.user_group_handler.delete_user_group(group_id=int(selected["group_id"])):
+        print(f"ERROR: failed to delete group {ref!r}", file=sys.stderr)
+        return 1
+    if flags.get("json"):
+        print(json.dumps(selected, separators=(",", ":"), default=str))
+    else:
+        print(f"Deleted group {selected['group_name']} (id {selected['group_id']})")
+    return 0
 
 
 def cmd_groups_csv(argv):
@@ -2305,9 +2435,48 @@ def cmd_codes_create(argv):
 
 
 def cmd_codes_remove(argv):
-    from remoteRF_server.server.user_group_cli import remove_enrollment_code_local
+    from remoteRF_server.server import user_group_cli as groups
 
-    remove_enrollment_code_local(_prompt_session())
+    if not argv:
+        if sys.stdin.isatty():
+            groups.remove_enrollment_code_local(_prompt_session())
+            return 0
+        print("ERROR: non-interactive codes remove requires a code or --group and --yes", file=sys.stderr)
+        return 1
+    if not _yes(argv):
+        print("ERROR: non-interactive codes remove requires --yes", file=sys.stderr)
+        return 1
+    parsed, error = _parse_create_args(argv, value_flags={"group"}, bool_flags={"yes", "json"})
+    if error:
+        print(f"ERROR: {error}", file=sys.stderr)
+        return 1
+    pos, flags = parsed
+    if (len(pos) != 1) == ("group" not in flags):
+        print("ERROR: codes remove requires exactly one code/invite or --group <id>", file=sys.stderr)
+        return 1
+    rows = groups.user_group_handler.get_all_enrollment_codes() or []
+    if "group" in flags:
+        try:
+            group_id = _bounded_int(flags["group"], "--group", minimum=0)
+        except ValueError as exc:
+            print(f"ERROR: {exc}", file=sys.stderr)
+            return 1
+        removed = [row for row in rows if int(row.get("group_id", -1)) == group_id]
+        if not removed or not groups.user_group_handler.delete_enrollment_code_id(group_id=group_id):
+            print(f"ERROR: no enrollment codes found for group {group_id}", file=sys.stderr)
+            return 1
+        result = {"group_id": group_id, "removed": removed}
+        message = f"Deleted {len(removed)} enrollment code(s) for group {group_id}"
+    else:
+        code_name = pos[0].rpartition("/")[2].strip()
+        selected = next((row for row in rows if row.get("code_name") == code_name), None)
+        if selected is None or not groups.user_group_handler.delete_enrollment_code_name(code_name=code_name):
+            print(f"ERROR: enrollment code {code_name!r} not found", file=sys.stderr)
+            return 1
+        result = selected
+        message = f"Deleted enrollment code {code_name}"
+    print(json.dumps(result, separators=(",", ":"), default=str) if flags.get("json") else message)
+    return 0
 
 
 def cmd_codes_csv(argv):
@@ -2316,6 +2485,53 @@ def cmd_codes_csv(argv):
     export_enrollment_codes_csv_local()
 
 
+def _cmd_users_manage_noninteractive(argv, perms) -> int:
+    """Flag-only half of the daemon's users-manage command."""
+    if "-y" not in argv and "--yes" not in argv:
+        print("ERROR: non-interactive users manage requires --yes", file=sys.stderr)
+        return 1
+    parsed, error = _parse_create_args(
+        argv, value_flags={"role"}, bool_flags={"yes", "json"},
+    )
+    if error:
+        print(f"ERROR: {error}", file=sys.stderr)
+        return 1
+    positional, flags = parsed
+    if len(positional) != 1 or "role" not in flags:
+        print("ERROR: users manage requires exactly one user and --role <user|power-user|admin>", file=sys.stderr)
+        return 1
+
+    username = positional[0]
+    current = perms.get_perms(username)
+    if not current:
+        print(f"ERROR: user {username!r} does not exist", file=sys.stderr)
+        return 1
+    raw_role = str(flags["role"]).strip().lower().replace("_", "-")
+    roles = {
+        "u": "Normal User", "user": "Normal User", "normal-user": "Normal User", "normal user": "Normal User",
+        "p": "Power User", "power": "Power User", "power-user": "Power User", "power user": "Power User",
+        "a": "Admin", "admin": "Admin",
+    }
+    role = roles.get(raw_role)
+    if role is None:
+        print("ERROR: --role must be user, power-user, or admin", file=sys.stderr)
+        return 1
+    if role == "Normal User":
+        perms.set_user(username)
+    elif role == "Admin":
+        perms.set_admin(username, confirm=False, quiet=True)
+    elif current[0][0] != "Power User":
+        print("ERROR: changing to power-user requires its device and quota details; use interactive users manage", file=sys.stderr)
+        return 1
+
+    result = {"user": username, "role": role}
+    if flags.get("json"):
+        print(json.dumps(result, separators=(",", ":")))
+    else:
+        print(f"Set {username} role to {role}.")
+    return 0
+
+
 def cmd_hosts_token(argv: List[str]) -> int:
     from .host.host_auth_token import create_host_token
 

{remoterf_server-1.7.20 → remoterf_server-1.7.22}/src/remoteRF_server.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoteRF-server
-Version: 1.7.20
+Version: 1.7.22
 Summary: RemoteRF server-side control package
 License: GPL-3.0-or-later
 Classifier: Programming Language :: Python :: 3

{remoterf_server-1.7.20 → remoterf_server-1.7.22}/tests/test_client_sessions.py

@@ -113,14 +113,36 @@ class ReservedTotalTests(unittest.TestCase):
             now = datetime.now()
             add = "INSERT INTO Reservations (username, device_id, start_time, end_time, salt, hash) VALUES ('u', 1, ?, ?, '', '')"
             total = lambda: db.execute("SELECT seconds FROM ReservedTotal").fetchone()[0]
-            db.execute(add, (now - timedelta(hours=3), now - timedelta(hours=2)))  # 1 h, past
             db.execute(add, (now + timedelta(hours=1), now + timedelta(hours=3)))  # 2 h, future
+            db.execute(add, (now + timedelta(hours=4), now + timedelta(hours=5)))  # 1 h, future
             self.assertAlmostEqual(total(), 3 * 3600, delta=1)
+            # Let the 1 h one end; moving it back by UPDATE fires no trigger.
+            db.execute("UPDATE Reservations SET start_time = ?, end_time = ? WHERE start_time > ?",
+                       (now - timedelta(hours=3), now - timedelta(hours=2), now + timedelta(hours=2)))
             db.execute("DELETE FROM Reservations WHERE end_time < ?", (now,))  # purge: no change
             self.assertAlmostEqual(total(), 3 * 3600, delta=1)
             db.execute("DELETE FROM Reservations")  # cancel the future one: unused 2 h refunded
             self.assertAlmostEqual(total(), 3600, delta=2)
 
+    def test_a_booking_made_after_its_start_counts_only_from_then(self):
+        import sqlite3
+        from datetime import datetime, timedelta
+        from remoteRF_server.server import reservation
+
+        with tempfile.TemporaryDirectory() as tmp, \
+                mock.patch.object(reservation, "get_db_dir", return_value=Path(tmp)):
+            reservation.ReservationHandler()
+            db = sqlite3.connect(Path(tmp) / "reservations.db", isolation_level=None)
+            now = datetime.now()
+            add = "INSERT INTO Reservations (username, device_id, start_time, end_time, salt, hash) VALUES ('u', 1, ?, ?, '', '')"
+            total = lambda: db.execute("SELECT seconds FROM ReservedTotal").fetchone()[0]
+            db.execute(add, (now - timedelta(minutes=15), now + timedelta(minutes=15)))
+            self.assertAlmostEqual(total(), 15 * 60, delta=2)
+            db.execute("DELETE FROM Reservations")  # cancelled right away: nothing held
+            self.assertAlmostEqual(total(), 0, delta=2)
+            db.execute(add, (now - timedelta(hours=2), now - timedelta(hours=1)))  # already over
+            self.assertAlmostEqual(total(), 0, delta=2)
+
     def test_a_partner_device_is_left_to_its_owner_even_with_the_old_triggers(self):
         import sqlite3
         from datetime import datetime, timedelta
@@ -255,15 +277,18 @@ class ReservationBucketsTests(unittest.TestCase):
 
         self.handler()
         db = self.connect()
-        self.add(db, 1, "2026-11-02 02:00:00", "2026-11-02 03:00:00")  # Mon 02:00 here = Sun 20:30 UTC
-        self.add(db, 1, "2026-11-04 12:00:00", "2026-11-04 14:00:00")  # Wed 12:00 here = Wed 06:30 UTC
-        self.add(db, ALIAS_BASE, "2026-11-02 02:00:00", "2026-11-02 03:00:00")
+        self.add(db, 1, "2099-11-02 02:00:00", "2099-11-02 03:00:00")  # Mon 02:00 here = Sun 20:30 UTC
+        self.add(db, 1, "2099-11-04 12:00:00", "2099-11-04 14:00:00")  # Wed 12:00 here = Wed 06:30 UTC
+        self.add(db, ALIAS_BASE, "2099-11-02 02:00:00", "2099-11-02 03:00:00")
         expected = {"all": (2, 3 * 3600), "h20": (1, 3600), "d6": (1, 3600), "h06": (1, 2 * 3600), "d2": (1, 2 * 3600)}
         self.assertEqual(self.buckets(db, 1), expected)
         self.assertEqual(self.buckets(db, ALIAS_BASE), {})
-        days = {"2026-11-01": (1, 3600), "2026-11-04": (1, 2 * 3600)}  # the first starts the UTC day before
+        days = {"2099-11-01": (1, 3600), "2099-11-04": (1, 2 * 3600)}  # the first starts the UTC day before
         self.assertEqual(self.days(db, 1), days)
         self.assertEqual(self.days(db, ALIAS_BASE), {})
+        # Let them end; moving them back by UPDATE fires no trigger.
+        db.execute("UPDATE Reservations SET start_time = datetime(start_time, '-100 years'), "
+                   "end_time = datetime(end_time, '-100 years')")
         db.execute("DELETE FROM Reservations WHERE end_time < ?", (datetime.now(),))  # purge: no change
         self.assertEqual(self.buckets(db, 1), expected)
         self.assertEqual(self.days(db, 1), days)
@@ -281,10 +306,13 @@ class ReservationBucketsTests(unittest.TestCase):
         self.assertEqual(values(2), [(1, 2 * 3600)] * 4)
         db.execute("DELETE FROM Reservations WHERE device_id = 2")  # cancel before start: all given back
         self.assertEqual(values(2), [(0, 0)] * 4)
+        for n, seconds in values(3):  # booked an hour after its start: only the rest counts
+            self.assertEqual(n, 1)
+            self.assertAlmostEqual(seconds, 3600, delta=2)
         db.execute("DELETE FROM Reservations WHERE device_id = 3")  # cancel after start: unused hour back
         for n, seconds in values(3):
             self.assertEqual(n, 1)
-            self.assertAlmostEqual(seconds, 3600, delta=2)
+            self.assertAlmostEqual(seconds, 0, delta=2)
         for table in ("ReservationBuckets", "ReservationDays"):
             db.execute(f"UPDATE {table} SET reservations = 0, seconds = 0 WHERE device_id = 4")
         db.execute("DELETE FROM Reservations WHERE device_id = 4")
@@ -317,9 +345,30 @@ class ReservationBucketsTests(unittest.TestCase):
         time.tzset()
         self.assertEqual(self.buckets(db, 1), expected)
         self.assertEqual(self.days(db, 1), days)
-        self.add(db, 1, "2026-11-02 02:20:00", "2026-11-02 02:50:00")  # 20:50 UTC
+        self.add(db, 1, "2099-11-02 02:20:00", "2099-11-02 02:50:00")  # 20:50 UTC
         self.assertEqual(self.buckets(db, 1)["h20"], (3, 7200))
-        self.assertEqual(self.days(db, 1), {"2026-11-01": (3, 7200)})
+        self.assertEqual(self.days(db, 1), {"2026-11-01": (2, 5400), "2099-11-01": (1, 1800)})
+
+    def test_a_restart_replaces_the_old_insert_triggers(self):
+        from datetime import datetime, timedelta
+
+        self.handler()
+        db = self.connect()
+        # A lab from before: its insert triggers count the full length.
+        for name in ("reservation_buckets_ins", "reservation_days_ins"):
+            sql = db.execute("SELECT sql FROM sqlite_master WHERE name = ?", (name,)).fetchone()[0]
+            old = sql.replace("MAX(NEW.start_time, datetime('now', 'localtime'))", "NEW.start_time")
+            self.assertNotEqual(old, sql)
+            db.executescript(f"DROP TRIGGER {name}; {old};")
+        self.handler()
+        for name in ("reservation_buckets_ins", "reservation_days_ins", "reserved_total_ins"):
+            sql = db.execute("SELECT sql FROM sqlite_master WHERE name = ?", (name,)).fetchone()[0]
+            self.assertIn("MAX(NEW.start_time, datetime('now', 'localtime'))", sql)
+        now = datetime.now()
+        self.add(db, 5, now - timedelta(minutes=15), now + timedelta(minutes=15))
+        for n, seconds in [*self.buckets(db, 5).values(), *self.days(db, 5).values()]:
+            self.assertEqual(n, 1)
+            self.assertAlmostEqual(seconds, 15 * 60, delta=2)
 
     def test_days_seed_into_an_existing_lab_that_already_has_buckets(self):
         """A lab upgrading from 1.7.14 has ReservationBuckets but no ReservationDays yet."""