BlueGit

timfa bluegit

backup: meerdere backup servers, bediening van de backup server vanuit BlueGit

- backup.json bevat een lijst met servers, elk met eigen key (max 16);
  de oude vorm met één koppeling wordt omgezet
- meldingen gaan naar elke gekoppelde backup server
- Beheer > Backup: lijst, toevoegen, per server status, instellingen,
  sync/archief/opruimen, archief verwijderen, rollback, key vervangen,
  hernoemen, verwijderen (vraagt de server eerst te ontkoppelen)
- acties komen van de backup server zelf (GET /api/v1/admin/actions) en
  gaan ondertekend door; API: /api/v1/admin/backup/servers/...
- rollback-formulier stopte niet zonder vinkje (return ontbrak)

timfa Grok Bot · pushed by timfa

Authored 2026-11-15 · 2 days ago

Hash
e66db78680a0b72e35e2b0519d7db06ec3f2c5cc
Parent
46bc2378
Pipeline
Passed
13 files changed +1254 −329
README.md +2 −2
@@ -23,7 +23,7 @@ Het logo is de blauwe ster: [`assets/logo.svg`](assets/logo.svg).
23 23 - Periodiek onderhoud van de bare repositories (`git gc --auto`, plus `git maintenance` voor loose objects en incremental-repack als de git-binary dat kent). Standaard elke 24 uur (`git.maintenance_interval`; `off` of `0` zet het uit). Eén repo tegelijk, met lage prioriteit (`nice -n 19`) en gits eigen locking, nooit `--prune=now`. Een fout op één repo slaat die over. Installatiebeheerders zien de status en kunnen een ronde starten via `GET`/`POST /api/v1/admin/git-maintenance`.
24 24 - REST-API. Het schema staat op `/api/v1/openapi.json`.
25 25 - Self-update: de instantie installeert een nieuw AUR-pakket met pacman.
26 - Koppeling met een losse backup server ([bluegit-backup](https://git.timfalken.com/timfa/bluegit-backup)) onder Beheer > Backup: Backupserver-Key, een melding na elke wijziging, de archieflijst en een rollback met waarschuwing. Zie [docs/BACKUP.md](docs/BACKUP.md).
26 - Een of meer losse backup servers ([bluegit-backup](https://git.timfalken.com/timfa/bluegit-backup)) onder Beheer > Backup: per server een Backupserver-Key, een melding na elke wijziging, de archieflijst, een rollback met waarschuwing en de bediening en instellingen van de backup server zelf. Zie [docs/BACKUP.md](docs/BACKUP.md).
27 27 - Linkpreviews: een gedeelde pagina krijgt een kaart via Open Graph, oEmbed en `/-/card.png`.
28 28
29 29 Een repository hoort bij een gebruiker of bij een groep. De hoogste rol telt.
@@ -117,7 +117,7 @@ git clone http://tim:bg_…@127.0.0.1:8080/tim/demo.git
117 117 - [docs/CI.md](docs/CI.md) beschrijft `blue-ci-cd.yml` en Steve.
118 118 - [docs/AUR.md](docs/AUR.md) beschrijft het pakket en de self-update.
119 119 - [docs/BEHEER.md](docs/BEHEER.md) beschrijft de installatie op git.timfalken.com.
120 - [docs/BACKUP.md](docs/BACKUP.md) beschrijft de koppeling met een losse backup server (bluegit-backup): Backupserver-Key, meldingen, archieven en rollback.
120 - [docs/BACKUP.md](docs/BACKUP.md) beschrijft de koppeling met losse backup servers (bluegit-backup): Backupserver-Keys, meldingen, archieven, rollback en bediening vanuit BlueGit.
121 121 - [docs/MIGRATIE.md](docs/MIGRATIE.md) beschrijft de overstap van de user-unit naar de system-service.
122 122 - [docs/ROADMAP.md](docs/ROADMAP.md) en [docs/VRAGEN.md](docs/VRAGEN.md) houden bij wat nog openstaat en welke besluiten al vastliggen.
123 123
@@ -23,7 +23,7 @@ Het logo is de blauwe ster: [`assets/logo.svg`](assets/logo.svg).
23- Periodiek onderhoud van de bare repositories (`git gc --auto`, plus `git maintenance` voor loose objects en incremental-repack als de git-binary dat kent). Standaard elke 24 uur (`git.maintenance_interval`; `off` of `0` zet het uit). Eén repo tegelijk, met lage prioriteit (`nice -n 19`) en gits eigen locking, nooit `--prune=now`. Een fout op één repo slaat die over. Installatiebeheerders zien de status en kunnen een ronde starten via `GET`/`POST /api/v1/admin/git-maintenance`.
23- Periodiek onderhoud van de bare repositories (`git gc --auto`, plus `git maintenance` voor loose objects en incremental-repack als de git-binary dat kent). Standaard elke 24 uur (`git.maintenance_interval`; `off` of `0` zet het uit). Eén repo tegelijk, met lage prioriteit (`nice -n 19`) en gits eigen locking, nooit `--prune=now`. Een fout op één repo slaat die over. Installatiebeheerders zien de status en kunnen een ronde starten via `GET`/`POST /api/v1/admin/git-maintenance`.
24- REST-API. Het schema staat op `/api/v1/openapi.json`.
24- REST-API. Het schema staat op `/api/v1/openapi.json`.
25- Self-update: de instantie installeert een nieuw AUR-pakket met pacman.
25- Self-update: de instantie installeert een nieuw AUR-pakket met pacman.
26- Koppeling met een losse backup server ([bluegit-backup](https://git.timfalken.com/timfa/bluegit-backup)) onder Beheer > Backup: Backupserver-Key, een melding na elke wijziging, de archieflijst en een rollback met waarschuwing. Zie [docs/BACKUP.md](docs/BACKUP.md).
26- Een of meer losse backup servers ([bluegit-backup](https://git.timfalken.com/timfa/bluegit-backup)) onder Beheer > Backup: per server een Backupserver-Key, een melding na elke wijziging, de archieflijst, een rollback met waarschuwing en de bediening en instellingen van de backup server zelf. Zie [docs/BACKUP.md](docs/BACKUP.md).
27- Linkpreviews: een gedeelde pagina krijgt een kaart via Open Graph, oEmbed en `/-/card.png`.
27- Linkpreviews: een gedeelde pagina krijgt een kaart via Open Graph, oEmbed en `/-/card.png`.
28
28
29Een repository hoort bij een gebruiker of bij een groep. De hoogste rol telt.
29Een repository hoort bij een gebruiker of bij een groep. De hoogste rol telt.
@@ -117,7 +117,7 @@ git clone http://tim:bg_…@127.0.0.1:8080/tim/demo.git
117- [docs/CI.md](docs/CI.md) beschrijft `blue-ci-cd.yml` en Steve.
117- [docs/CI.md](docs/CI.md) beschrijft `blue-ci-cd.yml` en Steve.
118- [docs/AUR.md](docs/AUR.md) beschrijft het pakket en de self-update.
118- [docs/AUR.md](docs/AUR.md) beschrijft het pakket en de self-update.
119- [docs/BEHEER.md](docs/BEHEER.md) beschrijft de installatie op git.timfalken.com.
119- [docs/BEHEER.md](docs/BEHEER.md) beschrijft de installatie op git.timfalken.com.
120- [docs/BACKUP.md](docs/BACKUP.md) beschrijft de koppeling met een losse backup server (bluegit-backup): Backupserver-Key, meldingen, archieven en rollback.
120- [docs/BACKUP.md](docs/BACKUP.md) beschrijft de koppeling met losse backup servers (bluegit-backup): Backupserver-Keys, meldingen, archieven, rollback en bediening vanuit BlueGit.
121- [docs/MIGRATIE.md](docs/MIGRATIE.md) beschrijft de overstap van de user-unit naar de system-service.
121- [docs/MIGRATIE.md](docs/MIGRATIE.md) beschrijft de overstap van de user-unit naar de system-service.
122- [docs/ROADMAP.md](docs/ROADMAP.md) en [docs/VRAGEN.md](docs/VRAGEN.md) houden bij wat nog openstaat en welke besluiten al vastliggen.
122- [docs/ROADMAP.md](docs/ROADMAP.md) en [docs/VRAGEN.md](docs/VRAGEN.md) houden bij wat nog openstaat en welke besluiten al vastliggen.
123
123
docs/BACKUP.md +25 −12
@@ -1,23 +1,35 @@
1 # Backup server (bluegit-backup)
1 # Backup servers (bluegit-backup)
2 2
3 3 Een losse backup server ([timfa/bluegit-backup](https://git.timfalken.com/timfa/bluegit-backup)) houdt een kopie bij van alle gegevens en configuratie van één BlueGit. Hij haalt ze langzaam op, krijgt na elke wijziging een melding, maakt periodiek een gecomprimeerd archief, en kan BlueGit naar zo'n archief terugzetten.
4 4
5 Eén BlueGit kan meerdere backup servers hebben (hoogstens 16), elk met een eigen Backupserver-Key. Een backup server hoort bij één BlueGit.
6
5 7 ## In BlueGit
6 8
7 **Beheer > Backup** (`/admin/backup`, alleen installatiebeheerders):
9 **Beheer > Backup** (`/admin/backup`, alleen installatiebeheerders) toont de lijst met backup servers: naam, gekoppeld of wachtend op de key, adres en laatste contact. **Backup server toevoegen** maakt een nieuwe server met een eigen key, die één keer wordt getoond.
10
11 Per backup server (`/admin/backup/s/<id>`) staat dezelfde bediening als in de webinterface van de backup server zelf:
8 12
9 - **Backupserver-Key** maken (één keer getoond), vervangen of intrekken. Er is altijd hoogstens één key; een nieuwe key maakt de oude ongeldig en vergeet de gekoppelde server.
10 - **Gekoppelde backup server**: adres, laatste contact, archiefinterval en bewaartermijn.
11 - **Backup-archieven** als lijst, met per archief een rollback. Die staat achter een grote rode waarschuwing, een vinkje ("ik begrijp dat dit niet terug te draaien is"), het intypen van de archiefnaam en een bevestigingsdialoog.
13 - **Status**: laatste sync en het resultaat ervan, aantal syncs en meldingen, grootte van de kopie, archieven, de laatste rollback en de versie. Met de knoppen *Nu synchroniseren*, *Nu archiveren* en *Nu opruimen*.
14 - **Instellingen** van de backup server: archiefinterval, bewaartermijn, minimale vrije ruimte, downloadsnelheid, syncintervallen, publiek adres en luisteradres. BlueGit krijgt de velden van de backup server en toont ze zoals ze daar staan.
15 - **Backup-archieven** met *Verwijderen* en *Rollback*. Een rollback staat achter een grote rode waarschuwing, een vinkje ("ik begrijp dat dit niet terug te draaien is"), het intypen van de archiefnaam en een bevestigingsdialoog.
16 - **Backupserver-Key** vervangen (de oude key werkt meteen niet meer; de server moet opnieuw koppelen), de server hernoemen, of key intrekken en de server verwijderen. Bij verwijderen vraagt BlueGit de backup server eerst om te ontkoppelen. De archieven blijven op de backup server staan.
17
18 BlueGit kent de acties niet vooraf. Het vraagt ze op bij de backup server (`GET /api/v1/admin/actions`) en stuurt ze ondertekend door. Alles wat de backup server voor BlueGit openzet, kan dus ook hier. Koppelen en een archief downloaden kan alleen op de backup server zelf.
12 19
13 20 Dezelfde acties via de API (token van een beheerder, scope `api`/`admin`):
14 21
15 22 | | |
16 23 |---|---|
17 | `GET /api/v1/admin/backup` | status, gekoppelde server, archieven |
18 | `POST /api/v1/admin/backup/key` | nieuwe key, `{"key": "bgbk_…"}` (eenmalig) |
19 | `DELETE /api/v1/admin/backup/key` | key intrekken |
20 | `POST /api/v1/admin/backup/rollback` | `{"archive": "naam", "confirm": "naam"}` |
24 | `GET /api/v1/admin/backup` | `instance_id` en de lijst met backup servers |
25 | `POST /api/v1/admin/backup/servers` | `{"name"}`: nieuwe backup server; het antwoord bevat eenmalig `key` |
26 | `GET /api/v1/admin/backup/servers/{id}` | server met `remote` (status), `archives` en `config`, zoals de backup server ze meldt |
27 | `PUT /api/v1/admin/backup/servers/{id}` | `{"name"}`: hernoemen |
28 | `POST /api/v1/admin/backup/servers/{id}/key` | nieuwe key (eenmalig in het antwoord) |
29 | `DELETE /api/v1/admin/backup/servers/{id}` | ontkoppelen en vergeten |
30 | `POST /api/v1/admin/backup/servers/{id}/actions/{name}` | actie van de backup server, bijvoorbeeld `config.update` met `{"retention_days": "14"}`, `sync`, `archive`, `prune`, `archive.delete` met `{"name"}`, of `rollback` met `{"archive": "naam", "confirm": "naam"}` |
31
32 Het antwoord van een actie is het antwoord van de backup server, met dezelfde statuscode.
21 33
22 34 ## Protocol
23 35
@@ -25,7 +37,7 @@ Dezelfde acties via de API (token van een beheerder, scope `api`/`admin`):
25 37
26 38 | | |
27 39 |---|---|
28 | `GET /api/v1/backup/info` | `instance_id`, `base_url`, gekoppelde server |
40 | `GET /api/v1/backup/info` | `instance_id`, `base_url`, naam en adres van de server bij deze key |
29 41 | `POST /api/v1/backup/connect` | `{"server_url", "server_id"}`: waar BlueGit meldingen heen stuurt |
30 42 | `GET /api/v1/backup/manifest` | alle bestanden: pad, grootte, mtime, mode; de database ook met sha256 |
31 43 | `GET /api/v1/backup/file?path=…` | één bestand |
@@ -47,8 +59,9 @@ X-BlueGit-Signature: hex(HMAC-SHA256(geheim, METHOD "\n" PAD "\n" TS "\n" sha256
47 59 | `GET /api/v1/archives` | `{"archives": [{name, created_at, size}]}` |
48 60 | `GET /api/v1/status` | interval, bewaartermijn, stand van de laatste rollback |
49 61 | `POST /api/v1/rollback` | `{"archive": "naam"}` |
62 | `* /api/v1/admin/…` | de beheeracties van de backup server (lijst: `GET /api/v1/admin/actions`, veld `bluegit: true`) |
50 63
51 **Meldingen.** Na elk schrijvend HTTP-verzoek (behalve de backup-API zelf en `git-upload-pack`), na elke push (ook SSH) en bij elke CI-gebeurtenis meldt BlueGit een wijziging. Meldingen worden 2 seconden gebundeld en bij een fout tot vier keer opnieuw geprobeerd. De backup server haalt daarnaast periodiek alles op, dus een gemiste melding kost alleen vertraging. Het adres van de backup server mag een privéadres zijn (de beheerder koppelt hem met een eigen key); de SSRF-regels van webhooks gelden hier niet.
64 **Meldingen.** Elke gekoppelde backup server krijgt ze, ondertekend met zijn eigen key. Na elk schrijvend HTTP-verzoek (behalve de backup-API zelf en `git-upload-pack`), na elke push (ook SSH) en bij elke CI-gebeurtenis meldt BlueGit een wijziging. Meldingen worden 2 seconden gebundeld en bij een fout tot vier keer opnieuw geprobeerd. De backup server haalt daarnaast periodiek alles op, dus een gemiste melding kost alleen vertraging. Het adres van de backup server mag een privéadres zijn (de beheerder koppelt hem met een eigen key); de SSRF-regels van webhooks gelden hier niet.
52 65
53 66 ## Wat er in een backup zit
54 67
@@ -62,7 +75,7 @@ data/releases/… release-assets (zonder .incoming)
62 75 data/artifacts/… CI-artifacts
63 76 ```
64 77
65 Niet mee: `config.yml`, `storage_path`, `cache.json`, `backup.json` en `instance_id` (horen bij deze installatie), `data/work`, `*.lock` en symlinks. De koppeling staat in `<state>/backup.json` (0600, alleen de hash van de key) en niet in de database, zodat een rollback naar een oud archief de koppeling niet terugdraait.
78 Niet mee: `config.yml`, `storage_path`, `cache.json`, `backup.json` en `instance_id` (horen bij deze installatie), `data/work`, `*.lock` en symlinks. De koppelingen staan in `<state>/backup.json` (0600, per server alleen de hash van de key) en niet in de database, zodat een rollback naar een oud archief de koppeling niet terugdraait.
66 79
67 80 ## Terugzetten
68 81
@@ -1,23 +1,35 @@
1# Backup server (bluegit-backup)
1# Backup servers (bluegit-backup)
2
2
3Een losse backup server ([timfa/bluegit-backup](https://git.timfalken.com/timfa/bluegit-backup)) houdt een kopie bij van alle gegevens en configuratie van één BlueGit. Hij haalt ze langzaam op, krijgt na elke wijziging een melding, maakt periodiek een gecomprimeerd archief, en kan BlueGit naar zo'n archief terugzetten.
3Een losse backup server ([timfa/bluegit-backup](https://git.timfalken.com/timfa/bluegit-backup)) houdt een kopie bij van alle gegevens en configuratie van één BlueGit. Hij haalt ze langzaam op, krijgt na elke wijziging een melding, maakt periodiek een gecomprimeerd archief, en kan BlueGit naar zo'n archief terugzetten.
4
4
5Eén BlueGit kan meerdere backup servers hebben (hoogstens 16), elk met een eigen Backupserver-Key. Een backup server hoort bij één BlueGit.
6
5## In BlueGit
7## In BlueGit
6
8
7**Beheer > Backup** (`/admin/backup`, alleen installatiebeheerders):
9**Beheer > Backup** (`/admin/backup`, alleen installatiebeheerders) toont de lijst met backup servers: naam, gekoppeld of wachtend op de key, adres en laatste contact. **Backup server toevoegen** maakt een nieuwe server met een eigen key, die één keer wordt getoond.
10
11Per backup server (`/admin/backup/s/<id>`) staat dezelfde bediening als in de webinterface van de backup server zelf:
8
12
9- **Backupserver-Key** maken (één keer getoond), vervangen of intrekken. Er is altijd hoogstens één key; een nieuwe key maakt de oude ongeldig en vergeet de gekoppelde server.
13- **Status**: laatste sync en het resultaat ervan, aantal syncs en meldingen, grootte van de kopie, archieven, de laatste rollback en de versie. Met de knoppen *Nu synchroniseren*, *Nu archiveren* en *Nu opruimen*.
10- **Gekoppelde backup server**: adres, laatste contact, archiefinterval en bewaartermijn.
14- **Instellingen** van de backup server: archiefinterval, bewaartermijn, minimale vrije ruimte, downloadsnelheid, syncintervallen, publiek adres en luisteradres. BlueGit krijgt de velden van de backup server en toont ze zoals ze daar staan.
11- **Backup-archieven** als lijst, met per archief een rollback. Die staat achter een grote rode waarschuwing, een vinkje ("ik begrijp dat dit niet terug te draaien is"), het intypen van de archiefnaam en een bevestigingsdialoog.
15- **Backup-archieven** met *Verwijderen* en *Rollback*. Een rollback staat achter een grote rode waarschuwing, een vinkje ("ik begrijp dat dit niet terug te draaien is"), het intypen van de archiefnaam en een bevestigingsdialoog.
16- **Backupserver-Key** vervangen (de oude key werkt meteen niet meer; de server moet opnieuw koppelen), de server hernoemen, of key intrekken en de server verwijderen. Bij verwijderen vraagt BlueGit de backup server eerst om te ontkoppelen. De archieven blijven op de backup server staan.
17
18BlueGit kent de acties niet vooraf. Het vraagt ze op bij de backup server (`GET /api/v1/admin/actions`) en stuurt ze ondertekend door. Alles wat de backup server voor BlueGit openzet, kan dus ook hier. Koppelen en een archief downloaden kan alleen op de backup server zelf.
12
19
13Dezelfde acties via de API (token van een beheerder, scope `api`/`admin`):
20Dezelfde acties via de API (token van een beheerder, scope `api`/`admin`):
14
21
15| | |
22| | |
16|---|---|
23|---|---|
17| `GET /api/v1/admin/backup` | status, gekoppelde server, archieven |
24| `GET /api/v1/admin/backup` | `instance_id` en de lijst met backup servers |
18| `POST /api/v1/admin/backup/key` | nieuwe key, `{"key": "bgbk_…"}` (eenmalig) |
25| `POST /api/v1/admin/backup/servers` | `{"name"}`: nieuwe backup server; het antwoord bevat eenmalig `key` |
19| `DELETE /api/v1/admin/backup/key` | key intrekken |
26| `GET /api/v1/admin/backup/servers/{id}` | server met `remote` (status), `archives` en `config`, zoals de backup server ze meldt |
20| `POST /api/v1/admin/backup/rollback` | `{"archive": "naam", "confirm": "naam"}` |
27| `PUT /api/v1/admin/backup/servers/{id}` | `{"name"}`: hernoemen |
28| `POST /api/v1/admin/backup/servers/{id}/key` | nieuwe key (eenmalig in het antwoord) |
29| `DELETE /api/v1/admin/backup/servers/{id}` | ontkoppelen en vergeten |
30| `POST /api/v1/admin/backup/servers/{id}/actions/{name}` | actie van de backup server, bijvoorbeeld `config.update` met `{"retention_days": "14"}`, `sync`, `archive`, `prune`, `archive.delete` met `{"name"}`, of `rollback` met `{"archive": "naam", "confirm": "naam"}` |
31
32Het antwoord van een actie is het antwoord van de backup server, met dezelfde statuscode.
21
33
22## Protocol
34## Protocol
23
35
@@ -25,7 +37,7 @@ Dezelfde acties via de API (token van een beheerder, scope `api`/`admin`):
25
37
26| | |
38| | |
27|---|---|
39|---|---|
28| `GET /api/v1/backup/info` | `instance_id`, `base_url`, gekoppelde server |
40| `GET /api/v1/backup/info` | `instance_id`, `base_url`, naam en adres van de server bij deze key |
29| `POST /api/v1/backup/connect` | `{"server_url", "server_id"}`: waar BlueGit meldingen heen stuurt |
41| `POST /api/v1/backup/connect` | `{"server_url", "server_id"}`: waar BlueGit meldingen heen stuurt |
30| `GET /api/v1/backup/manifest` | alle bestanden: pad, grootte, mtime, mode; de database ook met sha256 |
42| `GET /api/v1/backup/manifest` | alle bestanden: pad, grootte, mtime, mode; de database ook met sha256 |
31| `GET /api/v1/backup/file?path=…` | één bestand |
43| `GET /api/v1/backup/file?path=…` | één bestand |
@@ -47,8 +59,9 @@ X-BlueGit-Signature: hex(HMAC-SHA256(geheim, METHOD "\n" PAD "\n" TS "\n" sha256
47| `GET /api/v1/archives` | `{"archives": [{name, created_at, size}]}` |
59| `GET /api/v1/archives` | `{"archives": [{name, created_at, size}]}` |
48| `GET /api/v1/status` | interval, bewaartermijn, stand van de laatste rollback |
60| `GET /api/v1/status` | interval, bewaartermijn, stand van de laatste rollback |
49| `POST /api/v1/rollback` | `{"archive": "naam"}` |
61| `POST /api/v1/rollback` | `{"archive": "naam"}` |
62| `* /api/v1/admin/…` | de beheeracties van de backup server (lijst: `GET /api/v1/admin/actions`, veld `bluegit: true`) |
50
63
51**Meldingen.** Na elk schrijvend HTTP-verzoek (behalve de backup-API zelf en `git-upload-pack`), na elke push (ook SSH) en bij elke CI-gebeurtenis meldt BlueGit een wijziging. Meldingen worden 2 seconden gebundeld en bij een fout tot vier keer opnieuw geprobeerd. De backup server haalt daarnaast periodiek alles op, dus een gemiste melding kost alleen vertraging. Het adres van de backup server mag een privéadres zijn (de beheerder koppelt hem met een eigen key); de SSRF-regels van webhooks gelden hier niet.
64**Meldingen.** Elke gekoppelde backup server krijgt ze, ondertekend met zijn eigen key. Na elk schrijvend HTTP-verzoek (behalve de backup-API zelf en `git-upload-pack`), na elke push (ook SSH) en bij elke CI-gebeurtenis meldt BlueGit een wijziging. Meldingen worden 2 seconden gebundeld en bij een fout tot vier keer opnieuw geprobeerd. De backup server haalt daarnaast periodiek alles op, dus een gemiste melding kost alleen vertraging. Het adres van de backup server mag een privéadres zijn (de beheerder koppelt hem met een eigen key); de SSRF-regels van webhooks gelden hier niet.
52
65
53## Wat er in een backup zit
66## Wat er in een backup zit
54
67
@@ -62,7 +75,7 @@ data/releases/… release-assets (zonder .incoming)
62data/artifacts/… CI-artifacts
75data/artifacts/… CI-artifacts
63```
76```
64
77
65Niet mee: `config.yml`, `storage_path`, `cache.json`, `backup.json` en `instance_id` (horen bij deze installatie), `data/work`, `*.lock` en symlinks. De koppeling staat in `<state>/backup.json` (0600, alleen de hash van de key) en niet in de database, zodat een rollback naar een oud archief de koppeling niet terugdraait.
78Niet mee: `config.yml`, `storage_path`, `cache.json`, `backup.json` en `instance_id` (horen bij deze installatie), `data/work`, `*.lock` en symlinks. De koppelingen staan in `<state>/backup.json` (0600, per server alleen de hash van de key) en niet in de database, zodat een rollback naar een oud archief de koppeling niet terugdraait.
66
79
67## Terugzetten
80## Terugzetten
68
81
docs/BEHEER.md +1 −1
@@ -64,4 +64,4 @@ Zet in de instellingen van de repo **Zichtbaarheid releases** op *Publiek*. Iede
64 64
65 65 ## Backup
66 66
67 Een losse backup server (bluegit-backup) koppel je onder **Beheer > Backup** met een Backupserver-Key. Daar staan ook de archieven en de rollback. Zie [BACKUP.md](BACKUP.md).
67 Losse backup servers (bluegit-backup) voeg je toe onder **Beheer > Backup**, elk met een eigen Backupserver-Key. Per server staan daar de status, de instellingen, de archieven en de rollback. Zie [BACKUP.md](BACKUP.md).
@@ -64,4 +64,4 @@ Zet in de instellingen van de repo **Zichtbaarheid releases** op *Publiek*. Iede
64
64
65## Backup
65## Backup
66
66
67Een losse backup server (bluegit-backup) koppel je onder **Beheer > Backup** met een Backupserver-Key. Daar staan ook de archieven en de rollback. Zie [BACKUP.md](BACKUP.md).
67Losse backup servers (bluegit-backup) voeg je toe onder **Beheer > Backup**, elk met een eigen Backupserver-Key. Per server staan daar de status, de instellingen, de archieven en de rollback. Zie [BACKUP.md](BACKUP.md).
internal/backup/backup_test.go +59 −9
@@ -41,9 +41,9 @@ func TestKeyLifecycle(t *testing.T) {
41 41 if _, ok := m.Check("bgbk_nope"); ok {
42 42 t.Fatal("check zonder key")
43 43 }
44 key, c, err := m.NewKey("tim")
45 if err != nil || !strings.HasPrefix(key, KeyPrefix) || c.KeyHash == "" {
46 t.Fatal(key, err)
44 key, c, err := m.Add(" nas kelder ", "tim")
45 if err != nil || !strings.HasPrefix(key, KeyPrefix) || c.KeyHash == "" || c.Name != "nas kelder" || c.ID == "" {
46 t.Fatal(key, c, err)
47 47 }
48 48 raw, _ := os.ReadFile(filepath.Join(m.Dir, "backup.json"))
49 49 if strings.Contains(string(raw), key) {
@@ -53,35 +53,85 @@ func TestKeyLifecycle(t *testing.T) {
53 53 if fi.Mode().Perm() != 0o600 {
54 54 t.Fatalf("mode %v", fi.Mode())
55 55 }
56 if _, ok := m.Check(key); !ok {
56 if got, ok := m.Check(key); !ok || got.ID != c.ID {
57 57 t.Fatal("eigen key geweigerd")
58 58 }
59 if _, err := m.Connect("http://backup:9000/", "srv1"); err != nil {
59 if _, err := m.Connect(c.ID, "http://backup:9000/", "srv1"); err != nil {
60 60 t.Fatal(err)
61 61 }
62 c, _ = m.Load()
62 c, _ = m.Get(c.ID)
63 63 if !c.Connected() || c.ServerURL != "http://backup:9000" || c.SignSecret != SigningSecret(key) {
64 64 t.Fatalf("%+v", c)
65 65 }
66 key2, _, _ := m.NewKey("tim")
66 // Een tweede backup server met een eigen key; de eerste blijft werken.
67 keyB, b, err := m.Add("offsite", "tim")
68 if err != nil {
69 t.Fatal(err)
70 }
71 if got, ok := m.Check(keyB); !ok || got.ID != b.ID {
72 t.Fatal("tweede key")
73 }
74 if got, ok := m.Check(key); !ok || got.ID != c.ID {
75 t.Fatal("eerste key werkt niet meer")
76 }
77 if list, _ := m.List(); len(list) != 2 {
78 t.Fatalf("%d servers", len(list))
79 }
80 // Nieuwe key voor de eerste: oude key dood, koppeling weg, tweede blijft.
81 key2, _, err := m.RotateKey(c.ID, "tim")
82 if err != nil {
83 t.Fatal(err)
84 }
67 85 if _, ok := m.Check(key); ok {
68 86 t.Fatal("oude key werkt nog")
69 87 }
70 88 if _, ok := m.Check(key2); !ok {
71 89 t.Fatal("nieuwe key geweigerd")
72 90 }
73 if c, _ := m.Load(); c.Connected() {
91 if c, _ := m.Get(c.ID); c.Connected() {
74 92 t.Fatal("nieuwe key houdt oude server vast")
75 93 }
94 if _, err := m.Rename(b.ID, "Offsite 2"); err != nil {
95 t.Fatal(err)
96 }
97 if b, _ := m.Get(b.ID); b.Name != "Offsite 2" {
98 t.Fatal(b.Name)
99 }
76 100 id1, _ := m.InstanceID()
77 101 id2, _ := m.InstanceID()
78 102 if id1 == "" || id1 != id2 {
79 103 t.Fatal("instance-id niet vast")
80 104 }
81 _ = m.Revoke()
105 if err := m.Remove(c.ID); err != nil {
106 t.Fatal(err)
107 }
82 108 if _, ok := m.Check(key2); ok {
83 109 t.Fatal("ingetrokken key werkt")
84 110 }
111 if _, ok := m.Check(keyB); !ok {
112 t.Fatal("andere server verloor zijn key")
113 }
114 if err := m.Remove("bestaatniet"); err != ErrUnknown {
115 t.Fatal(err)
116 }
117 for i := 0; i < MaxServers; i++ {
118 _, _, _ = m.Add("x", "tim")
119 }
120 if _, _, err := m.Add("x", "tim"); err != ErrTooMany {
121 t.Fatal(err)
122 }
123 }
124
125 func TestLegacySingleConn(t *testing.T) {
126 d := t.TempDir()
127 key := "bgbk_" + strings.Repeat("ab", 32)
128 old := `{"key_hash":"` + HashKey(key) + `","sign_secret":"` + SigningSecret(key) + `","key_hint":"bgbk_ababab","server_url":"http://b:8080"}`
129 _ = os.WriteFile(filepath.Join(d, "backup.json"), []byte(old), 0o600)
130 m := &Manager{Dir: d}
131 c, ok := m.Check(key)
132 if !ok || c.ID == "" || c.Name != "backup" || !c.Connected() {
133 t.Fatalf("%+v %v", c, ok)
134 }
85 135 }
86 136
87 137 func TestCleanLogical(t *testing.T) {
@@ -41,9 +41,9 @@ func TestKeyLifecycle(t *testing.T) {
41 if _, ok := m.Check("bgbk_nope"); ok {
41 if _, ok := m.Check("bgbk_nope"); ok {
42 t.Fatal("check zonder key")
42 t.Fatal("check zonder key")
43 }
43 }
44 key, c, err := m.NewKey("tim")
44 key, c, err := m.Add(" nas kelder ", "tim")
45 if err != nil || !strings.HasPrefix(key, KeyPrefix) || c.KeyHash == "" {
45 if err != nil || !strings.HasPrefix(key, KeyPrefix) || c.KeyHash == "" || c.Name != "nas kelder" || c.ID == "" {
46 t.Fatal(key, err)
46 t.Fatal(key, c, err)
47 }
47 }
48 raw, _ := os.ReadFile(filepath.Join(m.Dir, "backup.json"))
48 raw, _ := os.ReadFile(filepath.Join(m.Dir, "backup.json"))
49 if strings.Contains(string(raw), key) {
49 if strings.Contains(string(raw), key) {
@@ -53,35 +53,85 @@ func TestKeyLifecycle(t *testing.T) {
53 if fi.Mode().Perm() != 0o600 {
53 if fi.Mode().Perm() != 0o600 {
54 t.Fatalf("mode %v", fi.Mode())
54 t.Fatalf("mode %v", fi.Mode())
55 }
55 }
56 if _, ok := m.Check(key); !ok {
56 if got, ok := m.Check(key); !ok || got.ID != c.ID {
57 t.Fatal("eigen key geweigerd")
57 t.Fatal("eigen key geweigerd")
58 }
58 }
59 if _, err := m.Connect("http://backup:9000/", "srv1"); err != nil {
59 if _, err := m.Connect(c.ID, "http://backup:9000/", "srv1"); err != nil {
60 t.Fatal(err)
60 t.Fatal(err)
61 }
61 }
62 c, _ = m.Load()
62 c, _ = m.Get(c.ID)
63 if !c.Connected() || c.ServerURL != "http://backup:9000" || c.SignSecret != SigningSecret(key) {
63 if !c.Connected() || c.ServerURL != "http://backup:9000" || c.SignSecret != SigningSecret(key) {
64 t.Fatalf("%+v", c)
64 t.Fatalf("%+v", c)
65 }
65 }
66 key2, _, _ := m.NewKey("tim")
66 // Een tweede backup server met een eigen key; de eerste blijft werken.
67 keyB, b, err := m.Add("offsite", "tim")
68 if err != nil {
69 t.Fatal(err)
70 }
71 if got, ok := m.Check(keyB); !ok || got.ID != b.ID {
72 t.Fatal("tweede key")
73 }
74 if got, ok := m.Check(key); !ok || got.ID != c.ID {
75 t.Fatal("eerste key werkt niet meer")
76 }
77 if list, _ := m.List(); len(list) != 2 {
78 t.Fatalf("%d servers", len(list))
79 }
80 // Nieuwe key voor de eerste: oude key dood, koppeling weg, tweede blijft.
81 key2, _, err := m.RotateKey(c.ID, "tim")
82 if err != nil {
83 t.Fatal(err)
84 }
67 if _, ok := m.Check(key); ok {
85 if _, ok := m.Check(key); ok {
68 t.Fatal("oude key werkt nog")
86 t.Fatal("oude key werkt nog")
69 }
87 }
70 if _, ok := m.Check(key2); !ok {
88 if _, ok := m.Check(key2); !ok {
71 t.Fatal("nieuwe key geweigerd")
89 t.Fatal("nieuwe key geweigerd")
72 }
90 }
73 if c, _ := m.Load(); c.Connected() {
91 if c, _ := m.Get(c.ID); c.Connected() {
74 t.Fatal("nieuwe key houdt oude server vast")
92 t.Fatal("nieuwe key houdt oude server vast")
75 }
93 }
94 if _, err := m.Rename(b.ID, "Offsite 2"); err != nil {
95 t.Fatal(err)
96 }
97 if b, _ := m.Get(b.ID); b.Name != "Offsite 2" {
98 t.Fatal(b.Name)
99 }
76 id1, _ := m.InstanceID()
100 id1, _ := m.InstanceID()
77 id2, _ := m.InstanceID()
101 id2, _ := m.InstanceID()
78 if id1 == "" || id1 != id2 {
102 if id1 == "" || id1 != id2 {
79 t.Fatal("instance-id niet vast")
103 t.Fatal("instance-id niet vast")
80 }
104 }
81 _ = m.Revoke()
105 if err := m.Remove(c.ID); err != nil {
106 t.Fatal(err)
107 }
82 if _, ok := m.Check(key2); ok {
108 if _, ok := m.Check(key2); ok {
83 t.Fatal("ingetrokken key werkt")
109 t.Fatal("ingetrokken key werkt")
84 }
110 }
111 if _, ok := m.Check(keyB); !ok {
112 t.Fatal("andere server verloor zijn key")
113 }
114 if err := m.Remove("bestaatniet"); err != ErrUnknown {
115 t.Fatal(err)
116 }
117 for i := 0; i < MaxServers; i++ {
118 _, _, _ = m.Add("x", "tim")
119 }
120 if _, _, err := m.Add("x", "tim"); err != ErrTooMany {
121 t.Fatal(err)
122 }
123}
124
125func TestLegacySingleConn(t *testing.T) {
126 d := t.TempDir()
127 key := "bgbk_" + strings.Repeat("ab", 32)
128 old := `{"key_hash":"` + HashKey(key) + `","sign_secret":"` + SigningSecret(key) + `","key_hint":"bgbk_ababab","server_url":"http://b:8080"}`
129 _ = os.WriteFile(filepath.Join(d, "backup.json"), []byte(old), 0o600)
130 m := &Manager{Dir: d}
131 c, ok := m.Check(key)
132 if !ok || c.ID == "" || c.Name != "backup" || !c.Connected() {
133 t.Fatalf("%+v %v", c, ok)
134 }
85}
135}
86
136
87func TestCleanLogical(t *testing.T) {
137func TestCleanLogical(t *testing.T) {
internal/backup/client.go +122 −38
@@ -20,10 +20,23 @@ type Archive struct {
20 20
21 21 // RemoteStatus is wat de backup server over zichzelf zegt.
22 22 type RemoteStatus struct {
23 Version string `json:"version"`
24 LastSync time.Time `json:"last_sync"`
25 SyncError string `json:"sync_error,omitempty"`
26 Rollback struct {
23 Version string `json:"version"`
24 ServerID string `json:"server_id"`
25 LastSync time.Time `json:"last_sync"`
26 SyncError string `json:"sync_error,omitempty"`
27 Syncs int `json:"syncs"`
28 Notifies int `json:"notifies"`
29 MirrorBytes int64 `json:"mirror_bytes"`
30 LastStats struct {
31 Files int `json:"files"`
32 Downloaded int `json:"downloaded"`
33 Bytes int64 `json:"bytes"`
34 Deleted int `json:"deleted"`
35 } `json:"last_stats"`
36 Archives int `json:"archives"`
37 LastArchive time.Time `json:"last_archive"`
38 ArchiveError string `json:"archive_error,omitempty"`
39 Rollback struct {
27 40 State string `json:"state"`
28 41 Archive string `json:"archive,omitempty"`
29 42 Error string `json:"error,omitempty"`
@@ -31,36 +44,43 @@ type RemoteStatus struct {
31 44 } `json:"rollback"`
32 45 Interval string `json:"archive_interval"`
33 46 RetentionDays int `json:"retention_days"`
47 RateLimitKiB int64 `json:"rate_limit_kib"`
34 48 }
35 49
36 // Client praat ondertekend met de gekoppelde backup server.
50 // Client praat ondertekend met de backup servers.
37 51 type Client struct {
38 52 Manager *Manager
39 53 HTTP *http.Client
40 54 Now func() time.Time
41 55 }
42 56
43 func (c *Client) do(ctx context.Context, method, p string, in, out any) error {
44 conn, err := c.Manager.Load()
45 if err != nil {
46 return err
47 }
57 // RemoteError is een foutantwoord van de backup server.
58 type RemoteError struct {
59 Status int
60 Msg string
61 }
62
63 func (e *RemoteError) Error() string { return "backup server: " + e.Msg }
64
65 // Call stuurt een ondertekend verzoek naar backup server conn en geeft het
66 // ruwe antwoord terug. in is nil of wordt JSON.
67 func (c *Client) Call(ctx context.Context, conn Conn, method, p string, in any) (int, []byte, error) {
48 68 if !conn.Connected() {
49 return fmt.Errorf("geen backup server gekoppeld")
69 return 0, nil, fmt.Errorf("backup server %s is niet gekoppeld", conn.Name)
50 70 }
51 71 inst, err := c.Manager.InstanceID()
52 72 if err != nil {
53 return err
73 return 0, nil, err
54 74 }
55 75 var body []byte
56 76 if in != nil {
57 77 if body, err = json.Marshal(in); err != nil {
58 return err
78 return 0, nil, err
59 79 }
60 80 }
61 81 req, err := http.NewRequestWithContext(ctx, method, conn.ServerURL+p, bytes.NewReader(body))
62 82 if err != nil {
63 return err
83 return 0, nil, err
64 84 }
65 85 if in != nil {
66 86 req.Header.Set("Content-Type", "application/json")
@@ -76,19 +96,27 @@ func (c *Client) do(ctx context.Context, method, p string, in, out any) error {
76 96 }
77 97 resp, err := hc.Do(req)
78 98 if err != nil {
79 return err
99 return 0, nil, err
80 100 }
81 101 defer resp.Body.Close()
82 102 raw, _ := io.ReadAll(io.LimitReader(resp.Body, 4<<20))
83 if resp.StatusCode >= 300 {
103 return resp.StatusCode, raw, nil
104 }
105
106 func (c *Client) do(ctx context.Context, conn Conn, method, p string, in, out any) error {
107 code, raw, err := c.Call(ctx, conn, method, p, in)
108 if err != nil {
109 return err
110 }
111 if code >= 300 {
84 112 var e struct {
85 113 Error string `json:"error"`
86 114 }
87 115 _ = json.Unmarshal(raw, &e)
88 116 if e.Error == "" {
89 e.Error = resp.Status
117 e.Error = http.StatusText(code)
90 118 }
91 return fmt.Errorf("backup server: %s", e.Error)
119 return &RemoteError{Status: code, Msg: e.Error}
92 120 }
93 121 if out != nil {
94 122 return json.Unmarshal(raw, out)
@@ -97,35 +125,80 @@ func (c *Client) do(ctx context.Context, method, p string, in, out any) error {
97 125 }
98 126
99 127 // Archives vraagt de lijst met archieven op, nieuwste eerst.
100 func (c *Client) Archives(ctx context.Context) ([]Archive, error) {
128 func (c *Client) Archives(ctx context.Context, conn Conn) ([]Archive, error) {
101 129 var out struct {
102 130 Archives []Archive `json:"archives"`
103 131 }
104 err := c.do(ctx, http.MethodGet, "/api/v1/archives", nil, &out)
132 err := c.do(ctx, conn, http.MethodGet, "/api/v1/archives", nil, &out)
105 133 return out.Archives, err
106 134 }
107 135
108 136 // Status vraagt de toestand van de backup server op.
109 func (c *Client) Status(ctx context.Context) (RemoteStatus, error) {
137 func (c *Client) Status(ctx context.Context, conn Conn) (RemoteStatus, error) {
110 138 var out RemoteStatus
111 err := c.do(ctx, http.MethodGet, "/api/v1/status", nil, &out)
139 err := c.do(ctx, conn, http.MethodGet, "/api/v1/status", nil, &out)
112 140 return out, err
113 141 }
114 142
143 // RemoteField is één instelling van de backup server.
144 type RemoteField struct {
145 Key string `json:"key"`
146 Label string `json:"label"`
147 Help string `json:"help"`
148 Kind string `json:"kind"`
149 Restart bool `json:"restart"`
150 Value string `json:"value"`
151 }
152
153 // RemoteConfig is GET /api/v1/admin/config van de backup server.
154 type RemoteConfig struct {
155 Fields []RemoteField `json:"fields"`
156 DataDir string `json:"data_dir"`
157 Restart bool `json:"restart_pending"`
158 }
159
160 // Config vraagt de instellingen van de backup server op.
161 func (c *Client) Config(ctx context.Context, conn Conn) (RemoteConfig, error) {
162 var out RemoteConfig
163 err := c.do(ctx, conn, http.MethodGet, "/api/v1/admin/config", nil, &out)
164 return out, err
165 }
166
167 // RemoteAction is één beheeractie die de backup server aanbiedt.
168 type RemoteAction struct {
169 Name string `json:"name"`
170 Method string `json:"method"`
171 Path string `json:"path"`
172 Title string `json:"title"`
173 Signed bool `json:"bluegit"`
174 Params []string `json:"params"`
175 Fields []string `json:"fields"`
176 }
177
178 // Actions vraagt op wat de backup server aanbiedt.
179 func (c *Client) Actions(ctx context.Context, conn Conn) ([]RemoteAction, error) {
180 var out struct {
181 Actions []RemoteAction `json:"actions"`
182 }
183 err := c.do(ctx, conn, http.MethodGet, "/api/v1/admin/actions", nil, &out)
184 return out.Actions, err
185 }
186
115 187 // Rollback vraagt de backup server om archive terug te zetten. De server
116 188 // antwoordt meteen; het terugsturen naar BlueGit gebeurt daarna.
117 func (c *Client) Rollback(ctx context.Context, archive string) error {
118 return c.do(ctx, http.MethodPost, "/api/v1/rollback", map[string]string{"archive": archive}, nil)
189 func (c *Client) Rollback(ctx context.Context, conn Conn, archive string) error {
190 return c.do(ctx, conn, http.MethodPost, "/api/v1/rollback", map[string]string{"archive": archive}, nil)
119 191 }
120 192
121 193 // Notify meldt dat er iets veranderd is.
122 func (c *Client) Notify(ctx context.Context) error {
123 return c.do(ctx, http.MethodPost, "/api/v1/notify", map[string]any{"at": time.Now().UTC()}, nil)
194 func (c *Client) Notify(ctx context.Context, conn Conn) error {
195 return c.do(ctx, conn, http.MethodPost, "/api/v1/notify", map[string]any{"at": time.Now().UTC()}, nil)
124 196 }
125 197
126 // Notifier bundelt wijzigingen: hoogstens één melding per Delay, en bij een
127 // mislukking een paar nieuwe pogingen. De backup server haalt daarnaast
128 // periodiek alles op, dus een gemiste melding kost alleen vertraging.
198 // Notifier bundelt wijzigingen: hoogstens één melding per Delay, aan elke
199 // gekoppelde backup server, met een paar nieuwe pogingen bij een fout. De
200 // backup servers halen daarnaast periodiek alles op, dus een gemiste
201 // melding kost alleen vertraging.
129 202 type Notifier struct {
130 203 Client *Client
131 204 Delay time.Duration
@@ -160,18 +233,29 @@ func (n *Notifier) loop() {
160 233 case <-n.kick:
161 234 default:
162 235 }
163 conn, err := n.Client.Manager.Load()
164 if err != nil || !conn.Connected() {
236 list, err := n.Client.Manager.List()
237 if err != nil {
165 238 continue
166 239 }
167 for try := 0; try < 4; try++ {
168 ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
169 err := n.Client.Notify(ctx)
170 cancel()
171 if err == nil {
172 break
240 var wg sync.WaitGroup
241 for _, conn := range list {
242 if !conn.Connected() {
243 continue
173 244 }
174 time.Sleep(time.Duration(1<<try) * 2 * time.Second)
245 wg.Add(1)
246 go func(conn Conn) {
247 defer wg.Done()
248 for try := 0; try < 4; try++ {
249 ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
250 err := n.Client.Notify(ctx, conn)
251 cancel()
252 if err == nil {
253 return
254 }
255 time.Sleep(time.Duration(1<<try) * 2 * time.Second)
256 }
257 }(conn)
175 258 }
259 wg.Wait()
176 260 }
177 261 }
@@ -20,10 +20,23 @@ type Archive struct {
20
20
21// RemoteStatus is wat de backup server over zichzelf zegt.
21// RemoteStatus is wat de backup server over zichzelf zegt.
22type RemoteStatus struct {
22type RemoteStatus struct {
23 Version string `json:"version"`
23 Version string `json:"version"`
24 LastSync time.Time `json:"last_sync"`
24 ServerID string `json:"server_id"`
25 SyncError string `json:"sync_error,omitempty"`
25 LastSync time.Time `json:"last_sync"`
26 Rollback struct {
26 SyncError string `json:"sync_error,omitempty"`
27 Syncs int `json:"syncs"`
28 Notifies int `json:"notifies"`
29 MirrorBytes int64 `json:"mirror_bytes"`
30 LastStats struct {
31 Files int `json:"files"`
32 Downloaded int `json:"downloaded"`
33 Bytes int64 `json:"bytes"`
34 Deleted int `json:"deleted"`
35 } `json:"last_stats"`
36 Archives int `json:"archives"`
37 LastArchive time.Time `json:"last_archive"`
38 ArchiveError string `json:"archive_error,omitempty"`
39 Rollback struct {
27 State string `json:"state"`
40 State string `json:"state"`
28 Archive string `json:"archive,omitempty"`
41 Archive string `json:"archive,omitempty"`
29 Error string `json:"error,omitempty"`
42 Error string `json:"error,omitempty"`
@@ -31,36 +44,43 @@ type RemoteStatus struct {
31 } `json:"rollback"`
44 } `json:"rollback"`
32 Interval string `json:"archive_interval"`
45 Interval string `json:"archive_interval"`
33 RetentionDays int `json:"retention_days"`
46 RetentionDays int `json:"retention_days"`
47 RateLimitKiB int64 `json:"rate_limit_kib"`
34}
48}
35
49
36// Client praat ondertekend met de gekoppelde backup server.
50// Client praat ondertekend met de backup servers.
37type Client struct {
51type Client struct {
38 Manager *Manager
52 Manager *Manager
39 HTTP *http.Client
53 HTTP *http.Client
40 Now func() time.Time
54 Now func() time.Time
41}
55}
42
56
43func (c *Client) do(ctx context.Context, method, p string, in, out any) error {
57// RemoteError is een foutantwoord van de backup server.
44 conn, err := c.Manager.Load()
58type RemoteError struct {
45 if err != nil {
59 Status int
46 return err
60 Msg string
47 }
61}
62
63func (e *RemoteError) Error() string { return "backup server: " + e.Msg }
64
65// Call stuurt een ondertekend verzoek naar backup server conn en geeft het
66// ruwe antwoord terug. in is nil of wordt JSON.
67func (c *Client) Call(ctx context.Context, conn Conn, method, p string, in any) (int, []byte, error) {
48 if !conn.Connected() {
68 if !conn.Connected() {
49 return fmt.Errorf("geen backup server gekoppeld")
69 return 0, nil, fmt.Errorf("backup server %s is niet gekoppeld", conn.Name)
50 }
70 }
51 inst, err := c.Manager.InstanceID()
71 inst, err := c.Manager.InstanceID()
52 if err != nil {
72 if err != nil {
53 return err
73 return 0, nil, err
54 }
74 }
55 var body []byte
75 var body []byte
56 if in != nil {
76 if in != nil {
57 if body, err = json.Marshal(in); err != nil {
77 if body, err = json.Marshal(in); err != nil {
58 return err
78 return 0, nil, err
59 }
79 }
60 }
80 }
61 req, err := http.NewRequestWithContext(ctx, method, conn.ServerURL+p, bytes.NewReader(body))
81 req, err := http.NewRequestWithContext(ctx, method, conn.ServerURL+p, bytes.NewReader(body))
62 if err != nil {
82 if err != nil {
63 return err
83 return 0, nil, err
64 }
84 }
65 if in != nil {
85 if in != nil {
66 req.Header.Set("Content-Type", "application/json")
86 req.Header.Set("Content-Type", "application/json")
@@ -76,19 +96,27 @@ func (c *Client) do(ctx context.Context, method, p string, in, out any) error {
76 }
96 }
77 resp, err := hc.Do(req)
97 resp, err := hc.Do(req)
78 if err != nil {
98 if err != nil {
79 return err
99 return 0, nil, err
80 }
100 }
81 defer resp.Body.Close()
101 defer resp.Body.Close()
82 raw, _ := io.ReadAll(io.LimitReader(resp.Body, 4<<20))
102 raw, _ := io.ReadAll(io.LimitReader(resp.Body, 4<<20))
83 if resp.StatusCode >= 300 {
103 return resp.StatusCode, raw, nil
104}
105
106func (c *Client) do(ctx context.Context, conn Conn, method, p string, in, out any) error {
107 code, raw, err := c.Call(ctx, conn, method, p, in)
108 if err != nil {
109 return err
110 }
111 if code >= 300 {
84 var e struct {
112 var e struct {
85 Error string `json:"error"`
113 Error string `json:"error"`
86 }
114 }
87 _ = json.Unmarshal(raw, &e)
115 _ = json.Unmarshal(raw, &e)
88 if e.Error == "" {
116 if e.Error == "" {
89 e.Error = resp.Status
117 e.Error = http.StatusText(code)
90 }
118 }
91 return fmt.Errorf("backup server: %s", e.Error)
119 return &RemoteError{Status: code, Msg: e.Error}
92 }
120 }
93 if out != nil {
121 if out != nil {
94 return json.Unmarshal(raw, out)
122 return json.Unmarshal(raw, out)
@@ -97,35 +125,80 @@ func (c *Client) do(ctx context.Context, method, p string, in, out any) error {
97}
125}
98
126
99// Archives vraagt de lijst met archieven op, nieuwste eerst.
127// Archives vraagt de lijst met archieven op, nieuwste eerst.
100func (c *Client) Archives(ctx context.Context) ([]Archive, error) {
128func (c *Client) Archives(ctx context.Context, conn Conn) ([]Archive, error) {
101 var out struct {
129 var out struct {
102 Archives []Archive `json:"archives"`
130 Archives []Archive `json:"archives"`
103 }
131 }
104 err := c.do(ctx, http.MethodGet, "/api/v1/archives", nil, &out)
132 err := c.do(ctx, conn, http.MethodGet, "/api/v1/archives", nil, &out)
105 return out.Archives, err
133 return out.Archives, err
106}
134}
107
135
108// Status vraagt de toestand van de backup server op.
136// Status vraagt de toestand van de backup server op.
109func (c *Client) Status(ctx context.Context) (RemoteStatus, error) {
137func (c *Client) Status(ctx context.Context, conn Conn) (RemoteStatus, error) {
110 var out RemoteStatus
138 var out RemoteStatus
111 err := c.do(ctx, http.MethodGet, "/api/v1/status", nil, &out)
139 err := c.do(ctx, conn, http.MethodGet, "/api/v1/status", nil, &out)
112 return out, err
140 return out, err
113}
141}
114
142
143// RemoteField is één instelling van de backup server.
144type RemoteField struct {
145 Key string `json:"key"`
146 Label string `json:"label"`
147 Help string `json:"help"`
148 Kind string `json:"kind"`
149 Restart bool `json:"restart"`
150 Value string `json:"value"`
151}
152
153// RemoteConfig is GET /api/v1/admin/config van de backup server.
154type RemoteConfig struct {
155 Fields []RemoteField `json:"fields"`
156 DataDir string `json:"data_dir"`
157 Restart bool `json:"restart_pending"`
158}
159
160// Config vraagt de instellingen van de backup server op.
161func (c *Client) Config(ctx context.Context, conn Conn) (RemoteConfig, error) {
162 var out RemoteConfig
163 err := c.do(ctx, conn, http.MethodGet, "/api/v1/admin/config", nil, &out)
164 return out, err
165}
166
167// RemoteAction is één beheeractie die de backup server aanbiedt.
168type RemoteAction struct {
169 Name string `json:"name"`
170 Method string `json:"method"`
171 Path string `json:"path"`
172 Title string `json:"title"`
173 Signed bool `json:"bluegit"`
174 Params []string `json:"params"`
175 Fields []string `json:"fields"`
176}
177
178// Actions vraagt op wat de backup server aanbiedt.
179func (c *Client) Actions(ctx context.Context, conn Conn) ([]RemoteAction, error) {
180 var out struct {
181 Actions []RemoteAction `json:"actions"`
182 }
183 err := c.do(ctx, conn, http.MethodGet, "/api/v1/admin/actions", nil, &out)
184 return out.Actions, err
185}
186
115// Rollback vraagt de backup server om archive terug te zetten. De server
187// Rollback vraagt de backup server om archive terug te zetten. De server
116// antwoordt meteen; het terugsturen naar BlueGit gebeurt daarna.
188// antwoordt meteen; het terugsturen naar BlueGit gebeurt daarna.
117func (c *Client) Rollback(ctx context.Context, archive string) error {
189func (c *Client) Rollback(ctx context.Context, conn Conn, archive string) error {
118 return c.do(ctx, http.MethodPost, "/api/v1/rollback", map[string]string{"archive": archive}, nil)
190 return c.do(ctx, conn, http.MethodPost, "/api/v1/rollback", map[string]string{"archive": archive}, nil)
119}
191}
120
192
121// Notify meldt dat er iets veranderd is.
193// Notify meldt dat er iets veranderd is.
122func (c *Client) Notify(ctx context.Context) error {
194func (c *Client) Notify(ctx context.Context, conn Conn) error {
123 return c.do(ctx, http.MethodPost, "/api/v1/notify", map[string]any{"at": time.Now().UTC()}, nil)
195 return c.do(ctx, conn, http.MethodPost, "/api/v1/notify", map[string]any{"at": time.Now().UTC()}, nil)
124}
196}
125
197
126// Notifier bundelt wijzigingen: hoogstens één melding per Delay, en bij een
198// Notifier bundelt wijzigingen: hoogstens één melding per Delay, aan elke
127// mislukking een paar nieuwe pogingen. De backup server haalt daarnaast
199// gekoppelde backup server, met een paar nieuwe pogingen bij een fout. De
128// periodiek alles op, dus een gemiste melding kost alleen vertraging.
200// backup servers halen daarnaast periodiek alles op, dus een gemiste
201// melding kost alleen vertraging.
129type Notifier struct {
202type Notifier struct {
130 Client *Client
203 Client *Client
131 Delay time.Duration
204 Delay time.Duration
@@ -160,18 +233,29 @@ func (n *Notifier) loop() {
160 case <-n.kick:
233 case <-n.kick:
161 default:
234 default:
162 }
235 }
163 conn, err := n.Client.Manager.Load()
236 list, err := n.Client.Manager.List()
164 if err != nil || !conn.Connected() {
237 if err != nil {
165 continue
238 continue
166 }
239 }
167 for try := 0; try < 4; try++ {
240 var wg sync.WaitGroup
168 ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
241 for _, conn := range list {
169 err := n.Client.Notify(ctx)
242 if !conn.Connected() {
170 cancel()
243 continue
171 if err == nil {
172 break
173 }
244 }
174 time.Sleep(time.Duration(1<<try) * 2 * time.Second)
245 wg.Add(1)
246 go func(conn Conn) {
247 defer wg.Done()
248 for try := 0; try < 4; try++ {
249 ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
250 err := n.Client.Notify(ctx, conn)
251 cancel()
252 if err == nil {
253 return
254 }
255 time.Sleep(time.Duration(1<<try) * 2 * time.Second)
256 }
257 }(conn)
175 }
258 }
259 wg.Wait()
176 }
260 }
177}
261}
internal/backup/conn.go +196 −56
@@ -1,5 +1,5 @@
1 // Package backup is de BlueGit-kant van bluegit-backup: de Backupserver-Key,
2 // de koppeling met één backup server, het manifest van alle gegevens, het
1 // Package backup is de BlueGit-kant van bluegit-backup: de Backupserver-Keys,
2 // de koppelingen met een of meer backup servers, het manifest van alle gegevens, het
3 3 // ondertekenen van verzoeken en het terugzetten van een backup bij de start.
4 4 //
5 5 // De koppeling staat in <state>/backup.json en het instance-id in
@@ -29,8 +29,10 @@ const (
29 29 instanceFile = "instance_id"
30 30 )
31 31
32 // Conn is de opgeslagen koppeling. De key zelf wordt nooit bewaard.
32 // Conn is één backup server. De key zelf wordt nooit bewaard.
33 33 type Conn struct {
34 ID string `json:"id"`
35 Name string `json:"name"`
34 36 KeyHash string `json:"key_hash"`
35 37 SignSecret string `json:"sign_secret"`
36 38 KeyHint string `json:"key_hint"`
@@ -48,7 +50,16 @@ func (c Conn) HasKey() bool { return c.KeyHash != "" }
48 50 // Connected zegt of een backup server zich met de key heeft gemeld.
49 51 func (c Conn) Connected() bool { return c.HasKey() && c.ServerURL != "" }
50 52
51 // Manager bewaart de koppeling in de state-map.
53 // MaxServers begrenst het aantal backup servers per BlueGit.
54 const MaxServers = 16
55
56 // file is backup.json. Eén BlueGit kan meerdere backup servers hebben; een
57 // backup server hoort bij één BlueGit.
58 type file struct {
59 Servers []Conn `json:"servers"`
60 }
61
62 // Manager bewaart de koppelingen in de state-map.
52 63 type Manager struct {
53 64 Dir string
54 65 mu sync.Mutex
@@ -67,31 +78,68 @@ func SigningSecret(key string) string {
67 78 return hex.EncodeToString(s[:])
68 79 }
69 80
70 // Load leest de koppeling. Geen bestand is een lege koppeling.
71 func (m *Manager) Load() (Conn, error) {
81 // List geeft alle backup servers, in volgorde van aanmaken.
82 func (m *Manager) List() ([]Conn, error) {
72 83 m.mu.Lock()
73 84 defer m.mu.Unlock()
74 return m.load()
85 f, err := m.load()
86 return f.Servers, err
87 }
88
89 // Get zoekt een backup server op id.
90 func (m *Manager) Get(id string) (Conn, bool) {
91 list, err := m.List()
92 if err != nil {
93 return Conn{}, false
94 }
95 for _, c := range list {
96 if c.ID == id {
97 return c, true
98 }
99 }
100 return Conn{}, false
75 101 }
76 102
77 func (m *Manager) load() (Conn, error) {
78 var c Conn
103 func (m *Manager) load() (file, error) {
104 var f file
79 105 b, err := os.ReadFile(filepath.Join(m.Dir, connFile))
80 106 if errors.Is(err, os.ErrNotExist) {
81 return c, nil
107 return f, nil
82 108 }
83 109 if err != nil {
84 return c, err
110 return f, err
111 }
112 if err := json.Unmarshal(b, &f); err != nil {
113 return f, err
85 114 }
86 err = json.Unmarshal(b, &c)
87 return c, err
115 if f.Servers == nil {
116 // Oude vorm met één koppeling.
117 var one Conn
118 if json.Unmarshal(b, &one) == nil && one.HasKey() {
119 if one.ID == "" {
120 one.ID = newID()
121 }
122 if one.Name == "" {
123 one.Name = "backup"
124 }
125 f.Servers = []Conn{one}
126 // Meteen bewaren, zodat het id vast is.
127 if err := m.save(f); err != nil {
128 return f, err
129 }
130 }
131 }
132 return f, nil
88 133 }
89 134
90 func (m *Manager) save(c Conn) error {
135 func (m *Manager) save(f file) error {
91 136 if m.Dir == "" {
92 137 return errors.New("geen state-map")
93 138 }
94 b, err := json.MarshalIndent(c, "", " ")
139 if f.Servers == nil {
140 f.Servers = []Conn{}
141 }
142 b, err := json.MarshalIndent(f, "", " ")
95 143 if err != nil {
96 144 return err
97 145 }
@@ -102,81 +150,173 @@ func (m *Manager) save(c Conn) error {
102 150 return os.Rename(tmp, filepath.Join(m.Dir, connFile))
103 151 }
104 152
105 // NewKey maakt een nieuwe key en vervangt de oude. Een gekoppelde backup
106 // server verliest daarmee zijn toegang tot hij de nieuwe key krijgt.
107 func (m *Manager) NewKey(by string) (string, Conn, error) {
153 func (m *Manager) update(id string, fn func(*Conn) error) (Conn, error) {
154 m.mu.Lock()
155 defer m.mu.Unlock()
156 f, err := m.load()
157 if err != nil {
158 return Conn{}, err
159 }
160 for i := range f.Servers {
161 if f.Servers[i].ID == id {
162 if err := fn(&f.Servers[i]); err != nil {
163 return Conn{}, err
164 }
165 return f.Servers[i], m.save(f)
166 }
167 }
168 return Conn{}, ErrUnknown
169 }
170
171 // ErrUnknown: geen backup server met dat id.
172 var ErrUnknown = errors.New("onbekende backup server")
173
174 func newID() string {
175 raw := make([]byte, 6)
176 _, _ = rand.Read(raw)
177 return hex.EncodeToString(raw)
178 }
179
180 func newKey() (string, error) {
108 181 raw := make([]byte, 32)
109 182 if _, err := rand.Read(raw); err != nil {
183 return "", err
184 }
185 return KeyPrefix + hex.EncodeToString(raw), nil
186 }
187
188 // CleanName maakt van een naam iets korts en toonbaars.
189 func CleanName(name string) string {
190 name = strings.Join(strings.Fields(name), " ")
191 if r := []rune(name); len(r) > 60 {
192 name = string(r[:60])
193 }
194 return name
195 }
196
197 // Add maakt een nieuwe backup server met een eigen key. De key wordt
198 // alleen hier teruggegeven.
199 func (m *Manager) Add(name, by string) (string, Conn, error) {
200 name = CleanName(name)
201 if name == "" {
202 name = "backup"
203 }
204 key, err := newKey()
205 if err != nil {
110 206 return "", Conn{}, err
111 207 }
112 key := KeyPrefix + hex.EncodeToString(raw)
113 208 c := Conn{
114 KeyHash: HashKey(key), SignSecret: SigningSecret(key),
209 ID: newID(), Name: name, KeyHash: HashKey(key), SignSecret: SigningSecret(key),
115 210 KeyHint: key[:len(KeyPrefix)+6], CreatedAt: time.Now().UTC(), CreatedBy: by,
116 211 }
117 212 m.mu.Lock()
118 213 defer m.mu.Unlock()
119 if err := m.save(c); err != nil {
214 f, err := m.load()
215 if err != nil {
216 return "", Conn{}, err
217 }
218 if len(f.Servers) >= MaxServers {
219 return "", Conn{}, ErrTooMany
220 }
221 f.Servers = append(f.Servers, c)
222 if err := m.save(f); err != nil {
223 return "", Conn{}, err
224 }
225 return key, c, nil
226 }
227
228 // ErrTooMany: MaxServers bereikt.
229 var ErrTooMany = errors.New("te veel backup servers")
230
231 // RotateKey geeft een backup server een nieuwe key. Hij verliest zijn
232 // toegang tot hij opnieuw koppelt met de nieuwe key.
233 func (m *Manager) RotateKey(id, by string) (string, Conn, error) {
234 key, err := newKey()
235 if err != nil {
236 return "", Conn{}, err
237 }
238 c, err := m.update(id, func(c *Conn) error {
239 c.KeyHash, c.SignSecret, c.KeyHint = HashKey(key), SigningSecret(key), key[:len(KeyPrefix)+6]
240 c.CreatedAt, c.CreatedBy = time.Now().UTC(), by
241 c.ServerURL, c.ServerID, c.ConnectedAt = "", "", time.Time{}
242 return nil
243 })
244 if err != nil {
120 245 return "", Conn{}, err
121 246 }
122 247 return key, c, nil
123 248 }
124 249
125 // Revoke trekt de key in en vergeet de backup server.
126 func (m *Manager) Revoke() error {
250 // Rename geeft een backup server een andere naam.
251 func (m *Manager) Rename(id, name string) (Conn, error) {
252 name = CleanName(name)
253 if name == "" {
254 return Conn{}, errors.New("naam is leeg")
255 }
256 return m.update(id, func(c *Conn) error { c.Name = name; return nil })
257 }
258
259 // Remove trekt de key in en vergeet de backup server.
260 func (m *Manager) Remove(id string) error {
127 261 m.mu.Lock()
128 262 defer m.mu.Unlock()
129 err := os.Remove(filepath.Join(m.Dir, connFile))
130 if errors.Is(err, os.ErrNotExist) {
131 return nil
263 f, err := m.load()
264 if err != nil {
265 return err
266 }
267 out := f.Servers[:0]
268 found := false
269 for _, c := range f.Servers {
270 if c.ID == id {
271 found = true
272 continue
273 }
274 out = append(out, c)
132 275 }
133 return err
276 if !found {
277 return ErrUnknown
278 }
279 f.Servers = out
280 return m.save(f)
134 281 }
135 282
136 // Check zegt of key de uitgegeven key is.
283 // Check zoekt de backup server bij key.
137 284 func (m *Manager) Check(key string) (Conn, bool) {
138 285 key = strings.TrimSpace(key)
139 286 if !strings.HasPrefix(key, KeyPrefix) {
140 287 return Conn{}, false
141 288 }
142 c, err := m.Load()
143 if err != nil || !c.HasKey() {
289 list, err := m.List()
290 if err != nil {
144 291 return Conn{}, false
145 292 }
146 if subtle.ConstantTimeCompare([]byte(HashKey(key)), []byte(c.KeyHash)) != 1 {
147 return Conn{}, false
293 h := HashKey(key)
294 for _, c := range list {
295 if c.HasKey() && subtle.ConstantTimeCompare([]byte(h), []byte(c.KeyHash)) == 1 {
296 return c, true
297 }
148 298 }
149 return c, true
299 return Conn{}, false
150 300 }
151 301
152 // Connect legt het adres van de backup server vast.
153 func (m *Manager) Connect(serverURL, serverID string) (Conn, error) {
154 m.mu.Lock()
155 defer m.mu.Unlock()
156 c, err := m.load()
157 if err != nil {
158 return c, err
159 }
160 if !c.HasKey() {
161 return c, errors.New("geen key")
162 }
163 c.ServerURL = strings.TrimRight(strings.TrimSpace(serverURL), "/")
164 c.ServerID = serverID
165 c.ConnectedAt = time.Now().UTC()
166 c.LastSeen = c.ConnectedAt
167 return c, m.save(c)
302 // Connect legt het adres van een backup server vast.
303 func (m *Manager) Connect(id, serverURL, serverID string) (Conn, error) {
304 return m.update(id, func(c *Conn) error {
305 c.ServerURL = strings.TrimRight(strings.TrimSpace(serverURL), "/")
306 c.ServerID = serverID
307 c.ConnectedAt = time.Now().UTC()
308 c.LastSeen = c.ConnectedAt
309 return nil
310 })
168 311 }
169 312
170 313 // Seen werkt LastSeen bij, hoogstens één keer per minuut naar schijf.
171 func (m *Manager) Seen() {
172 m.mu.Lock()
173 defer m.mu.Unlock()
174 c, err := m.load()
175 if err != nil || !c.HasKey() || time.Since(c.LastSeen) < time.Minute {
314 func (m *Manager) Seen(id string) {
315 c, ok := m.Get(id)
316 if !ok || time.Since(c.LastSeen) < time.Minute {
176 317 return
177 318 }
178 c.LastSeen = time.Now().UTC()
179 _ = m.save(c)
319 _, _ = m.update(id, func(c *Conn) error { c.LastSeen = time.Now().UTC(); return nil })
180 320 }
181 321
182 322 // InstanceID is het vaste id van deze installatie. Het wordt één keer
@@ -1,5 +1,5 @@
1// Package backup is de BlueGit-kant van bluegit-backup: de Backupserver-Key,
1// Package backup is de BlueGit-kant van bluegit-backup: de Backupserver-Keys,
2// de koppeling met één backup server, het manifest van alle gegevens, het
2// de koppelingen met een of meer backup servers, het manifest van alle gegevens, het
3// ondertekenen van verzoeken en het terugzetten van een backup bij de start.
3// ondertekenen van verzoeken en het terugzetten van een backup bij de start.
4//
4//
5// De koppeling staat in <state>/backup.json en het instance-id in
5// De koppeling staat in <state>/backup.json en het instance-id in
@@ -29,8 +29,10 @@ const (
29 instanceFile = "instance_id"
29 instanceFile = "instance_id"
30)
30)
31
31
32// Conn is de opgeslagen koppeling. De key zelf wordt nooit bewaard.
32// Conn is één backup server. De key zelf wordt nooit bewaard.
33type Conn struct {
33type Conn struct {
34 ID string `json:"id"`
35 Name string `json:"name"`
34 KeyHash string `json:"key_hash"`
36 KeyHash string `json:"key_hash"`
35 SignSecret string `json:"sign_secret"`
37 SignSecret string `json:"sign_secret"`
36 KeyHint string `json:"key_hint"`
38 KeyHint string `json:"key_hint"`
@@ -48,7 +50,16 @@ func (c Conn) HasKey() bool { return c.KeyHash != "" }
48// Connected zegt of een backup server zich met de key heeft gemeld.
50// Connected zegt of een backup server zich met de key heeft gemeld.
49func (c Conn) Connected() bool { return c.HasKey() && c.ServerURL != "" }
51func (c Conn) Connected() bool { return c.HasKey() && c.ServerURL != "" }
50
52
51// Manager bewaart de koppeling in de state-map.
53// MaxServers begrenst het aantal backup servers per BlueGit.
54const MaxServers = 16
55
56// file is backup.json. Eén BlueGit kan meerdere backup servers hebben; een
57// backup server hoort bij één BlueGit.
58type file struct {
59 Servers []Conn `json:"servers"`
60}
61
62// Manager bewaart de koppelingen in de state-map.
52type Manager struct {
63type Manager struct {
53 Dir string
64 Dir string
54 mu sync.Mutex
65 mu sync.Mutex
@@ -67,31 +78,68 @@ func SigningSecret(key string) string {
67 return hex.EncodeToString(s[:])
78 return hex.EncodeToString(s[:])
68}
79}
69
80
70// Load leest de koppeling. Geen bestand is een lege koppeling.
81// List geeft alle backup servers, in volgorde van aanmaken.
71func (m *Manager) Load() (Conn, error) {
82func (m *Manager) List() ([]Conn, error) {
72 m.mu.Lock()
83 m.mu.Lock()
73 defer m.mu.Unlock()
84 defer m.mu.Unlock()
74 return m.load()
85 f, err := m.load()
86 return f.Servers, err
87}
88
89// Get zoekt een backup server op id.
90func (m *Manager) Get(id string) (Conn, bool) {
91 list, err := m.List()
92 if err != nil {
93 return Conn{}, false
94 }
95 for _, c := range list {
96 if c.ID == id {
97 return c, true
98 }
99 }
100 return Conn{}, false
75}
101}
76
102
77func (m *Manager) load() (Conn, error) {
103func (m *Manager) load() (file, error) {
78 var c Conn
104 var f file
79 b, err := os.ReadFile(filepath.Join(m.Dir, connFile))
105 b, err := os.ReadFile(filepath.Join(m.Dir, connFile))
80 if errors.Is(err, os.ErrNotExist) {
106 if errors.Is(err, os.ErrNotExist) {
81 return c, nil
107 return f, nil
82 }
108 }
83 if err != nil {
109 if err != nil {
84 return c, err
110 return f, err
111 }
112 if err := json.Unmarshal(b, &f); err != nil {
113 return f, err
85 }
114 }
86 err = json.Unmarshal(b, &c)
115 if f.Servers == nil {
87 return c, err
116 // Oude vorm met één koppeling.
117 var one Conn
118 if json.Unmarshal(b, &one) == nil && one.HasKey() {
119 if one.ID == "" {
120 one.ID = newID()
121 }
122 if one.Name == "" {
123 one.Name = "backup"
124 }
125 f.Servers = []Conn{one}
126 // Meteen bewaren, zodat het id vast is.
127 if err := m.save(f); err != nil {
128 return f, err
129 }
130 }
131 }
132 return f, nil
88}
133}
89
134
90func (m *Manager) save(c Conn) error {
135func (m *Manager) save(f file) error {
91 if m.Dir == "" {
136 if m.Dir == "" {
92 return errors.New("geen state-map")
137 return errors.New("geen state-map")
93 }
138 }
94 b, err := json.MarshalIndent(c, "", " ")
139 if f.Servers == nil {
140 f.Servers = []Conn{}
141 }
142 b, err := json.MarshalIndent(f, "", " ")
95 if err != nil {
143 if err != nil {
96 return err
144 return err
97 }
145 }
@@ -102,81 +150,173 @@ func (m *Manager) save(c Conn) error {
102 return os.Rename(tmp, filepath.Join(m.Dir, connFile))
150 return os.Rename(tmp, filepath.Join(m.Dir, connFile))
103}
151}
104
152
105// NewKey maakt een nieuwe key en vervangt de oude. Een gekoppelde backup
153func (m *Manager) update(id string, fn func(*Conn) error) (Conn, error) {
106// server verliest daarmee zijn toegang tot hij de nieuwe key krijgt.
154 m.mu.Lock()
107func (m *Manager) NewKey(by string) (string, Conn, error) {
155 defer m.mu.Unlock()
156 f, err := m.load()
157 if err != nil {
158 return Conn{}, err
159 }
160 for i := range f.Servers {
161 if f.Servers[i].ID == id {
162 if err := fn(&f.Servers[i]); err != nil {
163 return Conn{}, err
164 }
165 return f.Servers[i], m.save(f)
166 }
167 }
168 return Conn{}, ErrUnknown
169}
170
171// ErrUnknown: geen backup server met dat id.
172var ErrUnknown = errors.New("onbekende backup server")
173
174func newID() string {
175 raw := make([]byte, 6)
176 _, _ = rand.Read(raw)
177 return hex.EncodeToString(raw)
178}
179
180func newKey() (string, error) {
108 raw := make([]byte, 32)
181 raw := make([]byte, 32)
109 if _, err := rand.Read(raw); err != nil {
182 if _, err := rand.Read(raw); err != nil {
183 return "", err
184 }
185 return KeyPrefix + hex.EncodeToString(raw), nil
186}
187
188// CleanName maakt van een naam iets korts en toonbaars.
189func CleanName(name string) string {
190 name = strings.Join(strings.Fields(name), " ")
191 if r := []rune(name); len(r) > 60 {
192 name = string(r[:60])
193 }
194 return name
195}
196
197// Add maakt een nieuwe backup server met een eigen key. De key wordt
198// alleen hier teruggegeven.
199func (m *Manager) Add(name, by string) (string, Conn, error) {
200 name = CleanName(name)
201 if name == "" {
202 name = "backup"
203 }
204 key, err := newKey()
205 if err != nil {
110 return "", Conn{}, err
206 return "", Conn{}, err
111 }
207 }
112 key := KeyPrefix + hex.EncodeToString(raw)
113 c := Conn{
208 c := Conn{
114 KeyHash: HashKey(key), SignSecret: SigningSecret(key),
209 ID: newID(), Name: name, KeyHash: HashKey(key), SignSecret: SigningSecret(key),
115 KeyHint: key[:len(KeyPrefix)+6], CreatedAt: time.Now().UTC(), CreatedBy: by,
210 KeyHint: key[:len(KeyPrefix)+6], CreatedAt: time.Now().UTC(), CreatedBy: by,
116 }
211 }
117 m.mu.Lock()
212 m.mu.Lock()
118 defer m.mu.Unlock()
213 defer m.mu.Unlock()
119 if err := m.save(c); err != nil {
214 f, err := m.load()
215 if err != nil {
216 return "", Conn{}, err
217 }
218 if len(f.Servers) >= MaxServers {
219 return "", Conn{}, ErrTooMany
220 }
221 f.Servers = append(f.Servers, c)
222 if err := m.save(f); err != nil {
223 return "", Conn{}, err
224 }
225 return key, c, nil
226}
227
228// ErrTooMany: MaxServers bereikt.
229var ErrTooMany = errors.New("te veel backup servers")
230
231// RotateKey geeft een backup server een nieuwe key. Hij verliest zijn
232// toegang tot hij opnieuw koppelt met de nieuwe key.
233func (m *Manager) RotateKey(id, by string) (string, Conn, error) {
234 key, err := newKey()
235 if err != nil {
236 return "", Conn{}, err
237 }
238 c, err := m.update(id, func(c *Conn) error {
239 c.KeyHash, c.SignSecret, c.KeyHint = HashKey(key), SigningSecret(key), key[:len(KeyPrefix)+6]
240 c.CreatedAt, c.CreatedBy = time.Now().UTC(), by
241 c.ServerURL, c.ServerID, c.ConnectedAt = "", "", time.Time{}
242 return nil
243 })
244 if err != nil {
120 return "", Conn{}, err
245 return "", Conn{}, err
121 }
246 }
122 return key, c, nil
247 return key, c, nil
123}
248}
124
249
125// Revoke trekt de key in en vergeet de backup server.
250// Rename geeft een backup server een andere naam.
126func (m *Manager) Revoke() error {
251func (m *Manager) Rename(id, name string) (Conn, error) {
252 name = CleanName(name)
253 if name == "" {
254 return Conn{}, errors.New("naam is leeg")
255 }
256 return m.update(id, func(c *Conn) error { c.Name = name; return nil })
257}
258
259// Remove trekt de key in en vergeet de backup server.
260func (m *Manager) Remove(id string) error {
127 m.mu.Lock()
261 m.mu.Lock()
128 defer m.mu.Unlock()
262 defer m.mu.Unlock()
129 err := os.Remove(filepath.Join(m.Dir, connFile))
263 f, err := m.load()
130 if errors.Is(err, os.ErrNotExist) {
264 if err != nil {
131 return nil
265 return err
266 }
267 out := f.Servers[:0]
268 found := false
269 for _, c := range f.Servers {
270 if c.ID == id {
271 found = true
272 continue
273 }
274 out = append(out, c)
132 }
275 }
133 return err
276 if !found {
277 return ErrUnknown
278 }
279 f.Servers = out
280 return m.save(f)
134}
281}
135
282
136// Check zegt of key de uitgegeven key is.
283// Check zoekt de backup server bij key.
137func (m *Manager) Check(key string) (Conn, bool) {
284func (m *Manager) Check(key string) (Conn, bool) {
138 key = strings.TrimSpace(key)
285 key = strings.TrimSpace(key)
139 if !strings.HasPrefix(key, KeyPrefix) {
286 if !strings.HasPrefix(key, KeyPrefix) {
140 return Conn{}, false
287 return Conn{}, false
141 }
288 }
142 c, err := m.Load()
289 list, err := m.List()
143 if err != nil || !c.HasKey() {
290 if err != nil {
144 return Conn{}, false
291 return Conn{}, false
145 }
292 }
146 if subtle.ConstantTimeCompare([]byte(HashKey(key)), []byte(c.KeyHash)) != 1 {
293 h := HashKey(key)
147 return Conn{}, false
294 for _, c := range list {
295 if c.HasKey() && subtle.ConstantTimeCompare([]byte(h), []byte(c.KeyHash)) == 1 {
296 return c, true
297 }
148 }
298 }
149 return c, true
299 return Conn{}, false
150}
300}
151
301
152// Connect legt het adres van de backup server vast.
302// Connect legt het adres van een backup server vast.
153func (m *Manager) Connect(serverURL, serverID string) (Conn, error) {
303func (m *Manager) Connect(id, serverURL, serverID string) (Conn, error) {
154 m.mu.Lock()
304 return m.update(id, func(c *Conn) error {
155 defer m.mu.Unlock()
305 c.ServerURL = strings.TrimRight(strings.TrimSpace(serverURL), "/")
156 c, err := m.load()
306 c.ServerID = serverID
157 if err != nil {
307 c.ConnectedAt = time.Now().UTC()
158 return c, err
308 c.LastSeen = c.ConnectedAt
159 }
309 return nil
160 if !c.HasKey() {
310 })
161 return c, errors.New("geen key")
162 }
163 c.ServerURL = strings.TrimRight(strings.TrimSpace(serverURL), "/")
164 c.ServerID = serverID
165 c.ConnectedAt = time.Now().UTC()
166 c.LastSeen = c.ConnectedAt
167 return c, m.save(c)
168}
311}
169
312
170// Seen werkt LastSeen bij, hoogstens één keer per minuut naar schijf.
313// Seen werkt LastSeen bij, hoogstens één keer per minuut naar schijf.
171func (m *Manager) Seen() {
314func (m *Manager) Seen(id string) {
172 m.mu.Lock()
315 c, ok := m.Get(id)
173 defer m.mu.Unlock()
316 if !ok || time.Since(c.LastSeen) < time.Minute {
174 c, err := m.load()
175 if err != nil || !c.HasKey() || time.Since(c.LastSeen) < time.Minute {
176 return
317 return
177 }
318 }
178 c.LastSeen = time.Now().UTC()
319 _, _ = m.update(id, func(c *Conn) error { c.LastSeen = time.Now().UTC(); return nil })
179 _ = m.save(c)
180}
320}
181
321
182// InstanceID is het vaste id van deze installatie. Het wordt één keer
322// InstanceID is het vaste id van deze installatie. Het wordt één keer
internal/i18n/catalog_backup.go +150 −10
@@ -2,6 +2,41 @@ package i18n
2 2
3 3 func init() {
4 4 addCatalog(en, map[string]string{
5 "backup.back": "All backup servers",
6 "backup.servers.title": "Backup servers",
7 "backup.servers.none": "No backup servers yet. Add one, then enter its Backupserver-Key on the backup server.",
8 "backup.servers.add": "Add backup server",
9 "backup.servers.name": "Name",
10 "backup.servers.namePh": "e.g. NAS in the basement",
11 "backup.multi": "One BlueGit can have several backup servers, each with its own key. A backup server belongs to one BlueGit only.",
12 "backup.col.name": "Name",
13 "backup.col.state": "State",
14 "backup.col.address": "Address",
15 "backup.state.connected": "connected",
16 "backup.state.waiting": "waiting for the key",
17 "backup.open": "Manage",
18 "backup.rename": "Rename",
19 "backup.status.lastSync": "Last sync",
20 "backup.status.result": "Last result",
21 "backup.status.resultText": "%d files, %d fetched, %d removed",
22 "backup.status.counts": "Syncs / notifications",
23 "backup.status.mirror": "Copy",
24 "backup.status.rollback": "Rollback",
25 "backup.status.version": "Version",
26 "backup.act.sync": "Sync now",
27 "backup.act.archive": "Archive now",
28 "backup.act.prune": "Clean up now",
29 "backup.config.title": "Backup server settings",
30 "backup.config.save": "Save settings",
31 "backup.config.restart": "A change is waiting for a restart of the backup server.",
32 "backup.archive.delete": "Delete",
33 "backup.archive.deleteAsk": "Delete archive %s on the backup server?",
34 "backup.err.tooMany": "at most %d backup servers",
35 "backup.err.unknown": "unknown backup server",
36 "backup.err.action": "the backup server does not offer this action",
37 "backup.err.remote": "Backup server: %s",
38 "backup.ok.renamed": "Backup server renamed",
39 "backup.ok.action": "Done on the backup server",
5 40 "admin.tab.backup": "Backup",
6 41 "backup.title": "Backup server",
7 42 "backup.lead": "A separate bluegit-backup server copies all data and configuration of this BlueGit, slowly and incrementally. It is notified after every change, keeps compressed archives, and can roll this BlueGit back to one of them.",
@@ -14,9 +49,9 @@ func init() {
14 49 "backup.key.replace": "Generate new key",
15 50 "backup.key.new": "Generate Backupserver-Key",
16 51 "backup.key.revokeAsk": "Revoke the key and disconnect the backup server? Its archives stay on the backup server.",
17 "backup.key.revoke": "Revoke key",
52 "backup.key.revoke": "Revoke key and remove",
18 53 "backup.instance": "Instance ID: %s",
19 "backup.server.title": "Connected backup server",
54 "backup.server.title": "Status",
20 55 "backup.server.connected": "Connected: %s",
21 56 "backup.server.seen": "last contact",
22 57 "backup.server.settings": "Archive interval %s, archives kept for %d days",
@@ -36,7 +71,7 @@ func init() {
36 71 "backup.typeName": "Type the archive name to confirm",
37 72 "backup.rollbackNow": "Roll back now",
38 73 "backup.ok.key": "New Backupserver-Key generated",
39 "backup.ok.revoked": "Key revoked; backup server disconnected",
74 "backup.ok.revoked": "Key revoked; backup server removed",
40 75 "backup.ok.rollback": "Rollback to %s started. BlueGit restarts as soon as the backup server has sent the data.",
41 76 "backup.err.archive": "choose an archive",
42 77 "backup.err.confirm": "the typed name does not match the archive",
@@ -44,6 +79,41 @@ func init() {
44 79 "backup.err.understood": "tick that you understand the rollback cannot be undone",
45 80 })
46 81 addCatalog(nl, map[string]string{
82 "backup.back": "Alle backup servers",
83 "backup.servers.title": "Backup servers",
84 "backup.servers.none": "Nog geen backup servers. Voeg er een toe en vul daarna de Backupserver-Key in op de backup server.",
85 "backup.servers.add": "Backup server toevoegen",
86 "backup.servers.name": "Naam",
87 "backup.servers.namePh": "bijv. NAS in de kelder",
88 "backup.multi": "Eén BlueGit kan meerdere backup servers hebben, elk met een eigen key. Een backup server hoort bij maar één BlueGit.",
89 "backup.col.name": "Naam",
90 "backup.col.state": "Status",
91 "backup.col.address": "Adres",
92 "backup.state.connected": "gekoppeld",
93 "backup.state.waiting": "wacht op de key",
94 "backup.open": "Beheren",
95 "backup.rename": "Hernoemen",
96 "backup.status.lastSync": "Laatste sync",
97 "backup.status.result": "Laatste resultaat",
98 "backup.status.resultText": "%d bestanden, %d opgehaald, %d verwijderd",
99 "backup.status.counts": "Syncs / meldingen",
100 "backup.status.mirror": "Kopie",
101 "backup.status.rollback": "Rollback",
102 "backup.status.version": "Versie",
103 "backup.act.sync": "Nu synchroniseren",
104 "backup.act.archive": "Nu archiveren",
105 "backup.act.prune": "Nu opruimen",
106 "backup.config.title": "Instellingen van de backup server",
107 "backup.config.save": "Instellingen opslaan",
108 "backup.config.restart": "Er staat een wijziging klaar die pas na een herstart van de backup server geldt.",
109 "backup.archive.delete": "Verwijderen",
110 "backup.archive.deleteAsk": "Archief %s op de backup server verwijderen?",
111 "backup.err.tooMany": "hoogstens %d backup servers",
112 "backup.err.unknown": "onbekende backup server",
113 "backup.err.action": "de backup server biedt deze actie niet aan",
114 "backup.err.remote": "Backup server: %s",
115 "backup.ok.renamed": "Backup server hernoemd",
116 "backup.ok.action": "Uitgevoerd op de backup server",
47 117 "admin.tab.backup": "Backup",
48 118 "backup.title": "Backup server",
49 119 "backup.lead": "Een losse bluegit-backup-server kopieert langzaam en stapsgewijs alle gegevens en configuratie van deze BlueGit. Hij krijgt na elke wijziging een melding, bewaart gecomprimeerde archieven en kan deze BlueGit naar één daarvan terugzetten.",
@@ -56,9 +126,9 @@ func init() {
56 126 "backup.key.replace": "Nieuwe key maken",
57 127 "backup.key.new": "Backupserver-Key maken",
58 128 "backup.key.revokeAsk": "Key intrekken en de backup server loskoppelen? Zijn archieven blijven op de backup server staan.",
59 "backup.key.revoke": "Key intrekken",
129 "backup.key.revoke": "Key intrekken en verwijderen",
60 130 "backup.instance": "Instance-id: %s",
61 "backup.server.title": "Gekoppelde backup server",
131 "backup.server.title": "Status",
62 132 "backup.server.connected": "Gekoppeld: %s",
63 133 "backup.server.seen": "laatste contact",
64 134 "backup.server.settings": "Archiefinterval %s, archieven %d dagen bewaard",
@@ -78,7 +148,7 @@ func init() {
78 148 "backup.typeName": "Typ de naam van het archief ter bevestiging",
79 149 "backup.rollbackNow": "Nu terugzetten",
80 150 "backup.ok.key": "Nieuwe Backupserver-Key gemaakt",
81 "backup.ok.revoked": "Key ingetrokken; backup server losgekoppeld",
151 "backup.ok.revoked": "Key ingetrokken; backup server verwijderd",
82 152 "backup.ok.rollback": "Rollback naar %s gestart. BlueGit herstart zodra de backup server de gegevens heeft gestuurd.",
83 153 "backup.err.archive": "kies een archief",
84 154 "backup.err.confirm": "de getypte naam klopt niet met het archief",
@@ -86,6 +156,41 @@ func init() {
86 156 "backup.err.understood": "vink aan dat je begrijpt dat de rollback niet terug te draaien is",
87 157 })
88 158 addCatalog(de, map[string]string{
159 "backup.back": "Alle Backup-Server",
160 "backup.servers.title": "Backup-Server",
161 "backup.servers.none": "Noch keine Backup-Server. Füge einen hinzu und trage dann seinen Backupserver-Key auf dem Backup-Server ein.",
162 "backup.servers.add": "Backup-Server hinzufügen",
163 "backup.servers.name": "Name",
164 "backup.servers.namePh": "z. B. NAS im Keller",
165 "backup.multi": "Ein BlueGit kann mehrere Backup-Server haben, jeder mit eigenem Key. Ein Backup-Server gehört nur zu einem BlueGit.",
166 "backup.col.name": "Name",
167 "backup.col.state": "Status",
168 "backup.col.address": "Adresse",
169 "backup.state.connected": "verbunden",
170 "backup.state.waiting": "wartet auf den Key",
171 "backup.open": "Verwalten",
172 "backup.rename": "Umbenennen",
173 "backup.status.lastSync": "Letzte Synchronisierung",
174 "backup.status.result": "Letztes Ergebnis",
175 "backup.status.resultText": "%d Dateien, %d abgerufen, %d entfernt",
176 "backup.status.counts": "Synchronisierungen / Meldungen",
177 "backup.status.mirror": "Kopie",
178 "backup.status.rollback": "Rollback",
179 "backup.status.version": "Version",
180 "backup.act.sync": "Jetzt synchronisieren",
181 "backup.act.archive": "Jetzt archivieren",
182 "backup.act.prune": "Jetzt aufräumen",
183 "backup.config.title": "Einstellungen des Backup-Servers",
184 "backup.config.save": "Einstellungen speichern",
185 "backup.config.restart": "Eine Änderung wartet auf einen Neustart des Backup-Servers.",
186 "backup.archive.delete": "Löschen",
187 "backup.archive.deleteAsk": "Archiv %s auf dem Backup-Server löschen?",
188 "backup.err.tooMany": "höchstens %d Backup-Server",
189 "backup.err.unknown": "unbekannter Backup-Server",
190 "backup.err.action": "der Backup-Server bietet diese Aktion nicht an",
191 "backup.err.remote": "Backup-Server: %s",
192 "backup.ok.renamed": "Backup-Server umbenannt",
193 "backup.ok.action": "Auf dem Backup-Server ausgeführt",
89 194 "admin.tab.backup": "Backup",
90 195 "backup.title": "Backup-Server",
91 196 "backup.lead": "Ein separater bluegit-backup-Server kopiert langsam und schrittweise alle Daten und die Konfiguration dieses BlueGit. Er wird nach jeder Änderung benachrichtigt, bewahrt komprimierte Archive auf und kann dieses BlueGit auf eines davon zurücksetzen.",
@@ -98,9 +203,9 @@ func init() {
98 203 "backup.key.replace": "Neuen Key erstellen",
99 204 "backup.key.new": "Backupserver-Key erstellen",
100 205 "backup.key.revokeAsk": "Key widerrufen und den Backup-Server trennen? Seine Archive bleiben auf dem Backup-Server.",
101 "backup.key.revoke": "Key widerrufen",
206 "backup.key.revoke": "Key widerrufen und entfernen",
102 207 "backup.instance": "Instanz-ID: %s",
103 "backup.server.title": "Verbundener Backup-Server",
208 "backup.server.title": "Status",
104 209 "backup.server.connected": "Verbunden: %s",
105 210 "backup.server.seen": "letzter Kontakt",
106 211 "backup.server.settings": "Archivintervall %s, Archive %d Tage aufbewahrt",
@@ -128,6 +233,41 @@ func init() {
128 233 "backup.err.understood": "bestätige, dass der Rollback nicht rückgängig gemacht werden kann",
129 234 })
130 235 addCatalog(fr, map[string]string{
236 "backup.back": "Tous les serveurs de sauvegarde",
237 "backup.servers.title": "Serveurs de sauvegarde",
238 "backup.servers.none": "Aucun serveur de sauvegarde. Ajoutez-en un, puis saisissez sa Backupserver-Key sur le serveur de sauvegarde.",
239 "backup.servers.add": "Ajouter un serveur de sauvegarde",
240 "backup.servers.name": "Nom",
241 "backup.servers.namePh": "p. ex. NAS au sous-sol",
242 "backup.multi": "Un BlueGit peut avoir plusieurs serveurs de sauvegarde, chacun avec sa propre clé. Un serveur de sauvegarde n'appartient qu'à un seul BlueGit.",
243 "backup.col.name": "Nom",
244 "backup.col.state": "État",
245 "backup.col.address": "Adresse",
246 "backup.state.connected": "connecté",
247 "backup.state.waiting": "en attente de la clé",
248 "backup.open": "Gérer",
249 "backup.rename": "Renommer",
250 "backup.status.lastSync": "Dernière synchronisation",
251 "backup.status.result": "Dernier résultat",
252 "backup.status.resultText": "%d fichiers, %d récupérés, %d supprimés",
253 "backup.status.counts": "Synchronisations / notifications",
254 "backup.status.mirror": "Copie",
255 "backup.status.rollback": "Restauration",
256 "backup.status.version": "Version",
257 "backup.act.sync": "Synchroniser maintenant",
258 "backup.act.archive": "Archiver maintenant",
259 "backup.act.prune": "Nettoyer maintenant",
260 "backup.config.title": "Paramètres du serveur de sauvegarde",
261 "backup.config.save": "Enregistrer les paramètres",
262 "backup.config.restart": "Une modification attend un redémarrage du serveur de sauvegarde.",
263 "backup.archive.delete": "Supprimer",
264 "backup.archive.deleteAsk": "Supprimer l'archive %s sur le serveur de sauvegarde ?",
265 "backup.err.tooMany": "au plus %d serveurs de sauvegarde",
266 "backup.err.unknown": "serveur de sauvegarde inconnu",
267 "backup.err.action": "le serveur de sauvegarde ne propose pas cette action",
268 "backup.err.remote": "Serveur de sauvegarde : %s",
269 "backup.ok.renamed": "Serveur de sauvegarde renommé",
270 "backup.ok.action": "Effectué sur le serveur de sauvegarde",
131 271 "admin.tab.backup": "Sauvegarde",
132 272 "backup.title": "Serveur de sauvegarde",
133 273 "backup.lead": "Un serveur bluegit-backup séparé copie lentement et progressivement toutes les données et la configuration de ce BlueGit. Il est notifié après chaque modification, conserve des archives compressées et peut ramener ce BlueGit à l’une d’elles.",
@@ -140,9 +280,9 @@ func init() {
140 280 "backup.key.replace": "Générer une nouvelle clé",
141 281 "backup.key.new": "Générer une Backupserver-Key",
142 282 "backup.key.revokeAsk": "Révoquer la clé et déconnecter le serveur ? Ses archives restent sur le serveur de sauvegarde.",
143 "backup.key.revoke": "Révoquer la clé",
283 "backup.key.revoke": "Révoquer la clé et supprimer",
144 284 "backup.instance": "ID d’instance : %s",
145 "backup.server.title": "Serveur de sauvegarde connecté",
285 "backup.server.title": "État",
146 286 "backup.server.connected": "Connecté : %s",
147 287 "backup.server.seen": "dernier contact",
148 288 "backup.server.settings": "Intervalle d’archivage %s, archives conservées %d jours",
@@ -2,6 +2,41 @@ package i18n
2
2
3func init() {
3func init() {
4 addCatalog(en, map[string]string{
4 addCatalog(en, map[string]string{
5 "backup.back": "All backup servers",
6 "backup.servers.title": "Backup servers",
7 "backup.servers.none": "No backup servers yet. Add one, then enter its Backupserver-Key on the backup server.",
8 "backup.servers.add": "Add backup server",
9 "backup.servers.name": "Name",
10 "backup.servers.namePh": "e.g. NAS in the basement",
11 "backup.multi": "One BlueGit can have several backup servers, each with its own key. A backup server belongs to one BlueGit only.",
12 "backup.col.name": "Name",
13 "backup.col.state": "State",
14 "backup.col.address": "Address",
15 "backup.state.connected": "connected",
16 "backup.state.waiting": "waiting for the key",
17 "backup.open": "Manage",
18 "backup.rename": "Rename",
19 "backup.status.lastSync": "Last sync",
20 "backup.status.result": "Last result",
21 "backup.status.resultText": "%d files, %d fetched, %d removed",
22 "backup.status.counts": "Syncs / notifications",
23 "backup.status.mirror": "Copy",
24 "backup.status.rollback": "Rollback",
25 "backup.status.version": "Version",
26 "backup.act.sync": "Sync now",
27 "backup.act.archive": "Archive now",
28 "backup.act.prune": "Clean up now",
29 "backup.config.title": "Backup server settings",
30 "backup.config.save": "Save settings",
31 "backup.config.restart": "A change is waiting for a restart of the backup server.",
32 "backup.archive.delete": "Delete",
33 "backup.archive.deleteAsk": "Delete archive %s on the backup server?",
34 "backup.err.tooMany": "at most %d backup servers",
35 "backup.err.unknown": "unknown backup server",
36 "backup.err.action": "the backup server does not offer this action",
37 "backup.err.remote": "Backup server: %s",
38 "backup.ok.renamed": "Backup server renamed",
39 "backup.ok.action": "Done on the backup server",
5 "admin.tab.backup": "Backup",
40 "admin.tab.backup": "Backup",
6 "backup.title": "Backup server",
41 "backup.title": "Backup server",
7 "backup.lead": "A separate bluegit-backup server copies all data and configuration of this BlueGit, slowly and incrementally. It is notified after every change, keeps compressed archives, and can roll this BlueGit back to one of them.",
42 "backup.lead": "A separate bluegit-backup server copies all data and configuration of this BlueGit, slowly and incrementally. It is notified after every change, keeps compressed archives, and can roll this BlueGit back to one of them.",
@@ -14,9 +49,9 @@ func init() {
14 "backup.key.replace": "Generate new key",
49 "backup.key.replace": "Generate new key",
15 "backup.key.new": "Generate Backupserver-Key",
50 "backup.key.new": "Generate Backupserver-Key",
16 "backup.key.revokeAsk": "Revoke the key and disconnect the backup server? Its archives stay on the backup server.",
51 "backup.key.revokeAsk": "Revoke the key and disconnect the backup server? Its archives stay on the backup server.",
17 "backup.key.revoke": "Revoke key",
52 "backup.key.revoke": "Revoke key and remove",
18 "backup.instance": "Instance ID: %s",
53 "backup.instance": "Instance ID: %s",
19 "backup.server.title": "Connected backup server",
54 "backup.server.title": "Status",
20 "backup.server.connected": "Connected: %s",
55 "backup.server.connected": "Connected: %s",
21 "backup.server.seen": "last contact",
56 "backup.server.seen": "last contact",
22 "backup.server.settings": "Archive interval %s, archives kept for %d days",
57 "backup.server.settings": "Archive interval %s, archives kept for %d days",
@@ -36,7 +71,7 @@ func init() {
36 "backup.typeName": "Type the archive name to confirm",
71 "backup.typeName": "Type the archive name to confirm",
37 "backup.rollbackNow": "Roll back now",
72 "backup.rollbackNow": "Roll back now",
38 "backup.ok.key": "New Backupserver-Key generated",
73 "backup.ok.key": "New Backupserver-Key generated",
39 "backup.ok.revoked": "Key revoked; backup server disconnected",
74 "backup.ok.revoked": "Key revoked; backup server removed",
40 "backup.ok.rollback": "Rollback to %s started. BlueGit restarts as soon as the backup server has sent the data.",
75 "backup.ok.rollback": "Rollback to %s started. BlueGit restarts as soon as the backup server has sent the data.",
41 "backup.err.archive": "choose an archive",
76 "backup.err.archive": "choose an archive",
42 "backup.err.confirm": "the typed name does not match the archive",
77 "backup.err.confirm": "the typed name does not match the archive",
@@ -44,6 +79,41 @@ func init() {
44 "backup.err.understood": "tick that you understand the rollback cannot be undone",
79 "backup.err.understood": "tick that you understand the rollback cannot be undone",
45 })
80 })
46 addCatalog(nl, map[string]string{
81 addCatalog(nl, map[string]string{
82 "backup.back": "Alle backup servers",
83 "backup.servers.title": "Backup servers",
84 "backup.servers.none": "Nog geen backup servers. Voeg er een toe en vul daarna de Backupserver-Key in op de backup server.",
85 "backup.servers.add": "Backup server toevoegen",
86 "backup.servers.name": "Naam",
87 "backup.servers.namePh": "bijv. NAS in de kelder",
88 "backup.multi": "Eén BlueGit kan meerdere backup servers hebben, elk met een eigen key. Een backup server hoort bij maar één BlueGit.",
89 "backup.col.name": "Naam",
90 "backup.col.state": "Status",
91 "backup.col.address": "Adres",
92 "backup.state.connected": "gekoppeld",
93 "backup.state.waiting": "wacht op de key",
94 "backup.open": "Beheren",
95 "backup.rename": "Hernoemen",
96 "backup.status.lastSync": "Laatste sync",
97 "backup.status.result": "Laatste resultaat",
98 "backup.status.resultText": "%d bestanden, %d opgehaald, %d verwijderd",
99 "backup.status.counts": "Syncs / meldingen",
100 "backup.status.mirror": "Kopie",
101 "backup.status.rollback": "Rollback",
102 "backup.status.version": "Versie",
103 "backup.act.sync": "Nu synchroniseren",
104 "backup.act.archive": "Nu archiveren",
105 "backup.act.prune": "Nu opruimen",
106 "backup.config.title": "Instellingen van de backup server",
107 "backup.config.save": "Instellingen opslaan",
108 "backup.config.restart": "Er staat een wijziging klaar die pas na een herstart van de backup server geldt.",
109 "backup.archive.delete": "Verwijderen",
110 "backup.archive.deleteAsk": "Archief %s op de backup server verwijderen?",
111 "backup.err.tooMany": "hoogstens %d backup servers",
112 "backup.err.unknown": "onbekende backup server",
113 "backup.err.action": "de backup server biedt deze actie niet aan",
114 "backup.err.remote": "Backup server: %s",
115 "backup.ok.renamed": "Backup server hernoemd",
116 "backup.ok.action": "Uitgevoerd op de backup server",
47 "admin.tab.backup": "Backup",
117 "admin.tab.backup": "Backup",
48 "backup.title": "Backup server",
118 "backup.title": "Backup server",
49 "backup.lead": "Een losse bluegit-backup-server kopieert langzaam en stapsgewijs alle gegevens en configuratie van deze BlueGit. Hij krijgt na elke wijziging een melding, bewaart gecomprimeerde archieven en kan deze BlueGit naar één daarvan terugzetten.",
119 "backup.lead": "Een losse bluegit-backup-server kopieert langzaam en stapsgewijs alle gegevens en configuratie van deze BlueGit. Hij krijgt na elke wijziging een melding, bewaart gecomprimeerde archieven en kan deze BlueGit naar één daarvan terugzetten.",
@@ -56,9 +126,9 @@ func init() {
56 "backup.key.replace": "Nieuwe key maken",
126 "backup.key.replace": "Nieuwe key maken",
57 "backup.key.new": "Backupserver-Key maken",
127 "backup.key.new": "Backupserver-Key maken",
58 "backup.key.revokeAsk": "Key intrekken en de backup server loskoppelen? Zijn archieven blijven op de backup server staan.",
128 "backup.key.revokeAsk": "Key intrekken en de backup server loskoppelen? Zijn archieven blijven op de backup server staan.",
59 "backup.key.revoke": "Key intrekken",
129 "backup.key.revoke": "Key intrekken en verwijderen",
60 "backup.instance": "Instance-id: %s",
130 "backup.instance": "Instance-id: %s",
61 "backup.server.title": "Gekoppelde backup server",
131 "backup.server.title": "Status",
62 "backup.server.connected": "Gekoppeld: %s",
132 "backup.server.connected": "Gekoppeld: %s",
63 "backup.server.seen": "laatste contact",
133 "backup.server.seen": "laatste contact",
64 "backup.server.settings": "Archiefinterval %s, archieven %d dagen bewaard",
134 "backup.server.settings": "Archiefinterval %s, archieven %d dagen bewaard",
@@ -78,7 +148,7 @@ func init() {
78 "backup.typeName": "Typ de naam van het archief ter bevestiging",
148 "backup.typeName": "Typ de naam van het archief ter bevestiging",
79 "backup.rollbackNow": "Nu terugzetten",
149 "backup.rollbackNow": "Nu terugzetten",
80 "backup.ok.key": "Nieuwe Backupserver-Key gemaakt",
150 "backup.ok.key": "Nieuwe Backupserver-Key gemaakt",
81 "backup.ok.revoked": "Key ingetrokken; backup server losgekoppeld",
151 "backup.ok.revoked": "Key ingetrokken; backup server verwijderd",
82 "backup.ok.rollback": "Rollback naar %s gestart. BlueGit herstart zodra de backup server de gegevens heeft gestuurd.",
152 "backup.ok.rollback": "Rollback naar %s gestart. BlueGit herstart zodra de backup server de gegevens heeft gestuurd.",
83 "backup.err.archive": "kies een archief",
153 "backup.err.archive": "kies een archief",
84 "backup.err.confirm": "de getypte naam klopt niet met het archief",
154 "backup.err.confirm": "de getypte naam klopt niet met het archief",
@@ -86,6 +156,41 @@ func init() {
86 "backup.err.understood": "vink aan dat je begrijpt dat de rollback niet terug te draaien is",
156 "backup.err.understood": "vink aan dat je begrijpt dat de rollback niet terug te draaien is",
87 })
157 })
88 addCatalog(de, map[string]string{
158 addCatalog(de, map[string]string{
159 "backup.back": "Alle Backup-Server",
160 "backup.servers.title": "Backup-Server",
161 "backup.servers.none": "Noch keine Backup-Server. Füge einen hinzu und trage dann seinen Backupserver-Key auf dem Backup-Server ein.",
162 "backup.servers.add": "Backup-Server hinzufügen",
163 "backup.servers.name": "Name",
164 "backup.servers.namePh": "z. B. NAS im Keller",
165 "backup.multi": "Ein BlueGit kann mehrere Backup-Server haben, jeder mit eigenem Key. Ein Backup-Server gehört nur zu einem BlueGit.",
166 "backup.col.name": "Name",
167 "backup.col.state": "Status",
168 "backup.col.address": "Adresse",
169 "backup.state.connected": "verbunden",
170 "backup.state.waiting": "wartet auf den Key",
171 "backup.open": "Verwalten",
172 "backup.rename": "Umbenennen",
173 "backup.status.lastSync": "Letzte Synchronisierung",
174 "backup.status.result": "Letztes Ergebnis",
175 "backup.status.resultText": "%d Dateien, %d abgerufen, %d entfernt",
176 "backup.status.counts": "Synchronisierungen / Meldungen",
177 "backup.status.mirror": "Kopie",
178 "backup.status.rollback": "Rollback",
179 "backup.status.version": "Version",
180 "backup.act.sync": "Jetzt synchronisieren",
181 "backup.act.archive": "Jetzt archivieren",
182 "backup.act.prune": "Jetzt aufräumen",
183 "backup.config.title": "Einstellungen des Backup-Servers",
184 "backup.config.save": "Einstellungen speichern",
185 "backup.config.restart": "Eine Änderung wartet auf einen Neustart des Backup-Servers.",
186 "backup.archive.delete": "Löschen",
187 "backup.archive.deleteAsk": "Archiv %s auf dem Backup-Server löschen?",
188 "backup.err.tooMany": "höchstens %d Backup-Server",
189 "backup.err.unknown": "unbekannter Backup-Server",
190 "backup.err.action": "der Backup-Server bietet diese Aktion nicht an",
191 "backup.err.remote": "Backup-Server: %s",
192 "backup.ok.renamed": "Backup-Server umbenannt",
193 "backup.ok.action": "Auf dem Backup-Server ausgeführt",
89 "admin.tab.backup": "Backup",
194 "admin.tab.backup": "Backup",
90 "backup.title": "Backup-Server",
195 "backup.title": "Backup-Server",
91 "backup.lead": "Ein separater bluegit-backup-Server kopiert langsam und schrittweise alle Daten und die Konfiguration dieses BlueGit. Er wird nach jeder Änderung benachrichtigt, bewahrt komprimierte Archive auf und kann dieses BlueGit auf eines davon zurücksetzen.",
196 "backup.lead": "Ein separater bluegit-backup-Server kopiert langsam und schrittweise alle Daten und die Konfiguration dieses BlueGit. Er wird nach jeder Änderung benachrichtigt, bewahrt komprimierte Archive auf und kann dieses BlueGit auf eines davon zurücksetzen.",
@@ -98,9 +203,9 @@ func init() {
98 "backup.key.replace": "Neuen Key erstellen",
203 "backup.key.replace": "Neuen Key erstellen",
99 "backup.key.new": "Backupserver-Key erstellen",
204 "backup.key.new": "Backupserver-Key erstellen",
100 "backup.key.revokeAsk": "Key widerrufen und den Backup-Server trennen? Seine Archive bleiben auf dem Backup-Server.",
205 "backup.key.revokeAsk": "Key widerrufen und den Backup-Server trennen? Seine Archive bleiben auf dem Backup-Server.",
101 "backup.key.revoke": "Key widerrufen",
206 "backup.key.revoke": "Key widerrufen und entfernen",
102 "backup.instance": "Instanz-ID: %s",
207 "backup.instance": "Instanz-ID: %s",
103 "backup.server.title": "Verbundener Backup-Server",
208 "backup.server.title": "Status",
104 "backup.server.connected": "Verbunden: %s",
209 "backup.server.connected": "Verbunden: %s",
105 "backup.server.seen": "letzter Kontakt",
210 "backup.server.seen": "letzter Kontakt",
106 "backup.server.settings": "Archivintervall %s, Archive %d Tage aufbewahrt",
211 "backup.server.settings": "Archivintervall %s, Archive %d Tage aufbewahrt",
@@ -128,6 +233,41 @@ func init() {
128 "backup.err.understood": "bestätige, dass der Rollback nicht rückgängig gemacht werden kann",
233 "backup.err.understood": "bestätige, dass der Rollback nicht rückgängig gemacht werden kann",
129 })
234 })
130 addCatalog(fr, map[string]string{
235 addCatalog(fr, map[string]string{
236 "backup.back": "Tous les serveurs de sauvegarde",
237 "backup.servers.title": "Serveurs de sauvegarde",
238 "backup.servers.none": "Aucun serveur de sauvegarde. Ajoutez-en un, puis saisissez sa Backupserver-Key sur le serveur de sauvegarde.",
239 "backup.servers.add": "Ajouter un serveur de sauvegarde",
240 "backup.servers.name": "Nom",
241 "backup.servers.namePh": "p. ex. NAS au sous-sol",
242 "backup.multi": "Un BlueGit peut avoir plusieurs serveurs de sauvegarde, chacun avec sa propre clé. Un serveur de sauvegarde n'appartient qu'à un seul BlueGit.",
243 "backup.col.name": "Nom",
244 "backup.col.state": "État",
245 "backup.col.address": "Adresse",
246 "backup.state.connected": "connecté",
247 "backup.state.waiting": "en attente de la clé",
248 "backup.open": "Gérer",
249 "backup.rename": "Renommer",
250 "backup.status.lastSync": "Dernière synchronisation",
251 "backup.status.result": "Dernier résultat",
252 "backup.status.resultText": "%d fichiers, %d récupérés, %d supprimés",
253 "backup.status.counts": "Synchronisations / notifications",
254 "backup.status.mirror": "Copie",
255 "backup.status.rollback": "Restauration",
256 "backup.status.version": "Version",
257 "backup.act.sync": "Synchroniser maintenant",
258 "backup.act.archive": "Archiver maintenant",
259 "backup.act.prune": "Nettoyer maintenant",
260 "backup.config.title": "Paramètres du serveur de sauvegarde",
261 "backup.config.save": "Enregistrer les paramètres",
262 "backup.config.restart": "Une modification attend un redémarrage du serveur de sauvegarde.",
263 "backup.archive.delete": "Supprimer",
264 "backup.archive.deleteAsk": "Supprimer l'archive %s sur le serveur de sauvegarde ?",
265 "backup.err.tooMany": "au plus %d serveurs de sauvegarde",
266 "backup.err.unknown": "serveur de sauvegarde inconnu",
267 "backup.err.action": "le serveur de sauvegarde ne propose pas cette action",
268 "backup.err.remote": "Serveur de sauvegarde : %s",
269 "backup.ok.renamed": "Serveur de sauvegarde renommé",
270 "backup.ok.action": "Effectué sur le serveur de sauvegarde",
131 "admin.tab.backup": "Sauvegarde",
271 "admin.tab.backup": "Sauvegarde",
132 "backup.title": "Serveur de sauvegarde",
272 "backup.title": "Serveur de sauvegarde",
133 "backup.lead": "Un serveur bluegit-backup séparé copie lentement et progressivement toutes les données et la configuration de ce BlueGit. Il est notifié après chaque modification, conserve des archives compressées et peut ramener ce BlueGit à l’une d’elles.",
273 "backup.lead": "Un serveur bluegit-backup séparé copie lentement et progressivement toutes les données et la configuration de ce BlueGit. Il est notifié après chaque modification, conserve des archives compressées et peut ramener ce BlueGit à l’une d’elles.",
@@ -140,9 +280,9 @@ func init() {
140 "backup.key.replace": "Générer une nouvelle clé",
280 "backup.key.replace": "Générer une nouvelle clé",
141 "backup.key.new": "Générer une Backupserver-Key",
281 "backup.key.new": "Générer une Backupserver-Key",
142 "backup.key.revokeAsk": "Révoquer la clé et déconnecter le serveur ? Ses archives restent sur le serveur de sauvegarde.",
282 "backup.key.revokeAsk": "Révoquer la clé et déconnecter le serveur ? Ses archives restent sur le serveur de sauvegarde.",
143 "backup.key.revoke": "Révoquer la clé",
283 "backup.key.revoke": "Révoquer la clé et supprimer",
144 "backup.instance": "ID d’instance : %s",
284 "backup.instance": "ID d’instance : %s",
145 "backup.server.title": "Serveur de sauvegarde connecté",
285 "backup.server.title": "État",
146 "backup.server.connected": "Connecté : %s",
286 "backup.server.connected": "Connecté : %s",
147 "backup.server.seen": "dernier contact",
287 "backup.server.seen": "dernier contact",
148 "backup.server.settings": "Intervalle d’archivage %s, archives conservées %d jours",
288 "backup.server.settings": "Intervalle d’archivage %s, archives conservées %d jours",
internal/server/admin_users.go +2 −2
@@ -30,13 +30,13 @@ func adminTabs(page string) []AdminTab {
30 30 {Key: "admin.tab.backup", Href: "/admin/backup"},
31 31 }
32 32 for i := range tabs {
33 tabs[i].On = (page == "adminusers" && i == 0) || (page == "adminrunner" && i == 1) || (page == "setup" && i == 2) || (page == "adminpipelines" && i == 3) || (page == "adminbackup" && i == 4)
33 tabs[i].On = (page == "adminusers" && i == 0) || (page == "adminrunner" && i == 1) || (page == "setup" && i == 2) || (page == "adminpipelines" && i == 3) || ((page == "adminbackup" || page == "adminbackupserver") && i == 4)
34 34 }
35 35 return tabs
36 36 }
37 37
38 38 func isAdminPage(page string) bool {
39 return page == "adminusers" || page == "adminrunner" || page == "setup" || page == "adminpipelines" || page == "adminbackup"
39 return page == "adminusers" || page == "adminrunner" || page == "setup" || page == "adminpipelines" || page == "adminbackup" || page == "adminbackupserver"
40 40 }
41 41
42 42 func (s *Server) mountAdmin(mux *http.ServeMux) {
@@ -30,13 +30,13 @@ func adminTabs(page string) []AdminTab {
30 {Key: "admin.tab.backup", Href: "/admin/backup"},
30 {Key: "admin.tab.backup", Href: "/admin/backup"},
31 }
31 }
32 for i := range tabs {
32 for i := range tabs {
33 tabs[i].On = (page == "adminusers" && i == 0) || (page == "adminrunner" && i == 1) || (page == "setup" && i == 2) || (page == "adminpipelines" && i == 3) || (page == "adminbackup" && i == 4)
33 tabs[i].On = (page == "adminusers" && i == 0) || (page == "adminrunner" && i == 1) || (page == "setup" && i == 2) || (page == "adminpipelines" && i == 3) || ((page == "adminbackup" || page == "adminbackupserver") && i == 4)
34 }
34 }
35 return tabs
35 return tabs
36}
36}
37
37
38func isAdminPage(page string) bool {
38func isAdminPage(page string) bool {
39 return page == "adminusers" || page == "adminrunner" || page == "setup" || page == "adminpipelines" || page == "adminbackup"
39 return page == "adminusers" || page == "adminrunner" || page == "setup" || page == "adminpipelines" || page == "adminbackup" || page == "adminbackupserver"
40}
40}
41
41
42func (s *Server) mountAdmin(mux *http.ServeMux) {
42func (s *Server) mountAdmin(mux *http.ServeMux) {
internal/server/api_routes.go +7 −4
@@ -191,9 +191,12 @@ var apiCatalog = []apiRoute{
191 191 {http.MethodPost, "/api/v1/admin/self-update/force", access.ScopeAdmin, authUser, "Install the pending self-update now, without waiting for running jobs", (*Server).apiForceUpdate},
192 192 {http.MethodGet, "/api/v1/admin/cache", access.ScopeAdmin, authUser, "Read cache settings and usage", (*Server).apiAdminCache},
193 193 {http.MethodPut, "/api/v1/admin/cache", access.ScopeAdmin, authUser, "Set cache path", (*Server).apiAdminCache},
194 {http.MethodGet, "/api/v1/admin/backup", access.ScopeAdmin, authUser, "Backup server status and archive list (instance admin)", (*Server).apiAdminBackup},
195 {http.MethodPost, "/api/v1/admin/backup/key", access.ScopeAdmin, authUser, "Generate a new Backupserver-Key; shown once, replaces the old key (instance admin)", (*Server).apiAdminBackupKey},
196 {http.MethodDelete, "/api/v1/admin/backup/key", access.ScopeAdmin, authUser, "Revoke the Backupserver-Key and forget the backup server (instance admin)", (*Server).apiAdminBackupRevoke},
197 {http.MethodPost, "/api/v1/admin/backup/rollback", access.ScopeAdmin, authUser, "Roll back to a backup archive. Irreversible. Body {archive, confirm: archive name again} (instance admin)", (*Server).apiAdminBackupRollback},
194 {http.MethodGet, "/api/v1/admin/backup", access.ScopeAdmin, authUser, "List backup servers (instance admin)", (*Server).apiAdminBackup},
195 {http.MethodPost, "/api/v1/admin/backup/servers", access.ScopeAdmin, authUser, "Add a backup server. Body {name}. Returns its Backupserver-Key once (instance admin)", (*Server).apiAdminBackupAdd},
196 {http.MethodGet, "/api/v1/admin/backup/servers/{id}", access.ScopeAdmin, authUser, "Backup server with its status, archives and settings, as the backup server reports them (instance admin)", (*Server).apiAdminBackupServer},
197 {http.MethodPut, "/api/v1/admin/backup/servers/{id}", access.ScopeAdmin, authUser, "Rename a backup server. Body {name} (instance admin)", (*Server).apiAdminBackupRename},
198 {http.MethodPost, "/api/v1/admin/backup/servers/{id}/key", access.ScopeAdmin, authUser, "New Backupserver-Key for this backup server; shown once, the old key stops working (instance admin)", (*Server).apiAdminBackupKey},
199 {http.MethodDelete, "/api/v1/admin/backup/servers/{id}", access.ScopeAdmin, authUser, "Disconnect and forget a backup server; its archives stay there (instance admin)", (*Server).apiAdminBackupRemove},
200 {http.MethodPost, "/api/v1/admin/backup/servers/{id}/actions/{name}", access.ScopeAdmin, authUser, "Run an action of the backup server (status, config, config.update, sync, archive, prune, archives, archive.delete, rollback, disconnect). rollback is irreversible and needs {archive, confirm: archive name again} (instance admin)", (*Server).apiAdminBackupAction},
198 201 {http.MethodPost, "/api/v1/admin/cache/clear", access.ScopeAdmin, authUser, "Clear the read cache", (*Server).apiAdminCacheClear},
199 202 }
@@ -191,9 +191,12 @@ var apiCatalog = []apiRoute{
191 {http.MethodPost, "/api/v1/admin/self-update/force", access.ScopeAdmin, authUser, "Install the pending self-update now, without waiting for running jobs", (*Server).apiForceUpdate},
191 {http.MethodPost, "/api/v1/admin/self-update/force", access.ScopeAdmin, authUser, "Install the pending self-update now, without waiting for running jobs", (*Server).apiForceUpdate},
192 {http.MethodGet, "/api/v1/admin/cache", access.ScopeAdmin, authUser, "Read cache settings and usage", (*Server).apiAdminCache},
192 {http.MethodGet, "/api/v1/admin/cache", access.ScopeAdmin, authUser, "Read cache settings and usage", (*Server).apiAdminCache},
193 {http.MethodPut, "/api/v1/admin/cache", access.ScopeAdmin, authUser, "Set cache path", (*Server).apiAdminCache},
193 {http.MethodPut, "/api/v1/admin/cache", access.ScopeAdmin, authUser, "Set cache path", (*Server).apiAdminCache},
194 {http.MethodGet, "/api/v1/admin/backup", access.ScopeAdmin, authUser, "Backup server status and archive list (instance admin)", (*Server).apiAdminBackup},
194 {http.MethodGet, "/api/v1/admin/backup", access.ScopeAdmin, authUser, "List backup servers (instance admin)", (*Server).apiAdminBackup},
195 {http.MethodPost, "/api/v1/admin/backup/key", access.ScopeAdmin, authUser, "Generate a new Backupserver-Key; shown once, replaces the old key (instance admin)", (*Server).apiAdminBackupKey},
195 {http.MethodPost, "/api/v1/admin/backup/servers", access.ScopeAdmin, authUser, "Add a backup server. Body {name}. Returns its Backupserver-Key once (instance admin)", (*Server).apiAdminBackupAdd},
196 {http.MethodDelete, "/api/v1/admin/backup/key", access.ScopeAdmin, authUser, "Revoke the Backupserver-Key and forget the backup server (instance admin)", (*Server).apiAdminBackupRevoke},
196 {http.MethodGet, "/api/v1/admin/backup/servers/{id}", access.ScopeAdmin, authUser, "Backup server with its status, archives and settings, as the backup server reports them (instance admin)", (*Server).apiAdminBackupServer},
197 {http.MethodPost, "/api/v1/admin/backup/rollback", access.ScopeAdmin, authUser, "Roll back to a backup archive. Irreversible. Body {archive, confirm: archive name again} (instance admin)", (*Server).apiAdminBackupRollback},
197 {http.MethodPut, "/api/v1/admin/backup/servers/{id}", access.ScopeAdmin, authUser, "Rename a backup server. Body {name} (instance admin)", (*Server).apiAdminBackupRename},
198 {http.MethodPost, "/api/v1/admin/backup/servers/{id}/key", access.ScopeAdmin, authUser, "New Backupserver-Key for this backup server; shown once, the old key stops working (instance admin)", (*Server).apiAdminBackupKey},
199 {http.MethodDelete, "/api/v1/admin/backup/servers/{id}", access.ScopeAdmin, authUser, "Disconnect and forget a backup server; its archives stay there (instance admin)", (*Server).apiAdminBackupRemove},
200 {http.MethodPost, "/api/v1/admin/backup/servers/{id}/actions/{name}", access.ScopeAdmin, authUser, "Run an action of the backup server (status, config, config.update, sync, archive, prune, archives, archive.delete, rollback, disconnect). rollback is irreversible and needs {archive, confirm: archive name again} (instance admin)", (*Server).apiAdminBackupAction},
198 {http.MethodPost, "/api/v1/admin/cache/clear", access.ScopeAdmin, authUser, "Clear the read cache", (*Server).apiAdminCacheClear},
201 {http.MethodPost, "/api/v1/admin/cache/clear", access.ScopeAdmin, authUser, "Clear the read cache", (*Server).apiAdminCacheClear},
199}
202}
internal/server/backup.go +420 −117
@@ -17,10 +17,12 @@ import (
17 17 "gitlab.com/Timfa/bluegit/internal/i18n"
18 18 )
19 19
20 // Beheer > Backup: één losse backup server (repo bluegit-backup) haalt met
21 // een Backupserver-Key alle gegevens op, krijgt een melding bij elke
22 // wijziging, en kan een archief terugsturen (rollback). Het protocol staat
23 // in docs/BACKUP.md.
20 // Beheer > Backup: een of meer losse backup servers (repo bluegit-backup)
21 // halen elk met een eigen Backupserver-Key alle gegevens op, krijgen een
22 // melding bij elke wijziging, en kunnen een archief terugsturen (rollback).
23 // Vanuit BlueGit is elke backup server ook te bedienen: BlueGit stuurt
24 // ondertekende verzoeken naar de beheer-API van de backup server. Het
25 // protocol staat in docs/BACKUP.md.
24 26
25 27 // maxRestoreBytes begrenst een terug te zetten archief (64 GiB).
26 28 const maxRestoreBytes = 64 << 30
@@ -32,12 +34,21 @@ var (
32 34
33 35 // BackupView is de stand op Beheer > Backup.
34 36 type BackupView struct {
35 Conn backup.Conn
36 NewKey string
37 Archives []backup.Archive
38 Remote *backup.RemoteStatus
39 RemoteErr string
40 37 InstanceID string
38 Servers []backup.Conn
39 Max int
40 // Current is de geopende backup server (detailpagina).
41 Current *BackupServerView
42 NewKey string
43 }
44
45 // BackupServerView is één backup server met wat hij zelf meldt.
46 type BackupServerView struct {
47 Conn backup.Conn
48 Remote *backup.RemoteStatus
49 Archives []backup.Archive
50 Config *backup.RemoteConfig
51 RemoteErr string
41 52 }
42 53
43 54 func (s *Server) backupInit() {
@@ -81,9 +92,12 @@ func (s *Server) mountBackup(mux *http.ServeMux) {
81 92 mux.HandleFunc("GET /api/v1/backup/file", s.backupKeyed(s.backupFile))
82 93 mux.HandleFunc("POST /api/v1/backup/restore", s.backupKeyed(s.backupRestore))
83 94 mux.HandleFunc("GET /admin/backup", s.adminBackup)
84 mux.HandleFunc("POST /admin/backup/key", s.adminBackupKey)
85 mux.HandleFunc("POST /admin/backup/revoke", s.adminBackupRevoke)
86 mux.HandleFunc("POST /admin/backup/rollback", s.adminBackupRollback)
95 mux.HandleFunc("POST /admin/backup/servers", s.adminBackupAdd)
96 mux.HandleFunc("GET /admin/backup/s/{id}", s.adminBackupServer)
97 mux.HandleFunc("POST /admin/backup/s/{id}/key", s.adminBackupKey)
98 mux.HandleFunc("POST /admin/backup/s/{id}/rename", s.adminBackupRename)
99 mux.HandleFunc("POST /admin/backup/s/{id}/remove", s.adminBackupRemove)
100 mux.HandleFunc("POST /admin/backup/s/{id}/act/{name}", s.adminBackupAct)
87 101 }
88 102
89 103 // backupWatch meldt na elk schrijvend verzoek een wijziging. De backup
@@ -121,7 +135,8 @@ func (s *Server) backupKeyed(h func(http.ResponseWriter, *http.Request)) http.Ha
121 135 return
122 136 }
123 137 s.backupInit()
124 if _, ok := s.backupMgr.Check(bearer(r)); !ok {
138 conn, ok := s.backupMgr.Check(bearer(r))
139 if !ok {
125 140 // Alleen mislukte pogingen tellen: hoogstens 5 per minuut per IP.
126 141 if !backupFails.allow(clientIP(r), time.Now()) {
127 142 backupErr(w, http.StatusTooManyRequests, "te veel mislukte pogingen")
@@ -130,20 +145,27 @@ func (s *Server) backupKeyed(h func(http.ResponseWriter, *http.Request)) http.Ha
130 145 backupErr(w, http.StatusUnauthorized, "ongeldige Backupserver-Key")
131 146 return
132 147 }
133 s.backupMgr.Seen()
134 h(w, r)
148 s.backupMgr.Seen(conn.ID)
149 h(w, r.WithContext(context.WithValue(r.Context(), backupConnKey{}, conn)))
135 150 }
136 151 }
137 152
153 type backupConnKey struct{}
154
155 func backupConnOf(r *http.Request) backup.Conn {
156 c, _ := r.Context().Value(backupConnKey{}).(backup.Conn)
157 return c
158 }
159
138 160 func (s *Server) backupInfo(w http.ResponseWriter, r *http.Request) {
139 161 id, err := s.backupMgr.InstanceID()
140 162 if err != nil {
141 163 backupErr(w, 500, err.Error())
142 164 return
143 165 }
144 c, _ := s.backupMgr.Load()
166 c := backupConnOf(r)
145 167 writeJSON(w, http.StatusOK, map[string]any{
146 "instance_id": id, "base_url": s.Cfg.BaseURL, "server_url": c.ServerURL, "server_id": c.ServerID,
168 "instance_id": id, "base_url": s.Cfg.BaseURL, "name": c.Name, "server_url": c.ServerURL, "server_id": c.ServerID,
147 169 "has_storage": s.StoragePath() != "",
148 170 })
149 171 }
@@ -162,14 +184,14 @@ func (s *Server) backupConnect(w http.ResponseWriter, r *http.Request) {
162 184 backupErr(w, 400, "server_url moet een http(s)-adres zijn")
163 185 return
164 186 }
165 c, err := s.backupMgr.Connect(u.String(), strings.TrimSpace(in.ServerID))
187 c, err := s.backupMgr.Connect(backupConnOf(r).ID, u.String(), strings.TrimSpace(in.ServerID))
166 188 if err != nil {
167 189 backupErr(w, 500, err.Error())
168 190 return
169 191 }
170 192 id, _ := s.backupMgr.InstanceID()
171 193 if s.Log != nil {
172 s.Log.Info("backup audit", "action", "connect", "server", c.ServerURL, "server_id", c.ServerID)
194 s.Log.Info("backup audit", "action", "connect", "id", c.ID, "name", c.Name, "server", c.ServerURL, "server_id", c.ServerID)
173 195 }
174 196 writeJSON(w, http.StatusOK, map[string]any{"instance_id": id, "server_url": c.ServerURL})
175 197 }
@@ -230,7 +252,7 @@ func (s *Server) backupRestore(w http.ResponseWriter, r *http.Request) {
230 252 return
231 253 }
232 254 if s.Log != nil {
233 s.Log.Warn("backup audit", "action", "restore_staged", "files", n)
255 s.Log.Warn("backup audit", "action", "restore_staged", "files", n, "id", backupConnOf(r).ID, "name", backupConnOf(r).Name)
234 256 }
235 257 writeJSON(w, http.StatusAccepted, map[string]any{"files": n, "restarting": s.RequestRestart != nil})
236 258 if f, ok := w.(http.Flusher); ok {
@@ -246,193 +268,474 @@ func (s *Server) backupRestore(w http.ResponseWriter, r *http.Request) {
246 268
247 269 // ---------- Beheer > Backup ----------
248 270
249 func (s *Server) backupView(r *http.Request) *BackupView {
271 func (s *Server) backupList() *BackupView {
250 272 s.backupInit()
251 bv := &BackupView{}
252 bv.Conn, _ = s.backupMgr.Load()
273 bv := &BackupView{Max: backup.MaxServers}
274 bv.Servers, _ = s.backupMgr.List()
253 275 bv.InstanceID, _ = s.backupMgr.InstanceID()
254 if bv.Conn.Connected() {
255 ctx, cancel := context.WithTimeout(r.Context(), 8*time.Second)
256 defer cancel()
257 arch, err := s.backupClient().Archives(ctx)
258 if err != nil {
259 bv.RemoteErr = err.Error()
260 } else {
261 bv.Archives = arch
262 if st, err := s.backupClient().Status(ctx); err == nil {
263 bv.Remote = &st
264 }
265 }
266 }
267 276 return bv
268 277 }
269 278
279 // backupServerView vraagt status, archieven en instellingen op bij de
280 // backup server.
281 func (s *Server) backupServerView(ctx context.Context, conn backup.Conn) *BackupServerView {
282 v := &BackupServerView{Conn: conn}
283 if !conn.Connected() {
284 return v
285 }
286 ctx, cancel := context.WithTimeout(ctx, 8*time.Second)
287 defer cancel()
288 c := s.backupClient()
289 st, err := c.Status(ctx, conn)
290 if err != nil {
291 v.RemoteErr = err.Error()
292 return v
293 }
294 v.Remote = &st
295 if arch, err := c.Archives(ctx, conn); err == nil {
296 v.Archives = arch
297 } else {
298 v.RemoteErr = err.Error()
299 }
300 if cfg, err := c.Config(ctx, conn); err == nil {
301 v.Config = &cfg
302 } else if v.RemoteErr == "" {
303 v.RemoteErr = err.Error()
304 }
305 return v
306 }
307
270 308 func (s *Server) adminBackup(w http.ResponseWriter, r *http.Request) {
271 309 if ok, _ := s.adminOnly(w, r); !ok {
272 310 return
273 311 }
274 312 v := s.view(w, r, "title.admin")
275 313 v.Page = "adminbackup"
276 v.Backup = s.backupView(r)
314 v.Backup = s.backupList()
315 s.render(w, "adminbackup", v)
316 }
317
318 func (s *Server) backupConnFromPath(w http.ResponseWriter, r *http.Request) (backup.Conn, bool) {
319 s.backupInit()
320 c, ok := s.backupMgr.Get(r.PathValue("id"))
321 if !ok {
322 http.NotFound(w, r)
323 }
324 return c, ok
325 }
326
327 func backupPath(id string) string { return "/admin/backup/s/" + url.PathEscape(id) }
328
329 func (s *Server) adminBackupServer(w http.ResponseWriter, r *http.Request) {
330 if ok, _ := s.adminOnly(w, r); !ok {
331 return
332 }
333 conn, ok := s.backupConnFromPath(w, r)
334 if !ok {
335 return
336 }
337 v := s.view(w, r, "title.admin")
338 v.Page = "adminbackupserver"
339 v.Backup = s.backupList()
340 v.Backup.Current = s.backupServerView(r.Context(), conn)
277 341 if c, err := r.Cookie("bluegit_backup_key"); err == nil && c.Value != "" {
278 342 v.Backup.NewKey = c.Value
279 http.SetCookie(w, &http.Cookie{Name: "bluegit_backup_key", Value: "", Path: "/admin/backup", MaxAge: -1})
343 http.SetCookie(w, &http.Cookie{Name: "bluegit_backup_key", Value: "", Path: backupPath(conn.ID), MaxAge: -1})
280 344 }
281 345 s.render(w, "adminbackup", v)
282 346 }
283 347
284 func (s *Server) adminBackupKey(w http.ResponseWriter, r *http.Request) {
348 // showKeyOnce zet de nieuwe key in een kort, HttpOnly cookie dat alleen de
349 // pagina van die backup server leest.
350 func (s *Server) showKeyOnce(w http.ResponseWriter, id, key string) {
351 http.SetCookie(w, &http.Cookie{
352 Name: "bluegit_backup_key", Value: key, Path: backupPath(id), MaxAge: 60, HttpOnly: true,
353 SameSite: http.SameSiteStrictMode, Secure: strings.HasPrefix(s.Cfg.BaseURL, "https://"),
354 })
355 }
356
357 func (s *Server) backupAudit(action, by string, kv ...any) {
358 if s.Log != nil {
359 s.Log.Info("backup audit", append([]any{"action", action, "by", by}, kv...)...)
360 }
361 }
362
363 func (s *Server) adminBackupAdd(w http.ResponseWriter, r *http.Request) {
285 364 if ok, _ := s.adminOnly(w, r); !ok || !s.csrfOK(w, r) {
286 365 return
287 366 }
288 367 s.backupInit()
289 key, _, err := s.backupMgr.NewKey(s.who(r).User.Username)
368 by := s.who(r).User.Username
369 key, c, err := s.backupMgr.Add(r.FormValue("name"), by)
290 370 if err != nil {
291 s.redirect(w, r, "/admin/backup", "", err.Error())
371 s.redirect(w, r, "/admin/backup", "", s.backupErrText(r, err))
292 372 return
293 373 }
294 if s.Log != nil {
295 s.Log.Info("backup audit", "action", "new_key", "by", s.who(r).User.Username)
374 s.backupAudit("add", by, "id", c.ID, "name", c.Name)
375 s.showKeyOnce(w, c.ID, key)
376 s.redirect(w, r, backupPath(c.ID), s.tr(r, "backup.ok.key"), "")
377 }
378
379 func (s *Server) backupErrText(r *http.Request, err error) string {
380 switch {
381 case errors.Is(err, backup.ErrTooMany):
382 return s.tr(r, "backup.err.tooMany", backup.MaxServers)
383 case errors.Is(err, backup.ErrUnknown):
384 return s.tr(r, "backup.err.unknown")
296 385 }
297 // Eenmalig tonen: kort, HttpOnly cookie alleen voor deze pagina.
298 http.SetCookie(w, &http.Cookie{
299 Name: "bluegit_backup_key", Value: key, Path: "/admin/backup", MaxAge: 60, HttpOnly: true,
300 SameSite: http.SameSiteStrictMode, Secure: strings.HasPrefix(s.Cfg.BaseURL, "https://"),
301 })
302 s.redirect(w, r, "/admin/backup", s.tr(r, "backup.ok.key"), "")
386 return s.trErr(r, unwrapFail(err))
303 387 }
304 388
305 func (s *Server) adminBackupRevoke(w http.ResponseWriter, r *http.Request) {
389 func (s *Server) adminBackupKey(w http.ResponseWriter, r *http.Request) {
306 390 if ok, _ := s.adminOnly(w, r); !ok || !s.csrfOK(w, r) {
307 391 return
308 392 }
309 s.backupInit()
310 if err := s.backupMgr.Revoke(); err != nil {
311 s.redirect(w, r, "/admin/backup", "", err.Error())
393 conn, ok := s.backupConnFromPath(w, r)
394 if !ok {
312 395 return
313 396 }
314 if s.Log != nil {
315 s.Log.Info("backup audit", "action", "revoke", "by", s.who(r).User.Username)
397 by := s.who(r).User.Username
398 key, _, err := s.backupMgr.RotateKey(conn.ID, by)
399 if err != nil {
400 s.redirect(w, r, backupPath(conn.ID), "", s.backupErrText(r, err))
401 return
316 402 }
317 s.redirect(w, r, "/admin/backup", s.tr(r, "backup.ok.revoked"), "")
403 s.backupAudit("new_key", by, "id", conn.ID, "name", conn.Name)
404 s.showKeyOnce(w, conn.ID, key)
405 s.redirect(w, r, backupPath(conn.ID), s.tr(r, "backup.ok.key"), "")
318 406 }
319 407
320 func (s *Server) startRollback(ctx context.Context, by, archive, confirm string) error {
321 s.backupInit()
322 archive = strings.TrimSpace(archive)
323 if archive == "" {
324 return fail(400, i18n.E("backup.err.archive"))
408 func (s *Server) adminBackupRename(w http.ResponseWriter, r *http.Request) {
409 if ok, _ := s.adminOnly(w, r); !ok || !s.csrfOK(w, r) {
410 return
325 411 }
326 if strings.TrimSpace(confirm) != archive {
327 return fail(400, i18n.E("backup.err.confirm"))
412 conn, ok := s.backupConnFromPath(w, r)
413 if !ok {
414 return
328 415 }
329 c, _ := s.backupMgr.Load()
330 if !c.Connected() {
331 return fail(409, i18n.E("backup.err.none"))
416 if _, err := s.backupMgr.Rename(conn.ID, r.FormValue("name")); err != nil {
417 s.redirect(w, r, backupPath(conn.ID), "", s.backupErrText(r, err))
418 return
332 419 }
333 if err := s.backupClient().Rollback(ctx, archive); err != nil {
334 return fail(502, err)
420 s.redirect(w, r, backupPath(conn.ID), s.tr(r, "backup.ok.renamed"), "")
421 }
422
423 // removeBackupServer laat de backup server ontkoppelen (als hij bereikbaar
424 // is) en vergeet hem daarna.
425 func (s *Server) removeBackupServer(ctx context.Context, by string, conn backup.Conn) error {
426 if conn.Connected() {
427 ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
428 _, _, _ = s.backupClient().Call(ctx, conn, http.MethodPost, "/api/v1/admin/disconnect", map[string]any{})
429 cancel()
335 430 }
336 if s.Log != nil {
337 s.Log.Warn("backup audit", "action", "rollback", "by", by, "archive", archive)
431 if err := s.backupMgr.Remove(conn.ID); err != nil {
432 return err
338 433 }
434 s.backupAudit("remove", by, "id", conn.ID, "name", conn.Name)
339 435 return nil
340 436 }
341 437
342 func (s *Server) adminBackupRollback(w http.ResponseWriter, r *http.Request) {
438 func (s *Server) adminBackupRemove(w http.ResponseWriter, r *http.Request) {
343 439 if ok, _ := s.adminOnly(w, r); !ok || !s.csrfOK(w, r) {
344 440 return
345 441 }
346 if r.FormValue("understood") != "1" {
347 s.redirect(w, r, "/admin/backup", "", s.tr(r, "backup.err.understood"))
442 conn, ok := s.backupConnFromPath(w, r)
443 if !ok {
348 444 return
349 445 }
350 if err := s.startRollback(r.Context(), s.who(r).User.Username, r.FormValue("archive"), r.FormValue("confirm")); err != nil {
351 s.redirect(w, r, "/admin/backup", "", s.trErr(r, unwrapFail(err)))
446 if err := s.removeBackupServer(r.Context(), s.who(r).User.Username, conn); err != nil {
447 s.redirect(w, r, backupPath(conn.ID), "", s.backupErrText(r, err))
352 448 return
353 449 }
354 s.redirect(w, r, "/admin/backup", s.tr(r, "backup.ok.rollback", r.FormValue("archive")), "")
450 s.redirect(w, r, "/admin/backup", s.tr(r, "backup.ok.revoked"), "")
355 451 }
356 452
357 func unwrapFail(err error) error {
358 var oe interface{ Unwrap() error }
359 if errors.As(err, &oe) && oe.Unwrap() != nil {
360 return oe.Unwrap()
453 // backupAction voert een beheeractie van de backup server uit. BlueGit kent
454 // de acties niet vooraf: de backup server noemt ze (GET /api/v1/admin/actions),
455 // zodat alles wat zijn eigen webinterface kan, ook hier kan.
456 func (s *Server) backupAction(ctx context.Context, by string, conn backup.Conn, name string, in map[string]any) (int, []byte, error) {
457 if !conn.Connected() {
458 return 0, nil, fail(409, i18n.E("backup.err.none"))
459 }
460 ctx, cancel := context.WithTimeout(ctx, 60*time.Second)
461 defer cancel()
462 c := s.backupClient()
463 actions, err := c.Actions(ctx, conn)
464 if err != nil {
465 return 0, nil, fail(502, err)
361 466 }
362 return err
467 var act *backup.RemoteAction
468 for i := range actions {
469 if actions[i].Name == name && actions[i].Signed {
470 act = &actions[i]
471 }
472 }
473 if act == nil {
474 return 0, nil, fail(404, i18n.E("backup.err.action"))
475 }
476 str := func(k string) string {
477 v, _ := in[k].(string)
478 return strings.TrimSpace(v)
479 }
480 if name == "rollback" {
481 if str("archive") == "" {
482 return 0, nil, fail(400, i18n.E("backup.err.archive"))
483 }
484 if str("confirm") != str("archive") {
485 return 0, nil, fail(400, i18n.E("backup.err.confirm"))
486 }
487 }
488 if name == "sync" {
489 if _, ok := in["wait"]; !ok {
490 in["wait"] = "false"
491 }
492 }
493 p := act.Path
494 for _, param := range act.Params {
495 v := str(param)
496 if v == "" {
497 return 0, nil, fail(400, i18n.E("backup.err.archive"))
498 }
499 p = strings.ReplaceAll(p, "{"+param+"}", url.PathEscape(v))
500 delete(in, param)
501 }
502 var body any
503 if act.Method != http.MethodGet {
504 body = in
505 }
506 hc := *s.backupHTTP
507 hc.Timeout = 60 * time.Second
508 cl := *c
509 cl.HTTP = &hc
510 code, raw, err := cl.Call(ctx, conn, act.Method, p, body)
511 if err != nil {
512 return 0, nil, fail(502, err)
513 }
514 if act.Method != http.MethodGet {
515 kv := []any{"id", conn.ID, "name", conn.Name, "remote_action", name, "status", code}
516 if a := str("archive"); a != "" {
517 kv = append(kv, "archive", a)
518 }
519 if s.Log != nil && name == "rollback" {
520 s.Log.Warn("backup audit", append([]any{"action", "rollback", "by", by}, kv...)...)
521 } else {
522 s.backupAudit("remote", by, kv...)
523 }
524 }
525 return code, raw, nil
526 }
527
528 func (s *Server) adminBackupAct(w http.ResponseWriter, r *http.Request) {
529 if ok, _ := s.adminOnly(w, r); !ok || !s.csrfOK(w, r) {
530 return
531 }
532 conn, ok := s.backupConnFromPath(w, r)
533 if !ok {
534 return
535 }
536 back := backupPath(conn.ID)
537 name := r.PathValue("name")
538 if name == "rollback" && r.FormValue("understood") != "1" {
539 s.redirect(w, r, back, "", s.tr(r, "backup.err.understood"))
540 return
541 }
542 in := map[string]any{}
543 _ = r.ParseForm()
544 for k, v := range r.PostForm {
545 if k == "csrf" || k == "understood" || len(v) == 0 {
546 continue
547 }
548 in[k] = v[0]
549 }
550 code, raw, err := s.backupAction(r.Context(), s.who(r).User.Username, conn, name, in)
551 if err != nil {
552 s.redirect(w, r, back, "", s.backupErrText(r, err))
553 return
554 }
555 if code >= 300 {
556 var e struct {
557 Error string `json:"error"`
558 }
559 _ = json.Unmarshal(raw, &e)
560 if e.Error == "" {
561 e.Error = http.StatusText(code)
562 }
563 s.redirect(w, r, back, "", s.tr(r, "backup.err.remote", e.Error))
564 return
565 }
566 msg := s.tr(r, "backup.ok.action")
567 if name == "rollback" {
568 msg = s.tr(r, "backup.ok.rollback", in["archive"])
569 }
570 s.redirect(w, r, back, msg, "")
363 571 }
364 572
365 573 // ---------- API voor beheerders ----------
366 574
367 func (s *Server) apiAdminBackup(w http.ResponseWriter, r *http.Request) {
575 func backupConnJSON(c backup.Conn) map[string]any {
576 out := map[string]any{
577 "id": c.ID, "name": c.Name, "key_hint": c.KeyHint, "created_at": rfcTime(c.CreatedAt), "created_by": c.CreatedBy,
578 "connected": c.Connected(), "server_url": c.ServerURL, "server_id": c.ServerID,
579 }
580 if c.Connected() {
581 out["connected_at"] = rfcTime(c.ConnectedAt)
582 out["last_seen"] = rfcTime(c.LastSeen)
583 }
584 return out
585 }
586
587 func (s *Server) apiBackupAdmin(w http.ResponseWriter, r *http.Request) bool {
368 588 if !apiUser(r).InstanceAdmin {
369 589 s.writeAPIErr(w, r, fail(403, i18n.E("err.forbidden")))
590 return false
591 }
592 s.backupInit()
593 return true
594 }
595
596 func (s *Server) apiBackupConn(w http.ResponseWriter, r *http.Request) (backup.Conn, bool) {
597 if !s.apiBackupAdmin(w, r) {
598 return backup.Conn{}, false
599 }
600 c, ok := s.backupMgr.Get(r.PathValue("id"))
601 if !ok {
602 s.writeAPIErr(w, r, fail(404, i18n.E("backup.err.unknown")))
603 }
604 return c, ok
605 }
606
607 func (s *Server) apiAdminBackup(w http.ResponseWriter, r *http.Request) {
608 if !s.apiBackupAdmin(w, r) {
370 609 return
371 610 }
372 bv := s.backupView(r)
373 out := map[string]any{
374 "instance_id": bv.InstanceID, "has_key": bv.Conn.HasKey(), "key_hint": bv.Conn.KeyHint,
375 "connected": bv.Conn.Connected(), "server_url": bv.Conn.ServerURL, "server_id": bv.Conn.ServerID,
376 "archives": bv.Archives, "remote_error": bv.RemoteErr,
611 bv := s.backupList()
612 servers := make([]map[string]any, 0, len(bv.Servers))
613 for _, c := range bv.Servers {
614 servers = append(servers, backupConnJSON(c))
377 615 }
378 if bv.Conn.Connected() {
379 out["last_seen"] = rfcTime(bv.Conn.LastSeen)
616 writeJSON(w, http.StatusOK, map[string]any{"instance_id": bv.InstanceID, "max_servers": bv.Max, "servers": servers})
617 }
618
619 func (s *Server) apiAdminBackupAdd(w http.ResponseWriter, r *http.Request) {
620 if !s.apiBackupAdmin(w, r) {
621 return
622 }
623 var in struct {
624 Name string `json:"name"`
625 }
626 _ = readJSON(r, &in)
627 by := apiUser(r).Username
628 key, c, err := s.backupMgr.Add(in.Name, by)
629 if errors.Is(err, backup.ErrTooMany) {
630 s.writeAPIErr(w, r, fail(409, err))
631 return
632 }
633 if err != nil {
634 s.writeAPIErr(w, r, fail(500, err))
635 return
380 636 }
381 if bv.Archives == nil {
637 s.backupAudit("add", by, "id", c.ID, "name", c.Name)
638 out := backupConnJSON(c)
639 out["key"] = key
640 writeJSON(w, http.StatusCreated, out)
641 }
642
643 func (s *Server) apiAdminBackupServer(w http.ResponseWriter, r *http.Request) {
644 c, ok := s.apiBackupConn(w, r)
645 if !ok {
646 return
647 }
648 v := s.backupServerView(r.Context(), c)
649 out := backupConnJSON(c)
650 out["archives"] = v.Archives
651 if v.Archives == nil {
382 652 out["archives"] = []backup.Archive{}
383 653 }
384 if bv.Remote != nil {
385 out["remote"] = bv.Remote
654 if v.Remote != nil {
655 out["remote"] = v.Remote
656 }
657 if v.Config != nil {
658 out["config"] = v.Config
386 659 }
660 out["remote_error"] = v.RemoteErr
387 661 writeJSON(w, http.StatusOK, out)
388 662 }
389 663
664 func (s *Server) apiAdminBackupRename(w http.ResponseWriter, r *http.Request) {
665 c, ok := s.apiBackupConn(w, r)
666 if !ok {
667 return
668 }
669 var in struct {
670 Name string `json:"name"`
671 }
672 if err := readJSON(r, &in); err != nil {
673 s.writeAPIErr(w, r, fail(400, err))
674 return
675 }
676 c, err := s.backupMgr.Rename(c.ID, in.Name)
677 if err != nil {
678 s.writeAPIErr(w, r, fail(400, err))
679 return
680 }
681 writeJSON(w, http.StatusOK, backupConnJSON(c))
682 }
683
390 684 func (s *Server) apiAdminBackupKey(w http.ResponseWriter, r *http.Request) {
391 if !apiUser(r).InstanceAdmin {
392 s.writeAPIErr(w, r, fail(403, i18n.E("err.forbidden")))
685 c, ok := s.apiBackupConn(w, r)
686 if !ok {
393 687 return
394 688 }
395 s.backupInit()
396 key, c, err := s.backupMgr.NewKey(apiUser(r).Username)
689 by := apiUser(r).Username
690 key, c, err := s.backupMgr.RotateKey(c.ID, by)
397 691 if err != nil {
398 692 s.writeAPIErr(w, r, fail(500, err))
399 693 return
400 694 }
401 if s.Log != nil {
402 s.Log.Info("backup audit", "action", "new_key", "by", apiUser(r).Username)
403 }
404 writeJSON(w, http.StatusCreated, map[string]any{"key": key, "key_hint": c.KeyHint, "created_at": rfcTime(c.CreatedAt)})
695 s.backupAudit("new_key", by, "id", c.ID, "name", c.Name)
696 out := backupConnJSON(c)
697 out["key"] = key
698 writeJSON(w, http.StatusCreated, out)
405 699 }
406 700
407 func (s *Server) apiAdminBackupRevoke(w http.ResponseWriter, r *http.Request) {
408 if !apiUser(r).InstanceAdmin {
409 s.writeAPIErr(w, r, fail(403, i18n.E("err.forbidden")))
701 func (s *Server) apiAdminBackupRemove(w http.ResponseWriter, r *http.Request) {
702 c, ok := s.apiBackupConn(w, r)
703 if !ok {
410 704 return
411 705 }
412 s.backupInit()
413 if err := s.backupMgr.Revoke(); err != nil {
706 if err := s.removeBackupServer(r.Context(), apiUser(r).Username, c); err != nil {
414 707 s.writeAPIErr(w, r, fail(500, err))
415 708 return
416 709 }
417 710 writeJSON(w, http.StatusNoContent, nil)
418 711 }
419 712
420 func (s *Server) apiAdminBackupRollback(w http.ResponseWriter, r *http.Request) {
421 if !apiUser(r).InstanceAdmin {
422 s.writeAPIErr(w, r, fail(403, i18n.E("err.forbidden")))
713 func (s *Server) apiAdminBackupAction(w http.ResponseWriter, r *http.Request) {
714 c, ok := s.apiBackupConn(w, r)
715 if !ok {
423 716 return
424 717 }
425 var in struct {
426 Archive string `json:"archive"`
427 Confirm string `json:"confirm"`
428 }
429 if err := readJSON(r, &in); err != nil {
430 s.writeAPIErr(w, r, fail(400, i18n.E("backup.err.archive")))
431 return
718 in := map[string]any{}
719 if r.ContentLength != 0 {
720 if err := readJSON(r, &in); err != nil {
721 s.writeAPIErr(w, r, fail(400, err))
722 return
723 }
432 724 }
433 if err := s.startRollback(r.Context(), apiUser(r).Username, in.Archive, in.Confirm); err != nil {
725 code, raw, err := s.backupAction(r.Context(), apiUser(r).Username, c, r.PathValue("name"), in)
726 if err != nil {
434 727 s.writeAPIErr(w, r, err)
435 728 return
436 729 }
437 writeJSON(w, http.StatusAccepted, map[string]any{"archive": in.Archive, "state": "started"})
730 w.Header().Set("Content-Type", "application/json")
731 w.WriteHeader(code)
732 _, _ = w.Write(raw)
733 }
734
735 func unwrapFail(err error) error {
736 var oe interface{ Unwrap() error }
737 if errors.As(err, &oe) && oe.Unwrap() != nil {
738 return oe.Unwrap()
739 }
740 return err
438 741 }
@@ -17,10 +17,12 @@ import (
17 "gitlab.com/Timfa/bluegit/internal/i18n"
17 "gitlab.com/Timfa/bluegit/internal/i18n"
18)
18)
19
19
20// Beheer > Backup: één losse backup server (repo bluegit-backup) haalt met
20// Beheer > Backup: een of meer losse backup servers (repo bluegit-backup)
21// een Backupserver-Key alle gegevens op, krijgt een melding bij elke
21// halen elk met een eigen Backupserver-Key alle gegevens op, krijgen een
22// wijziging, en kan een archief terugsturen (rollback). Het protocol staat
22// melding bij elke wijziging, en kunnen een archief terugsturen (rollback).
23// in docs/BACKUP.md.
23// Vanuit BlueGit is elke backup server ook te bedienen: BlueGit stuurt
24// ondertekende verzoeken naar de beheer-API van de backup server. Het
25// protocol staat in docs/BACKUP.md.
24
26
25// maxRestoreBytes begrenst een terug te zetten archief (64 GiB).
27// maxRestoreBytes begrenst een terug te zetten archief (64 GiB).
26const maxRestoreBytes = 64 << 30
28const maxRestoreBytes = 64 << 30
@@ -32,12 +34,21 @@ var (
32
34
33// BackupView is de stand op Beheer > Backup.
35// BackupView is de stand op Beheer > Backup.
34type BackupView struct {
36type BackupView struct {
35 Conn backup.Conn
36 NewKey string
37 Archives []backup.Archive
38 Remote *backup.RemoteStatus
39 RemoteErr string
40 InstanceID string
37 InstanceID string
38 Servers []backup.Conn
39 Max int
40 // Current is de geopende backup server (detailpagina).
41 Current *BackupServerView
42 NewKey string
43}
44
45// BackupServerView is één backup server met wat hij zelf meldt.
46type BackupServerView struct {
47 Conn backup.Conn
48 Remote *backup.RemoteStatus
49 Archives []backup.Archive
50 Config *backup.RemoteConfig
51 RemoteErr string
41}
52}
42
53
43func (s *Server) backupInit() {
54func (s *Server) backupInit() {
@@ -81,9 +92,12 @@ func (s *Server) mountBackup(mux *http.ServeMux) {
81 mux.HandleFunc("GET /api/v1/backup/file", s.backupKeyed(s.backupFile))
92 mux.HandleFunc("GET /api/v1/backup/file", s.backupKeyed(s.backupFile))
82 mux.HandleFunc("POST /api/v1/backup/restore", s.backupKeyed(s.backupRestore))
93 mux.HandleFunc("POST /api/v1/backup/restore", s.backupKeyed(s.backupRestore))
83 mux.HandleFunc("GET /admin/backup", s.adminBackup)
94 mux.HandleFunc("GET /admin/backup", s.adminBackup)
84 mux.HandleFunc("POST /admin/backup/key", s.adminBackupKey)
95 mux.HandleFunc("POST /admin/backup/servers", s.adminBackupAdd)
85 mux.HandleFunc("POST /admin/backup/revoke", s.adminBackupRevoke)
96 mux.HandleFunc("GET /admin/backup/s/{id}", s.adminBackupServer)
86 mux.HandleFunc("POST /admin/backup/rollback", s.adminBackupRollback)
97 mux.HandleFunc("POST /admin/backup/s/{id}/key", s.adminBackupKey)
98 mux.HandleFunc("POST /admin/backup/s/{id}/rename", s.adminBackupRename)
99 mux.HandleFunc("POST /admin/backup/s/{id}/remove", s.adminBackupRemove)
100 mux.HandleFunc("POST /admin/backup/s/{id}/act/{name}", s.adminBackupAct)
87}
101}
88
102
89// backupWatch meldt na elk schrijvend verzoek een wijziging. De backup
103// backupWatch meldt na elk schrijvend verzoek een wijziging. De backup
@@ -121,7 +135,8 @@ func (s *Server) backupKeyed(h func(http.ResponseWriter, *http.Request)) http.Ha
121 return
135 return
122 }
136 }
123 s.backupInit()
137 s.backupInit()
124 if _, ok := s.backupMgr.Check(bearer(r)); !ok {
138 conn, ok := s.backupMgr.Check(bearer(r))
139 if !ok {
125 // Alleen mislukte pogingen tellen: hoogstens 5 per minuut per IP.
140 // Alleen mislukte pogingen tellen: hoogstens 5 per minuut per IP.
126 if !backupFails.allow(clientIP(r), time.Now()) {
141 if !backupFails.allow(clientIP(r), time.Now()) {
127 backupErr(w, http.StatusTooManyRequests, "te veel mislukte pogingen")
142 backupErr(w, http.StatusTooManyRequests, "te veel mislukte pogingen")
@@ -130,20 +145,27 @@ func (s *Server) backupKeyed(h func(http.ResponseWriter, *http.Request)) http.Ha
130 backupErr(w, http.StatusUnauthorized, "ongeldige Backupserver-Key")
145 backupErr(w, http.StatusUnauthorized, "ongeldige Backupserver-Key")
131 return
146 return
132 }
147 }
133 s.backupMgr.Seen()
148 s.backupMgr.Seen(conn.ID)
134 h(w, r)
149 h(w, r.WithContext(context.WithValue(r.Context(), backupConnKey{}, conn)))
135 }
150 }
136}
151}
137
152
153type backupConnKey struct{}
154
155func backupConnOf(r *http.Request) backup.Conn {
156 c, _ := r.Context().Value(backupConnKey{}).(backup.Conn)
157 return c
158}
159
138func (s *Server) backupInfo(w http.ResponseWriter, r *http.Request) {
160func (s *Server) backupInfo(w http.ResponseWriter, r *http.Request) {
139 id, err := s.backupMgr.InstanceID()
161 id, err := s.backupMgr.InstanceID()
140 if err != nil {
162 if err != nil {
141 backupErr(w, 500, err.Error())
163 backupErr(w, 500, err.Error())
142 return
164 return
143 }
165 }
144 c, _ := s.backupMgr.Load()
166 c := backupConnOf(r)
145 writeJSON(w, http.StatusOK, map[string]any{
167 writeJSON(w, http.StatusOK, map[string]any{
146 "instance_id": id, "base_url": s.Cfg.BaseURL, "server_url": c.ServerURL, "server_id": c.ServerID,
168 "instance_id": id, "base_url": s.Cfg.BaseURL, "name": c.Name, "server_url": c.ServerURL, "server_id": c.ServerID,
147 "has_storage": s.StoragePath() != "",
169 "has_storage": s.StoragePath() != "",
148 })
170 })
149}
171}
@@ -162,14 +184,14 @@ func (s *Server) backupConnect(w http.ResponseWriter, r *http.Request) {
162 backupErr(w, 400, "server_url moet een http(s)-adres zijn")
184 backupErr(w, 400, "server_url moet een http(s)-adres zijn")
163 return
185 return
164 }
186 }
165 c, err := s.backupMgr.Connect(u.String(), strings.TrimSpace(in.ServerID))
187 c, err := s.backupMgr.Connect(backupConnOf(r).ID, u.String(), strings.TrimSpace(in.ServerID))
166 if err != nil {
188 if err != nil {
167 backupErr(w, 500, err.Error())
189 backupErr(w, 500, err.Error())
168 return
190 return
169 }
191 }
170 id, _ := s.backupMgr.InstanceID()
192 id, _ := s.backupMgr.InstanceID()
171 if s.Log != nil {
193 if s.Log != nil {
172 s.Log.Info("backup audit", "action", "connect", "server", c.ServerURL, "server_id", c.ServerID)
194 s.Log.Info("backup audit", "action", "connect", "id", c.ID, "name", c.Name, "server", c.ServerURL, "server_id", c.ServerID)
173 }
195 }
174 writeJSON(w, http.StatusOK, map[string]any{"instance_id": id, "server_url": c.ServerURL})
196 writeJSON(w, http.StatusOK, map[string]any{"instance_id": id, "server_url": c.ServerURL})
175}
197}
@@ -230,7 +252,7 @@ func (s *Server) backupRestore(w http.ResponseWriter, r *http.Request) {
230 return
252 return
231 }
253 }
232 if s.Log != nil {
254 if s.Log != nil {
233 s.Log.Warn("backup audit", "action", "restore_staged", "files", n)
255 s.Log.Warn("backup audit", "action", "restore_staged", "files", n, "id", backupConnOf(r).ID, "name", backupConnOf(r).Name)
234 }
256 }
235 writeJSON(w, http.StatusAccepted, map[string]any{"files": n, "restarting": s.RequestRestart != nil})
257 writeJSON(w, http.StatusAccepted, map[string]any{"files": n, "restarting": s.RequestRestart != nil})
236 if f, ok := w.(http.Flusher); ok {
258 if f, ok := w.(http.Flusher); ok {
@@ -246,193 +268,474 @@ func (s *Server) backupRestore(w http.ResponseWriter, r *http.Request) {
246
268
247// ---------- Beheer > Backup ----------
269// ---------- Beheer > Backup ----------
248
270
249func (s *Server) backupView(r *http.Request) *BackupView {
271func (s *Server) backupList() *BackupView {
250 s.backupInit()
272 s.backupInit()
251 bv := &BackupView{}
273 bv := &BackupView{Max: backup.MaxServers}
252 bv.Conn, _ = s.backupMgr.Load()
274 bv.Servers, _ = s.backupMgr.List()
253 bv.InstanceID, _ = s.backupMgr.InstanceID()
275 bv.InstanceID, _ = s.backupMgr.InstanceID()
254 if bv.Conn.Connected() {
255 ctx, cancel := context.WithTimeout(r.Context(), 8*time.Second)
256 defer cancel()
257 arch, err := s.backupClient().Archives(ctx)
258 if err != nil {
259 bv.RemoteErr = err.Error()
260 } else {
261 bv.Archives = arch
262 if st, err := s.backupClient().Status(ctx); err == nil {
263 bv.Remote = &st
264 }
265 }
266 }
267 return bv
276 return bv
268}
277}
269
278
279// backupServerView vraagt status, archieven en instellingen op bij de
280// backup server.
281func (s *Server) backupServerView(ctx context.Context, conn backup.Conn) *BackupServerView {
282 v := &BackupServerView{Conn: conn}
283 if !conn.Connected() {
284 return v
285 }
286 ctx, cancel := context.WithTimeout(ctx, 8*time.Second)
287 defer cancel()
288 c := s.backupClient()
289 st, err := c.Status(ctx, conn)
290 if err != nil {
291 v.RemoteErr = err.Error()
292 return v
293 }
294 v.Remote = &st
295 if arch, err := c.Archives(ctx, conn); err == nil {
296 v.Archives = arch
297 } else {
298 v.RemoteErr = err.Error()
299 }
300 if cfg, err := c.Config(ctx, conn); err == nil {
301 v.Config = &cfg
302 } else if v.RemoteErr == "" {
303 v.RemoteErr = err.Error()
304 }
305 return v
306}
307
270func (s *Server) adminBackup(w http.ResponseWriter, r *http.Request) {
308func (s *Server) adminBackup(w http.ResponseWriter, r *http.Request) {
271 if ok, _ := s.adminOnly(w, r); !ok {
309 if ok, _ := s.adminOnly(w, r); !ok {
272 return
310 return
273 }
311 }
274 v := s.view(w, r, "title.admin")
312 v := s.view(w, r, "title.admin")
275 v.Page = "adminbackup"
313 v.Page = "adminbackup"
276 v.Backup = s.backupView(r)
314 v.Backup = s.backupList()
315 s.render(w, "adminbackup", v)
316}
317
318func (s *Server) backupConnFromPath(w http.ResponseWriter, r *http.Request) (backup.Conn, bool) {
319 s.backupInit()
320 c, ok := s.backupMgr.Get(r.PathValue("id"))
321 if !ok {
322 http.NotFound(w, r)
323 }
324 return c, ok
325}
326
327func backupPath(id string) string { return "/admin/backup/s/" + url.PathEscape(id) }
328
329func (s *Server) adminBackupServer(w http.ResponseWriter, r *http.Request) {
330 if ok, _ := s.adminOnly(w, r); !ok {
331 return
332 }
333 conn, ok := s.backupConnFromPath(w, r)
334 if !ok {
335 return
336 }
337 v := s.view(w, r, "title.admin")
338 v.Page = "adminbackupserver"
339 v.Backup = s.backupList()
340 v.Backup.Current = s.backupServerView(r.Context(), conn)
277 if c, err := r.Cookie("bluegit_backup_key"); err == nil && c.Value != "" {
341 if c, err := r.Cookie("bluegit_backup_key"); err == nil && c.Value != "" {
278 v.Backup.NewKey = c.Value
342 v.Backup.NewKey = c.Value
279 http.SetCookie(w, &http.Cookie{Name: "bluegit_backup_key", Value: "", Path: "/admin/backup", MaxAge: -1})
343 http.SetCookie(w, &http.Cookie{Name: "bluegit_backup_key", Value: "", Path: backupPath(conn.ID), MaxAge: -1})
280 }
344 }
281 s.render(w, "adminbackup", v)
345 s.render(w, "adminbackup", v)
282}
346}
283
347
284func (s *Server) adminBackupKey(w http.ResponseWriter, r *http.Request) {
348// showKeyOnce zet de nieuwe key in een kort, HttpOnly cookie dat alleen de
349// pagina van die backup server leest.
350func (s *Server) showKeyOnce(w http.ResponseWriter, id, key string) {
351 http.SetCookie(w, &http.Cookie{
352 Name: "bluegit_backup_key", Value: key, Path: backupPath(id), MaxAge: 60, HttpOnly: true,
353 SameSite: http.SameSiteStrictMode, Secure: strings.HasPrefix(s.Cfg.BaseURL, "https://"),
354 })
355}
356
357func (s *Server) backupAudit(action, by string, kv ...any) {
358 if s.Log != nil {
359 s.Log.Info("backup audit", append([]any{"action", action, "by", by}, kv...)...)
360 }
361}
362
363func (s *Server) adminBackupAdd(w http.ResponseWriter, r *http.Request) {
285 if ok, _ := s.adminOnly(w, r); !ok || !s.csrfOK(w, r) {
364 if ok, _ := s.adminOnly(w, r); !ok || !s.csrfOK(w, r) {
286 return
365 return
287 }
366 }
288 s.backupInit()
367 s.backupInit()
289 key, _, err := s.backupMgr.NewKey(s.who(r).User.Username)
368 by := s.who(r).User.Username
369 key, c, err := s.backupMgr.Add(r.FormValue("name"), by)
290 if err != nil {
370 if err != nil {
291 s.redirect(w, r, "/admin/backup", "", err.Error())
371 s.redirect(w, r, "/admin/backup", "", s.backupErrText(r, err))
292 return
372 return
293 }
373 }
294 if s.Log != nil {
374 s.backupAudit("add", by, "id", c.ID, "name", c.Name)
295 s.Log.Info("backup audit", "action", "new_key", "by", s.who(r).User.Username)
375 s.showKeyOnce(w, c.ID, key)
376 s.redirect(w, r, backupPath(c.ID), s.tr(r, "backup.ok.key"), "")
377}
378
379func (s *Server) backupErrText(r *http.Request, err error) string {
380 switch {
381 case errors.Is(err, backup.ErrTooMany):
382 return s.tr(r, "backup.err.tooMany", backup.MaxServers)
383 case errors.Is(err, backup.ErrUnknown):
384 return s.tr(r, "backup.err.unknown")
296 }
385 }
297 // Eenmalig tonen: kort, HttpOnly cookie alleen voor deze pagina.
386 return s.trErr(r, unwrapFail(err))
298 http.SetCookie(w, &http.Cookie{
299 Name: "bluegit_backup_key", Value: key, Path: "/admin/backup", MaxAge: 60, HttpOnly: true,
300 SameSite: http.SameSiteStrictMode, Secure: strings.HasPrefix(s.Cfg.BaseURL, "https://"),
301 })
302 s.redirect(w, r, "/admin/backup", s.tr(r, "backup.ok.key"), "")
303}
387}
304
388
305func (s *Server) adminBackupRevoke(w http.ResponseWriter, r *http.Request) {
389func (s *Server) adminBackupKey(w http.ResponseWriter, r *http.Request) {
306 if ok, _ := s.adminOnly(w, r); !ok || !s.csrfOK(w, r) {
390 if ok, _ := s.adminOnly(w, r); !ok || !s.csrfOK(w, r) {
307 return
391 return
308 }
392 }
309 s.backupInit()
393 conn, ok := s.backupConnFromPath(w, r)
310 if err := s.backupMgr.Revoke(); err != nil {
394 if !ok {
311 s.redirect(w, r, "/admin/backup", "", err.Error())
312 return
395 return
313 }
396 }
314 if s.Log != nil {
397 by := s.who(r).User.Username
315 s.Log.Info("backup audit", "action", "revoke", "by", s.who(r).User.Username)
398 key, _, err := s.backupMgr.RotateKey(conn.ID, by)
399 if err != nil {
400 s.redirect(w, r, backupPath(conn.ID), "", s.backupErrText(r, err))
401 return
316 }
402 }
317 s.redirect(w, r, "/admin/backup", s.tr(r, "backup.ok.revoked"), "")
403 s.backupAudit("new_key", by, "id", conn.ID, "name", conn.Name)
404 s.showKeyOnce(w, conn.ID, key)
405 s.redirect(w, r, backupPath(conn.ID), s.tr(r, "backup.ok.key"), "")
318}
406}
319
407
320func (s *Server) startRollback(ctx context.Context, by, archive, confirm string) error {
408func (s *Server) adminBackupRename(w http.ResponseWriter, r *http.Request) {
321 s.backupInit()
409 if ok, _ := s.adminOnly(w, r); !ok || !s.csrfOK(w, r) {
322 archive = strings.TrimSpace(archive)
410 return
323 if archive == "" {
324 return fail(400, i18n.E("backup.err.archive"))
325 }
411 }
326 if strings.TrimSpace(confirm) != archive {
412 conn, ok := s.backupConnFromPath(w, r)
327 return fail(400, i18n.E("backup.err.confirm"))
413 if !ok {
414 return
328 }
415 }
329 c, _ := s.backupMgr.Load()
416 if _, err := s.backupMgr.Rename(conn.ID, r.FormValue("name")); err != nil {
330 if !c.Connected() {
417 s.redirect(w, r, backupPath(conn.ID), "", s.backupErrText(r, err))
331 return fail(409, i18n.E("backup.err.none"))
418 return
332 }
419 }
333 if err := s.backupClient().Rollback(ctx, archive); err != nil {
420 s.redirect(w, r, backupPath(conn.ID), s.tr(r, "backup.ok.renamed"), "")
334 return fail(502, err)
421}
422
423// removeBackupServer laat de backup server ontkoppelen (als hij bereikbaar
424// is) en vergeet hem daarna.
425func (s *Server) removeBackupServer(ctx context.Context, by string, conn backup.Conn) error {
426 if conn.Connected() {
427 ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
428 _, _, _ = s.backupClient().Call(ctx, conn, http.MethodPost, "/api/v1/admin/disconnect", map[string]any{})
429 cancel()
335 }
430 }
336 if s.Log != nil {
431 if err := s.backupMgr.Remove(conn.ID); err != nil {
337 s.Log.Warn("backup audit", "action", "rollback", "by", by, "archive", archive)
432 return err
338 }
433 }
434 s.backupAudit("remove", by, "id", conn.ID, "name", conn.Name)
339 return nil
435 return nil
340}
436}
341
437
342func (s *Server) adminBackupRollback(w http.ResponseWriter, r *http.Request) {
438func (s *Server) adminBackupRemove(w http.ResponseWriter, r *http.Request) {
343 if ok, _ := s.adminOnly(w, r); !ok || !s.csrfOK(w, r) {
439 if ok, _ := s.adminOnly(w, r); !ok || !s.csrfOK(w, r) {
344 return
440 return
345 }
441 }
346 if r.FormValue("understood") != "1" {
442 conn, ok := s.backupConnFromPath(w, r)
347 s.redirect(w, r, "/admin/backup", "", s.tr(r, "backup.err.understood"))
443 if !ok {
348 return
444 return
349 }
445 }
350 if err := s.startRollback(r.Context(), s.who(r).User.Username, r.FormValue("archive"), r.FormValue("confirm")); err != nil {
446 if err := s.removeBackupServer(r.Context(), s.who(r).User.Username, conn); err != nil {
351 s.redirect(w, r, "/admin/backup", "", s.trErr(r, unwrapFail(err)))
447 s.redirect(w, r, backupPath(conn.ID), "", s.backupErrText(r, err))
352 return
448 return
353 }
449 }
354 s.redirect(w, r, "/admin/backup", s.tr(r, "backup.ok.rollback", r.FormValue("archive")), "")
450 s.redirect(w, r, "/admin/backup", s.tr(r, "backup.ok.revoked"), "")
355}
451}
356
452
357func unwrapFail(err error) error {
453// backupAction voert een beheeractie van de backup server uit. BlueGit kent
358 var oe interface{ Unwrap() error }
454// de acties niet vooraf: de backup server noemt ze (GET /api/v1/admin/actions),
359 if errors.As(err, &oe) && oe.Unwrap() != nil {
455// zodat alles wat zijn eigen webinterface kan, ook hier kan.
360 return oe.Unwrap()
456func (s *Server) backupAction(ctx context.Context, by string, conn backup.Conn, name string, in map[string]any) (int, []byte, error) {
457 if !conn.Connected() {
458 return 0, nil, fail(409, i18n.E("backup.err.none"))
459 }
460 ctx, cancel := context.WithTimeout(ctx, 60*time.Second)
461 defer cancel()
462 c := s.backupClient()
463 actions, err := c.Actions(ctx, conn)
464 if err != nil {
465 return 0, nil, fail(502, err)
361 }
466 }
362 return err
467 var act *backup.RemoteAction
468 for i := range actions {
469 if actions[i].Name == name && actions[i].Signed {
470 act = &actions[i]
471 }
472 }
473 if act == nil {
474 return 0, nil, fail(404, i18n.E("backup.err.action"))
475 }
476 str := func(k string) string {
477 v, _ := in[k].(string)
478 return strings.TrimSpace(v)
479 }
480 if name == "rollback" {
481 if str("archive") == "" {
482 return 0, nil, fail(400, i18n.E("backup.err.archive"))
483 }
484 if str("confirm") != str("archive") {
485 return 0, nil, fail(400, i18n.E("backup.err.confirm"))
486 }
487 }
488 if name == "sync" {
489 if _, ok := in["wait"]; !ok {
490 in["wait"] = "false"
491 }
492 }
493 p := act.Path
494 for _, param := range act.Params {
495 v := str(param)
496 if v == "" {
497 return 0, nil, fail(400, i18n.E("backup.err.archive"))
498 }
499 p = strings.ReplaceAll(p, "{"+param+"}", url.PathEscape(v))
500 delete(in, param)
501 }
502 var body any
503 if act.Method != http.MethodGet {
504 body = in
505 }
506 hc := *s.backupHTTP
507 hc.Timeout = 60 * time.Second
508 cl := *c
509 cl.HTTP = &hc
510 code, raw, err := cl.Call(ctx, conn, act.Method, p, body)
511 if err != nil {
512 return 0, nil, fail(502, err)
513 }
514 if act.Method != http.MethodGet {
515 kv := []any{"id", conn.ID, "name", conn.Name, "remote_action", name, "status", code}
516 if a := str("archive"); a != "" {
517 kv = append(kv, "archive", a)
518 }
519 if s.Log != nil && name == "rollback" {
520 s.Log.Warn("backup audit", append([]any{"action", "rollback", "by", by}, kv...)...)
521 } else {
522 s.backupAudit("remote", by, kv...)
523 }
524 }
525 return code, raw, nil
526}
527
528func (s *Server) adminBackupAct(w http.ResponseWriter, r *http.Request) {
529 if ok, _ := s.adminOnly(w, r); !ok || !s.csrfOK(w, r) {
530 return
531 }
532 conn, ok := s.backupConnFromPath(w, r)
533 if !ok {
534 return
535 }
536 back := backupPath(conn.ID)
537 name := r.PathValue("name")
538 if name == "rollback" && r.FormValue("understood") != "1" {
539 s.redirect(w, r, back, "", s.tr(r, "backup.err.understood"))
540 return
541 }
542 in := map[string]any{}
543 _ = r.ParseForm()
544 for k, v := range r.PostForm {
545 if k == "csrf" || k == "understood" || len(v) == 0 {
546 continue
547 }
548 in[k] = v[0]
549 }
550 code, raw, err := s.backupAction(r.Context(), s.who(r).User.Username, conn, name, in)
551 if err != nil {
552 s.redirect(w, r, back, "", s.backupErrText(r, err))
553 return
554 }
555 if code >= 300 {
556 var e struct {
557 Error string `json:"error"`
558 }
559 _ = json.Unmarshal(raw, &e)
560 if e.Error == "" {
561 e.Error = http.StatusText(code)
562 }
563 s.redirect(w, r, back, "", s.tr(r, "backup.err.remote", e.Error))
564 return
565 }
566 msg := s.tr(r, "backup.ok.action")
567 if name == "rollback" {
568 msg = s.tr(r, "backup.ok.rollback", in["archive"])
569 }
570 s.redirect(w, r, back, msg, "")
363}
571}
364
572
365// ---------- API voor beheerders ----------
573// ---------- API voor beheerders ----------
366
574
367func (s *Server) apiAdminBackup(w http.ResponseWriter, r *http.Request) {
575func backupConnJSON(c backup.Conn) map[string]any {
576 out := map[string]any{
577 "id": c.ID, "name": c.Name, "key_hint": c.KeyHint, "created_at": rfcTime(c.CreatedAt), "created_by": c.CreatedBy,
578 "connected": c.Connected(), "server_url": c.ServerURL, "server_id": c.ServerID,
579 }
580 if c.Connected() {
581 out["connected_at"] = rfcTime(c.ConnectedAt)
582 out["last_seen"] = rfcTime(c.LastSeen)
583 }
584 return out
585}
586
587func (s *Server) apiBackupAdmin(w http.ResponseWriter, r *http.Request) bool {
368 if !apiUser(r).InstanceAdmin {
588 if !apiUser(r).InstanceAdmin {
369 s.writeAPIErr(w, r, fail(403, i18n.E("err.forbidden")))
589 s.writeAPIErr(w, r, fail(403, i18n.E("err.forbidden")))
590 return false
591 }
592 s.backupInit()
593 return true
594}
595
596func (s *Server) apiBackupConn(w http.ResponseWriter, r *http.Request) (backup.Conn, bool) {
597 if !s.apiBackupAdmin(w, r) {
598 return backup.Conn{}, false
599 }
600 c, ok := s.backupMgr.Get(r.PathValue("id"))
601 if !ok {
602 s.writeAPIErr(w, r, fail(404, i18n.E("backup.err.unknown")))
603 }
604 return c, ok
605}
606
607func (s *Server) apiAdminBackup(w http.ResponseWriter, r *http.Request) {
608 if !s.apiBackupAdmin(w, r) {
370 return
609 return
371 }
610 }
372 bv := s.backupView(r)
611 bv := s.backupList()
373 out := map[string]any{
612 servers := make([]map[string]any, 0, len(bv.Servers))
374 "instance_id": bv.InstanceID, "has_key": bv.Conn.HasKey(), "key_hint": bv.Conn.KeyHint,
613 for _, c := range bv.Servers {
375 "connected": bv.Conn.Connected(), "server_url": bv.Conn.ServerURL, "server_id": bv.Conn.ServerID,
614 servers = append(servers, backupConnJSON(c))
376 "archives": bv.Archives, "remote_error": bv.RemoteErr,
377 }
615 }
378 if bv.Conn.Connected() {
616 writeJSON(w, http.StatusOK, map[string]any{"instance_id": bv.InstanceID, "max_servers": bv.Max, "servers": servers})
379 out["last_seen"] = rfcTime(bv.Conn.LastSeen)
617}
618
619func (s *Server) apiAdminBackupAdd(w http.ResponseWriter, r *http.Request) {
620 if !s.apiBackupAdmin(w, r) {
621 return
622 }
623 var in struct {
624 Name string `json:"name"`
625 }
626 _ = readJSON(r, &in)
627 by := apiUser(r).Username
628 key, c, err := s.backupMgr.Add(in.Name, by)
629 if errors.Is(err, backup.ErrTooMany) {
630 s.writeAPIErr(w, r, fail(409, err))
631 return
632 }
633 if err != nil {
634 s.writeAPIErr(w, r, fail(500, err))
635 return
380 }
636 }
381 if bv.Archives == nil {
637 s.backupAudit("add", by, "id", c.ID, "name", c.Name)
638 out := backupConnJSON(c)
639 out["key"] = key
640 writeJSON(w, http.StatusCreated, out)
641}
642
643func (s *Server) apiAdminBackupServer(w http.ResponseWriter, r *http.Request) {
644 c, ok := s.apiBackupConn(w, r)
645 if !ok {
646 return
647 }
648 v := s.backupServerView(r.Context(), c)
649 out := backupConnJSON(c)
650 out["archives"] = v.Archives
651 if v.Archives == nil {
382 out["archives"] = []backup.Archive{}
652 out["archives"] = []backup.Archive{}
383 }
653 }
384 if bv.Remote != nil {
654 if v.Remote != nil {
385 out["remote"] = bv.Remote
655 out["remote"] = v.Remote
656 }
657 if v.Config != nil {
658 out["config"] = v.Config
386 }
659 }
660 out["remote_error"] = v.RemoteErr
387 writeJSON(w, http.StatusOK, out)
661 writeJSON(w, http.StatusOK, out)
388}
662}
389
663
664func (s *Server) apiAdminBackupRename(w http.ResponseWriter, r *http.Request) {
665 c, ok := s.apiBackupConn(w, r)
666 if !ok {
667 return
668 }
669 var in struct {
670 Name string `json:"name"`
671 }
672 if err := readJSON(r, &in); err != nil {
673 s.writeAPIErr(w, r, fail(400, err))
674 return
675 }
676 c, err := s.backupMgr.Rename(c.ID, in.Name)
677 if err != nil {
678 s.writeAPIErr(w, r, fail(400, err))
679 return
680 }
681 writeJSON(w, http.StatusOK, backupConnJSON(c))
682}
683
390func (s *Server) apiAdminBackupKey(w http.ResponseWriter, r *http.Request) {
684func (s *Server) apiAdminBackupKey(w http.ResponseWriter, r *http.Request) {
391 if !apiUser(r).InstanceAdmin {
685 c, ok := s.apiBackupConn(w, r)
392 s.writeAPIErr(w, r, fail(403, i18n.E("err.forbidden")))
686 if !ok {
393 return
687 return
394 }
688 }
395 s.backupInit()
689 by := apiUser(r).Username
396 key, c, err := s.backupMgr.NewKey(apiUser(r).Username)
690 key, c, err := s.backupMgr.RotateKey(c.ID, by)
397 if err != nil {
691 if err != nil {
398 s.writeAPIErr(w, r, fail(500, err))
692 s.writeAPIErr(w, r, fail(500, err))
399 return
693 return
400 }
694 }
401 if s.Log != nil {
695 s.backupAudit("new_key", by, "id", c.ID, "name", c.Name)
402 s.Log.Info("backup audit", "action", "new_key", "by", apiUser(r).Username)
696 out := backupConnJSON(c)
403 }
697 out["key"] = key
404 writeJSON(w, http.StatusCreated, map[string]any{"key": key, "key_hint": c.KeyHint, "created_at": rfcTime(c.CreatedAt)})
698 writeJSON(w, http.StatusCreated, out)
405}
699}
406
700
407func (s *Server) apiAdminBackupRevoke(w http.ResponseWriter, r *http.Request) {
701func (s *Server) apiAdminBackupRemove(w http.ResponseWriter, r *http.Request) {
408 if !apiUser(r).InstanceAdmin {
702 c, ok := s.apiBackupConn(w, r)
409 s.writeAPIErr(w, r, fail(403, i18n.E("err.forbidden")))
703 if !ok {
410 return
704 return
411 }
705 }
412 s.backupInit()
706 if err := s.removeBackupServer(r.Context(), apiUser(r).Username, c); err != nil {
413 if err := s.backupMgr.Revoke(); err != nil {
414 s.writeAPIErr(w, r, fail(500, err))
707 s.writeAPIErr(w, r, fail(500, err))
415 return
708 return
416 }
709 }
417 writeJSON(w, http.StatusNoContent, nil)
710 writeJSON(w, http.StatusNoContent, nil)
418}
711}
419
712
420func (s *Server) apiAdminBackupRollback(w http.ResponseWriter, r *http.Request) {
713func (s *Server) apiAdminBackupAction(w http.ResponseWriter, r *http.Request) {
421 if !apiUser(r).InstanceAdmin {
714 c, ok := s.apiBackupConn(w, r)
422 s.writeAPIErr(w, r, fail(403, i18n.E("err.forbidden")))
715 if !ok {
423 return
716 return
424 }
717 }
425 var in struct {
718 in := map[string]any{}
426 Archive string `json:"archive"`
719 if r.ContentLength != 0 {
427 Confirm string `json:"confirm"`
720 if err := readJSON(r, &in); err != nil {
428 }
721 s.writeAPIErr(w, r, fail(400, err))
429 if err := readJSON(r, &in); err != nil {
722 return
430 s.writeAPIErr(w, r, fail(400, i18n.E("backup.err.archive")))
723 }
431 return
432 }
724 }
433 if err := s.startRollback(r.Context(), apiUser(r).Username, in.Archive, in.Confirm); err != nil {
725 code, raw, err := s.backupAction(r.Context(), apiUser(r).Username, c, r.PathValue("name"), in)
726 if err != nil {
434 s.writeAPIErr(w, r, err)
727 s.writeAPIErr(w, r, err)
435 return
728 return
436 }
729 }
437 writeJSON(w, http.StatusAccepted, map[string]any{"archive": in.Archive, "state": "started"})
730 w.Header().Set("Content-Type", "application/json")
731 w.WriteHeader(code)
732 _, _ = w.Write(raw)
733}
734
735func unwrapFail(err error) error {
736 var oe interface{ Unwrap() error }
737 if errors.As(err, &oe) && oe.Unwrap() != nil {
738 return oe.Unwrap()
739 }
740 return err
438}
741}
internal/server/backup_test.go +170 −53
@@ -81,6 +81,8 @@ type fakeBackup struct {
81 81 secret string
82 82 notifies int
83 83 rollback []string
84 calls []string
85 bodies map[string]string
84 86 badSig int
85 87 ts *httptest.Server
86 88 }
@@ -109,7 +111,40 @@ func newFakeBackup(t *testing.T) *fakeBackup {
109 111 _ = json.Unmarshal(body, &in)
110 112 f.rollback = append(f.rollback, in.Archive)
111 113 w.WriteHeader(202)
114 case "/api/v1/admin/actions":
115 _, _ = w.Write([]byte(`{"actions":[
116 {"name":"status","method":"GET","path":"/api/v1/admin/status","bluegit":true},
117 {"name":"config","method":"GET","path":"/api/v1/admin/config","bluegit":true},
118 {"name":"config.update","method":"PUT","path":"/api/v1/admin/config","bluegit":true},
119 {"name":"sync","method":"POST","path":"/api/v1/admin/sync","bluegit":true},
120 {"name":"archive.delete","method":"DELETE","path":"/api/v1/admin/archives/{name}","bluegit":true,"params":["name"]},
121 {"name":"archive.download","method":"GET","path":"/api/v1/admin/archives/{name}/download","params":["name"]},
122 {"name":"rollback","method":"POST","path":"/api/v1/admin/rollback","bluegit":true},
123 {"name":"disconnect","method":"POST","path":"/api/v1/admin/disconnect","bluegit":true}]}`))
124 case "/api/v1/admin/config":
125 if r.Method == "PUT" {
126 f.calls = append(f.calls, "PUT config")
127 if f.bodies == nil {
128 f.bodies = map[string]string{}
129 }
130 f.bodies["config"] = string(body)
131 }
132 _, _ = w.Write([]byte(`{"fields":[{"key":"archive_interval","label":"Archiefinterval","kind":"duration","value":"24h"},{"key":"retention_days","label":"Bewaartermijn","kind":"int","value":"30"}],"data_dir":"/var/lib/bluegit-backup"}`))
133 case "/api/v1/admin/rollback":
134 var in struct{ Archive, Confirm string }
135 _ = json.Unmarshal(body, &in)
136 if in.Confirm != in.Archive {
137 http.Error(w, `{"error":"confirm"}`, 400)
138 return
139 }
140 f.rollback = append(f.rollback, in.Archive)
141 w.WriteHeader(202)
112 142 default:
143 if r.URL.Path == "/api/v1/admin/sync" || r.URL.Path == "/api/v1/admin/disconnect" || strings.HasPrefix(r.URL.Path, "/api/v1/admin/archives/") {
144 f.calls = append(f.calls, r.Method+" "+r.URL.Path+" "+string(body))
145 _, _ = w.Write([]byte(`{}`))
146 return
147 }
113 148 http.NotFound(w, r)
114 149 }
115 150 }))
@@ -117,6 +152,25 @@ func newFakeBackup(t *testing.T) *fakeBackup {
117 152 return f
118 153 }
119 154
155 type addedServer struct {
156 ID string `json:"id"`
157 Key string `json:"key"`
158 }
159
160 func addBackupServer(t *testing.T, e *backupEnv, name string) addedServer {
161 t.Helper()
162 code, b := rapi(t, e.base, e.tok, "POST", "/admin/backup/servers", map[string]any{"name": name})
163 if code != 201 {
164 t.Fatalf("server toevoegen: %d %s", code, b)
165 }
166 var a addedServer
167 _ = json.Unmarshal(b, &a)
168 if !strings.HasPrefix(a.Key, "bgbk_") || a.ID == "" {
169 t.Fatalf("%s", b)
170 }
171 return a
172 }
173
120 174 func TestBackupKeyAndKeyedAPI(t *testing.T) {
121 175 e := newBackupEnv(t)
122 176 // Zonder key: 401. Met een gewoon toegangstoken: ook 401.
@@ -126,26 +180,19 @@ func TestBackupKeyAndKeyedAPI(t *testing.T) {
126 180 if code, _ := keyed(t, "GET", e.base+"/api/v1/backup/manifest", e.tok, nil); code != 401 {
127 181 t.Fatalf("bg_-token: %d", code)
128 182 }
129 // Alleen een beheerder maakt een key.
183 // Alleen een beheerder maakt een backup server.
130 184 bob, _ := e.st.UpsertUser(context.Background(), 2, "bob", "", false)
131 if code, _ := rapi(t, e.base, issue(t, e.st, bob.ID, "api"), "POST", "/admin/backup/key", nil); code != 403 {
132 t.Fatalf("bob maakt key: %d", code)
133 }
134 code, b := rapi(t, e.base, e.tok, "POST", "/admin/backup/key", nil)
135 if code != 201 {
136 t.Fatalf("key: %d %s", code, b)
185 if code, _ := rapi(t, e.base, issue(t, e.st, bob.ID, "api"), "POST", "/admin/backup/servers", map[string]any{"name": "x"}); code != 403 {
186 t.Fatalf("bob maakt server: %d", code)
137 187 }
138 var k struct{ Key string }
139 _ = json.Unmarshal(b, &k)
140 if !strings.HasPrefix(k.Key, "bgbk_") {
141 t.Fatalf("key %q", k.Key)
142 }
143 code, b = keyed(t, "GET", e.base+"/api/v1/backup/info", k.Key, nil)
188 k := addBackupServer(t, e, "nas")
189 code, b := keyed(t, "GET", e.base+"/api/v1/backup/info", k.Key, nil)
144 190 var info struct {
145 191 InstanceID string `json:"instance_id"`
192 Name string `json:"name"`
146 193 }
147 194 _ = json.Unmarshal(b, &info)
148 if code != 200 || info.InstanceID == "" {
195 if code != 200 || info.InstanceID == "" || info.Name != "nas" {
149 196 t.Fatalf("info: %d %s", code, b)
150 197 }
151 198 code, b = keyed(t, "GET", e.base+"/api/v1/backup/manifest", k.Key, nil)
@@ -176,82 +223,154 @@ func TestBackupKeyAndKeyedAPI(t *testing.T) {
176 223 t.Fatalf("%s: %d", bad, code)
177 224 }
178 225 }
179 // Intrekken: de key werkt niet meer.
180 if code, _ := rapi(t, e.base, e.tok, "DELETE", "/admin/backup/key", nil); code != 204 {
181 t.Fatalf("revoke: %d", code)
226 // Een tweede server met een eigen key; nieuwe key voor de eerste.
227 k2 := addBackupServer(t, e, "offsite")
228 code, b = rapi(t, e.base, e.tok, "POST", "/admin/backup/servers/"+k.ID+"/key", nil)
229 var rot addedServer
230 _ = json.Unmarshal(b, &rot)
231 if code != 201 || rot.Key == k.Key {
232 t.Fatalf("nieuwe key: %d %s", code, b)
182 233 }
183 234 if code, _ := keyed(t, "GET", e.base+"/api/v1/backup/info", k.Key, nil); code != 401 {
184 t.Fatalf("na intrekken: %d", code)
235 t.Fatalf("oude key werkt nog: %d", code)
236 }
237 if code, _ := keyed(t, "GET", e.base+"/api/v1/backup/info", rot.Key, nil); code != 200 {
238 t.Fatalf("nieuwe key: %d", code)
239 }
240 if code, b := rapi(t, e.base, e.tok, "PUT", "/admin/backup/servers/"+k2.ID, map[string]any{"name": "Offsite 2"}); code != 200 || !strings.Contains(string(b), "Offsite 2") {
241 t.Fatalf("hernoemen: %d %s", code, b)
242 }
243 // Verwijderen: die key werkt niet meer, de andere wel.
244 if code, _ := rapi(t, e.base, e.tok, "DELETE", "/admin/backup/servers/"+k.ID, nil); code != 204 {
245 t.Fatalf("verwijderen: %d", code)
246 }
247 if code, _ := keyed(t, "GET", e.base+"/api/v1/backup/info", rot.Key, nil); code != 401 {
248 t.Fatalf("na verwijderen: %d", code)
249 }
250 if code, _ := keyed(t, "GET", e.base+"/api/v1/backup/info", k2.Key, nil); code != 200 {
251 t.Fatalf("andere server: %d", code)
252 }
253 if code, _ := rapi(t, e.base, e.tok, "GET", "/admin/backup/servers/onbekend", nil); code != 404 {
254 t.Fatalf("onbekend: %d", code)
185 255 }
186 256 }
187 257
188 func TestBackupConnectNotifyArchivesRollback(t *testing.T) {
258 func TestBackupMultipleServersAndControl(t *testing.T) {
189 259 e := newBackupEnv(t)
190 fb := newFakeBackup(t)
191 _, b := rapi(t, e.base, e.tok, "POST", "/admin/backup/key", nil)
192 var k struct{ Key string }
193 _ = json.Unmarshal(b, &k)
194 fb.secret = backup.SigningSecret(k.Key)
195 code, b := keyed(t, "POST", e.base+"/api/v1/backup/connect", k.Key, strings.NewReader(`{"server_url":"`+fb.ts.URL+`","server_id":"s1"}`))
196 if code != 200 {
197 t.Fatalf("connect: %d %s", code, b)
198 }
199 if code, _ := keyed(t, "POST", e.base+"/api/v1/backup/connect", k.Key, strings.NewReader(`{"server_url":"ftp://x"}`)); code != 400 {
260 fa, fb := newFakeBackup(t), newFakeBackup(t)
261 ka, kb := addBackupServer(t, e, "nas"), addBackupServer(t, e, "offsite")
262 fa.secret, fb.secret = backup.SigningSecret(ka.Key), backup.SigningSecret(kb.Key)
263 for _, c := range []struct {
264 key, url string
265 }{{ka.Key, fa.ts.URL}, {kb.Key, fb.ts.URL}} {
266 code, b := keyed(t, "POST", e.base+"/api/v1/backup/connect", c.key, strings.NewReader(`{"server_url":"`+c.url+`","server_id":"s"}`))
267 if code != 200 {
268 t.Fatalf("connect: %d %s", code, b)
269 }
270 }
271 if code, _ := keyed(t, "POST", e.base+"/api/v1/backup/connect", ka.Key, strings.NewReader(`{"server_url":"ftp://x"}`)); code != 400 {
200 272 t.Fatalf("ftp-adres: %d", code)
201 273 }
202 274
203 // Een schrijvende actie geeft een ondertekende melding.
275 // Een schrijvende actie geeft een ondertekende melding aan beide.
204 276 if code, b := rapi(t, e.base, e.tok, "POST", "/projects", map[string]any{"name": "Notify"}); code/100 != 2 {
205 277 t.Fatalf("project: %d %s", code, b)
206 278 }
207 279 deadline := time.Now().Add(5 * time.Second)
208 280 for {
281 fa.mu.Lock()
282 na := fa.notifies
283 fa.mu.Unlock()
209 284 fb.mu.Lock()
210 n := fb.notifies
285 nb := fb.notifies
211 286 fb.mu.Unlock()
212 if n > 0 {
287 if na > 0 && nb > 0 {
213 288 break
214 289 }
215 290 if time.Now().After(deadline) {
216 t.Fatal("geen melding ontvangen")
291 t.Fatalf("meldingen: %d en %d", na, nb)
217 292 }
218 293 time.Sleep(20 * time.Millisecond)
219 294 }
220 295
221 // Archieven via de API en op de beheerpagina, met de waarschuwing.
222 code, b = rapi(t, e.base, e.tok, "GET", "/admin/backup", nil)
223 if code != 200 || !strings.Contains(string(b), "bluegit-20261115-120000.tar.gz") || !strings.Contains(string(b), `"connected":true`) {
296 // Lijst via de API en op de pagina.
297 code, b := rapi(t, e.base, e.tok, "GET", "/admin/backup", nil)
298 if code != 200 || strings.Count(string(b), `"connected":true`) != 2 {
224 299 t.Fatalf("admin backup: %d %s", code, b)
225 300 }
301 code, b = rapi(t, e.base, e.tok, "GET", "/admin/backup/servers/"+ka.ID, nil)
302 if code != 200 || !strings.Contains(string(b), "bluegit-20261115-120000.tar.gz") || !strings.Contains(string(b), `"retention_days"`) {
303 t.Fatalf("server: %d %s", code, b)
304 }
226 305 tc, csrf := sessionClient(t, e.st, e.base, e.tim.ID)
227 306 res, _ := tc.Get(e.base + "/admin/backup")
228 307 page := body(t, res)
229 for _, want := range []string{"bluegit-20261115-120000.tar.gz", `class="backup-danger"`, `name="understood"`, `name="confirm"`, `href="/admin/backup"`} {
308 for _, want := range []string{"nas", "offsite", `/admin/backup/s/` + ka.ID, `/admin/backup/s/` + kb.ID, `href="/admin/backup"`} {
309 if !strings.Contains(page, want) {
310 t.Fatalf("lijst mist %s: %.600s", want, page)
311 }
312 }
313 res, _ = tc.Get(e.base + "/admin/backup/s/" + ka.ID)
314 page = body(t, res)
315 for _, want := range []string{"bluegit-20261115-120000.tar.gz", `class="backup-danger"`, `name="understood"`, `name="confirm"`,
316 `act/config.update`, `name="retention_days" value="30"`, `act/sync`, `act/archive.delete`} {
230 317 if !strings.Contains(page, want) {
231 318 t.Fatalf("pagina mist %s: %.600s", want, page)
232 319 }
233 320 }
234 321
235 // Rollback: verkeerde bevestiging, dan goed.
236 if code, _ := rapi(t, e.base, e.tok, "POST", "/admin/backup/rollback", map[string]any{"archive": "bluegit-20261115-120000.tar.gz", "confirm": "ja"}); code != 400 {
237 t.Fatalf("verkeerde bevestiging: %d", code)
322 // Instellingen en sync vanuit BlueGit (formulier en API).
323 res, _ = tc.PostForm(e.base+"/admin/backup/s/"+ka.ID+"/act/config.update", url.Values{"csrf": {csrf}, "retention_days": {"9"}})
324 res.Body.Close()
325 if code, b := rapi(t, e.base, e.tok, "POST", "/admin/backup/servers/"+ka.ID+"/actions/sync", nil); code != 200 {
326 t.Fatalf("sync: %d %s", code, b)
327 }
328 if code, _ := rapi(t, e.base, e.tok, "POST", "/admin/backup/servers/"+ka.ID+"/actions/archive.download", map[string]any{"name": "x"}); code != 404 {
329 t.Fatalf("niet-BlueGit-actie: %d", code)
330 }
331 if code, _ := rapi(t, e.base, e.tok, "POST", "/admin/backup/servers/"+ka.ID+"/actions/archive.delete", map[string]any{"name": "bluegit-20261115-120000.tar.gz"}); code != 200 {
332 t.Fatalf("archief verwijderen: %d", code)
238 333 }
239 res, _ = tc.PostForm(e.base+"/admin/backup/rollback", url.Values{"csrf": {csrf}, "archive": {"bluegit-20261115-120000.tar.gz"}, "confirm": {"bluegit-20261115-120000.tar.gz"}})
334 fa.mu.Lock()
335 if fa.bodies["config"] != `{"retention_days":"9"}` {
336 t.Fatalf("config %q", fa.bodies["config"])
337 }
338 calls := strings.Join(fa.calls, "|")
339 fa.mu.Unlock()
340 if !strings.Contains(calls, `POST /api/v1/admin/sync {"wait":"false"}`) || !strings.Contains(calls, "DELETE /api/v1/admin/archives/bluegit-20261115-120000.tar.gz") {
341 t.Fatalf("calls %s", calls)
342 }
343
344 // Rollback: zonder vinkje niets, verkeerde bevestiging 400, dan goed.
345 arch := "bluegit-20261115-120000.tar.gz"
346 res, _ = tc.PostForm(e.base+"/admin/backup/s/"+ka.ID+"/act/rollback", url.Values{"csrf": {csrf}, "archive": {arch}, "confirm": {arch}})
240 347 res.Body.Close()
241 fb.mu.Lock()
242 if len(fb.rollback) != 0 {
243 t.Fatal("rollback zonder vinkje")
348 if code, _ := rapi(t, e.base, e.tok, "POST", "/admin/backup/servers/"+ka.ID+"/actions/rollback", map[string]any{"archive": arch, "confirm": "ja"}); code != 400 {
349 t.Fatalf("verkeerde bevestiging: %d", code)
244 350 }
245 fb.mu.Unlock()
246 res, _ = tc.PostForm(e.base+"/admin/backup/rollback", url.Values{"csrf": {csrf}, "archive": {"bluegit-20261115-120000.tar.gz"}, "confirm": {"bluegit-20261115-120000.tar.gz"}, "understood": {"1"}})
351 fa.mu.Lock()
352 if len(fa.rollback) != 0 {
353 t.Fatal("rollback zonder vinkje of bevestiging")
354 }
355 fa.mu.Unlock()
356 res, _ = tc.PostForm(e.base+"/admin/backup/s/"+ka.ID+"/act/rollback", url.Values{"csrf": {csrf}, "archive": {arch}, "confirm": {arch}, "understood": {"1"}})
247 357 res.Body.Close()
248 if code, b := rapi(t, e.base, e.tok, "POST", "/admin/backup/rollback", map[string]any{"archive": "bluegit-20261115-120000.tar.gz", "confirm": "bluegit-20261115-120000.tar.gz"}); code != 202 {
358 if code, b := rapi(t, e.base, e.tok, "POST", "/admin/backup/servers/"+ka.ID+"/actions/rollback", map[string]any{"archive": arch, "confirm": arch}); code != 202 {
249 359 t.Fatalf("rollback api: %d %s", code, b)
250 360 }
361 // Verwijderen laat de backup server ontkoppelen.
362 if code, _ := rapi(t, e.base, e.tok, "DELETE", "/admin/backup/servers/"+kb.ID, nil); code != 204 {
363 t.Fatalf("verwijderen: %d", code)
364 }
251 365 fb.mu.Lock()
252 defer fb.mu.Unlock()
253 if len(fb.rollback) != 2 || fb.badSig != 0 {
254 t.Fatalf("rollbacks %v, foute handtekeningen %d", fb.rollback, fb.badSig)
366 if !strings.Contains(strings.Join(fb.calls, "|"), "POST /api/v1/admin/disconnect") {
367 t.Fatalf("geen disconnect: %v", fb.calls)
368 }
369 fb.mu.Unlock()
370 fa.mu.Lock()
371 defer fa.mu.Unlock()
372 if len(fa.rollback) != 2 || fa.badSig != 0 {
373 t.Fatalf("rollbacks %v, foute handtekeningen %d", fa.rollback, fa.badSig)
255 374 }
256 375 }
257 376
@@ -259,9 +378,7 @@ func TestBackupRestoreStagesAndRestarts(t *testing.T) {
259 378 e := newBackupEnv(t)
260 379 restarted := make(chan struct{}, 1)
261 380 e.srv.RequestRestart = func() { restarted <- struct{}{} }
262 _, b := rapi(t, e.base, e.tok, "POST", "/admin/backup/key", nil)
263 var k struct{ Key string }
264 _ = json.Unmarshal(b, &k)
381 k := addBackupServer(t, e, "nas")
265 382 // Ongeldig archief: 400, niets klaargezet.
266 383 if code, _ := keyed(t, "POST", e.base+"/api/v1/backup/restore", k.Key, strings.NewReader("x")); code != 400 {
267 384 t.Fatalf("ongeldig: %d", code)
@@ -81,6 +81,8 @@ type fakeBackup struct {
81 secret string
81 secret string
82 notifies int
82 notifies int
83 rollback []string
83 rollback []string
84 calls []string
85 bodies map[string]string
84 badSig int
86 badSig int
85 ts *httptest.Server
87 ts *httptest.Server
86}
88}
@@ -109,7 +111,40 @@ func newFakeBackup(t *testing.T) *fakeBackup {
109 _ = json.Unmarshal(body, &in)
111 _ = json.Unmarshal(body, &in)
110 f.rollback = append(f.rollback, in.Archive)
112 f.rollback = append(f.rollback, in.Archive)
111 w.WriteHeader(202)
113 w.WriteHeader(202)
114 case "/api/v1/admin/actions":
115 _, _ = w.Write([]byte(`{"actions":[
116 {"name":"status","method":"GET","path":"/api/v1/admin/status","bluegit":true},
117 {"name":"config","method":"GET","path":"/api/v1/admin/config","bluegit":true},
118 {"name":"config.update","method":"PUT","path":"/api/v1/admin/config","bluegit":true},
119 {"name":"sync","method":"POST","path":"/api/v1/admin/sync","bluegit":true},
120 {"name":"archive.delete","method":"DELETE","path":"/api/v1/admin/archives/{name}","bluegit":true,"params":["name"]},
121 {"name":"archive.download","method":"GET","path":"/api/v1/admin/archives/{name}/download","params":["name"]},
122 {"name":"rollback","method":"POST","path":"/api/v1/admin/rollback","bluegit":true},
123 {"name":"disconnect","method":"POST","path":"/api/v1/admin/disconnect","bluegit":true}]}`))
124 case "/api/v1/admin/config":
125 if r.Method == "PUT" {
126 f.calls = append(f.calls, "PUT config")
127 if f.bodies == nil {
128 f.bodies = map[string]string{}
129 }
130 f.bodies["config"] = string(body)
131 }
132 _, _ = w.Write([]byte(`{"fields":[{"key":"archive_interval","label":"Archiefinterval","kind":"duration","value":"24h"},{"key":"retention_days","label":"Bewaartermijn","kind":"int","value":"30"}],"data_dir":"/var/lib/bluegit-backup"}`))
133 case "/api/v1/admin/rollback":
134 var in struct{ Archive, Confirm string }
135 _ = json.Unmarshal(body, &in)
136 if in.Confirm != in.Archive {
137 http.Error(w, `{"error":"confirm"}`, 400)
138 return
139 }
140 f.rollback = append(f.rollback, in.Archive)
141 w.WriteHeader(202)
112 default:
142 default:
143 if r.URL.Path == "/api/v1/admin/sync" || r.URL.Path == "/api/v1/admin/disconnect" || strings.HasPrefix(r.URL.Path, "/api/v1/admin/archives/") {
144 f.calls = append(f.calls, r.Method+" "+r.URL.Path+" "+string(body))
145 _, _ = w.Write([]byte(`{}`))
146 return
147 }
113 http.NotFound(w, r)
148 http.NotFound(w, r)
114 }
149 }
115 }))
150 }))
@@ -117,6 +152,25 @@ func newFakeBackup(t *testing.T) *fakeBackup {
117 return f
152 return f
118}
153}
119
154
155type addedServer struct {
156 ID string `json:"id"`
157 Key string `json:"key"`
158}
159
160func addBackupServer(t *testing.T, e *backupEnv, name string) addedServer {
161 t.Helper()
162 code, b := rapi(t, e.base, e.tok, "POST", "/admin/backup/servers", map[string]any{"name": name})
163 if code != 201 {
164 t.Fatalf("server toevoegen: %d %s", code, b)
165 }
166 var a addedServer
167 _ = json.Unmarshal(b, &a)
168 if !strings.HasPrefix(a.Key, "bgbk_") || a.ID == "" {
169 t.Fatalf("%s", b)
170 }
171 return a
172}
173
120func TestBackupKeyAndKeyedAPI(t *testing.T) {
174func TestBackupKeyAndKeyedAPI(t *testing.T) {
121 e := newBackupEnv(t)
175 e := newBackupEnv(t)
122 // Zonder key: 401. Met een gewoon toegangstoken: ook 401.
176 // Zonder key: 401. Met een gewoon toegangstoken: ook 401.
@@ -126,26 +180,19 @@ func TestBackupKeyAndKeyedAPI(t *testing.T) {
126 if code, _ := keyed(t, "GET", e.base+"/api/v1/backup/manifest", e.tok, nil); code != 401 {
180 if code, _ := keyed(t, "GET", e.base+"/api/v1/backup/manifest", e.tok, nil); code != 401 {
127 t.Fatalf("bg_-token: %d", code)
181 t.Fatalf("bg_-token: %d", code)
128 }
182 }
129 // Alleen een beheerder maakt een key.
183 // Alleen een beheerder maakt een backup server.
130 bob, _ := e.st.UpsertUser(context.Background(), 2, "bob", "", false)
184 bob, _ := e.st.UpsertUser(context.Background(), 2, "bob", "", false)
131 if code, _ := rapi(t, e.base, issue(t, e.st, bob.ID, "api"), "POST", "/admin/backup/key", nil); code != 403 {
185 if code, _ := rapi(t, e.base, issue(t, e.st, bob.ID, "api"), "POST", "/admin/backup/servers", map[string]any{"name": "x"}); code != 403 {
132 t.Fatalf("bob maakt key: %d", code)
186 t.Fatalf("bob maakt server: %d", code)
133 }
134 code, b := rapi(t, e.base, e.tok, "POST", "/admin/backup/key", nil)
135 if code != 201 {
136 t.Fatalf("key: %d %s", code, b)
137 }
187 }
138 var k struct{ Key string }
188 k := addBackupServer(t, e, "nas")
139 _ = json.Unmarshal(b, &k)
189 code, b := keyed(t, "GET", e.base+"/api/v1/backup/info", k.Key, nil)
140 if !strings.HasPrefix(k.Key, "bgbk_") {
141 t.Fatalf("key %q", k.Key)
142 }
143 code, b = keyed(t, "GET", e.base+"/api/v1/backup/info", k.Key, nil)
144 var info struct {
190 var info struct {
145 InstanceID string `json:"instance_id"`
191 InstanceID string `json:"instance_id"`
192 Name string `json:"name"`
146 }
193 }
147 _ = json.Unmarshal(b, &info)
194 _ = json.Unmarshal(b, &info)
148 if code != 200 || info.InstanceID == "" {
195 if code != 200 || info.InstanceID == "" || info.Name != "nas" {
149 t.Fatalf("info: %d %s", code, b)
196 t.Fatalf("info: %d %s", code, b)
150 }
197 }
151 code, b = keyed(t, "GET", e.base+"/api/v1/backup/manifest", k.Key, nil)
198 code, b = keyed(t, "GET", e.base+"/api/v1/backup/manifest", k.Key, nil)
@@ -176,82 +223,154 @@ func TestBackupKeyAndKeyedAPI(t *testing.T) {
176 t.Fatalf("%s: %d", bad, code)
223 t.Fatalf("%s: %d", bad, code)
177 }
224 }
178 }
225 }
179 // Intrekken: de key werkt niet meer.
226 // Een tweede server met een eigen key; nieuwe key voor de eerste.
180 if code, _ := rapi(t, e.base, e.tok, "DELETE", "/admin/backup/key", nil); code != 204 {
227 k2 := addBackupServer(t, e, "offsite")
181 t.Fatalf("revoke: %d", code)
228 code, b = rapi(t, e.base, e.tok, "POST", "/admin/backup/servers/"+k.ID+"/key", nil)
229 var rot addedServer
230 _ = json.Unmarshal(b, &rot)
231 if code != 201 || rot.Key == k.Key {
232 t.Fatalf("nieuwe key: %d %s", code, b)
182 }
233 }
183 if code, _ := keyed(t, "GET", e.base+"/api/v1/backup/info", k.Key, nil); code != 401 {
234 if code, _ := keyed(t, "GET", e.base+"/api/v1/backup/info", k.Key, nil); code != 401 {
184 t.Fatalf("na intrekken: %d", code)
235 t.Fatalf("oude key werkt nog: %d", code)
236 }
237 if code, _ := keyed(t, "GET", e.base+"/api/v1/backup/info", rot.Key, nil); code != 200 {
238 t.Fatalf("nieuwe key: %d", code)
239 }
240 if code, b := rapi(t, e.base, e.tok, "PUT", "/admin/backup/servers/"+k2.ID, map[string]any{"name": "Offsite 2"}); code != 200 || !strings.Contains(string(b), "Offsite 2") {
241 t.Fatalf("hernoemen: %d %s", code, b)
242 }
243 // Verwijderen: die key werkt niet meer, de andere wel.
244 if code, _ := rapi(t, e.base, e.tok, "DELETE", "/admin/backup/servers/"+k.ID, nil); code != 204 {
245 t.Fatalf("verwijderen: %d", code)
246 }
247 if code, _ := keyed(t, "GET", e.base+"/api/v1/backup/info", rot.Key, nil); code != 401 {
248 t.Fatalf("na verwijderen: %d", code)
249 }
250 if code, _ := keyed(t, "GET", e.base+"/api/v1/backup/info", k2.Key, nil); code != 200 {
251 t.Fatalf("andere server: %d", code)
252 }
253 if code, _ := rapi(t, e.base, e.tok, "GET", "/admin/backup/servers/onbekend", nil); code != 404 {
254 t.Fatalf("onbekend: %d", code)
185 }
255 }
186}
256}
187
257
188func TestBackupConnectNotifyArchivesRollback(t *testing.T) {
258func TestBackupMultipleServersAndControl(t *testing.T) {
189 e := newBackupEnv(t)
259 e := newBackupEnv(t)
190 fb := newFakeBackup(t)
260 fa, fb := newFakeBackup(t), newFakeBackup(t)
191 _, b := rapi(t, e.base, e.tok, "POST", "/admin/backup/key", nil)
261 ka, kb := addBackupServer(t, e, "nas"), addBackupServer(t, e, "offsite")
192 var k struct{ Key string }
262 fa.secret, fb.secret = backup.SigningSecret(ka.Key), backup.SigningSecret(kb.Key)
193 _ = json.Unmarshal(b, &k)
263 for _, c := range []struct {
194 fb.secret = backup.SigningSecret(k.Key)
264 key, url string
195 code, b := keyed(t, "POST", e.base+"/api/v1/backup/connect", k.Key, strings.NewReader(`{"server_url":"`+fb.ts.URL+`","server_id":"s1"}`))
265 }{{ka.Key, fa.ts.URL}, {kb.Key, fb.ts.URL}} {
196 if code != 200 {
266 code, b := keyed(t, "POST", e.base+"/api/v1/backup/connect", c.key, strings.NewReader(`{"server_url":"`+c.url+`","server_id":"s"}`))
197 t.Fatalf("connect: %d %s", code, b)
267 if code != 200 {
198 }
268 t.Fatalf("connect: %d %s", code, b)
199 if code, _ := keyed(t, "POST", e.base+"/api/v1/backup/connect", k.Key, strings.NewReader(`{"server_url":"ftp://x"}`)); code != 400 {
269 }
270 }
271 if code, _ := keyed(t, "POST", e.base+"/api/v1/backup/connect", ka.Key, strings.NewReader(`{"server_url":"ftp://x"}`)); code != 400 {
200 t.Fatalf("ftp-adres: %d", code)
272 t.Fatalf("ftp-adres: %d", code)
201 }
273 }
202
274
203 // Een schrijvende actie geeft een ondertekende melding.
275 // Een schrijvende actie geeft een ondertekende melding aan beide.
204 if code, b := rapi(t, e.base, e.tok, "POST", "/projects", map[string]any{"name": "Notify"}); code/100 != 2 {
276 if code, b := rapi(t, e.base, e.tok, "POST", "/projects", map[string]any{"name": "Notify"}); code/100 != 2 {
205 t.Fatalf("project: %d %s", code, b)
277 t.Fatalf("project: %d %s", code, b)
206 }
278 }
207 deadline := time.Now().Add(5 * time.Second)
279 deadline := time.Now().Add(5 * time.Second)
208 for {
280 for {
281 fa.mu.Lock()
282 na := fa.notifies
283 fa.mu.Unlock()
209 fb.mu.Lock()
284 fb.mu.Lock()
210 n := fb.notifies
285 nb := fb.notifies
211 fb.mu.Unlock()
286 fb.mu.Unlock()
212 if n > 0 {
287 if na > 0 && nb > 0 {
213 break
288 break
214 }
289 }
215 if time.Now().After(deadline) {
290 if time.Now().After(deadline) {
216 t.Fatal("geen melding ontvangen")
291 t.Fatalf("meldingen: %d en %d", na, nb)
217 }
292 }
218 time.Sleep(20 * time.Millisecond)
293 time.Sleep(20 * time.Millisecond)
219 }
294 }
220
295
221 // Archieven via de API en op de beheerpagina, met de waarschuwing.
296 // Lijst via de API en op de pagina.
222 code, b = rapi(t, e.base, e.tok, "GET", "/admin/backup", nil)
297 code, b := rapi(t, e.base, e.tok, "GET", "/admin/backup", nil)
223 if code != 200 || !strings.Contains(string(b), "bluegit-20261115-120000.tar.gz") || !strings.Contains(string(b), `"connected":true`) {
298 if code != 200 || strings.Count(string(b), `"connected":true`) != 2 {
224 t.Fatalf("admin backup: %d %s", code, b)
299 t.Fatalf("admin backup: %d %s", code, b)
225 }
300 }
301 code, b = rapi(t, e.base, e.tok, "GET", "/admin/backup/servers/"+ka.ID, nil)
302 if code != 200 || !strings.Contains(string(b), "bluegit-20261115-120000.tar.gz") || !strings.Contains(string(b), `"retention_days"`) {
303 t.Fatalf("server: %d %s", code, b)
304 }
226 tc, csrf := sessionClient(t, e.st, e.base, e.tim.ID)
305 tc, csrf := sessionClient(t, e.st, e.base, e.tim.ID)
227 res, _ := tc.Get(e.base + "/admin/backup")
306 res, _ := tc.Get(e.base + "/admin/backup")
228 page := body(t, res)
307 page := body(t, res)
229 for _, want := range []string{"bluegit-20261115-120000.tar.gz", `class="backup-danger"`, `name="understood"`, `name="confirm"`, `href="/admin/backup"`} {
308 for _, want := range []string{"nas", "offsite", `/admin/backup/s/` + ka.ID, `/admin/backup/s/` + kb.ID, `href="/admin/backup"`} {
309 if !strings.Contains(page, want) {
310 t.Fatalf("lijst mist %s: %.600s", want, page)
311 }
312 }
313 res, _ = tc.Get(e.base + "/admin/backup/s/" + ka.ID)
314 page = body(t, res)
315 for _, want := range []string{"bluegit-20261115-120000.tar.gz", `class="backup-danger"`, `name="understood"`, `name="confirm"`,
316 `act/config.update`, `name="retention_days" value="30"`, `act/sync`, `act/archive.delete`} {
230 if !strings.Contains(page, want) {
317 if !strings.Contains(page, want) {
231 t.Fatalf("pagina mist %s: %.600s", want, page)
318 t.Fatalf("pagina mist %s: %.600s", want, page)
232 }
319 }
233 }
320 }
234
321
235 // Rollback: verkeerde bevestiging, dan goed.
322 // Instellingen en sync vanuit BlueGit (formulier en API).
236 if code, _ := rapi(t, e.base, e.tok, "POST", "/admin/backup/rollback", map[string]any{"archive": "bluegit-20261115-120000.tar.gz", "confirm": "ja"}); code != 400 {
323 res, _ = tc.PostForm(e.base+"/admin/backup/s/"+ka.ID+"/act/config.update", url.Values{"csrf": {csrf}, "retention_days": {"9"}})
237 t.Fatalf("verkeerde bevestiging: %d", code)
324 res.Body.Close()
325 if code, b := rapi(t, e.base, e.tok, "POST", "/admin/backup/servers/"+ka.ID+"/actions/sync", nil); code != 200 {
326 t.Fatalf("sync: %d %s", code, b)
327 }
328 if code, _ := rapi(t, e.base, e.tok, "POST", "/admin/backup/servers/"+ka.ID+"/actions/archive.download", map[string]any{"name": "x"}); code != 404 {
329 t.Fatalf("niet-BlueGit-actie: %d", code)
330 }
331 if code, _ := rapi(t, e.base, e.tok, "POST", "/admin/backup/servers/"+ka.ID+"/actions/archive.delete", map[string]any{"name": "bluegit-20261115-120000.tar.gz"}); code != 200 {
332 t.Fatalf("archief verwijderen: %d", code)
238 }
333 }
239 res, _ = tc.PostForm(e.base+"/admin/backup/rollback", url.Values{"csrf": {csrf}, "archive": {"bluegit-20261115-120000.tar.gz"}, "confirm": {"bluegit-20261115-120000.tar.gz"}})
334 fa.mu.Lock()
335 if fa.bodies["config"] != `{"retention_days":"9"}` {
336 t.Fatalf("config %q", fa.bodies["config"])
337 }
338 calls := strings.Join(fa.calls, "|")
339 fa.mu.Unlock()
340 if !strings.Contains(calls, `POST /api/v1/admin/sync {"wait":"false"}`) || !strings.Contains(calls, "DELETE /api/v1/admin/archives/bluegit-20261115-120000.tar.gz") {
341 t.Fatalf("calls %s", calls)
342 }
343
344 // Rollback: zonder vinkje niets, verkeerde bevestiging 400, dan goed.
345 arch := "bluegit-20261115-120000.tar.gz"
346 res, _ = tc.PostForm(e.base+"/admin/backup/s/"+ka.ID+"/act/rollback", url.Values{"csrf": {csrf}, "archive": {arch}, "confirm": {arch}})
240 res.Body.Close()
347 res.Body.Close()
241 fb.mu.Lock()
348 if code, _ := rapi(t, e.base, e.tok, "POST", "/admin/backup/servers/"+ka.ID+"/actions/rollback", map[string]any{"archive": arch, "confirm": "ja"}); code != 400 {
242 if len(fb.rollback) != 0 {
349 t.Fatalf("verkeerde bevestiging: %d", code)
243 t.Fatal("rollback zonder vinkje")
244 }
350 }
245 fb.mu.Unlock()
351 fa.mu.Lock()
246 res, _ = tc.PostForm(e.base+"/admin/backup/rollback", url.Values{"csrf": {csrf}, "archive": {"bluegit-20261115-120000.tar.gz"}, "confirm": {"bluegit-20261115-120000.tar.gz"}, "understood": {"1"}})
352 if len(fa.rollback) != 0 {
353 t.Fatal("rollback zonder vinkje of bevestiging")
354 }
355 fa.mu.Unlock()
356 res, _ = tc.PostForm(e.base+"/admin/backup/s/"+ka.ID+"/act/rollback", url.Values{"csrf": {csrf}, "archive": {arch}, "confirm": {arch}, "understood": {"1"}})
247 res.Body.Close()
357 res.Body.Close()
248 if code, b := rapi(t, e.base, e.tok, "POST", "/admin/backup/rollback", map[string]any{"archive": "bluegit-20261115-120000.tar.gz", "confirm": "bluegit-20261115-120000.tar.gz"}); code != 202 {
358 if code, b := rapi(t, e.base, e.tok, "POST", "/admin/backup/servers/"+ka.ID+"/actions/rollback", map[string]any{"archive": arch, "confirm": arch}); code != 202 {
249 t.Fatalf("rollback api: %d %s", code, b)
359 t.Fatalf("rollback api: %d %s", code, b)
250 }
360 }
361 // Verwijderen laat de backup server ontkoppelen.
362 if code, _ := rapi(t, e.base, e.tok, "DELETE", "/admin/backup/servers/"+kb.ID, nil); code != 204 {
363 t.Fatalf("verwijderen: %d", code)
364 }
251 fb.mu.Lock()
365 fb.mu.Lock()
252 defer fb.mu.Unlock()
366 if !strings.Contains(strings.Join(fb.calls, "|"), "POST /api/v1/admin/disconnect") {
253 if len(fb.rollback) != 2 || fb.badSig != 0 {
367 t.Fatalf("geen disconnect: %v", fb.calls)
254 t.Fatalf("rollbacks %v, foute handtekeningen %d", fb.rollback, fb.badSig)
368 }
369 fb.mu.Unlock()
370 fa.mu.Lock()
371 defer fa.mu.Unlock()
372 if len(fa.rollback) != 2 || fa.badSig != 0 {
373 t.Fatalf("rollbacks %v, foute handtekeningen %d", fa.rollback, fa.badSig)
255 }
374 }
256}
375}
257
376
@@ -259,9 +378,7 @@ func TestBackupRestoreStagesAndRestarts(t *testing.T) {
259 e := newBackupEnv(t)
378 e := newBackupEnv(t)
260 restarted := make(chan struct{}, 1)
379 restarted := make(chan struct{}, 1)
261 e.srv.RequestRestart = func() { restarted <- struct{}{} }
380 e.srv.RequestRestart = func() { restarted <- struct{}{} }
262 _, b := rapi(t, e.base, e.tok, "POST", "/admin/backup/key", nil)
381 k := addBackupServer(t, e, "nas")
263 var k struct{ Key string }
264 _ = json.Unmarshal(b, &k)
265 // Ongeldig archief: 400, niets klaargezet.
382 // Ongeldig archief: 400, niets klaargezet.
266 if code, _ := keyed(t, "POST", e.base+"/api/v1/backup/restore", k.Key, strings.NewReader("x")); code != 400 {
383 if code, _ := keyed(t, "POST", e.base+"/api/v1/backup/restore", k.Key, strings.NewReader("x")); code != 400 {
267 t.Fatalf("ongeldig: %d", code)
384 t.Fatalf("ongeldig: %d", code)
internal/server/static/style.css +5 −0
@@ -1885,3 +1885,8 @@ span.starbtn.starred { color: #9a6700; }
1885 1885 .backup-rollback form { display: grid; gap: 8px; margin-top: 8px; }
1886 1886 .backup-rollback summary { cursor: pointer; }
1887 1887 .backup-key { word-break: break-all; }
1888 .backup-actions { margin-top: 10px; }
1889 .backup-actions form, .backup-archives td.act form { display: inline-block; margin: 0 4px 4px 0; }
1890 .backup-config { display: grid; gap: 10px; max-width: 46em; }
1891 .backup-config label { display: grid; gap: 2px; }
1892 .backup-status th { width: 14em; }
@@ -1885,3 +1885,8 @@ span.starbtn.starred { color: #9a6700; }
1885.backup-rollback form { display: grid; gap: 8px; margin-top: 8px; }
1885.backup-rollback form { display: grid; gap: 8px; margin-top: 8px; }
1886.backup-rollback summary { cursor: pointer; }
1886.backup-rollback summary { cursor: pointer; }
1887.backup-key { word-break: break-all; }
1887.backup-key { word-break: break-all; }
1888.backup-actions { margin-top: 10px; }
1889.backup-actions form, .backup-archives td.act form { display: inline-block; margin: 0 4px 4px 0; }
1890.backup-config { display: grid; gap: 10px; max-width: 46em; }
1891.backup-config label { display: grid; gap: 2px; }
1892.backup-status th { width: 14em; }
internal/server/templates/backup.html +95 −25
@@ -1,43 +1,56 @@
1 1 {{define "adminbackup"}}
2 2 {{template "layout-start" .}}
3 <h1>{{t "backup.title"}}</h1>
4 <p class="muted">{{t "backup.lead"}}</p>
5 3 {{with .Backup}}
6 <section class="panel" id="backup-key">
7 <h2>{{t "backup.key.title"}}</h2>
8 {{if .NewKey}}
4 {{if .Current}}{{with .Current}}
5 <p><a href="/admin/backup">← {{t "backup.back"}}</a></p>
6 <h1>{{.Conn.Name}}</h1>
7 {{if $.Backup.NewKey}}
8 <section class="panel" id="backup-newkey">
9 9 <p><strong>{{t "backup.key.once"}}</strong></p>
10 <p class="code backup-key">{{.NewKey}}</p>
11 {{end}}
12 {{if .Conn.HasKey}}
13 <p>{{t "backup.key.active" .Conn.KeyHint}} <span class="muted">{{t "backup.key.by" .Conn.CreatedBy}} · {{date .Conn.CreatedAt}}</span></p>
14 {{else}}
15 <p class="muted">{{t "backup.key.none"}}</p>
16 {{end}}
17 <form method="post" action="/admin/backup/key"{{if .Conn.HasKey}} data-confirm="{{t "backup.key.replaceAsk"}}"{{end}}>
18 <input type="hidden" name="csrf" value="{{$.CSRF}}">
19 <button type="submit">{{if .Conn.HasKey}}{{t "backup.key.replace"}}{{else}}{{t "backup.key.new"}}{{end}}</button>
20 </form>
21 {{if .Conn.HasKey}}
22 <form method="post" action="/admin/backup/revoke" data-confirm="{{t "backup.key.revokeAsk"}}">
23 <input type="hidden" name="csrf" value="{{$.CSRF}}">
24 <button type="submit" class="danger">{{t "backup.key.revoke"}}</button>
25 </form>
26 {{end}}
27 <p class="muted">{{t "backup.instance" .InstanceID}}</p>
10 <p class="code backup-key">{{$.Backup.NewKey}}</p>
28 11 </section>
12 {{end}}
29 13
30 14 <section class="panel" id="backup-server">
31 15 <h2>{{t "backup.server.title"}}</h2>
32 16 {{if .Conn.Connected}}
33 17 <p>{{t "backup.server.connected" .Conn.ServerURL}} <span class="muted">{{t "backup.server.seen"}} {{date .Conn.LastSeen}}</span></p>
34 {{with .Remote}}<p class="muted">{{t "backup.server.settings" .Interval .RetentionDays}}{{if .Rollback.State}} · {{t "backup.server.rollback" .Rollback.State .Rollback.Archive}}{{end}}</p>{{end}}
35 18 {{if .RemoteErr}}<p class="backup-danger-text">{{t "backup.server.unreachable" .RemoteErr}}</p>{{end}}
19 {{with .Remote}}
20 <table class="rui-table backup-status">
21 <tr><th>{{t "backup.status.lastSync"}}</th><td>{{if .LastSync.IsZero}}—{{else}}{{date .LastSync}}{{end}}{{if .SyncError}} <span class="backup-danger-text">{{.SyncError}}</span>{{end}}</td></tr>
22 <tr><th>{{t "backup.status.result"}}</th><td>{{t "backup.status.resultText" .LastStats.Files .LastStats.Downloaded .LastStats.Deleted}}</td></tr>
23 <tr><th>{{t "backup.status.counts"}}</th><td>{{.Syncs}} / {{.Notifies}}</td></tr>
24 <tr><th>{{t "backup.status.mirror"}}</th><td>{{printf "%.1f MB" (mb .MirrorBytes)}}</td></tr>
25 <tr><th>{{t "backup.archives.title"}}</th><td>{{.Archives}}{{if not .LastArchive.IsZero}} · {{date .LastArchive}}{{end}}{{if .ArchiveError}} <span class="backup-danger-text">{{.ArchiveError}}</span>{{end}}</td></tr>
26 {{if .Rollback.State}}<tr><th>{{t "backup.status.rollback"}}</th><td>{{.Rollback.State}} {{.Rollback.Archive}}{{if .Rollback.Error}} <span class="backup-danger-text">{{.Rollback.Error}}</span>{{end}}</td></tr>{{end}}
27 <tr><th>{{t "backup.status.version"}}</th><td>{{.Version}}</td></tr>
28 </table>
29 <div class="row backup-actions">
30 <form method="post" action="/admin/backup/s/{{$.Backup.Current.Conn.ID}}/act/sync"><input type="hidden" name="csrf" value="{{$.CSRF}}"><button type="submit">{{t "backup.act.sync"}}</button></form>
31 <form method="post" action="/admin/backup/s/{{$.Backup.Current.Conn.ID}}/act/archive"><input type="hidden" name="csrf" value="{{$.CSRF}}"><button type="submit">{{t "backup.act.archive"}}</button></form>
32 <form method="post" action="/admin/backup/s/{{$.Backup.Current.Conn.ID}}/act/prune"><input type="hidden" name="csrf" value="{{$.CSRF}}"><button type="submit" class="ghost">{{t "backup.act.prune"}}</button></form>
33 </div>
34 {{end}}
36 35 {{else}}
37 36 <p class="muted">{{t "backup.server.none"}}</p>
38 37 {{end}}
39 38 </section>
40 39
40 {{with .Config}}
41 <section class="panel" id="backup-config">
42 <h2>{{t "backup.config.title"}}</h2>
43 {{if .Restart}}<p class="muted">{{t "backup.config.restart"}}</p>{{end}}
44 <form method="post" action="/admin/backup/s/{{$.Backup.Current.Conn.ID}}/act/config.update" class="backup-config">
45 <input type="hidden" name="csrf" value="{{$.CSRF}}">
46 {{range .Fields}}
47 <label>{{.Label}} <input type="text" name="{{.Key}}" value="{{.Value}}"> <span class="muted">{{.Help}}</span></label>
48 {{end}}
49 <button type="submit">{{t "backup.config.save"}}</button>
50 </form>
51 </section>
52 {{end}}
53
41 54 {{if .Conn.Connected}}
42 55 <section class="panel" id="backup-archives">
43 56 <h2>{{t "backup.archives.title"}}</h2>
@@ -55,9 +68,13 @@
55 68 <td>{{date .CreatedAt}}</td>
56 69 <td>{{printf "%.1f MB" (mb .Size)}}</td>
57 70 <td class="act">
71 <form method="post" action="/admin/backup/s/{{$.Backup.Current.Conn.ID}}/act/archive.delete" data-confirm="{{t "backup.archive.deleteAsk" .Name}}">
72 <input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="name" value="{{.Name}}">
73 <button type="submit" class="ghost">{{t "backup.archive.delete"}}</button>
74 </form>
58 75 <details class="backup-rollback">
59 76 <summary class="danger">{{t "backup.rollback"}}</summary>
60 <form method="post" action="/admin/backup/rollback" data-confirm="{{t "backup.rollbackAsk" .Name}}">
77 <form method="post" action="/admin/backup/s/{{$.Backup.Current.Conn.ID}}/act/rollback" data-confirm="{{t "backup.rollbackAsk" .Name}}">
61 78 <input type="hidden" name="csrf" value="{{$.CSRF}}">
62 79 <input type="hidden" name="archive" value="{{.Name}}">
63 80 <p class="backup-danger-text">{{t "backup.warn.body"}}</p>
@@ -74,6 +91,59 @@
74 91 {{else}}<p class="muted">{{t "backup.archives.none"}}</p>{{end}}
75 92 </section>
76 93 {{end}}
94
95 <section class="panel" id="backup-key">
96 <h2>{{t "backup.key.title"}}</h2>
97 <p>{{t "backup.key.active" .Conn.KeyHint}} <span class="muted">{{t "backup.key.by" .Conn.CreatedBy}} · {{date .Conn.CreatedAt}}</span></p>
98 <form method="post" action="/admin/backup/s/{{.Conn.ID}}/key" data-confirm="{{t "backup.key.replaceAsk"}}">
99 <input type="hidden" name="csrf" value="{{$.CSRF}}">
100 <button type="submit">{{t "backup.key.replace"}}</button>
101 </form>
102 <form method="post" action="/admin/backup/s/{{.Conn.ID}}/rename" class="row">
103 <input type="hidden" name="csrf" value="{{$.CSRF}}">
104 <label>{{t "backup.servers.name"}} <input type="text" name="name" value="{{.Conn.Name}}" maxlength="60" required></label>
105 <button type="submit" class="ghost">{{t "backup.rename"}}</button>
106 </form>
107 <form method="post" action="/admin/backup/s/{{.Conn.ID}}/remove" data-confirm="{{t "backup.key.revokeAsk"}}">
108 <input type="hidden" name="csrf" value="{{$.CSRF}}">
109 <button type="submit" class="danger">{{t "backup.key.revoke"}}</button>
110 </form>
111 </section>
112 {{end}}
113 {{else}}
114 <h1>{{t "backup.title"}}</h1>
115 <p class="muted">{{t "backup.lead"}}</p>
116 <section class="panel" id="backup-servers">
117 <h2>{{t "backup.servers.title"}}</h2>
118 {{if .Servers}}
119 <div class="hscroll">
120 <table class="rui-table backup-servers">
121 <thead><tr><th>{{t "backup.col.name"}}</th><th>{{t "backup.col.state"}}</th><th>{{t "backup.col.address"}}</th><th>{{t "backup.server.seen"}}</th><th></th></tr></thead>
122 <tbody>
123 {{range .Servers}}<tr>
124 <td><a href="/admin/backup/s/{{.ID}}">{{.Name}}</a></td>
125 <td>{{if .Connected}}{{t "backup.state.connected"}}{{else}}{{t "backup.state.waiting"}}{{end}}</td>
126 <td>{{if .ServerURL}}<code>{{.ServerURL}}</code>{{else}}—{{end}}</td>
127 <td>{{if .LastSeen.IsZero}}—{{else}}{{date .LastSeen}}{{end}}</td>
128 <td><a href="/admin/backup/s/{{.ID}}">{{t "backup.open"}}</a></td>
129 </tr>{{end}}
130 </tbody>
131 </table>
132 </div>
133 {{else}}
134 <p class="muted">{{t "backup.servers.none"}}</p>
135 {{end}}
136 {{if lt (len .Servers) .Max}}
137 <form method="post" action="/admin/backup/servers" class="row">
138 <input type="hidden" name="csrf" value="{{$.CSRF}}">
139 <label>{{t "backup.servers.name"}} <input type="text" name="name" maxlength="60" placeholder="{{t "backup.servers.namePh"}}"></label>
140 <button type="submit">{{t "backup.servers.add"}}</button>
141 </form>
142 {{end}}
143 <p class="muted">{{t "backup.multi"}}</p>
144 <p class="muted">{{t "backup.instance" .InstanceID}}</p>
145 </section>
146 {{end}}
77 147 {{end}}
78 148 {{template "layout-end" .}}
79 149 {{end}}
@@ -1,43 +1,56 @@
1{{define "adminbackup"}}
1{{define "adminbackup"}}
2{{template "layout-start" .}}
2{{template "layout-start" .}}
3<h1>{{t "backup.title"}}</h1>
4<p class="muted">{{t "backup.lead"}}</p>
5{{with .Backup}}
3{{with .Backup}}
6<section class="panel" id="backup-key">
4{{if .Current}}{{with .Current}}
7 <h2>{{t "backup.key.title"}}</h2>
5<p><a href="/admin/backup">← {{t "backup.back"}}</a></p>
8 {{if .NewKey}}
6<h1>{{.Conn.Name}}</h1>
7{{if $.Backup.NewKey}}
8<section class="panel" id="backup-newkey">
9 <p><strong>{{t "backup.key.once"}}</strong></p>
9 <p><strong>{{t "backup.key.once"}}</strong></p>
10 <p class="code backup-key">{{.NewKey}}</p>
10 <p class="code backup-key">{{$.Backup.NewKey}}</p>
11 {{end}}
12 {{if .Conn.HasKey}}
13 <p>{{t "backup.key.active" .Conn.KeyHint}} <span class="muted">{{t "backup.key.by" .Conn.CreatedBy}} · {{date .Conn.CreatedAt}}</span></p>
14 {{else}}
15 <p class="muted">{{t "backup.key.none"}}</p>
16 {{end}}
17 <form method="post" action="/admin/backup/key"{{if .Conn.HasKey}} data-confirm="{{t "backup.key.replaceAsk"}}"{{end}}>
18 <input type="hidden" name="csrf" value="{{$.CSRF}}">
19 <button type="submit">{{if .Conn.HasKey}}{{t "backup.key.replace"}}{{else}}{{t "backup.key.new"}}{{end}}</button>
20 </form>
21 {{if .Conn.HasKey}}
22 <form method="post" action="/admin/backup/revoke" data-confirm="{{t "backup.key.revokeAsk"}}">
23 <input type="hidden" name="csrf" value="{{$.CSRF}}">
24 <button type="submit" class="danger">{{t "backup.key.revoke"}}</button>
25 </form>
26 {{end}}
27 <p class="muted">{{t "backup.instance" .InstanceID}}</p>
28</section>
11</section>
12{{end}}
29
13
30<section class="panel" id="backup-server">
14<section class="panel" id="backup-server">
31 <h2>{{t "backup.server.title"}}</h2>
15 <h2>{{t "backup.server.title"}}</h2>
32 {{if .Conn.Connected}}
16 {{if .Conn.Connected}}
33 <p>{{t "backup.server.connected" .Conn.ServerURL}} <span class="muted">{{t "backup.server.seen"}} {{date .Conn.LastSeen}}</span></p>
17 <p>{{t "backup.server.connected" .Conn.ServerURL}} <span class="muted">{{t "backup.server.seen"}} {{date .Conn.LastSeen}}</span></p>
34 {{with .Remote}}<p class="muted">{{t "backup.server.settings" .Interval .RetentionDays}}{{if .Rollback.State}} · {{t "backup.server.rollback" .Rollback.State .Rollback.Archive}}{{end}}</p>{{end}}
35 {{if .RemoteErr}}<p class="backup-danger-text">{{t "backup.server.unreachable" .RemoteErr}}</p>{{end}}
18 {{if .RemoteErr}}<p class="backup-danger-text">{{t "backup.server.unreachable" .RemoteErr}}</p>{{end}}
19 {{with .Remote}}
20 <table class="rui-table backup-status">
21 <tr><th>{{t "backup.status.lastSync"}}</th><td>{{if .LastSync.IsZero}}—{{else}}{{date .LastSync}}{{end}}{{if .SyncError}} <span class="backup-danger-text">{{.SyncError}}</span>{{end}}</td></tr>
22 <tr><th>{{t "backup.status.result"}}</th><td>{{t "backup.status.resultText" .LastStats.Files .LastStats.Downloaded .LastStats.Deleted}}</td></tr>
23 <tr><th>{{t "backup.status.counts"}}</th><td>{{.Syncs}} / {{.Notifies}}</td></tr>
24 <tr><th>{{t "backup.status.mirror"}}</th><td>{{printf "%.1f MB" (mb .MirrorBytes)}}</td></tr>
25 <tr><th>{{t "backup.archives.title"}}</th><td>{{.Archives}}{{if not .LastArchive.IsZero}} · {{date .LastArchive}}{{end}}{{if .ArchiveError}} <span class="backup-danger-text">{{.ArchiveError}}</span>{{end}}</td></tr>
26 {{if .Rollback.State}}<tr><th>{{t "backup.status.rollback"}}</th><td>{{.Rollback.State}} {{.Rollback.Archive}}{{if .Rollback.Error}} <span class="backup-danger-text">{{.Rollback.Error}}</span>{{end}}</td></tr>{{end}}
27 <tr><th>{{t "backup.status.version"}}</th><td>{{.Version}}</td></tr>
28 </table>
29 <div class="row backup-actions">
30 <form method="post" action="/admin/backup/s/{{$.Backup.Current.Conn.ID}}/act/sync"><input type="hidden" name="csrf" value="{{$.CSRF}}"><button type="submit">{{t "backup.act.sync"}}</button></form>
31 <form method="post" action="/admin/backup/s/{{$.Backup.Current.Conn.ID}}/act/archive"><input type="hidden" name="csrf" value="{{$.CSRF}}"><button type="submit">{{t "backup.act.archive"}}</button></form>
32 <form method="post" action="/admin/backup/s/{{$.Backup.Current.Conn.ID}}/act/prune"><input type="hidden" name="csrf" value="{{$.CSRF}}"><button type="submit" class="ghost">{{t "backup.act.prune"}}</button></form>
33 </div>
34 {{end}}
36 {{else}}
35 {{else}}
37 <p class="muted">{{t "backup.server.none"}}</p>
36 <p class="muted">{{t "backup.server.none"}}</p>
38 {{end}}
37 {{end}}
39</section>
38</section>
40
39
40{{with .Config}}
41<section class="panel" id="backup-config">
42 <h2>{{t "backup.config.title"}}</h2>
43 {{if .Restart}}<p class="muted">{{t "backup.config.restart"}}</p>{{end}}
44 <form method="post" action="/admin/backup/s/{{$.Backup.Current.Conn.ID}}/act/config.update" class="backup-config">
45 <input type="hidden" name="csrf" value="{{$.CSRF}}">
46 {{range .Fields}}
47 <label>{{.Label}} <input type="text" name="{{.Key}}" value="{{.Value}}"> <span class="muted">{{.Help}}</span></label>
48 {{end}}
49 <button type="submit">{{t "backup.config.save"}}</button>
50 </form>
51</section>
52{{end}}
53
41{{if .Conn.Connected}}
54{{if .Conn.Connected}}
42<section class="panel" id="backup-archives">
55<section class="panel" id="backup-archives">
43 <h2>{{t "backup.archives.title"}}</h2>
56 <h2>{{t "backup.archives.title"}}</h2>
@@ -55,9 +68,13 @@
55 <td>{{date .CreatedAt}}</td>
68 <td>{{date .CreatedAt}}</td>
56 <td>{{printf "%.1f MB" (mb .Size)}}</td>
69 <td>{{printf "%.1f MB" (mb .Size)}}</td>
57 <td class="act">
70 <td class="act">
71 <form method="post" action="/admin/backup/s/{{$.Backup.Current.Conn.ID}}/act/archive.delete" data-confirm="{{t "backup.archive.deleteAsk" .Name}}">
72 <input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="name" value="{{.Name}}">
73 <button type="submit" class="ghost">{{t "backup.archive.delete"}}</button>
74 </form>
58 <details class="backup-rollback">
75 <details class="backup-rollback">
59 <summary class="danger">{{t "backup.rollback"}}</summary>
76 <summary class="danger">{{t "backup.rollback"}}</summary>
60 <form method="post" action="/admin/backup/rollback" data-confirm="{{t "backup.rollbackAsk" .Name}}">
77 <form method="post" action="/admin/backup/s/{{$.Backup.Current.Conn.ID}}/act/rollback" data-confirm="{{t "backup.rollbackAsk" .Name}}">
61 <input type="hidden" name="csrf" value="{{$.CSRF}}">
78 <input type="hidden" name="csrf" value="{{$.CSRF}}">
62 <input type="hidden" name="archive" value="{{.Name}}">
79 <input type="hidden" name="archive" value="{{.Name}}">
63 <p class="backup-danger-text">{{t "backup.warn.body"}}</p>
80 <p class="backup-danger-text">{{t "backup.warn.body"}}</p>
@@ -74,6 +91,59 @@
74 {{else}}<p class="muted">{{t "backup.archives.none"}}</p>{{end}}
91 {{else}}<p class="muted">{{t "backup.archives.none"}}</p>{{end}}
75</section>
92</section>
76{{end}}
93{{end}}
94
95<section class="panel" id="backup-key">
96 <h2>{{t "backup.key.title"}}</h2>
97 <p>{{t "backup.key.active" .Conn.KeyHint}} <span class="muted">{{t "backup.key.by" .Conn.CreatedBy}} · {{date .Conn.CreatedAt}}</span></p>
98 <form method="post" action="/admin/backup/s/{{.Conn.ID}}/key" data-confirm="{{t "backup.key.replaceAsk"}}">
99 <input type="hidden" name="csrf" value="{{$.CSRF}}">
100 <button type="submit">{{t "backup.key.replace"}}</button>
101 </form>
102 <form method="post" action="/admin/backup/s/{{.Conn.ID}}/rename" class="row">
103 <input type="hidden" name="csrf" value="{{$.CSRF}}">
104 <label>{{t "backup.servers.name"}} <input type="text" name="name" value="{{.Conn.Name}}" maxlength="60" required></label>
105 <button type="submit" class="ghost">{{t "backup.rename"}}</button>
106 </form>
107 <form method="post" action="/admin/backup/s/{{.Conn.ID}}/remove" data-confirm="{{t "backup.key.revokeAsk"}}">
108 <input type="hidden" name="csrf" value="{{$.CSRF}}">
109 <button type="submit" class="danger">{{t "backup.key.revoke"}}</button>
110 </form>
111</section>
112{{end}}
113{{else}}
114<h1>{{t "backup.title"}}</h1>
115<p class="muted">{{t "backup.lead"}}</p>
116<section class="panel" id="backup-servers">
117 <h2>{{t "backup.servers.title"}}</h2>
118 {{if .Servers}}
119 <div class="hscroll">
120 <table class="rui-table backup-servers">
121 <thead><tr><th>{{t "backup.col.name"}}</th><th>{{t "backup.col.state"}}</th><th>{{t "backup.col.address"}}</th><th>{{t "backup.server.seen"}}</th><th></th></tr></thead>
122 <tbody>
123 {{range .Servers}}<tr>
124 <td><a href="/admin/backup/s/{{.ID}}">{{.Name}}</a></td>
125 <td>{{if .Connected}}{{t "backup.state.connected"}}{{else}}{{t "backup.state.waiting"}}{{end}}</td>
126 <td>{{if .ServerURL}}<code>{{.ServerURL}}</code>{{else}}—{{end}}</td>
127 <td>{{if .LastSeen.IsZero}}—{{else}}{{date .LastSeen}}{{end}}</td>
128 <td><a href="/admin/backup/s/{{.ID}}">{{t "backup.open"}}</a></td>
129 </tr>{{end}}
130 </tbody>
131 </table>
132 </div>
133 {{else}}
134 <p class="muted">{{t "backup.servers.none"}}</p>
135 {{end}}
136 {{if lt (len .Servers) .Max}}
137 <form method="post" action="/admin/backup/servers" class="row">
138 <input type="hidden" name="csrf" value="{{$.CSRF}}">
139 <label>{{t "backup.servers.name"}} <input type="text" name="name" maxlength="60" placeholder="{{t "backup.servers.namePh"}}"></label>
140 <button type="submit">{{t "backup.servers.add"}}</button>
141 </form>
142 {{end}}
143 <p class="muted">{{t "backup.multi"}}</p>
144 <p class="muted">{{t "backup.instance" .InstanceID}}</p>
145</section>
146{{end}}
77{{end}}
147{{end}}
78{{template "layout-end" .}}
148{{template "layout-end" .}}
79{{end}}
149{{end}}