Merge branch 'stage' into master
Commitgrafiek op het projectoverzicht en Microsoft Entra ID-aanmelden.
@@ -2,7 +2,7 @@
2
2
3
3
BlueGit is een self-hosted git-platform. Het is één Go-binary: de website, smart HTTP, de REST-API en de SSH-listener draaien in hetzelfde proces. Metadata staat in SQLite. Git-objecten staan in bare repositories op een schijf die de beheerder kiest. Docker wordt alleen gebruikt om CI-jobs te draaien.
4
4
5
Er is geen lokaal wachtwoord. Aanmelden gaat via de OAuth-flow van [auth.timfalken.com](https://auth.timfalken.com).
5
Er is geen lokaal wachtwoord. Aanmelden gaat via de OAuth-flow van [auth.timfalken.com](https://auth.timfalken.com) (`auth.mode: oauth`, de standaard) of via Microsoft Entra ID (`auth.mode: entra`, één tenant). Zie [docs/AUTH.md](docs/AUTH.md).
6
6
7
7
Het logo is de blauwe ster: [`assets/logo.svg`](assets/logo.svg).
8
8
@@ -11,6 +11,7 @@ Het logo is de blauwe ster: [`assets/logo.svg`](assets/logo.svg).
11
11
## Wat het doet
12
12
13
13
- Repositories van een gebruiker of een groep, met bestanden, commits, branches, tags en releases.
14
- Op de project-overzichtspagina staat een commitgrafiek in de lege ruimte naast de centrale kolom, als er plek is. De hoofdbranch gebruikt de BlueGit-blauw; andere branches krijgen een vaste kleur uit hun naam. De grafiek wordt in het geheugen bewaard (LRU) en bij een push ververst, zodat herhaald laden geen git-I/O op schijf doet.
14
15
- Merge requests met reviews, squash en het verwijderen van de bronbranch na een merge.
15
16
- Issues, met beschrijvingssjablonen in `.bluegit/issue_templates`. Merge requests gebruiken `.bluegit/merge_request_templates`. `Default.md` vult een lege beschrijving. Dezelfde namen onder `.gitlab/` zijn een terugval.
16
17
- Een ingebouwde CI-runner, Steve. Het bestand is `blue-ci-cd.yml`. Elke job draait in een eigen container. `image: bluegit/base` en de andere aliassen zijn image-presets die Steve lokaal bouwt.
@@ -41,6 +42,42 @@ Op Arch installeer je het AUR-pakket `bluegit`. De configuratie staat in `/etc/b
41
42
42
43
Hoe het pakket gepubliceerd wordt en hoe de self-update via pacman werkt, staat in [docs/AUR.md](docs/AUR.md). De stappen voor de installatie op git.timfalken.com staan in [docs/BEHEER.md](docs/BEHEER.md).
43
44
45
## Microsoft Entra ID
46
47
Details en de OIDC-controles staan in [docs/AUTH.md](docs/AUTH.md). Kort, stap voor stap:
48
49
1. Open het [Microsoft Entra-beheercentrum](https://entra.microsoft.com) → Identiteit → Toepassingen → App-registraties → Nieuwe registratie.
50
2. Kies één tenant (*Accounts in this organizational directory only* / single tenant).
51
3. Platform: **Web**. De redirect-URI moet exact `{base_url}{auth.redirect_path}` zijn, het pad dat BlueGit verwacht. `auth.redirect_path` is standaard `/auth/callback`, dus bijvoorbeeld `https://git.timfalken.com/auth/callback`. Een ander pad, schema (`http` vs `https`) of een slash te veel of te weinig geeft een redirect-mismatch.
52
4. Maak onder *Certificates & secrets* een client secret aan. Noteer de waarde (die is maar één keer zichtbaar) en de verloopdatum; na verlopen stopt aanmelden.
53
5. BlueGit vraagt de scopes `openid`, `profile` en `email`. Die horen bij OpenID Connect; er zijn geen extra Graph-rechten nodig voor aanmelden.
54
6. Op het overzicht van de app-registratie staan de **Directory (tenant) ID** (`auth.tenant_id`) en de **Application (client) ID** (`auth.client_id`).
55
56
Zet in `/etc/bluegit/config.yml` (geen echte geheimen in dit bestand of in deze docs):
57
58
```yaml
59
auth:
60
mode: entra
61
tenant_id: # Directory (tenant) ID
62
client_id: # Application (client) ID
63
client_secret_file: /etc/bluegit/client_secret
64
redirect_path: /auth/callback
65
# issuer alleen voor een andere cloud of een test; leeg =
66
# https://login.microsoftonline.com/{tenant_id}/v2.0
67
```
68
69
Het clientgeheim zet je niet in de yaml als het vermijdbaar is. Alternatieven met exacte namen uit de code: `auth.client_secret`, `auth.client_secret_file` (bijvoorbeeld `/etc/bluegit/client_secret`, mode `0600`) of de omgevingsvariabele `BLUEGIT_AUTH_CLIENT_SECRET` (bijvoorbeeld in `/etc/bluegit/secret.env`). `auth.base_url` hoort bij `mode: oauth`, niet bij entra.
70
71
Herstart daarna de service (`systemctl restart bluegit`). De bestaande knop **Aanmelden** (in de navigatie, naar `/login`) start de Entra-flow; er is geen aparte knop. Zonder `auth.mode: entra` blijft die knop naar auth.timfalken.com gaan.
72
73
**Accountkoppeling.** De BlueGit-gebruiker hangt aan `tid` + `oid` uit het ID-token (stabiele `auth_id`). Dezelfde Entra-gebruiker komt terug op het bestaande account. Een nieuwe login waarvan de afgeleide gebruikersnaam al door een ander account bezet is, wordt geweigerd; er is geen overname via e-mail.
74
75
**Veelvoorkomende fouten**
76
77
- De redirect-URI komt niet exact overeen (pad, schema, host, slash) → redirect mismatch (vaak AADSTS50011).
78
- Verlopen client secret → de token-exchange faalt; maak een nieuw geheim, werk `auth.client_secret_file` of `BLUEGIT_AUTH_CLIENT_SECRET` bij, en herstart.
79
- Verkeerde tenant: `auth.tenant_id` hoort bij een andere directory, of `tid` in het token komt niet overeen → aanmelden wordt geweigerd.
80
44
81
## Lokaal
45
82
46
83
`auth.mode: dev` maakt een sessie zonder de auth-server. De configuratie weigert die modus zodra `base_url` op `git.timfalken.com` wijst.
@@ -73,7 +110,7 @@ git clone http://tim:bg_…@127.0.0.1:8080/tim/demo.git
73
110
## Documentatie
74
111
75
112
- [docs/ARCHITECTURE.md](docs/ARCHITECTURE.md) beschrijft het proces, de schijf en waarom het één binary is.
76
- [docs/AUTH.md](docs/AUTH.md) beschrijft de OAuth-koppeling.
113
- [docs/AUTH.md](docs/AUTH.md) beschrijft de OAuth-koppeling en Microsoft Entra ID.
77
114
- [docs/INGRESS.md](docs/INGRESS.md) beschrijft TLS en de publieke SSH-poort.
78
115
- [docs/CI.md](docs/CI.md) beschrijft `blue-ci-cd.yml` en Steve.
79
116
- [docs/AUR.md](docs/AUR.md) beschrijft het pakket en de self-update.
@@ -2,7 +2,7 @@2
2
3
BlueGit is een self-hosted git-platform. Het is één Go-binary: de website, smart HTTP, de REST-API en de SSH-listener draaien in hetzelfde proces. Metadata staat in SQLite. Git-objecten staan in bare repositories op een schijf die de beheerder kiest. Docker wordt alleen gebruikt om CI-jobs te draaien.3
BlueGit is een self-hosted git-platform. Het is één Go-binary: de website, smart HTTP, de REST-API en de SSH-listener draaien in hetzelfde proces. Metadata staat in SQLite. Git-objecten staan in bare repositories op een schijf die de beheerder kiest. Docker wordt alleen gebruikt om CI-jobs te draaien.4
4
5
Er is geen lokaal wachtwoord. Aanmelden gaat via de OAuth-flow van [auth.timfalken.com](https://auth.timfalken.com).5
Er is geen lokaal wachtwoord. Aanmelden gaat via de OAuth-flow van [auth.timfalken.com](https://auth.timfalken.com) (`auth.mode: oauth`, de standaard) of via Microsoft Entra ID (`auth.mode: entra`, één tenant). Zie [docs/AUTH.md](docs/AUTH.md).6
6
7
Het logo is de blauwe ster: [`assets/logo.svg`](assets/logo.svg).7
Het logo is de blauwe ster: [`assets/logo.svg`](assets/logo.svg).8
8
@@ -11,6 +11,7 @@ Het logo is de blauwe ster: [`assets/logo.svg`](assets/logo.svg).11
## Wat het doet11
## Wat het doet12
12
13
- Repositories van een gebruiker of een groep, met bestanden, commits, branches, tags en releases.13
- Repositories van een gebruiker of een groep, met bestanden, commits, branches, tags en releases.14
- Op de project-overzichtspagina staat een commitgrafiek in de lege ruimte naast de centrale kolom, als er plek is. De hoofdbranch gebruikt de BlueGit-blauw; andere branches krijgen een vaste kleur uit hun naam. De grafiek wordt in het geheugen bewaard (LRU) en bij een push ververst, zodat herhaald laden geen git-I/O op schijf doet.14
- Merge requests met reviews, squash en het verwijderen van de bronbranch na een merge.15
- Merge requests met reviews, squash en het verwijderen van de bronbranch na een merge.15
- Issues, met beschrijvingssjablonen in `.bluegit/issue_templates`. Merge requests gebruiken `.bluegit/merge_request_templates`. `Default.md` vult een lege beschrijving. Dezelfde namen onder `.gitlab/` zijn een terugval.16
- Issues, met beschrijvingssjablonen in `.bluegit/issue_templates`. Merge requests gebruiken `.bluegit/merge_request_templates`. `Default.md` vult een lege beschrijving. Dezelfde namen onder `.gitlab/` zijn een terugval.16
- Een ingebouwde CI-runner, Steve. Het bestand is `blue-ci-cd.yml`. Elke job draait in een eigen container. `image: bluegit/base` en de andere aliassen zijn image-presets die Steve lokaal bouwt.17
- Een ingebouwde CI-runner, Steve. Het bestand is `blue-ci-cd.yml`. Elke job draait in een eigen container. `image: bluegit/base` en de andere aliassen zijn image-presets die Steve lokaal bouwt.@@ -41,6 +42,42 @@ Op Arch installeer je het AUR-pakket `bluegit`. De configuratie staat in `/etc/b41
42
42
Hoe het pakket gepubliceerd wordt en hoe de self-update via pacman werkt, staat in [docs/AUR.md](docs/AUR.md). De stappen voor de installatie op git.timfalken.com staan in [docs/BEHEER.md](docs/BEHEER.md).43
Hoe het pakket gepubliceerd wordt en hoe de self-update via pacman werkt, staat in [docs/AUR.md](docs/AUR.md). De stappen voor de installatie op git.timfalken.com staan in [docs/BEHEER.md](docs/BEHEER.md).43
44
45
## Microsoft Entra ID46
47
Details en de OIDC-controles staan in [docs/AUTH.md](docs/AUTH.md). Kort, stap voor stap:48
49
1. Open het [Microsoft Entra-beheercentrum](https://entra.microsoft.com) → Identiteit → Toepassingen → App-registraties → Nieuwe registratie.50
2. Kies één tenant (*Accounts in this organizational directory only* / single tenant).51
3. Platform: **Web**. De redirect-URI moet exact `{base_url}{auth.redirect_path}` zijn, het pad dat BlueGit verwacht. `auth.redirect_path` is standaard `/auth/callback`, dus bijvoorbeeld `https://git.timfalken.com/auth/callback`. Een ander pad, schema (`http` vs `https`) of een slash te veel of te weinig geeft een redirect-mismatch.52
4. Maak onder *Certificates & secrets* een client secret aan. Noteer de waarde (die is maar één keer zichtbaar) en de verloopdatum; na verlopen stopt aanmelden.53
5. BlueGit vraagt de scopes `openid`, `profile` en `email`. Die horen bij OpenID Connect; er zijn geen extra Graph-rechten nodig voor aanmelden.54
6. Op het overzicht van de app-registratie staan de **Directory (tenant) ID** (`auth.tenant_id`) en de **Application (client) ID** (`auth.client_id`).55
56
Zet in `/etc/bluegit/config.yml` (geen echte geheimen in dit bestand of in deze docs):57
58
```yaml59
auth:60
mode: entra61
tenant_id: # Directory (tenant) ID62
client_id: # Application (client) ID63
client_secret_file: /etc/bluegit/client_secret64
redirect_path: /auth/callback65
# issuer alleen voor een andere cloud of een test; leeg =66
# https://login.microsoftonline.com/{tenant_id}/v2.067
```68
69
Het clientgeheim zet je niet in de yaml als het vermijdbaar is. Alternatieven met exacte namen uit de code: `auth.client_secret`, `auth.client_secret_file` (bijvoorbeeld `/etc/bluegit/client_secret`, mode `0600`) of de omgevingsvariabele `BLUEGIT_AUTH_CLIENT_SECRET` (bijvoorbeeld in `/etc/bluegit/secret.env`). `auth.base_url` hoort bij `mode: oauth`, niet bij entra.70
71
Herstart daarna de service (`systemctl restart bluegit`). De bestaande knop **Aanmelden** (in de navigatie, naar `/login`) start de Entra-flow; er is geen aparte knop. Zonder `auth.mode: entra` blijft die knop naar auth.timfalken.com gaan.72
73
**Accountkoppeling.** De BlueGit-gebruiker hangt aan `tid` + `oid` uit het ID-token (stabiele `auth_id`). Dezelfde Entra-gebruiker komt terug op het bestaande account. Een nieuwe login waarvan de afgeleide gebruikersnaam al door een ander account bezet is, wordt geweigerd; er is geen overname via e-mail.74
75
**Veelvoorkomende fouten**76
77
- De redirect-URI komt niet exact overeen (pad, schema, host, slash) → redirect mismatch (vaak AADSTS50011).78
- Verlopen client secret → de token-exchange faalt; maak een nieuw geheim, werk `auth.client_secret_file` of `BLUEGIT_AUTH_CLIENT_SECRET` bij, en herstart.79
- Verkeerde tenant: `auth.tenant_id` hoort bij een andere directory, of `tid` in het token komt niet overeen → aanmelden wordt geweigerd.80
44
## Lokaal81
## Lokaal45
82
46
`auth.mode: dev` maakt een sessie zonder de auth-server. De configuratie weigert die modus zodra `base_url` op `git.timfalken.com` wijst.83
`auth.mode: dev` maakt een sessie zonder de auth-server. De configuratie weigert die modus zodra `base_url` op `git.timfalken.com` wijst.@@ -73,7 +110,7 @@ git clone http://tim:bg_…@127.0.0.1:8080/tim/demo.git73
## Documentatie110
## Documentatie74
111
75
- [docs/ARCHITECTURE.md](docs/ARCHITECTURE.md) beschrijft het proces, de schijf en waarom het één binary is.112
- [docs/ARCHITECTURE.md](docs/ARCHITECTURE.md) beschrijft het proces, de schijf en waarom het één binary is.76
- [docs/AUTH.md](docs/AUTH.md) beschrijft de OAuth-koppeling.113
- [docs/AUTH.md](docs/AUTH.md) beschrijft de OAuth-koppeling en Microsoft Entra ID.77
- [docs/INGRESS.md](docs/INGRESS.md) beschrijft TLS en de publieke SSH-poort.114
- [docs/INGRESS.md](docs/INGRESS.md) beschrijft TLS en de publieke SSH-poort.78
- [docs/CI.md](docs/CI.md) beschrijft `blue-ci-cd.yml` en Steve.115
- [docs/CI.md](docs/CI.md) beschrijft `blue-ci-cd.yml` en Steve.79
- [docs/AUR.md](docs/AUR.md) beschrijft het pakket en de self-update.116
- [docs/AUR.md](docs/AUR.md) beschrijft het pakket en de self-update.@@ -92,10 +92,13 @@ func serve(args []string) error {
92
92
dataPath := resolveStorage(cfg, log)
93
93
var provider auth.Provider
94
94
dev := cfg.Auth.Mode == "dev"
95
if dev {
95
switch cfg.Auth.Mode {
96
case "dev":
96
97
provider = auth.Dev{Username: cfg.Auth.DevUser, AuthID: cfg.Auth.DevAuthID}
97
98
log.Warn("auth.mode dev staat aan; doe dit niet op git.timfalken.com")
98
} else {
99
case "entra":
100
provider = auth.NewEntra(cfg.EntraIssuer(), cfg.Auth.TenantID, cfg.Auth.ClientID, cfg.Auth.ClientSecret, cfg.Auth.UserAgent)
101
default:
99
102
provider = auth.NewTimFalken(cfg.Auth.BaseURL, cfg.Auth.ClientID, cfg.Auth.ClientSecret, cfg.Auth.UserAgent)
100
103
}
101
104
ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
@@ -92,10 +92,13 @@ func serve(args []string) error {92
dataPath := resolveStorage(cfg, log)92
dataPath := resolveStorage(cfg, log)93
var provider auth.Provider93
var provider auth.Provider94
dev := cfg.Auth.Mode == "dev"94
dev := cfg.Auth.Mode == "dev"95
if dev {95
switch cfg.Auth.Mode {96
case "dev":96
provider = auth.Dev{Username: cfg.Auth.DevUser, AuthID: cfg.Auth.DevAuthID}97
provider = auth.Dev{Username: cfg.Auth.DevUser, AuthID: cfg.Auth.DevAuthID}97
log.Warn("auth.mode dev staat aan; doe dit niet op git.timfalken.com")98
log.Warn("auth.mode dev staat aan; doe dit niet op git.timfalken.com")98
} else {99
case "entra":100
provider = auth.NewEntra(cfg.EntraIssuer(), cfg.Auth.TenantID, cfg.Auth.ClientID, cfg.Auth.ClientSecret, cfg.Auth.UserAgent)101
default:99
provider = auth.NewTimFalken(cfg.Auth.BaseURL, cfg.Auth.ClientID, cfg.Auth.ClientSecret, cfg.Auth.UserAgent)102
provider = auth.NewTimFalken(cfg.Auth.BaseURL, cfg.Auth.ClientID, cfg.Auth.ClientSecret, cfg.Auth.UserAgent)100
}103
}101
ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)104
ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)@@ -92,3 +92,9 @@ De bestemming wordt bij het verbinden opgelost. Privébereiken (RFC1918, loopbac
92
92
De systeemgebruiker `bluegit` kan alles lezen wat op de schijf staat, inclusief geheimen (hij heeft `secret.key`). Mensen op de website kunnen dat niet, behalve een beheerder via het JSON-export dat de auth-server verplicht stelt. CI-jobs zien de geheimen die de regel van beschermde branches toelaat. Ze zien de Docker-socket niet.
93
93
94
94
Webhooks gaan niet naar een privénetwerk. De classificatie staat in `internal/ssrf`. Een allowlist van hosts, opnieuw proberen en een testknop staan nog op de roadmap.
95
96
## Commitgrafiek
97
98
De project-overzichtspagina toont een commitgrafiek in de lege ruimte links van de centrale kolom, als die ruimte breed genoeg is. Anders blijft hij verborgen; de bestaande kolom schuift niet. De hoofdbranch is altijd `--blue`. Andere branches krijgen een deterministische kleur uit een palet van CSS-variabelen, op basis van de branchnaam.
99
100
De gelegde grafiek (recente commits over alle branches, inclusief merges en forks) staat in een begrensde LRU-cache in het geheugen, per repository (en hoofdbranch). Een herhaalde pageview doet geen git-I/O. Bij een push wist `refsChanged` de entry en vult `refreshCache` hem op de achtergrond opnieuw. Deze cache schrijft niet naar schijf en is onafhankelijk van de optionele leescache.
@@ -92,3 +92,9 @@ De bestemming wordt bij het verbinden opgelost. Privébereiken (RFC1918, loopbac92
De systeemgebruiker `bluegit` kan alles lezen wat op de schijf staat, inclusief geheimen (hij heeft `secret.key`). Mensen op de website kunnen dat niet, behalve een beheerder via het JSON-export dat de auth-server verplicht stelt. CI-jobs zien de geheimen die de regel van beschermde branches toelaat. Ze zien de Docker-socket niet.92
De systeemgebruiker `bluegit` kan alles lezen wat op de schijf staat, inclusief geheimen (hij heeft `secret.key`). Mensen op de website kunnen dat niet, behalve een beheerder via het JSON-export dat de auth-server verplicht stelt. CI-jobs zien de geheimen die de regel van beschermde branches toelaat. Ze zien de Docker-socket niet.93
93
94
Webhooks gaan niet naar een privénetwerk. De classificatie staat in `internal/ssrf`. Een allowlist van hosts, opnieuw proberen en een testknop staan nog op de roadmap.94
Webhooks gaan niet naar een privénetwerk. De classificatie staat in `internal/ssrf`. Een allowlist van hosts, opnieuw proberen en een testknop staan nog op de roadmap.95
96
## Commitgrafiek97
98
De project-overzichtspagina toont een commitgrafiek in de lege ruimte links van de centrale kolom, als die ruimte breed genoeg is. Anders blijft hij verborgen; de bestaande kolom schuift niet. De hoofdbranch is altijd `--blue`. Andere branches krijgen een deterministische kleur uit een palet van CSS-variabelen, op basis van de branchnaam.99
100
De gelegde grafiek (recente commits over alle branches, inclusief merges en forks) staat in een begrensde LRU-cache in het geheugen, per repository (en hoofdbranch). Een herhaalde pageview doet geen git-I/O. Bij een push wist `refsChanged` de entry en vult `refreshCache` hem op de achtergrond opnieuw. Deze cache schrijft niet naar schijf en is onafhankelijk van de optionele leescache.@@ -1,8 +1,12 @@
1
# Koppeling met auth.timfalken.com
1
# Aanmelden: auth.timfalken.com of Microsoft Entra ID
2
3
BlueGit kent drie `auth.mode`-waarden: `oauth` (standaard, auth.timfalken.com), `entra` (Microsoft Entra ID, OIDC, één tenant) en `dev` (lokale sessie zonder IdP). Zonder nieuwe velden blijft alles zoals voorheen.
4
5
## auth.timfalken.com (`mode: oauth`)
2
6
3
7
De auth-server is geen OpenID-provider. `https://auth.timfalken.com/.well-known/openid-configuration` geeft 404. De integratie staat op [https://auth.timfalken.com/help](https://auth.timfalken.com/help) en, machineleesbaar, op [https://auth.timfalken.com/help.json](https://auth.timfalken.com/help.json) (schema 1.7, dienst `account-auth`). Verhalenboek op `projects.timfalken.com` gebruikt dezelfde flow; de README daar noemt dezelfde eindpunten.
4
8
5
## Wat een site moet doen
9
### Wat een site moet doen
6
10
7
11
1. Een beheerder registreert het domein op `/admin`. Het domein is de `client_id`. Voor BlueGit is dat `git.timfalken.com`. Het `client_secret` verschijnt één keer.
8
12
2. Het callback-pad is alleen het pad, zonder query. Voor BlueGit: `/auth/callback`. De volledige redirect-URI is `https://git.timfalken.com/auth/callback`. Subdomeinen van het geregistreerde domein zijn toegestaan. Een afwijkende poort moet apart geregistreerd worden.
@@ -25,13 +29,7 @@ grant_type=authorization_code&code=…&redirect_uri=…&client_id=…&client_sec
25
29
26
30
BlueGit stuurt op elk server-naar-server-verzoek `User-Agent: BlueGitAccountClient/0.1` en `Accept: application/json`.
27
31
28
## Wat BlueGit bewaart
29
30
Van het account: het numerieke id, de gebruikersnaam in kleine letters, de avatar-URL, en of die persoon op de auth-server beheerder is. Geen e-mail. Een merge vanaf de website gebruikt daarom `{naam}@users.git.timfalken.com` als afzender. Het bearer-token blijft in de sessietabel tot afmelden of verlopen.
31
32
SSH-sleutels op de auth-server zijn er voor aanmelden dáár (`POST /api/ssh-login/challenge` en `/verify`, namespace `timfalken-account`). Er komt geen API waarmee een verbonden site die sleutels ophaalt. BlueGit houdt eigen sleutels bij voor git-over-SSH. Ze worden geplakt op de accountpagina.
33
34
## Configuratie
32
### Configuratie (oauth)
35
33
36
34
```yaml
37
35
auth:
@@ -45,7 +43,78 @@ auth:
45
43
46
44
Een leeg `client_secret` valt terug op het bestand, en dat weer op `BLUEGIT_AUTH_CLIENT_SECRET`.
47
45
48
`auth.mode: dev` slaat de ronde over en maakt een sessie voor `dev_user`. De configuratie weigert die modus als `base_url` op `git.timfalken.com` staat.
46
## Microsoft Entra ID (`mode: entra`)
47
48
Entra is wél OpenID Connect. BlueGit gebruikt de authorization-code-flow met `scope=openid profile email` en PKCE S256. De login zet HttpOnly-cookies (`bluegit_oauth_state`, `bluegit_oauth_nonce`, `bluegit_oauth_pkce`; 600 seconden, `Secure` bij HTTPS, `SameSite=Lax`) en wist ze na de callback. In het ID-token controleert BlueGit: `nonce`, handtekening (JWKS, alleen RS256; `none` en HS256 worden geweigerd), `iss`, `aud`, verplichte `exp` (met 60 seconden klokverschuiving; ook `nbf` en `iat` als ze er zijn), en verplichte `tid` die case-insensitive gelijk moet zijn aan `auth.tenant_id`. `authorization_endpoint`, `token_endpoint` en `jwks_uri` moeten op dezelfde host staan als de issuer; bij een HTTPS-issuer moeten die eindpunten ook HTTPS zijn. Een zelfgezette `auth.issuer` moet HTTPS zijn, behalve op localhost (voor tests). Alleen één tenant: zet `tenant_id` op de Directory (tenant) ID van die directory.
49
50
Een korte checklist staat ook in de [README](../README.md#microsoft-entra-id).
51
52
### App-registratie
53
54
1. Open het [Microsoft Entra-beheercentrum](https://entra.microsoft.com) → Identiteit → Toepassingen → App-registraties → Nieuwe registratie.
55
2. Kies één tenant (*Accounts in this organizational directory only* / single tenant). Multi-tenant is niet ondersteund.
56
3. Platform: **Web**. De redirect-URI moet exact `{base_url}{auth.redirect_path}` zijn. `auth.redirect_path` is standaard `/auth/callback`, bijvoorbeeld `https://git.timfalken.com/auth/callback`. Pad, schema en host moeten letterlijk overeenkomen.
57
4. Maak onder *Certificates & secrets* een client secret aan. Noteer de waarde (één keer zichtbaar) en de verloopdatum.
58
5. BlueGit vraagt de scopes `openid`, `profile` en `email`. Geen aparte Graph-rechten nodig voor aanmelden. Avatar via Graph zit er niet in.
59
6. Op het overzicht van de registratie staan de **Directory (tenant) ID** (`auth.tenant_id`) en de **Application (client) ID** (`auth.client_id`).
60
61
### Configuratie (entra)
62
63
```yaml
64
auth:
65
mode: entra
66
tenant_id: 00000000-0000-0000-0000-000000000000
67
client_id: 11111111-1111-1111-1111-111111111111
68
client_secret: ""
69
client_secret_file: /etc/bluegit/client_secret
70
redirect_path: /auth/callback
71
# issuer alleen zetten voor een andere cloud of een testissuer.
72
# Leeg = https://login.microsoftonline.com/{tenant_id}/v2.0
73
# issuer: https://login.microsoftonline.com/00000000-0000-0000-0000-000000000000/v2.0
74
```
75
76
Ontbreekt `tenant_id`, `client_id` of het clientgeheim, dan weigert BlueGit te starten met een duidelijke fout. `auth.base_url` hoort bij oauth en wordt bij entra niet standaard op auth.timfalken.com gezet.
77
78
Het clientgeheim hoort in `auth.client_secret`, in `auth.client_secret_file` (bijvoorbeeld `/etc/bluegit/client_secret`, mode `0600`) of in de omgevingsvariabele `BLUEGIT_AUTH_CLIENT_SECRET` (bijvoorbeeld `/etc/bluegit/secret.env`). Na een wijziging: `systemctl restart bluegit`.
79
80
De bestaande knop **Aanmelden** (navigatie, `/login`) start de Entra-flow zodra `auth.mode: entra` staat. Er is geen aparte knop.
81
82
### Identiteit → BlueGit-gebruiker
83
84
| BlueGit | Bron bij Entra |
85
| --- | --- |
86
| `auth_id` (numeriek) | Stabiele hash van `tid` + `oid` (valt terug op `sub` als `oid` ontbreekt) |
87
| `username` | Lokaal deel van `preferred_username` of `email`, gesaneerd naar kleine letters; anders `u` + korte hash van `oid` |
88
| `avatar_url` | Leeg (initialen in de UI) |
89
| `auth_admin` / IdP-`is_admin` | Altijd false; Entra-rollen maken niemand BlueGit-beheerder |
90
91
Installatiebeheerder blijft: alleen de eerste aangemelde gebruiker op deze installatie.
92
93
Accountkoppeling loopt via `tid` + `oid` (de stabiele `auth_id`). Dezelfde Entra-gebruiker komt terug op het bestaande BlueGit-account, ook als de weergavenaam bij Entra verandert (als de nieuwe gebruikersnaam al bezet is, blijft de oude naam staan). Een *nieuwe* login waarvan de afgeleide gebruikersnaam al door een ander account bezet is, wordt geweigerd (`err.userTaken`). Er is geen overname via e-mail.
94
95
### Veelvoorkomende fouten
96
97
- Redirect-URI komt niet exact overeen (pad, schema, host, slash) → redirect mismatch, vaak AADSTS50011. Zet in Entra precies `{base_url}{auth.redirect_path}`.
98
- Verlopen of verkeerd client secret → de token-exchange faalt. Maak een nieuw geheim, werk `auth.client_secret_file` of `BLUEGIT_AUTH_CLIENT_SECRET` bij, en herstart.
99
- Verkeerde tenant: `auth.tenant_id` wijst naar een andere directory, of `tid` in het ID-token komt niet overeen → aanmelden wordt geweigerd.
100
- Issuer of discovery-eindpunten niet op HTTPS (buiten localhost) of `jwks_uri` op een andere host dan de issuer → BlueGit start niet of weigert discovery.
101
102
### Wat er anders is onder Entra
103
104
- Geen `/api/me`, geen avatar-URL, geen `email_verified` van de auth-server.
105
- `Extend` verlengt alleen de BlueGit-sessie (24 uur); er is geen remote session-extend.
106
- `Logout` wist alleen de lokale sessie; het Entra-token wordt niet ingetrokken.
107
- Pipeline-falenmail via `POST /api/email` op auth.timfalken.com werkt niet (geen `Mailer` op de Entra-provider).
108
109
## Wat BlueGit bewaart
110
111
Van het account: het numerieke auth-id, de gebruikersnaam in kleine letters, de avatar-URL (kan leeg zijn), en of die persoon op de auth-server beheerder is (`auth_admin`; bij Entra altijd false). Geen e-mail. Een merge vanaf de website gebruikt daarom `{naam}@users.git.timfalken.com` als afzender. Het bearer-token blijft in de sessietabel tot afmelden of verlopen.
112
113
SSH-sleutels op de auth-server zijn er voor aanmelden dáár (`POST /api/ssh-login/challenge` en `/verify`, namespace `timfalken-account`). Er komt geen API waarmee een verbonden site die sleutels ophaalt. BlueGit houdt eigen sleutels bij voor git-over-SSH. Ze worden geplakt op de accountpagina.
114
115
## Dev-modus
116
117
`auth.mode: dev` slaat de ronde over en maakt een sessie voor `dev_user`. De configuratie weigert die modus als `base_url` (van de BlueGit-site) op `git.timfalken.com` staat.
49
118
50
119
## Export
51
120
@@ -1,8 +1,12 @@1
# Koppeling met auth.timfalken.com1
# Aanmelden: auth.timfalken.com of Microsoft Entra ID2
3
BlueGit kent drie `auth.mode`-waarden: `oauth` (standaard, auth.timfalken.com), `entra` (Microsoft Entra ID, OIDC, één tenant) en `dev` (lokale sessie zonder IdP). Zonder nieuwe velden blijft alles zoals voorheen.4
5
## auth.timfalken.com (`mode: oauth`)2
6
3
De auth-server is geen OpenID-provider. `https://auth.timfalken.com/.well-known/openid-configuration` geeft 404. De integratie staat op [https://auth.timfalken.com/help](https://auth.timfalken.com/help) en, machineleesbaar, op [https://auth.timfalken.com/help.json](https://auth.timfalken.com/help.json) (schema 1.7, dienst `account-auth`). Verhalenboek op `projects.timfalken.com` gebruikt dezelfde flow; de README daar noemt dezelfde eindpunten.7
De auth-server is geen OpenID-provider. `https://auth.timfalken.com/.well-known/openid-configuration` geeft 404. De integratie staat op [https://auth.timfalken.com/help](https://auth.timfalken.com/help) en, machineleesbaar, op [https://auth.timfalken.com/help.json](https://auth.timfalken.com/help.json) (schema 1.7, dienst `account-auth`). Verhalenboek op `projects.timfalken.com` gebruikt dezelfde flow; de README daar noemt dezelfde eindpunten.4
8
5
## Wat een site moet doen9
### Wat een site moet doen6
10
7
1. Een beheerder registreert het domein op `/admin`. Het domein is de `client_id`. Voor BlueGit is dat `git.timfalken.com`. Het `client_secret` verschijnt één keer.11
1. Een beheerder registreert het domein op `/admin`. Het domein is de `client_id`. Voor BlueGit is dat `git.timfalken.com`. Het `client_secret` verschijnt één keer.8
2. Het callback-pad is alleen het pad, zonder query. Voor BlueGit: `/auth/callback`. De volledige redirect-URI is `https://git.timfalken.com/auth/callback`. Subdomeinen van het geregistreerde domein zijn toegestaan. Een afwijkende poort moet apart geregistreerd worden.12
2. Het callback-pad is alleen het pad, zonder query. Voor BlueGit: `/auth/callback`. De volledige redirect-URI is `https://git.timfalken.com/auth/callback`. Subdomeinen van het geregistreerde domein zijn toegestaan. Een afwijkende poort moet apart geregistreerd worden.@@ -25,13 +29,7 @@ grant_type=authorization_code&code=…&redirect_uri=…&client_id=…&client_sec25
29
26
BlueGit stuurt op elk server-naar-server-verzoek `User-Agent: BlueGitAccountClient/0.1` en `Accept: application/json`.30
BlueGit stuurt op elk server-naar-server-verzoek `User-Agent: BlueGitAccountClient/0.1` en `Accept: application/json`.27
31
28
## Wat BlueGit bewaart32
### Configuratie (oauth)29
30
Van het account: het numerieke id, de gebruikersnaam in kleine letters, de avatar-URL, en of die persoon op de auth-server beheerder is. Geen e-mail. Een merge vanaf de website gebruikt daarom `{naam}@users.git.timfalken.com` als afzender. Het bearer-token blijft in de sessietabel tot afmelden of verlopen.31
32
SSH-sleutels op de auth-server zijn er voor aanmelden dáár (`POST /api/ssh-login/challenge` en `/verify`, namespace `timfalken-account`). Er komt geen API waarmee een verbonden site die sleutels ophaalt. BlueGit houdt eigen sleutels bij voor git-over-SSH. Ze worden geplakt op de accountpagina.33
34
## Configuratie35
33
36
```yaml34
```yaml37
auth:35
auth:@@ -45,7 +43,78 @@ auth:45
43
46
Een leeg `client_secret` valt terug op het bestand, en dat weer op `BLUEGIT_AUTH_CLIENT_SECRET`.44
Een leeg `client_secret` valt terug op het bestand, en dat weer op `BLUEGIT_AUTH_CLIENT_SECRET`.47
45
48
`auth.mode: dev` slaat de ronde over en maakt een sessie voor `dev_user`. De configuratie weigert die modus als `base_url` op `git.timfalken.com` staat.46
## Microsoft Entra ID (`mode: entra`)47
48
Entra is wél OpenID Connect. BlueGit gebruikt de authorization-code-flow met `scope=openid profile email` en PKCE S256. De login zet HttpOnly-cookies (`bluegit_oauth_state`, `bluegit_oauth_nonce`, `bluegit_oauth_pkce`; 600 seconden, `Secure` bij HTTPS, `SameSite=Lax`) en wist ze na de callback. In het ID-token controleert BlueGit: `nonce`, handtekening (JWKS, alleen RS256; `none` en HS256 worden geweigerd), `iss`, `aud`, verplichte `exp` (met 60 seconden klokverschuiving; ook `nbf` en `iat` als ze er zijn), en verplichte `tid` die case-insensitive gelijk moet zijn aan `auth.tenant_id`. `authorization_endpoint`, `token_endpoint` en `jwks_uri` moeten op dezelfde host staan als de issuer; bij een HTTPS-issuer moeten die eindpunten ook HTTPS zijn. Een zelfgezette `auth.issuer` moet HTTPS zijn, behalve op localhost (voor tests). Alleen één tenant: zet `tenant_id` op de Directory (tenant) ID van die directory.49
50
Een korte checklist staat ook in de [README](../README.md#microsoft-entra-id).51
52
### App-registratie53
54
1. Open het [Microsoft Entra-beheercentrum](https://entra.microsoft.com) → Identiteit → Toepassingen → App-registraties → Nieuwe registratie.55
2. Kies één tenant (*Accounts in this organizational directory only* / single tenant). Multi-tenant is niet ondersteund.56
3. Platform: **Web**. De redirect-URI moet exact `{base_url}{auth.redirect_path}` zijn. `auth.redirect_path` is standaard `/auth/callback`, bijvoorbeeld `https://git.timfalken.com/auth/callback`. Pad, schema en host moeten letterlijk overeenkomen.57
4. Maak onder *Certificates & secrets* een client secret aan. Noteer de waarde (één keer zichtbaar) en de verloopdatum.58
5. BlueGit vraagt de scopes `openid`, `profile` en `email`. Geen aparte Graph-rechten nodig voor aanmelden. Avatar via Graph zit er niet in.59
6. Op het overzicht van de registratie staan de **Directory (tenant) ID** (`auth.tenant_id`) en de **Application (client) ID** (`auth.client_id`).60
61
### Configuratie (entra)62
63
```yaml64
auth:65
mode: entra66
tenant_id: 00000000-0000-0000-0000-00000000000067
client_id: 11111111-1111-1111-1111-11111111111168
client_secret: ""69
client_secret_file: /etc/bluegit/client_secret70
redirect_path: /auth/callback71
# issuer alleen zetten voor een andere cloud of een testissuer.72
# Leeg = https://login.microsoftonline.com/{tenant_id}/v2.073
# issuer: https://login.microsoftonline.com/00000000-0000-0000-0000-000000000000/v2.074
```75
76
Ontbreekt `tenant_id`, `client_id` of het clientgeheim, dan weigert BlueGit te starten met een duidelijke fout. `auth.base_url` hoort bij oauth en wordt bij entra niet standaard op auth.timfalken.com gezet.77
78
Het clientgeheim hoort in `auth.client_secret`, in `auth.client_secret_file` (bijvoorbeeld `/etc/bluegit/client_secret`, mode `0600`) of in de omgevingsvariabele `BLUEGIT_AUTH_CLIENT_SECRET` (bijvoorbeeld `/etc/bluegit/secret.env`). Na een wijziging: `systemctl restart bluegit`.79
80
De bestaande knop **Aanmelden** (navigatie, `/login`) start de Entra-flow zodra `auth.mode: entra` staat. Er is geen aparte knop.81
82
### Identiteit → BlueGit-gebruiker83
84
| BlueGit | Bron bij Entra |85
| --- | --- |86
| `auth_id` (numeriek) | Stabiele hash van `tid` + `oid` (valt terug op `sub` als `oid` ontbreekt) |87
| `username` | Lokaal deel van `preferred_username` of `email`, gesaneerd naar kleine letters; anders `u` + korte hash van `oid` |88
| `avatar_url` | Leeg (initialen in de UI) |89
| `auth_admin` / IdP-`is_admin` | Altijd false; Entra-rollen maken niemand BlueGit-beheerder |90
91
Installatiebeheerder blijft: alleen de eerste aangemelde gebruiker op deze installatie.92
93
Accountkoppeling loopt via `tid` + `oid` (de stabiele `auth_id`). Dezelfde Entra-gebruiker komt terug op het bestaande BlueGit-account, ook als de weergavenaam bij Entra verandert (als de nieuwe gebruikersnaam al bezet is, blijft de oude naam staan). Een *nieuwe* login waarvan de afgeleide gebruikersnaam al door een ander account bezet is, wordt geweigerd (`err.userTaken`). Er is geen overname via e-mail.94
95
### Veelvoorkomende fouten96
97
- Redirect-URI komt niet exact overeen (pad, schema, host, slash) → redirect mismatch, vaak AADSTS50011. Zet in Entra precies `{base_url}{auth.redirect_path}`.98
- Verlopen of verkeerd client secret → de token-exchange faalt. Maak een nieuw geheim, werk `auth.client_secret_file` of `BLUEGIT_AUTH_CLIENT_SECRET` bij, en herstart.99
- Verkeerde tenant: `auth.tenant_id` wijst naar een andere directory, of `tid` in het ID-token komt niet overeen → aanmelden wordt geweigerd.100
- Issuer of discovery-eindpunten niet op HTTPS (buiten localhost) of `jwks_uri` op een andere host dan de issuer → BlueGit start niet of weigert discovery.101
102
### Wat er anders is onder Entra103
104
- Geen `/api/me`, geen avatar-URL, geen `email_verified` van de auth-server.105
- `Extend` verlengt alleen de BlueGit-sessie (24 uur); er is geen remote session-extend.106
- `Logout` wist alleen de lokale sessie; het Entra-token wordt niet ingetrokken.107
- Pipeline-falenmail via `POST /api/email` op auth.timfalken.com werkt niet (geen `Mailer` op de Entra-provider).108
109
## Wat BlueGit bewaart110
111
Van het account: het numerieke auth-id, de gebruikersnaam in kleine letters, de avatar-URL (kan leeg zijn), en of die persoon op de auth-server beheerder is (`auth_admin`; bij Entra altijd false). Geen e-mail. Een merge vanaf de website gebruikt daarom `{naam}@users.git.timfalken.com` als afzender. Het bearer-token blijft in de sessietabel tot afmelden of verlopen.112
113
SSH-sleutels op de auth-server zijn er voor aanmelden dáár (`POST /api/ssh-login/challenge` en `/verify`, namespace `timfalken-account`). Er komt geen API waarmee een verbonden site die sleutels ophaalt. BlueGit houdt eigen sleutels bij voor git-over-SSH. Ze worden geplakt op de accountpagina.114
115
## Dev-modus116
117
`auth.mode: dev` slaat de ronde over en maakt een sessie voor `dev_user`. De configuratie weigert die modus als `base_url` (van de BlueGit-site) op `git.timfalken.com` staat.49
118
50
## Export119
## Export51
120
@@ -1,7 +1,7 @@
1
// Package auth praat met auth.timfalken.com.
2
// De site gebruikt de authorization-code-flow: het domein is de client_id,
3
// de code wordt server-side gewisseld, en /api/me levert id en gebruikersnaam.
4
// E-mail komt nooit mee. Er is geen lokaal wachtwoord.
1
// Package auth praat met de gekozen identity provider.
2
// Standaard is dat auth.timfalken.com (authorization-code-flow); optioneel
3
// Microsoft Entra ID (OIDC). E-mail komt nooit in het BlueGit-usermodel.
4
// Er is geen lokaal wachtwoord.
5
5
package auth
6
6
7
7
import (
@@ -27,9 +27,11 @@ type Identity struct {
27
27
}
28
28
29
29
// Provider is de auth-server, of een testvervanger.
30
// nonce is verplicht voor OIDC (Entra); TimFalken en Dev negeren hem.
31
// codeChallenge / codeVerifier zijn PKCE S256; verplicht bij Entra, genegeerd door TimFalken en Dev.
30
32
type Provider interface {
31
AuthorizeURL(state, redirectURI string) string
32
Exchange(ctx context.Context, code, redirectURI string) (Identity, error)
33
AuthorizeURL(state, nonce, redirectURI, codeChallenge string) string
34
Exchange(ctx context.Context, code, redirectURI, nonce, codeVerifier string) (Identity, error)
33
35
Extend(ctx context.Context, accessToken string) (expiresIn int, err error)
34
36
Logout(ctx context.Context, accessToken string) error
35
37
}
@@ -55,17 +57,21 @@ func NewTimFalken(baseURL, clientID, secret, userAgent string) *TimFalken {
55
57
}
56
58
57
59
// AuthorizeURL stuurt de browser naar de toestemmingspagina.
58
func (t *TimFalken) AuthorizeURL(state, redirectURI string) string {
60
func (t *TimFalken) AuthorizeURL(state, nonce, redirectURI, codeChallenge string) string {
59
61
q := url.Values{}
60
62
q.Set("client_id", t.ClientID)
61
63
q.Set("redirect_uri", redirectURI)
62
64
q.Set("response_type", "code")
63
65
q.Set("state", state)
66
_ = nonce
67
_ = codeChallenge
64
68
return t.BaseURL + "/oauth/authorize?" + q.Encode()
65
69
}
66
70
67
71
// Exchange wisselt de eenmalige code om voor een bearer-token.
68
func (t *TimFalken) Exchange(ctx context.Context, code, redirectURI string) (Identity, error) {
72
func (t *TimFalken) Exchange(ctx context.Context, code, redirectURI, nonce, codeVerifier string) (Identity, error) {
73
_ = nonce
74
_ = codeVerifier
69
75
form := url.Values{}
70
76
form.Set("grant_type", "authorization_code")
71
77
form.Set("code", code)
@@ -1,7 +1,7 @@1
// Package auth praat met auth.timfalken.com.1
// Package auth praat met de gekozen identity provider.2
// De site gebruikt de authorization-code-flow: het domein is de client_id,2
// Standaard is dat auth.timfalken.com (authorization-code-flow); optioneel3
// de code wordt server-side gewisseld, en /api/me levert id en gebruikersnaam.3
// Microsoft Entra ID (OIDC). E-mail komt nooit in het BlueGit-usermodel.4
// E-mail komt nooit mee. Er is geen lokaal wachtwoord.4
// Er is geen lokaal wachtwoord.5
package auth5
package auth6
6
7
import (7
import (@@ -27,9 +27,11 @@ type Identity struct {27
}27
}28
28
29
// Provider is de auth-server, of een testvervanger.29
// Provider is de auth-server, of een testvervanger.30
// nonce is verplicht voor OIDC (Entra); TimFalken en Dev negeren hem.31
// codeChallenge / codeVerifier zijn PKCE S256; verplicht bij Entra, genegeerd door TimFalken en Dev.30
type Provider interface {32
type Provider interface {31
AuthorizeURL(state, redirectURI string) string33
AuthorizeURL(state, nonce, redirectURI, codeChallenge string) string32
Exchange(ctx context.Context, code, redirectURI string) (Identity, error)34
Exchange(ctx context.Context, code, redirectURI, nonce, codeVerifier string) (Identity, error)33
Extend(ctx context.Context, accessToken string) (expiresIn int, err error)35
Extend(ctx context.Context, accessToken string) (expiresIn int, err error)34
Logout(ctx context.Context, accessToken string) error36
Logout(ctx context.Context, accessToken string) error35
}37
}@@ -55,17 +57,21 @@ func NewTimFalken(baseURL, clientID, secret, userAgent string) *TimFalken {55
}57
}56
58
57
// AuthorizeURL stuurt de browser naar de toestemmingspagina.59
// AuthorizeURL stuurt de browser naar de toestemmingspagina.58
func (t *TimFalken) AuthorizeURL(state, redirectURI string) string {60
func (t *TimFalken) AuthorizeURL(state, nonce, redirectURI, codeChallenge string) string {59
q := url.Values{}61
q := url.Values{}60
q.Set("client_id", t.ClientID)62
q.Set("client_id", t.ClientID)61
q.Set("redirect_uri", redirectURI)63
q.Set("redirect_uri", redirectURI)62
q.Set("response_type", "code")64
q.Set("response_type", "code")63
q.Set("state", state)65
q.Set("state", state)66
_ = nonce67
_ = codeChallenge64
return t.BaseURL + "/oauth/authorize?" + q.Encode()68
return t.BaseURL + "/oauth/authorize?" + q.Encode()65
}69
}66
70
67
// Exchange wisselt de eenmalige code om voor een bearer-token.71
// Exchange wisselt de eenmalige code om voor een bearer-token.68
func (t *TimFalken) Exchange(ctx context.Context, code, redirectURI string) (Identity, error) {72
func (t *TimFalken) Exchange(ctx context.Context, code, redirectURI, nonce, codeVerifier string) (Identity, error) {73
_ = nonce74
_ = codeVerifier69
form := url.Values{}75
form := url.Values{}70
form.Set("grant_type", "authorization_code")76
form.Set("grant_type", "authorization_code")71
form.Set("code", code)77
form.Set("code", code)@@ -31,7 +31,7 @@ func TestExchangeUsesAuthorizationCode(t *testing.T) {
31
31
}))
32
32
defer srv.Close()
33
33
client := NewTimFalken(srv.URL, "git.timfalken.com", "geheim", "BlueGitAccountClient/0.1")
34
id, err := client.Exchange(context.Background(), "code-1", "https://git.timfalken.com/auth/callback")
34
id, err := client.Exchange(context.Background(), "code-1", "https://git.timfalken.com/auth/callback", "", "")
35
35
if err != nil {
36
36
t.Fatal(err)
37
37
}
@@ -44,7 +44,7 @@ func TestExchangeUsesAuthorizationCode(t *testing.T) {
44
44
if gotAgent != "BlueGitAccountClient/0.1" || gotAccept != "application/json" {
45
45
t.Fatalf("headers %s %s", gotAgent, gotAccept)
46
46
}
47
url := client.AuthorizeURL("state-1", "https://git.timfalken.com/auth/callback")
47
url := client.AuthorizeURL("state-1", "nonce-1", "https://git.timfalken.com/auth/callback", "")
48
48
if !strings.Contains(url, "/oauth/authorize?") || !strings.Contains(url, "state=state-1") {
49
49
t.Fatal(url)
50
50
}
@@ -31,7 +31,7 @@ func TestExchangeUsesAuthorizationCode(t *testing.T) {31
}))31
}))32
defer srv.Close()32
defer srv.Close()33
client := NewTimFalken(srv.URL, "git.timfalken.com", "geheim", "BlueGitAccountClient/0.1")33
client := NewTimFalken(srv.URL, "git.timfalken.com", "geheim", "BlueGitAccountClient/0.1")34
id, err := client.Exchange(context.Background(), "code-1", "https://git.timfalken.com/auth/callback")34
id, err := client.Exchange(context.Background(), "code-1", "https://git.timfalken.com/auth/callback", "", "")35
if err != nil {35
if err != nil {36
t.Fatal(err)36
t.Fatal(err)37
}37
}@@ -44,7 +44,7 @@ func TestExchangeUsesAuthorizationCode(t *testing.T) {44
if gotAgent != "BlueGitAccountClient/0.1" || gotAccept != "application/json" {44
if gotAgent != "BlueGitAccountClient/0.1" || gotAccept != "application/json" {45
t.Fatalf("headers %s %s", gotAgent, gotAccept)45
t.Fatalf("headers %s %s", gotAgent, gotAccept)46
}46
}47
url := client.AuthorizeURL("state-1", "https://git.timfalken.com/auth/callback")47
url := client.AuthorizeURL("state-1", "nonce-1", "https://git.timfalken.com/auth/callback", "")48
if !strings.Contains(url, "/oauth/authorize?") || !strings.Contains(url, "state=state-1") {48
if !strings.Contains(url, "/oauth/authorize?") || !strings.Contains(url, "state=state-1") {49
t.Fatal(url)49
t.Fatal(url)50
}50
}@@ -13,10 +13,10 @@ type Dev struct {
13
13
}
14
14
15
15
// AuthorizeURL komt in de dev-modus niet voor: /login maakt meteen een sessie.
16
func (d Dev) AuthorizeURL(state, redirectURI string) string { return "/login" }
16
func (d Dev) AuthorizeURL(state, nonce, redirectURI, codeChallenge string) string { return "/login" }
17
17
18
18
// Exchange bestaat zodat de interface klopt. Dev-login gebruikt hem niet.
19
func (d Dev) Exchange(ctx context.Context, code, redirectURI string) (Identity, error) {
19
func (d Dev) Exchange(ctx context.Context, code, redirectURI, nonce, codeVerifier string) (Identity, error) {
20
20
if code != "dev" {
21
21
return Identity{}, fmt.Errorf("dev-auth accepteert alleen de lokale code")
22
22
}
@@ -13,10 +13,10 @@ type Dev struct {13
}13
}14
14
15
// AuthorizeURL komt in de dev-modus niet voor: /login maakt meteen een sessie.15
// AuthorizeURL komt in de dev-modus niet voor: /login maakt meteen een sessie.16
func (d Dev) AuthorizeURL(state, redirectURI string) string { return "/login" }16
func (d Dev) AuthorizeURL(state, nonce, redirectURI, codeChallenge string) string { return "/login" }17
17
18
// Exchange bestaat zodat de interface klopt. Dev-login gebruikt hem niet.18
// Exchange bestaat zodat de interface klopt. Dev-login gebruikt hem niet.19
func (d Dev) Exchange(ctx context.Context, code, redirectURI string) (Identity, error) {19
func (d Dev) Exchange(ctx context.Context, code, redirectURI, nonce, codeVerifier string) (Identity, error) {20
if code != "dev" {20
if code != "dev" {21
return Identity{}, fmt.Errorf("dev-auth accepteert alleen de lokale code")21
return Identity{}, fmt.Errorf("dev-auth accepteert alleen de lokale code")22
}22
}@@ -0,0 +1,401 @@
1
package auth
2
3
import (
4
"context"
5
"crypto/sha256"
6
"encoding/json"
7
"fmt"
8
"io"
9
"net/http"
10
"net/url"
11
"strings"
12
"sync"
13
"time"
14
15
"gitlab.com/Timfa/bluegit/internal/names"
16
)
17
18
// entraScope is wat de authorization-code-flow bij Entra vraagt.
19
const entraScope = "openid profile email"
20
21
// idTokenSkew is de toegestane klokverschuiving bij exp, nbf en iat.
22
const idTokenSkew = 60 * time.Second
23
24
// Entra is Microsoft Entra ID (OIDC, één tenant).
25
// Extend en Logout doen niets op afstand: Entra kent die TimFalken-API's niet.
26
type Entra struct {
27
Issuer string
28
TenantID string
29
ClientID string
30
Secret string
31
UserAgent string
32
HTTP *http.Client
33
34
mu sync.Mutex
35
authz string
36
token string
37
jwks *jwksCache
38
jwksURI string
39
}
40
41
// NewEntra maakt een OIDC-client. issuer is zonder slash aan het eind
42
// (standaard https://login.microsoftonline.com/{tenant}/v2.0).
43
func NewEntra(issuer, tenantID, clientID, secret, userAgent string) *Entra {
44
return &Entra{
45
Issuer: strings.TrimRight(issuer, "/"),
46
TenantID: tenantID,
47
ClientID: clientID,
48
Secret: secret,
49
UserAgent: userAgent,
50
HTTP: &http.Client{Timeout: 15 * time.Second},
51
jwks: &jwksCache{},
52
}
53
}
54
55
// AuthorizeURL stuurt de browser naar Entra met openid-profile-email, nonce en PKCE S256.
56
func (e *Entra) AuthorizeURL(state, nonce, redirectURI, codeChallenge string) string {
57
authz, err := e.authorizeEndpoint(context.Background())
58
if err != nil {
59
// Zonder discovery: vaste Entra-URL zodat /login niet paniceert.
60
authz = strings.TrimSuffix(e.Issuer, "/v2.0") + "/oauth2/v2.0/authorize"
61
}
62
q := url.Values{}
63
q.Set("client_id", e.ClientID)
64
q.Set("redirect_uri", redirectURI)
65
q.Set("response_type", "code")
66
q.Set("response_mode", "query")
67
q.Set("scope", entraScope)
68
q.Set("state", state)
69
q.Set("nonce", nonce)
70
if codeChallenge != "" {
71
q.Set("code_challenge", codeChallenge)
72
q.Set("code_challenge_method", "S256")
73
}
74
return authz + "?" + q.Encode()
75
}
76
77
// Exchange wisselt de code om, valideert het ID-token (JWKS, iss, aud, exp, tid, nonce, PKCE)
78
// en mapt oid/tid naar een BlueGit-identity.
79
func (e *Entra) Exchange(ctx context.Context, code, redirectURI, nonce, codeVerifier string) (Identity, error) {
80
if nonce == "" {
81
return Identity{}, fmt.Errorf("auth: nonce ontbreekt")
82
}
83
if strings.TrimSpace(codeVerifier) == "" {
84
return Identity{}, fmt.Errorf("auth: PKCE-verifier ontbreekt")
85
}
86
tokenURL, err := e.tokenEndpoint(ctx)
87
if err != nil {
88
return Identity{}, err
89
}
90
form := url.Values{}
91
form.Set("grant_type", "authorization_code")
92
form.Set("code", code)
93
form.Set("redirect_uri", redirectURI)
94
form.Set("client_id", e.ClientID)
95
form.Set("client_secret", e.Secret)
96
form.Set("scope", entraScope)
97
form.Set("code_verifier", codeVerifier)
98
req, err := http.NewRequestWithContext(ctx, http.MethodPost, tokenURL, strings.NewReader(form.Encode()))
99
if err != nil {
100
return Identity{}, err
101
}
102
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
103
req.Header.Set("Accept", "application/json")
104
if e.UserAgent != "" {
105
req.Header.Set("User-Agent", e.UserAgent)
106
}
107
var body struct {
108
AccessToken string `json:"access_token"`
109
IDToken string `json:"id_token"`
110
ExpiresIn int `json:"expires_in"`
111
Error string `json:"error"`
112
ErrorDesc string `json:"error_description"`
113
}
114
if err := e.doJSON(req, &body); err != nil {
115
return Identity{}, err
116
}
117
if body.Error != "" || body.IDToken == "" {
118
msg := body.Error
119
if body.ErrorDesc != "" {
120
msg = body.ErrorDesc
121
}
122
if msg == "" {
123
msg = "lege tokenrespons"
124
}
125
return Identity{}, fmt.Errorf("auth: %s", msg)
126
}
127
claims, err := e.verifyIDToken(ctx, body.IDToken, nonce)
128
if err != nil {
129
return Identity{}, err
130
}
131
oid := claims.OID
132
if oid == "" {
133
oid = claims.Sub
134
}
135
if oid == "" {
136
return Identity{}, fmt.Errorf("auth: id_token zonder oid/sub")
137
}
138
username, err := entraUsername(claims.PreferredUsername, claims.Email, claims.Name, oid)
139
if err != nil {
140
return Identity{}, err
141
}
142
return Identity{
143
AuthID: StableAuthID(e.TenantID, oid),
144
Username: username,
145
AvatarURL: "", // Entra levert geen avatar-URL zonder Graph-foto-API.
146
IsAdmin: false,
147
AccessToken: body.AccessToken,
148
ExpiresIn: 86400, // BlueGit-sessie; Entra's access_token is korter.
149
}, nil
150
}
151
152
// Extend verlengt alleen lokaal: Entra heeft geen /api/session/extend.
153
func (e *Entra) Extend(ctx context.Context, accessToken string) (int, error) {
154
return 86400, nil
155
}
156
157
// Logout doet niets op afstand; BlueGit wist de lokale sessie zelf.
158
func (e *Entra) Logout(ctx context.Context, accessToken string) error {
159
return nil
160
}
161
162
type idClaims struct {
163
Iss string `json:"iss"`
164
Aud jsonAudience `json:"aud"`
165
Exp int64 `json:"exp"`
166
Iat int64 `json:"iat"`
167
Nbf int64 `json:"nbf"`
168
Nonce string `json:"nonce"`
169
OID string `json:"oid"`
170
Sub string `json:"sub"`
171
TID string `json:"tid"`
172
PreferredUsername string `json:"preferred_username"`
173
Email string `json:"email"`
174
Name string `json:"name"`
175
}
176
177
func (e *Entra) verifyIDToken(ctx context.Context, raw, nonce string) (idClaims, error) {
178
hdr, payload, err := parseJWT(raw)
179
if err != nil {
180
return idClaims{}, err
181
}
182
var claims idClaims
183
if hdr.Alg != "RS256" {
184
return idClaims{}, fmt.Errorf("auth: onverwacht jwt-algorithme %q", hdr.Alg)
185
}
186
if err := json.Unmarshal(payload, &claims); err != nil {
187
return idClaims{}, fmt.Errorf("auth: id_token claims: %w", err)
188
}
189
if claims.Iss != e.Issuer {
190
return idClaims{}, fmt.Errorf("auth: ongeldige issuer")
191
}
192
if !claims.Aud.includes(e.ClientID) {
193
return idClaims{}, fmt.Errorf("auth: ongeldige audience")
194
}
195
now := time.Now()
196
if claims.Exp == 0 || now.Add(-idTokenSkew).Unix() >= claims.Exp {
197
return idClaims{}, fmt.Errorf("auth: id_token verlopen of mist exp")
198
}
199
if claims.Nbf > 0 && now.Add(idTokenSkew).Unix() < claims.Nbf {
200
return idClaims{}, fmt.Errorf("auth: id_token nog niet geldig")
201
}
202
if claims.Iat > 0 && now.Add(idTokenSkew).Unix() < claims.Iat {
203
return idClaims{}, fmt.Errorf("auth: id_token iat ligt in de toekomst")
204
}
205
if claims.Nonce == "" || claims.Nonce != nonce {
206
return idClaims{}, fmt.Errorf("auth: ongeldige nonce")
207
}
208
if claims.TID == "" || !strings.EqualFold(claims.TID, e.TenantID) {
209
return idClaims{}, fmt.Errorf("auth: onverwachte tenant")
210
}
211
key, err := e.signingKey(ctx, hdr.Kid)
212
if err != nil {
213
return idClaims{}, err
214
}
215
if err := verifyRS256(raw, key); err != nil {
216
return idClaims{}, err
217
}
218
return claims, nil
219
}
220
221
func (e *Entra) signingKey(ctx context.Context, kid string) (any, error) {
222
if err := e.ensureDiscovery(ctx); err != nil {
223
return nil, err
224
}
225
return e.jwks.key(ctx, e.HTTP, e.jwksURI, kid)
226
}
227
228
func (e *Entra) authorizeEndpoint(ctx context.Context) (string, error) {
229
if err := e.ensureDiscovery(ctx); err != nil {
230
return "", err
231
}
232
e.mu.Lock()
233
defer e.mu.Unlock()
234
return e.authz, nil
235
}
236
237
func (e *Entra) tokenEndpoint(ctx context.Context) (string, error) {
238
if err := e.ensureDiscovery(ctx); err != nil {
239
return "", err
240
}
241
e.mu.Lock()
242
defer e.mu.Unlock()
243
return e.token, nil
244
}
245
246
func (e *Entra) ensureDiscovery(ctx context.Context) error {
247
e.mu.Lock()
248
if e.authz != "" && e.token != "" && e.jwksURI != "" {
249
e.mu.Unlock()
250
return nil
251
}
252
e.mu.Unlock()
253
254
req, err := http.NewRequestWithContext(ctx, http.MethodGet, e.Issuer+"/.well-known/openid-configuration", nil)
255
if err != nil {
256
return err
257
}
258
if e.UserAgent != "" {
259
req.Header.Set("User-Agent", e.UserAgent)
260
}
261
var doc struct {
262
AuthorizationEndpoint string `json:"authorization_endpoint"`
263
TokenEndpoint string `json:"token_endpoint"`
264
JWKSURI string `json:"jwks_uri"`
265
Issuer string `json:"issuer"`
266
}
267
if err := e.doJSON(req, &doc); err != nil {
268
return fmt.Errorf("auth: oidc discovery: %w", err)
269
}
270
if doc.AuthorizationEndpoint == "" || doc.TokenEndpoint == "" || doc.JWKSURI == "" {
271
return fmt.Errorf("auth: onvolledige oidc discovery")
272
}
273
if doc.Issuer != "" && doc.Issuer != e.Issuer {
274
return fmt.Errorf("auth: discovery-issuer wijkt af")
275
}
276
for _, ep := range []string{doc.AuthorizationEndpoint, doc.TokenEndpoint, doc.JWKSURI} {
277
if err := oidcEndpointHostOK(ep, e.Issuer); err != nil {
278
return err
279
}
280
}
281
e.mu.Lock()
282
e.authz = doc.AuthorizationEndpoint
283
e.token = doc.TokenEndpoint
284
e.jwksURI = doc.JWKSURI
285
e.mu.Unlock()
286
return nil
287
}
288
289
// oidcEndpointHostOK eist dat authorization, token en jwks op dezelfde host
290
// staan als de issuer, en HTTPS gebruiken als de issuer HTTPS is.
291
func oidcEndpointHostOK(endpoint, issuer string) error {
292
eu, err := url.Parse(endpoint)
293
if err != nil || eu.Host == "" || (eu.Scheme != "https" && eu.Scheme != "http") {
294
return fmt.Errorf("auth: ongeldig OIDC-eindpunt %q", endpoint)
295
}
296
iu, err := url.Parse(issuer)
297
if err != nil || iu.Host == "" {
298
return fmt.Errorf("auth: ongeldige issuer %q", issuer)
299
}
300
if !strings.EqualFold(eu.Hostname(), iu.Hostname()) {
301
return fmt.Errorf("auth: OIDC-eindpunt host %s past niet bij issuer-host %s", eu.Hostname(), iu.Hostname())
302
}
303
if iu.Scheme == "https" && eu.Scheme != "https" {
304
return fmt.Errorf("auth: OIDC-eindpunt moet HTTPS zijn: %s", endpoint)
305
}
306
return nil
307
}
308
309
func (e *Entra) doJSON(req *http.Request, dest any) error {
310
res, err := e.HTTP.Do(req)
311
if err != nil {
312
return fmt.Errorf("auth: %w", err)
313
}
314
defer res.Body.Close()
315
raw, err := io.ReadAll(io.LimitReader(res.Body, 1<<20))
316
if err != nil {
317
return err
318
}
319
if res.StatusCode >= 400 {
320
var env struct {
321
Error string `json:"error"`
322
ErrorDesc string `json:"error_description"`
323
}
324
_ = json.Unmarshal(raw, &env)
325
msg := env.ErrorDesc
326
if msg == "" {
327
msg = env.Error
328
}
329
if msg == "" {
330
msg = res.Status
331
}
332
return fmt.Errorf("auth: %s", msg)
333
}
334
if dest == nil {
335
return nil
336
}
337
if err := json.Unmarshal(raw, dest); err != nil {
338
return fmt.Errorf("auth-antwoord: %w", err)
339
}
340
return nil
341
}
342
343
// StableAuthID maakt een positieve int64 uit tenant + object-id.
344
// Collisie is theoretisch mogelijk; bij een botsing krijgt de tweede gebruiker
345
// dezelfde auth_id (upsert op bestaande rij).
346
func StableAuthID(tenantID, objectID string) int64 {
347
sum := sha256.Sum256([]byte(tenantID + "\x00" + objectID))
348
var n uint64
349
for i := 0; i < 8; i++ {
350
n = n<<8 | uint64(sum[i])
351
}
352
n &^= 1 << 63
353
if n == 0 {
354
n = 1
355
}
356
return int64(n)
357
}
358
359
// entraUsername maakt een BlueGit-gebruikersnaam uit Entra-claims.
360
func entraUsername(preferred, email, display, oid string) (string, error) {
361
raw := strings.TrimSpace(preferred)
362
if raw == "" {
363
raw = strings.TrimSpace(email)
364
}
365
if i := strings.IndexByte(raw, '@'); i > 0 {
366
raw = raw[:i]
367
}
368
if raw == "" {
369
raw = strings.TrimSpace(display)
370
}
371
s := sanitizeUsername(raw)
372
if s == "" || names.ValidUsername(s) != nil {
373
sum := sha256.Sum256([]byte(oid))
374
s = fmt.Sprintf("u%x", sum[:4])
375
}
376
if err := names.ValidUsername(s); err != nil {
377
return "", fmt.Errorf("auth: geen bruikbare gebruikersnaam")
378
}
379
return s, nil
380
}
381
382
func sanitizeUsername(raw string) string {
383
s := strings.ToLower(strings.TrimSpace(raw))
384
var b strings.Builder
385
for _, r := range s {
386
switch {
387
case r >= 'a' && r <= 'z', r >= '0' && r <= '9', r == '_', r == '-':
388
b.WriteRune(r)
389
case r == '.' || r == ' ':
390
b.WriteByte('-')
391
}
392
}
393
out := strings.Trim(b.String(), "-_")
394
for strings.Contains(out, "--") {
395
out = strings.ReplaceAll(out, "--", "-")
396
}
397
if len(out) > 63 {
398
out = strings.Trim(out[:63], "-_")
399
}
400
return out
401
}
@@ -0,0 +1,401 @@1
package auth2
3
import (4
"context"5
"crypto/sha256"6
"encoding/json"7
"fmt"8
"io"9
"net/http"10
"net/url"11
"strings"12
"sync"13
"time"14
15
"gitlab.com/Timfa/bluegit/internal/names"16
)17
18
// entraScope is wat de authorization-code-flow bij Entra vraagt.19
const entraScope = "openid profile email"20
21
// idTokenSkew is de toegestane klokverschuiving bij exp, nbf en iat.22
const idTokenSkew = 60 * time.Second23
24
// Entra is Microsoft Entra ID (OIDC, één tenant).25
// Extend en Logout doen niets op afstand: Entra kent die TimFalken-API's niet.26
type Entra struct {27
Issuer string28
TenantID string29
ClientID string30
Secret string31
UserAgent string32
HTTP *http.Client33
34
mu sync.Mutex35
authz string36
token string37
jwks *jwksCache38
jwksURI string39
}40
41
// NewEntra maakt een OIDC-client. issuer is zonder slash aan het eind42
// (standaard https://login.microsoftonline.com/{tenant}/v2.0).43
func NewEntra(issuer, tenantID, clientID, secret, userAgent string) *Entra {44
return &Entra{45
Issuer: strings.TrimRight(issuer, "/"),46
TenantID: tenantID,47
ClientID: clientID,48
Secret: secret,49
UserAgent: userAgent,50
HTTP: &http.Client{Timeout: 15 * time.Second},51
jwks: &jwksCache{},52
}53
}54
55
// AuthorizeURL stuurt de browser naar Entra met openid-profile-email, nonce en PKCE S256.56
func (e *Entra) AuthorizeURL(state, nonce, redirectURI, codeChallenge string) string {57
authz, err := e.authorizeEndpoint(context.Background())58
if err != nil {59
// Zonder discovery: vaste Entra-URL zodat /login niet paniceert.60
authz = strings.TrimSuffix(e.Issuer, "/v2.0") + "/oauth2/v2.0/authorize"61
}62
q := url.Values{}63
q.Set("client_id", e.ClientID)64
q.Set("redirect_uri", redirectURI)65
q.Set("response_type", "code")66
q.Set("response_mode", "query")67
q.Set("scope", entraScope)68
q.Set("state", state)69
q.Set("nonce", nonce)70
if codeChallenge != "" {71
q.Set("code_challenge", codeChallenge)72
q.Set("code_challenge_method", "S256")73
}74
return authz + "?" + q.Encode()75
}76
77
// Exchange wisselt de code om, valideert het ID-token (JWKS, iss, aud, exp, tid, nonce, PKCE)78
// en mapt oid/tid naar een BlueGit-identity.79
func (e *Entra) Exchange(ctx context.Context, code, redirectURI, nonce, codeVerifier string) (Identity, error) {80
if nonce == "" {81
return Identity{}, fmt.Errorf("auth: nonce ontbreekt")82
}83
if strings.TrimSpace(codeVerifier) == "" {84
return Identity{}, fmt.Errorf("auth: PKCE-verifier ontbreekt")85
}86
tokenURL, err := e.tokenEndpoint(ctx)87
if err != nil {88
return Identity{}, err89
}90
form := url.Values{}91
form.Set("grant_type", "authorization_code")92
form.Set("code", code)93
form.Set("redirect_uri", redirectURI)94
form.Set("client_id", e.ClientID)95
form.Set("client_secret", e.Secret)96
form.Set("scope", entraScope)97
form.Set("code_verifier", codeVerifier)98
req, err := http.NewRequestWithContext(ctx, http.MethodPost, tokenURL, strings.NewReader(form.Encode()))99
if err != nil {100
return Identity{}, err101
}102
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")103
req.Header.Set("Accept", "application/json")104
if e.UserAgent != "" {105
req.Header.Set("User-Agent", e.UserAgent)106
}107
var body struct {108
AccessToken string `json:"access_token"`109
IDToken string `json:"id_token"`110
ExpiresIn int `json:"expires_in"`111
Error string `json:"error"`112
ErrorDesc string `json:"error_description"`113
}114
if err := e.doJSON(req, &body); err != nil {115
return Identity{}, err116
}117
if body.Error != "" || body.IDToken == "" {118
msg := body.Error119
if body.ErrorDesc != "" {120
msg = body.ErrorDesc121
}122
if msg == "" {123
msg = "lege tokenrespons"124
}125
return Identity{}, fmt.Errorf("auth: %s", msg)126
}127
claims, err := e.verifyIDToken(ctx, body.IDToken, nonce)128
if err != nil {129
return Identity{}, err130
}131
oid := claims.OID132
if oid == "" {133
oid = claims.Sub134
}135
if oid == "" {136
return Identity{}, fmt.Errorf("auth: id_token zonder oid/sub")137
}138
username, err := entraUsername(claims.PreferredUsername, claims.Email, claims.Name, oid)139
if err != nil {140
return Identity{}, err141
}142
return Identity{143
AuthID: StableAuthID(e.TenantID, oid),144
Username: username,145
AvatarURL: "", // Entra levert geen avatar-URL zonder Graph-foto-API.146
IsAdmin: false,147
AccessToken: body.AccessToken,148
ExpiresIn: 86400, // BlueGit-sessie; Entra's access_token is korter.149
}, nil150
}151
152
// Extend verlengt alleen lokaal: Entra heeft geen /api/session/extend.153
func (e *Entra) Extend(ctx context.Context, accessToken string) (int, error) {154
return 86400, nil155
}156
157
// Logout doet niets op afstand; BlueGit wist de lokale sessie zelf.158
func (e *Entra) Logout(ctx context.Context, accessToken string) error {159
return nil160
}161
162
type idClaims struct {163
Iss string `json:"iss"`164
Aud jsonAudience `json:"aud"`165
Exp int64 `json:"exp"`166
Iat int64 `json:"iat"`167
Nbf int64 `json:"nbf"`168
Nonce string `json:"nonce"`169
OID string `json:"oid"`170
Sub string `json:"sub"`171
TID string `json:"tid"`172
PreferredUsername string `json:"preferred_username"`173
Email string `json:"email"`174
Name string `json:"name"`175
}176
177
func (e *Entra) verifyIDToken(ctx context.Context, raw, nonce string) (idClaims, error) {178
hdr, payload, err := parseJWT(raw)179
if err != nil {180
return idClaims{}, err181
}182
var claims idClaims183
if hdr.Alg != "RS256" {184
return idClaims{}, fmt.Errorf("auth: onverwacht jwt-algorithme %q", hdr.Alg)185
}186
if err := json.Unmarshal(payload, &claims); err != nil {187
return idClaims{}, fmt.Errorf("auth: id_token claims: %w", err)188
}189
if claims.Iss != e.Issuer {190
return idClaims{}, fmt.Errorf("auth: ongeldige issuer")191
}192
if !claims.Aud.includes(e.ClientID) {193
return idClaims{}, fmt.Errorf("auth: ongeldige audience")194
}195
now := time.Now()196
if claims.Exp == 0 || now.Add(-idTokenSkew).Unix() >= claims.Exp {197
return idClaims{}, fmt.Errorf("auth: id_token verlopen of mist exp")198
}199
if claims.Nbf > 0 && now.Add(idTokenSkew).Unix() < claims.Nbf {200
return idClaims{}, fmt.Errorf("auth: id_token nog niet geldig")201
}202
if claims.Iat > 0 && now.Add(idTokenSkew).Unix() < claims.Iat {203
return idClaims{}, fmt.Errorf("auth: id_token iat ligt in de toekomst")204
}205
if claims.Nonce == "" || claims.Nonce != nonce {206
return idClaims{}, fmt.Errorf("auth: ongeldige nonce")207
}208
if claims.TID == "" || !strings.EqualFold(claims.TID, e.TenantID) {209
return idClaims{}, fmt.Errorf("auth: onverwachte tenant")210
}211
key, err := e.signingKey(ctx, hdr.Kid)212
if err != nil {213
return idClaims{}, err214
}215
if err := verifyRS256(raw, key); err != nil {216
return idClaims{}, err217
}218
return claims, nil219
}220
221
func (e *Entra) signingKey(ctx context.Context, kid string) (any, error) {222
if err := e.ensureDiscovery(ctx); err != nil {223
return nil, err224
}225
return e.jwks.key(ctx, e.HTTP, e.jwksURI, kid)226
}227
228
func (e *Entra) authorizeEndpoint(ctx context.Context) (string, error) {229
if err := e.ensureDiscovery(ctx); err != nil {230
return "", err231
}232
e.mu.Lock()233
defer e.mu.Unlock()234
return e.authz, nil235
}236
237
func (e *Entra) tokenEndpoint(ctx context.Context) (string, error) {238
if err := e.ensureDiscovery(ctx); err != nil {239
return "", err240
}241
e.mu.Lock()242
defer e.mu.Unlock()243
return e.token, nil244
}245
246
func (e *Entra) ensureDiscovery(ctx context.Context) error {247
e.mu.Lock()248
if e.authz != "" && e.token != "" && e.jwksURI != "" {249
e.mu.Unlock()250
return nil251
}252
e.mu.Unlock()253
254
req, err := http.NewRequestWithContext(ctx, http.MethodGet, e.Issuer+"/.well-known/openid-configuration", nil)255
if err != nil {256
return err257
}258
if e.UserAgent != "" {259
req.Header.Set("User-Agent", e.UserAgent)260
}261
var doc struct {262
AuthorizationEndpoint string `json:"authorization_endpoint"`263
TokenEndpoint string `json:"token_endpoint"`264
JWKSURI string `json:"jwks_uri"`265
Issuer string `json:"issuer"`266
}267
if err := e.doJSON(req, &doc); err != nil {268
return fmt.Errorf("auth: oidc discovery: %w", err)269
}270
if doc.AuthorizationEndpoint == "" || doc.TokenEndpoint == "" || doc.JWKSURI == "" {271
return fmt.Errorf("auth: onvolledige oidc discovery")272
}273
if doc.Issuer != "" && doc.Issuer != e.Issuer {274
return fmt.Errorf("auth: discovery-issuer wijkt af")275
}276
for _, ep := range []string{doc.AuthorizationEndpoint, doc.TokenEndpoint, doc.JWKSURI} {277
if err := oidcEndpointHostOK(ep, e.Issuer); err != nil {278
return err279
}280
}281
e.mu.Lock()282
e.authz = doc.AuthorizationEndpoint283
e.token = doc.TokenEndpoint284
e.jwksURI = doc.JWKSURI285
e.mu.Unlock()286
return nil287
}288
289
// oidcEndpointHostOK eist dat authorization, token en jwks op dezelfde host290
// staan als de issuer, en HTTPS gebruiken als de issuer HTTPS is.291
func oidcEndpointHostOK(endpoint, issuer string) error {292
eu, err := url.Parse(endpoint)293
if err != nil || eu.Host == "" || (eu.Scheme != "https" && eu.Scheme != "http") {294
return fmt.Errorf("auth: ongeldig OIDC-eindpunt %q", endpoint)295
}296
iu, err := url.Parse(issuer)297
if err != nil || iu.Host == "" {298
return fmt.Errorf("auth: ongeldige issuer %q", issuer)299
}300
if !strings.EqualFold(eu.Hostname(), iu.Hostname()) {301
return fmt.Errorf("auth: OIDC-eindpunt host %s past niet bij issuer-host %s", eu.Hostname(), iu.Hostname())302
}303
if iu.Scheme == "https" && eu.Scheme != "https" {304
return fmt.Errorf("auth: OIDC-eindpunt moet HTTPS zijn: %s", endpoint)305
}306
return nil307
}308
309
func (e *Entra) doJSON(req *http.Request, dest any) error {310
res, err := e.HTTP.Do(req)311
if err != nil {312
return fmt.Errorf("auth: %w", err)313
}314
defer res.Body.Close()315
raw, err := io.ReadAll(io.LimitReader(res.Body, 1<<20))316
if err != nil {317
return err318
}319
if res.StatusCode >= 400 {320
var env struct {321
Error string `json:"error"`322
ErrorDesc string `json:"error_description"`323
}324
_ = json.Unmarshal(raw, &env)325
msg := env.ErrorDesc326
if msg == "" {327
msg = env.Error328
}329
if msg == "" {330
msg = res.Status331
}332
return fmt.Errorf("auth: %s", msg)333
}334
if dest == nil {335
return nil336
}337
if err := json.Unmarshal(raw, dest); err != nil {338
return fmt.Errorf("auth-antwoord: %w", err)339
}340
return nil341
}342
343
// StableAuthID maakt een positieve int64 uit tenant + object-id.344
// Collisie is theoretisch mogelijk; bij een botsing krijgt de tweede gebruiker345
// dezelfde auth_id (upsert op bestaande rij).346
func StableAuthID(tenantID, objectID string) int64 {347
sum := sha256.Sum256([]byte(tenantID + "\x00" + objectID))348
var n uint64349
for i := 0; i < 8; i++ {350
n = n<<8 | uint64(sum[i])351
}352
n &^= 1 << 63353
if n == 0 {354
n = 1355
}356
return int64(n)357
}358
359
// entraUsername maakt een BlueGit-gebruikersnaam uit Entra-claims.360
func entraUsername(preferred, email, display, oid string) (string, error) {361
raw := strings.TrimSpace(preferred)362
if raw == "" {363
raw = strings.TrimSpace(email)364
}365
if i := strings.IndexByte(raw, '@'); i > 0 {366
raw = raw[:i]367
}368
if raw == "" {369
raw = strings.TrimSpace(display)370
}371
s := sanitizeUsername(raw)372
if s == "" || names.ValidUsername(s) != nil {373
sum := sha256.Sum256([]byte(oid))374
s = fmt.Sprintf("u%x", sum[:4])375
}376
if err := names.ValidUsername(s); err != nil {377
return "", fmt.Errorf("auth: geen bruikbare gebruikersnaam")378
}379
return s, nil380
}381
382
func sanitizeUsername(raw string) string {383
s := strings.ToLower(strings.TrimSpace(raw))384
var b strings.Builder385
for _, r := range s {386
switch {387
case r >= 'a' && r <= 'z', r >= '0' && r <= '9', r == '_', r == '-':388
b.WriteRune(r)389
case r == '.' || r == ' ':390
b.WriteByte('-')391
}392
}393
out := strings.Trim(b.String(), "-_")394
for strings.Contains(out, "--") {395
out = strings.ReplaceAll(out, "--", "-")396
}397
if len(out) > 63 {398
out = strings.Trim(out[:63], "-_")399
}400
return out401
}@@ -0,0 +1,277 @@
1
package auth
2
3
import (
4
"context"
5
"crypto/hmac"
6
"crypto/rand"
7
"crypto/rsa"
8
"crypto/sha256"
9
"encoding/base64"
10
"encoding/json"
11
"net/http"
12
"net/http/httptest"
13
"strings"
14
"testing"
15
"time"
16
)
17
18
func TestPKCEChallengeRFC7636(t *testing.T) {
19
got := PKCEChallenge("dBjftJeZ4CVP-mB92K27uhbUJU1p1r_wW1gFWFOEjXk")
20
if got != "E9Melhoa2OwvFrEMTJguCHaoeK1t8URWbuGJSstw-cM" {
21
t.Fatal(got)
22
}
23
}
24
25
type tokenHarness struct {
26
client *Entra
27
key *rsa.PrivateKey
28
kid string
29
nonce string
30
verifier string
31
close func()
32
}
33
34
func newTokenHarness(t *testing.T) *tokenHarness {
35
t.Helper()
36
key, err := rsa.GenerateKey(rand.Reader, 2048)
37
if err != nil {
38
t.Fatal(err)
39
}
40
kid := "test-key-1"
41
tenant := "00000000-0000-0000-0000-000000000099"
42
clientID := "11111111-1111-1111-1111-111111111199"
43
oid := "22222222-2222-2222-2222-222222222299"
44
nonce := "nonce-abc"
45
verifier, err := NewPKCEVerifier()
46
if err != nil {
47
t.Fatal(err)
48
}
49
mux := http.NewServeMux()
50
srv := httptest.NewServer(mux)
51
issuer := srv.URL
52
mux.HandleFunc("/.well-known/openid-configuration", func(w http.ResponseWriter, r *http.Request) {
53
_ = json.NewEncoder(w).Encode(map[string]string{
54
"issuer": issuer,
55
"authorization_endpoint": issuer + "/authorize",
56
"token_endpoint": issuer + "/token",
57
"jwks_uri": issuer + "/jwks",
58
})
59
})
60
mux.HandleFunc("/jwks", func(w http.ResponseWriter, r *http.Request) {
61
_ = json.NewEncoder(w).Encode(map[string]any{"keys": []map[string]string{testJWK(key, kid)}})
62
})
63
mux.HandleFunc("/token", func(w http.ResponseWriter, r *http.Request) {
64
_ = r.ParseForm()
65
if r.Form.Get("code_verifier") != verifier {
66
http.Error(w, `{"error":"invalid_grant"}`, http.StatusBadRequest)
67
return
68
}
69
tok, err := signIDToken(key, kid, validTokenClaims(issuer, nonce, tenant, clientID, oid))
70
if err != nil {
71
http.Error(w, err.Error(), 500)
72
return
73
}
74
_ = json.NewEncoder(w).Encode(map[string]any{"access_token": "entra-access", "id_token": tok, "expires_in": 3600})
75
})
76
client := NewEntra(issuer, tenant, clientID, "client-secret-placeholder", "BlueGitAccountClient/0.1")
77
client.HTTP = srv.Client()
78
return &tokenHarness{client: client, key: key, kid: kid, nonce: nonce, verifier: verifier, close: srv.Close}
79
}
80
81
func validTokenClaims(issuer, nonce, tenant, clientID, oid string) map[string]any {
82
now := time.Now()
83
return map[string]any{
84
"iss": issuer, "aud": clientID, "exp": now.Add(time.Hour).Unix(),
85
"iat": now.Unix(), "nbf": now.Add(-time.Minute).Unix(),
86
"nonce": nonce, "oid": oid, "sub": oid, "tid": tenant,
87
"preferred_username": "ada@contoso.example",
88
}
89
}
90
91
func signIDTokenAlg(alg, kid string, claims map[string]any, signer func(signing string) (string, error)) (string, error) {
92
hdr, err := json.Marshal(map[string]string{"alg": alg, "typ": "JWT", "kid": kid})
93
if err != nil {
94
return "", err
95
}
96
payload, err := json.Marshal(claims)
97
if err != nil {
98
return "", err
99
}
100
h := base64.RawURLEncoding.EncodeToString(hdr)
101
p := base64.RawURLEncoding.EncodeToString(payload)
102
signing := h + "." + p
103
if signer == nil {
104
return signing + ".", nil
105
}
106
sig, err := signer(signing)
107
if err != nil {
108
return "", err
109
}
110
return signing + "." + sig, nil
111
}
112
113
func TestEntraRequiresPKCE(t *testing.T) {
114
h := newTokenHarness(t)
115
defer h.close()
116
if _, err := h.client.Exchange(context.Background(), "good-code", "https://cb", h.nonce, ""); err == nil || !strings.Contains(err.Error(), "PKCE") {
117
t.Fatalf("lege verifier: %v", err)
118
}
119
if _, err := h.client.Exchange(context.Background(), "good-code", "https://cb", h.nonce, "andere-verifier"); err == nil {
120
t.Fatal("verkeerde verifier moest falen")
121
}
122
if _, err := h.client.Exchange(context.Background(), "good-code", "https://cb", h.nonce, h.verifier); err != nil {
123
t.Fatal(err)
124
}
125
}
126
127
func TestEntraRejectsForeignEndpointHost(t *testing.T) {
128
mux := http.NewServeMux()
129
srv := httptest.NewServer(mux)
130
defer srv.Close()
131
mux.HandleFunc("/.well-known/openid-configuration", func(w http.ResponseWriter, r *http.Request) {
132
_ = json.NewEncoder(w).Encode(map[string]string{
133
"issuer": srv.URL,
134
"authorization_endpoint": srv.URL + "/authorize",
135
"token_endpoint": srv.URL + "/token",
136
"jwks_uri": "https://evil.example/jwks",
137
})
138
})
139
client := NewEntra(srv.URL, "t", "c", "s", "")
140
client.HTTP = srv.Client()
141
err := client.ensureDiscovery(context.Background())
142
if err == nil || !strings.Contains(err.Error(), "host") {
143
t.Fatalf("vreemde jwks-host moest falen, kreeg %v", err)
144
}
145
}
146
147
func TestEntraIDTokenChecks(t *testing.T) {
148
h := newTokenHarness(t)
149
defer h.close()
150
if err := h.client.ensureDiscovery(context.Background()); err != nil {
151
t.Fatal(err)
152
}
153
tenant := h.client.TenantID
154
clientID := h.client.ClientID
155
oid := "22222222-2222-2222-2222-222222222299"
156
issuer := h.client.Issuer
157
nonce := h.nonce
158
159
mustOK := func(t *testing.T, claims map[string]any) {
160
t.Helper()
161
tok, err := signIDToken(h.key, h.kid, claims)
162
if err != nil {
163
t.Fatal(err)
164
}
165
if _, err := h.client.verifyIDToken(context.Background(), tok, nonce); err != nil {
166
t.Fatal(err)
167
}
168
}
169
mustErr := func(t *testing.T, tok, sub string) {
170
t.Helper()
171
_, err := h.client.verifyIDToken(context.Background(), tok, nonce)
172
if err == nil || (sub != "" && !strings.Contains(err.Error(), sub)) {
173
t.Fatalf("verwacht %q, kreeg %v", sub, err)
174
}
175
}
176
177
t.Run("ok", func(t *testing.T) { mustOK(t, validTokenClaims(issuer, nonce, tenant, clientID, oid)) })
178
179
t.Run("verlopen", func(t *testing.T) {
180
c := validTokenClaims(issuer, nonce, tenant, clientID, oid)
181
c["exp"] = time.Now().Add(-2 * time.Minute).Unix()
182
tok, err := signIDToken(h.key, h.kid, c)
183
if err != nil {
184
t.Fatal(err)
185
}
186
mustErr(t, tok, "verlopen")
187
})
188
t.Run("geen exp", func(t *testing.T) {
189
c := validTokenClaims(issuer, nonce, tenant, clientID, oid)
190
delete(c, "exp")
191
tok, err := signIDToken(h.key, h.kid, c)
192
if err != nil {
193
t.Fatal(err)
194
}
195
mustErr(t, tok, "exp")
196
})
197
t.Run("klokverschuiving exp", func(t *testing.T) {
198
c := validTokenClaims(issuer, nonce, tenant, clientID, oid)
199
c["exp"] = time.Now().Add(-30 * time.Second).Unix()
200
mustOK(t, c)
201
})
202
t.Run("geen tid", func(t *testing.T) {
203
c := validTokenClaims(issuer, nonce, tenant, clientID, oid)
204
delete(c, "tid")
205
tok, err := signIDToken(h.key, h.kid, c)
206
if err != nil {
207
t.Fatal(err)
208
}
209
mustErr(t, tok, "tenant")
210
})
211
t.Run("verkeerde tid", func(t *testing.T) {
212
c := validTokenClaims(issuer, nonce, tenant, clientID, oid)
213
c["tid"] = "andere-tenant"
214
tok, err := signIDToken(h.key, h.kid, c)
215
if err != nil {
216
t.Fatal(err)
217
}
218
mustErr(t, tok, "tenant")
219
})
220
t.Run("tid hoofdletters", func(t *testing.T) {
221
c := validTokenClaims(issuer, nonce, tenant, clientID, oid)
222
c["tid"] = strings.ToUpper(tenant)
223
mustOK(t, c)
224
})
225
t.Run("verkeerde issuer", func(t *testing.T) {
226
c := validTokenClaims("https://evil.example/t/v2.0", nonce, tenant, clientID, oid)
227
tok, err := signIDToken(h.key, h.kid, c)
228
if err != nil {
229
t.Fatal(err)
230
}
231
mustErr(t, tok, "issuer")
232
})
233
t.Run("slechte handtekening", func(t *testing.T) {
234
tok, err := signIDToken(h.key, h.kid, validTokenClaims(issuer, nonce, tenant, clientID, oid))
235
if err != nil {
236
t.Fatal(err)
237
}
238
tok = tok[:len(tok)-4] + "AAAA"
239
mustErr(t, tok, "handtekening")
240
})
241
t.Run("alg none", func(t *testing.T) {
242
tok, err := signIDTokenAlg("none", h.kid, validTokenClaims(issuer, nonce, tenant, clientID, oid), nil)
243
if err != nil {
244
t.Fatal(err)
245
}
246
mustErr(t, tok, "algorithme")
247
})
248
t.Run("alg HS256", func(t *testing.T) {
249
tok, err := signIDTokenAlg("HS256", h.kid, validTokenClaims(issuer, nonce, tenant, clientID, oid), func(signing string) (string, error) {
250
mac := hmac.New(sha256.New, []byte("geheim"))
251
_, _ = mac.Write([]byte(signing))
252
return base64.RawURLEncoding.EncodeToString(mac.Sum(nil)), nil
253
})
254
if err != nil {
255
t.Fatal(err)
256
}
257
mustErr(t, tok, "algorithme")
258
})
259
t.Run("nbf toekomst", func(t *testing.T) {
260
c := validTokenClaims(issuer, nonce, tenant, clientID, oid)
261
c["nbf"] = time.Now().Add(2 * time.Minute).Unix()
262
tok, err := signIDToken(h.key, h.kid, c)
263
if err != nil {
264
t.Fatal(err)
265
}
266
mustErr(t, tok, "geldig")
267
})
268
t.Run("iat toekomst", func(t *testing.T) {
269
c := validTokenClaims(issuer, nonce, tenant, clientID, oid)
270
c["iat"] = time.Now().Add(2 * time.Minute).Unix()
271
tok, err := signIDToken(h.key, h.kid, c)
272
if err != nil {
273
t.Fatal(err)
274
}
275
mustErr(t, tok, "iat")
276
})
277
}
@@ -0,0 +1,277 @@1
package auth2
3
import (4
"context"5
"crypto/hmac"6
"crypto/rand"7
"crypto/rsa"8
"crypto/sha256"9
"encoding/base64"10
"encoding/json"11
"net/http"12
"net/http/httptest"13
"strings"14
"testing"15
"time"16
)17
18
func TestPKCEChallengeRFC7636(t *testing.T) {19
got := PKCEChallenge("dBjftJeZ4CVP-mB92K27uhbUJU1p1r_wW1gFWFOEjXk")20
if got != "E9Melhoa2OwvFrEMTJguCHaoeK1t8URWbuGJSstw-cM" {21
t.Fatal(got)22
}23
}24
25
type tokenHarness struct {26
client *Entra27
key *rsa.PrivateKey28
kid string29
nonce string30
verifier string31
close func()32
}33
34
func newTokenHarness(t *testing.T) *tokenHarness {35
t.Helper()36
key, err := rsa.GenerateKey(rand.Reader, 2048)37
if err != nil {38
t.Fatal(err)39
}40
kid := "test-key-1"41
tenant := "00000000-0000-0000-0000-000000000099"42
clientID := "11111111-1111-1111-1111-111111111199"43
oid := "22222222-2222-2222-2222-222222222299"44
nonce := "nonce-abc"45
verifier, err := NewPKCEVerifier()46
if err != nil {47
t.Fatal(err)48
}49
mux := http.NewServeMux()50
srv := httptest.NewServer(mux)51
issuer := srv.URL52
mux.HandleFunc("/.well-known/openid-configuration", func(w http.ResponseWriter, r *http.Request) {53
_ = json.NewEncoder(w).Encode(map[string]string{54
"issuer": issuer,55
"authorization_endpoint": issuer + "/authorize",56
"token_endpoint": issuer + "/token",57
"jwks_uri": issuer + "/jwks",58
})59
})60
mux.HandleFunc("/jwks", func(w http.ResponseWriter, r *http.Request) {61
_ = json.NewEncoder(w).Encode(map[string]any{"keys": []map[string]string{testJWK(key, kid)}})62
})63
mux.HandleFunc("/token", func(w http.ResponseWriter, r *http.Request) {64
_ = r.ParseForm()65
if r.Form.Get("code_verifier") != verifier {66
http.Error(w, `{"error":"invalid_grant"}`, http.StatusBadRequest)67
return68
}69
tok, err := signIDToken(key, kid, validTokenClaims(issuer, nonce, tenant, clientID, oid))70
if err != nil {71
http.Error(w, err.Error(), 500)72
return73
}74
_ = json.NewEncoder(w).Encode(map[string]any{"access_token": "entra-access", "id_token": tok, "expires_in": 3600})75
})76
client := NewEntra(issuer, tenant, clientID, "client-secret-placeholder", "BlueGitAccountClient/0.1")77
client.HTTP = srv.Client()78
return &tokenHarness{client: client, key: key, kid: kid, nonce: nonce, verifier: verifier, close: srv.Close}79
}80
81
func validTokenClaims(issuer, nonce, tenant, clientID, oid string) map[string]any {82
now := time.Now()83
return map[string]any{84
"iss": issuer, "aud": clientID, "exp": now.Add(time.Hour).Unix(),85
"iat": now.Unix(), "nbf": now.Add(-time.Minute).Unix(),86
"nonce": nonce, "oid": oid, "sub": oid, "tid": tenant,87
"preferred_username": "ada@contoso.example",88
}89
}90
91
func signIDTokenAlg(alg, kid string, claims map[string]any, signer func(signing string) (string, error)) (string, error) {92
hdr, err := json.Marshal(map[string]string{"alg": alg, "typ": "JWT", "kid": kid})93
if err != nil {94
return "", err95
}96
payload, err := json.Marshal(claims)97
if err != nil {98
return "", err99
}100
h := base64.RawURLEncoding.EncodeToString(hdr)101
p := base64.RawURLEncoding.EncodeToString(payload)102
signing := h + "." + p103
if signer == nil {104
return signing + ".", nil105
}106
sig, err := signer(signing)107
if err != nil {108
return "", err109
}110
return signing + "." + sig, nil111
}112
113
func TestEntraRequiresPKCE(t *testing.T) {114
h := newTokenHarness(t)115
defer h.close()116
if _, err := h.client.Exchange(context.Background(), "good-code", "https://cb", h.nonce, ""); err == nil || !strings.Contains(err.Error(), "PKCE") {117
t.Fatalf("lege verifier: %v", err)118
}119
if _, err := h.client.Exchange(context.Background(), "good-code", "https://cb", h.nonce, "andere-verifier"); err == nil {120
t.Fatal("verkeerde verifier moest falen")121
}122
if _, err := h.client.Exchange(context.Background(), "good-code", "https://cb", h.nonce, h.verifier); err != nil {123
t.Fatal(err)124
}125
}126
127
func TestEntraRejectsForeignEndpointHost(t *testing.T) {128
mux := http.NewServeMux()129
srv := httptest.NewServer(mux)130
defer srv.Close()131
mux.HandleFunc("/.well-known/openid-configuration", func(w http.ResponseWriter, r *http.Request) {132
_ = json.NewEncoder(w).Encode(map[string]string{133
"issuer": srv.URL,134
"authorization_endpoint": srv.URL + "/authorize",135
"token_endpoint": srv.URL + "/token",136
"jwks_uri": "https://evil.example/jwks",137
})138
})139
client := NewEntra(srv.URL, "t", "c", "s", "")140
client.HTTP = srv.Client()141
err := client.ensureDiscovery(context.Background())142
if err == nil || !strings.Contains(err.Error(), "host") {143
t.Fatalf("vreemde jwks-host moest falen, kreeg %v", err)144
}145
}146
147
func TestEntraIDTokenChecks(t *testing.T) {148
h := newTokenHarness(t)149
defer h.close()150
if err := h.client.ensureDiscovery(context.Background()); err != nil {151
t.Fatal(err)152
}153
tenant := h.client.TenantID154
clientID := h.client.ClientID155
oid := "22222222-2222-2222-2222-222222222299"156
issuer := h.client.Issuer157
nonce := h.nonce158
159
mustOK := func(t *testing.T, claims map[string]any) {160
t.Helper()161
tok, err := signIDToken(h.key, h.kid, claims)162
if err != nil {163
t.Fatal(err)164
}165
if _, err := h.client.verifyIDToken(context.Background(), tok, nonce); err != nil {166
t.Fatal(err)167
}168
}169
mustErr := func(t *testing.T, tok, sub string) {170
t.Helper()171
_, err := h.client.verifyIDToken(context.Background(), tok, nonce)172
if err == nil || (sub != "" && !strings.Contains(err.Error(), sub)) {173
t.Fatalf("verwacht %q, kreeg %v", sub, err)174
}175
}176
177
t.Run("ok", func(t *testing.T) { mustOK(t, validTokenClaims(issuer, nonce, tenant, clientID, oid)) })178
179
t.Run("verlopen", func(t *testing.T) {180
c := validTokenClaims(issuer, nonce, tenant, clientID, oid)181
c["exp"] = time.Now().Add(-2 * time.Minute).Unix()182
tok, err := signIDToken(h.key, h.kid, c)183
if err != nil {184
t.Fatal(err)185
}186
mustErr(t, tok, "verlopen")187
})188
t.Run("geen exp", func(t *testing.T) {189
c := validTokenClaims(issuer, nonce, tenant, clientID, oid)190
delete(c, "exp")191
tok, err := signIDToken(h.key, h.kid, c)192
if err != nil {193
t.Fatal(err)194
}195
mustErr(t, tok, "exp")196
})197
t.Run("klokverschuiving exp", func(t *testing.T) {198
c := validTokenClaims(issuer, nonce, tenant, clientID, oid)199
c["exp"] = time.Now().Add(-30 * time.Second).Unix()200
mustOK(t, c)201
})202
t.Run("geen tid", func(t *testing.T) {203
c := validTokenClaims(issuer, nonce, tenant, clientID, oid)204
delete(c, "tid")205
tok, err := signIDToken(h.key, h.kid, c)206
if err != nil {207
t.Fatal(err)208
}209
mustErr(t, tok, "tenant")210
})211
t.Run("verkeerde tid", func(t *testing.T) {212
c := validTokenClaims(issuer, nonce, tenant, clientID, oid)213
c["tid"] = "andere-tenant"214
tok, err := signIDToken(h.key, h.kid, c)215
if err != nil {216
t.Fatal(err)217
}218
mustErr(t, tok, "tenant")219
})220
t.Run("tid hoofdletters", func(t *testing.T) {221
c := validTokenClaims(issuer, nonce, tenant, clientID, oid)222
c["tid"] = strings.ToUpper(tenant)223
mustOK(t, c)224
})225
t.Run("verkeerde issuer", func(t *testing.T) {226
c := validTokenClaims("https://evil.example/t/v2.0", nonce, tenant, clientID, oid)227
tok, err := signIDToken(h.key, h.kid, c)228
if err != nil {229
t.Fatal(err)230
}231
mustErr(t, tok, "issuer")232
})233
t.Run("slechte handtekening", func(t *testing.T) {234
tok, err := signIDToken(h.key, h.kid, validTokenClaims(issuer, nonce, tenant, clientID, oid))235
if err != nil {236
t.Fatal(err)237
}238
tok = tok[:len(tok)-4] + "AAAA"239
mustErr(t, tok, "handtekening")240
})241
t.Run("alg none", func(t *testing.T) {242
tok, err := signIDTokenAlg("none", h.kid, validTokenClaims(issuer, nonce, tenant, clientID, oid), nil)243
if err != nil {244
t.Fatal(err)245
}246
mustErr(t, tok, "algorithme")247
})248
t.Run("alg HS256", func(t *testing.T) {249
tok, err := signIDTokenAlg("HS256", h.kid, validTokenClaims(issuer, nonce, tenant, clientID, oid), func(signing string) (string, error) {250
mac := hmac.New(sha256.New, []byte("geheim"))251
_, _ = mac.Write([]byte(signing))252
return base64.RawURLEncoding.EncodeToString(mac.Sum(nil)), nil253
})254
if err != nil {255
t.Fatal(err)256
}257
mustErr(t, tok, "algorithme")258
})259
t.Run("nbf toekomst", func(t *testing.T) {260
c := validTokenClaims(issuer, nonce, tenant, clientID, oid)261
c["nbf"] = time.Now().Add(2 * time.Minute).Unix()262
tok, err := signIDToken(h.key, h.kid, c)263
if err != nil {264
t.Fatal(err)265
}266
mustErr(t, tok, "geldig")267
})268
t.Run("iat toekomst", func(t *testing.T) {269
c := validTokenClaims(issuer, nonce, tenant, clientID, oid)270
c["iat"] = time.Now().Add(2 * time.Minute).Unix()271
tok, err := signIDToken(h.key, h.kid, c)272
if err != nil {273
t.Fatal(err)274
}275
mustErr(t, tok, "iat")276
})277
}@@ -0,0 +1,203 @@
1
package auth
2
3
import (
4
"context"
5
"crypto"
6
"crypto/rand"
7
"crypto/rsa"
8
"crypto/sha256"
9
"encoding/base64"
10
"encoding/binary"
11
"encoding/json"
12
"net/http"
13
"net/http/httptest"
14
"strings"
15
"testing"
16
"time"
17
)
18
19
func TestStableAuthID(t *testing.T) {
20
a := StableAuthID("tenant-a", "oid-1")
21
b := StableAuthID("tenant-a", "oid-1")
22
c := StableAuthID("tenant-a", "oid-2")
23
if a <= 0 || a != b || a == c {
24
t.Fatalf("%d %d %d", a, b, c)
25
}
26
}
27
28
func TestEntraUsername(t *testing.T) {
29
u, err := entraUsername("Ada.Lovelace@contoso.example", "", "", "oid")
30
if err != nil || u != "ada-lovelace" {
31
t.Fatalf("%q %v", u, err)
32
}
33
u, err = entraUsername("", "", "!!!", "deadbeef-oid")
34
if err != nil || !strings.HasPrefix(u, "u") {
35
t.Fatalf("%q %v", u, err)
36
}
37
}
38
39
func TestEntraExchangeWithFakeOIDC(t *testing.T) {
40
key, err := rsa.GenerateKey(rand.Reader, 2048)
41
if err != nil {
42
t.Fatal(err)
43
}
44
kid := "test-key-1"
45
tenant := "00000000-0000-0000-0000-000000000099"
46
clientID := "11111111-1111-1111-1111-111111111199"
47
oid := "22222222-2222-2222-2222-222222222299"
48
nonce := "nonce-abc"
49
verifier, err := NewPKCEVerifier()
50
if err != nil {
51
t.Fatal(err)
52
}
53
54
var issuer string
55
mux := http.NewServeMux()
56
srv := httptest.NewServer(mux)
57
defer srv.Close()
58
issuer = srv.URL
59
60
mux.HandleFunc("/.well-known/openid-configuration", func(w http.ResponseWriter, r *http.Request) {
61
_ = json.NewEncoder(w).Encode(map[string]string{
62
"issuer": issuer,
63
"authorization_endpoint": issuer + "/authorize",
64
"token_endpoint": issuer + "/token",
65
"jwks_uri": issuer + "/jwks",
66
})
67
})
68
mux.HandleFunc("/jwks", func(w http.ResponseWriter, r *http.Request) {
69
_ = json.NewEncoder(w).Encode(map[string]any{"keys": []map[string]string{testJWK(key, kid)}})
70
})
71
mux.HandleFunc("/token", func(w http.ResponseWriter, r *http.Request) {
72
if err := r.ParseForm(); err != nil {
73
t.Error(err)
74
}
75
if r.Form.Get("code") != "good-code" || r.Form.Get("client_id") != clientID || r.Form.Get("code_verifier") != verifier {
76
http.Error(w, `{"error":"invalid_grant"}`, http.StatusBadRequest)
77
return
78
}
79
idTok, err := signIDToken(key, kid, map[string]any{
80
"iss": issuer,
81
"aud": clientID,
82
"exp": time.Now().Add(time.Hour).Unix(),
83
"nbf": time.Now().Add(-time.Minute).Unix(),
84
"nonce": nonce,
85
"oid": oid,
86
"sub": oid,
87
"tid": tenant,
88
"preferred_username": "ada@contoso.example",
89
"name": "Ada Lovelace",
90
})
91
if err != nil {
92
t.Error(err)
93
http.Error(w, err.Error(), 500)
94
return
95
}
96
_ = json.NewEncoder(w).Encode(map[string]any{
97
"access_token": "entra-access",
98
"id_token": idTok,
99
"expires_in": 3600,
100
"token_type": "Bearer",
101
})
102
})
103
104
client := NewEntra(issuer, tenant, clientID, "client-secret-placeholder", "BlueGitAccountClient/0.1")
105
client.HTTP = srv.Client()
106
107
challenge := PKCEChallenge(verifier)
108
url := client.AuthorizeURL("state-1", nonce, "https://git.example.test/auth/callback", challenge)
109
if !strings.Contains(url, "/authorize?") || !strings.Contains(url, "nonce="+nonce) || !strings.Contains(url, "scope=openid+profile+email") {
110
t.Fatal(url)
111
}
112
if !strings.Contains(url, "code_challenge="+challenge) || !strings.Contains(url, "code_challenge_method=S256") {
113
t.Fatal(url)
114
}
115
116
id, err := client.Exchange(context.Background(), "good-code", "https://git.example.test/auth/callback", nonce, verifier)
117
if err != nil {
118
t.Fatal(err)
119
}
120
if id.AuthID != StableAuthID(tenant, oid) || id.Username != "ada" || id.AccessToken != "entra-access" {
121
t.Fatalf("%+v", id)
122
}
123
if id.IsAdmin || id.AvatarURL != "" || id.ExpiresIn != 86400 {
124
t.Fatalf("degradatie verwacht: %+v", id)
125
}
126
sec, err := client.Extend(context.Background(), id.AccessToken)
127
if err != nil || sec != 86400 {
128
t.Fatalf("extend %d %v", sec, err)
129
}
130
if err := client.Logout(context.Background(), id.AccessToken); err != nil {
131
t.Fatal(err)
132
}
133
if _, err := client.Exchange(context.Background(), "good-code", "https://git.example.test/auth/callback", "andere", verifier); err == nil {
134
t.Fatal("verwacht nonce-fout")
135
}
136
}
137
138
func TestEntraRejectsBadAudience(t *testing.T) {
139
key, err := rsa.GenerateKey(rand.Reader, 2048)
140
if err != nil {
141
t.Fatal(err)
142
}
143
kid := "k1"
144
mux := http.NewServeMux()
145
srv := httptest.NewServer(mux)
146
defer srv.Close()
147
issuer := srv.URL
148
mux.HandleFunc("/.well-known/openid-configuration", func(w http.ResponseWriter, r *http.Request) {
149
_ = json.NewEncoder(w).Encode(map[string]string{
150
"issuer": issuer, "authorization_endpoint": issuer + "/a",
151
"token_endpoint": issuer + "/token", "jwks_uri": issuer + "/jwks",
152
})
153
})
154
mux.HandleFunc("/jwks", func(w http.ResponseWriter, r *http.Request) {
155
_ = json.NewEncoder(w).Encode(map[string]any{"keys": []map[string]string{testJWK(key, kid)}})
156
})
157
mux.HandleFunc("/token", func(w http.ResponseWriter, r *http.Request) {
158
tok, _ := signIDToken(key, kid, map[string]any{
159
"iss": issuer, "aud": "andere-app", "exp": time.Now().Add(time.Hour).Unix(),
160
"nonce": "n", "oid": "o", "sub": "o", "tid": "t",
161
})
162
_ = json.NewEncoder(w).Encode(map[string]any{"access_token": "x", "id_token": tok})
163
})
164
client := NewEntra(issuer, "t", "mijn-app", "geheim", "")
165
client.HTTP = srv.Client()
166
_, err = client.Exchange(context.Background(), "c", "https://cb", "n", "pkce-verifier")
167
if err == nil || !strings.Contains(err.Error(), "audience") {
168
t.Fatalf("verwacht audience-fout, kreeg %v", err)
169
}
170
}
171
172
func testJWK(key *rsa.PrivateKey, kid string) map[string]string {
173
n := base64.RawURLEncoding.EncodeToString(key.N.Bytes())
174
eb := make([]byte, 8)
175
binary.BigEndian.PutUint64(eb, uint64(key.E))
176
for len(eb) > 1 && eb[0] == 0 {
177
eb = eb[1:]
178
}
179
return map[string]string{
180
"kty": "RSA", "kid": kid, "use": "sig", "alg": "RS256",
181
"n": n, "e": base64.RawURLEncoding.EncodeToString(eb),
182
}
183
}
184
185
func signIDToken(key *rsa.PrivateKey, kid string, claims map[string]any) (string, error) {
186
hdr, err := json.Marshal(map[string]string{"alg": "RS256", "typ": "JWT", "kid": kid})
187
if err != nil {
188
return "", err
189
}
190
payload, err := json.Marshal(claims)
191
if err != nil {
192
return "", err
193
}
194
h := base64.RawURLEncoding.EncodeToString(hdr)
195
p := base64.RawURLEncoding.EncodeToString(payload)
196
signing := h + "." + p
197
sum := sha256.Sum256([]byte(signing))
198
sig, err := rsa.SignPKCS1v15(rand.Reader, key, crypto.SHA256, sum[:])
199
if err != nil {
200
return "", err
201
}
202
return signing + "." + base64.RawURLEncoding.EncodeToString(sig), nil
203
}
@@ -0,0 +1,203 @@1
package auth2
3
import (4
"context"5
"crypto"6
"crypto/rand"7
"crypto/rsa"8
"crypto/sha256"9
"encoding/base64"10
"encoding/binary"11
"encoding/json"12
"net/http"13
"net/http/httptest"14
"strings"15
"testing"16
"time"17
)18
19
func TestStableAuthID(t *testing.T) {20
a := StableAuthID("tenant-a", "oid-1")21
b := StableAuthID("tenant-a", "oid-1")22
c := StableAuthID("tenant-a", "oid-2")23
if a <= 0 || a != b || a == c {24
t.Fatalf("%d %d %d", a, b, c)25
}26
}27
28
func TestEntraUsername(t *testing.T) {29
u, err := entraUsername("Ada.Lovelace@contoso.example", "", "", "oid")30
if err != nil || u != "ada-lovelace" {31
t.Fatalf("%q %v", u, err)32
}33
u, err = entraUsername("", "", "!!!", "deadbeef-oid")34
if err != nil || !strings.HasPrefix(u, "u") {35
t.Fatalf("%q %v", u, err)36
}37
}38
39
func TestEntraExchangeWithFakeOIDC(t *testing.T) {40
key, err := rsa.GenerateKey(rand.Reader, 2048)41
if err != nil {42
t.Fatal(err)43
}44
kid := "test-key-1"45
tenant := "00000000-0000-0000-0000-000000000099"46
clientID := "11111111-1111-1111-1111-111111111199"47
oid := "22222222-2222-2222-2222-222222222299"48
nonce := "nonce-abc"49
verifier, err := NewPKCEVerifier()50
if err != nil {51
t.Fatal(err)52
}53
54
var issuer string55
mux := http.NewServeMux()56
srv := httptest.NewServer(mux)57
defer srv.Close()58
issuer = srv.URL59
60
mux.HandleFunc("/.well-known/openid-configuration", func(w http.ResponseWriter, r *http.Request) {61
_ = json.NewEncoder(w).Encode(map[string]string{62
"issuer": issuer,63
"authorization_endpoint": issuer + "/authorize",64
"token_endpoint": issuer + "/token",65
"jwks_uri": issuer + "/jwks",66
})67
})68
mux.HandleFunc("/jwks", func(w http.ResponseWriter, r *http.Request) {69
_ = json.NewEncoder(w).Encode(map[string]any{"keys": []map[string]string{testJWK(key, kid)}})70
})71
mux.HandleFunc("/token", func(w http.ResponseWriter, r *http.Request) {72
if err := r.ParseForm(); err != nil {73
t.Error(err)74
}75
if r.Form.Get("code") != "good-code" || r.Form.Get("client_id") != clientID || r.Form.Get("code_verifier") != verifier {76
http.Error(w, `{"error":"invalid_grant"}`, http.StatusBadRequest)77
return78
}79
idTok, err := signIDToken(key, kid, map[string]any{80
"iss": issuer,81
"aud": clientID,82
"exp": time.Now().Add(time.Hour).Unix(),83
"nbf": time.Now().Add(-time.Minute).Unix(),84
"nonce": nonce,85
"oid": oid,86
"sub": oid,87
"tid": tenant,88
"preferred_username": "ada@contoso.example",89
"name": "Ada Lovelace",90
})91
if err != nil {92
t.Error(err)93
http.Error(w, err.Error(), 500)94
return95
}96
_ = json.NewEncoder(w).Encode(map[string]any{97
"access_token": "entra-access",98
"id_token": idTok,99
"expires_in": 3600,100
"token_type": "Bearer",101
})102
})103
104
client := NewEntra(issuer, tenant, clientID, "client-secret-placeholder", "BlueGitAccountClient/0.1")105
client.HTTP = srv.Client()106
107
challenge := PKCEChallenge(verifier)108
url := client.AuthorizeURL("state-1", nonce, "https://git.example.test/auth/callback", challenge)109
if !strings.Contains(url, "/authorize?") || !strings.Contains(url, "nonce="+nonce) || !strings.Contains(url, "scope=openid+profile+email") {110
t.Fatal(url)111
}112
if !strings.Contains(url, "code_challenge="+challenge) || !strings.Contains(url, "code_challenge_method=S256") {113
t.Fatal(url)114
}115
116
id, err := client.Exchange(context.Background(), "good-code", "https://git.example.test/auth/callback", nonce, verifier)117
if err != nil {118
t.Fatal(err)119
}120
if id.AuthID != StableAuthID(tenant, oid) || id.Username != "ada" || id.AccessToken != "entra-access" {121
t.Fatalf("%+v", id)122
}123
if id.IsAdmin || id.AvatarURL != "" || id.ExpiresIn != 86400 {124
t.Fatalf("degradatie verwacht: %+v", id)125
}126
sec, err := client.Extend(context.Background(), id.AccessToken)127
if err != nil || sec != 86400 {128
t.Fatalf("extend %d %v", sec, err)129
}130
if err := client.Logout(context.Background(), id.AccessToken); err != nil {131
t.Fatal(err)132
}133
if _, err := client.Exchange(context.Background(), "good-code", "https://git.example.test/auth/callback", "andere", verifier); err == nil {134
t.Fatal("verwacht nonce-fout")135
}136
}137
138
func TestEntraRejectsBadAudience(t *testing.T) {139
key, err := rsa.GenerateKey(rand.Reader, 2048)140
if err != nil {141
t.Fatal(err)142
}143
kid := "k1"144
mux := http.NewServeMux()145
srv := httptest.NewServer(mux)146
defer srv.Close()147
issuer := srv.URL148
mux.HandleFunc("/.well-known/openid-configuration", func(w http.ResponseWriter, r *http.Request) {149
_ = json.NewEncoder(w).Encode(map[string]string{150
"issuer": issuer, "authorization_endpoint": issuer + "/a",151
"token_endpoint": issuer + "/token", "jwks_uri": issuer + "/jwks",152
})153
})154
mux.HandleFunc("/jwks", func(w http.ResponseWriter, r *http.Request) {155
_ = json.NewEncoder(w).Encode(map[string]any{"keys": []map[string]string{testJWK(key, kid)}})156
})157
mux.HandleFunc("/token", func(w http.ResponseWriter, r *http.Request) {158
tok, _ := signIDToken(key, kid, map[string]any{159
"iss": issuer, "aud": "andere-app", "exp": time.Now().Add(time.Hour).Unix(),160
"nonce": "n", "oid": "o", "sub": "o", "tid": "t",161
})162
_ = json.NewEncoder(w).Encode(map[string]any{"access_token": "x", "id_token": tok})163
})164
client := NewEntra(issuer, "t", "mijn-app", "geheim", "")165
client.HTTP = srv.Client()166
_, err = client.Exchange(context.Background(), "c", "https://cb", "n", "pkce-verifier")167
if err == nil || !strings.Contains(err.Error(), "audience") {168
t.Fatalf("verwacht audience-fout, kreeg %v", err)169
}170
}171
172
func testJWK(key *rsa.PrivateKey, kid string) map[string]string {173
n := base64.RawURLEncoding.EncodeToString(key.N.Bytes())174
eb := make([]byte, 8)175
binary.BigEndian.PutUint64(eb, uint64(key.E))176
for len(eb) > 1 && eb[0] == 0 {177
eb = eb[1:]178
}179
return map[string]string{180
"kty": "RSA", "kid": kid, "use": "sig", "alg": "RS256",181
"n": n, "e": base64.RawURLEncoding.EncodeToString(eb),182
}183
}184
185
func signIDToken(key *rsa.PrivateKey, kid string, claims map[string]any) (string, error) {186
hdr, err := json.Marshal(map[string]string{"alg": "RS256", "typ": "JWT", "kid": kid})187
if err != nil {188
return "", err189
}190
payload, err := json.Marshal(claims)191
if err != nil {192
return "", err193
}194
h := base64.RawURLEncoding.EncodeToString(hdr)195
p := base64.RawURLEncoding.EncodeToString(payload)196
signing := h + "." + p197
sum := sha256.Sum256([]byte(signing))198
sig, err := rsa.SignPKCS1v15(rand.Reader, key, crypto.SHA256, sum[:])199
if err != nil {200
return "", err201
}202
return signing + "." + base64.RawURLEncoding.EncodeToString(sig), nil203
}@@ -0,0 +1,195 @@
1
package auth
2
3
import (
4
"context"
5
"crypto"
6
"crypto/rsa"
7
"crypto/sha256"
8
"encoding/base64"
9
"encoding/binary"
10
"encoding/json"
11
"fmt"
12
"io"
13
"math/big"
14
"net/http"
15
"strings"
16
"sync"
17
"time"
18
)
19
20
type jwtHeader struct {
21
Alg string `json:"alg"`
22
Kid string `json:"kid"`
23
Typ string `json:"typ"`
24
}
25
26
// jsonAudience accepteert "aud" als string of als array.
27
type jsonAudience []string
28
29
func (a *jsonAudience) UnmarshalJSON(b []byte) error {
30
var one string
31
if err := json.Unmarshal(b, &one); err == nil {
32
*a = []string{one}
33
return nil
34
}
35
var many []string
36
if err := json.Unmarshal(b, &many); err != nil {
37
return err
38
}
39
*a = many
40
return nil
41
}
42
43
func (a jsonAudience) includes(want string) bool {
44
for _, v := range a {
45
if v == want {
46
return true
47
}
48
}
49
return false
50
}
51
52
func parseJWT(raw string) (jwtHeader, []byte, error) {
53
parts := strings.Split(raw, ".")
54
if len(parts) != 3 {
55
return jwtHeader{}, nil, fmt.Errorf("auth: ongeldig jwt")
56
}
57
hb, err := b64url(parts[0])
58
if err != nil {
59
return jwtHeader{}, nil, fmt.Errorf("auth: jwt-header: %w", err)
60
}
61
var hdr jwtHeader
62
if err := json.Unmarshal(hb, &hdr); err != nil {
63
return jwtHeader{}, nil, fmt.Errorf("auth: jwt-header: %w", err)
64
}
65
pb, err := b64url(parts[1])
66
if err != nil {
67
return jwtHeader{}, nil, fmt.Errorf("auth: jwt-payload: %w", err)
68
}
69
return hdr, pb, nil
70
}
71
72
func verifyRS256(raw string, key any) error {
73
pub, ok := key.(*rsa.PublicKey)
74
if !ok || pub == nil {
75
return fmt.Errorf("auth: geen rsa-sleutel")
76
}
77
parts := strings.Split(raw, ".")
78
if len(parts) != 3 {
79
return fmt.Errorf("auth: ongeldig jwt")
80
}
81
sig, err := b64url(parts[2])
82
if err != nil {
83
return fmt.Errorf("auth: jwt-handtekening: %w", err)
84
}
85
sum := sha256.Sum256([]byte(parts[0] + "." + parts[1]))
86
if err := rsa.VerifyPKCS1v15(pub, crypto.SHA256, sum[:], sig); err != nil {
87
return fmt.Errorf("auth: jwt-handtekening ongeldig")
88
}
89
return nil
90
}
91
92
func b64url(s string) ([]byte, error) {
93
return base64.RawURLEncoding.DecodeString(s)
94
}
95
96
type jwksCache struct {
97
mu sync.Mutex
98
fetched time.Time
99
keys map[string]*rsa.PublicKey
100
uri string
101
}
102
103
func (c *jwksCache) key(ctx context.Context, httpc *http.Client, uri, kid string) (*rsa.PublicKey, error) {
104
c.mu.Lock()
105
if k := c.keys[kid]; k != nil && c.uri == uri && time.Since(c.fetched) < time.Hour {
106
c.mu.Unlock()
107
return k, nil
108
}
109
c.mu.Unlock()
110
if err := c.refresh(ctx, httpc, uri); err != nil {
111
return nil, err
112
}
113
c.mu.Lock()
114
defer c.mu.Unlock()
115
k := c.keys[kid]
116
if k == nil {
117
return nil, fmt.Errorf("auth: jwks-sleutel %q ontbreekt", kid)
118
}
119
return k, nil
120
}
121
122
func (c *jwksCache) refresh(ctx context.Context, httpc *http.Client, uri string) error {
123
req, err := http.NewRequestWithContext(ctx, http.MethodGet, uri, nil)
124
if err != nil {
125
return err
126
}
127
res, err := httpc.Do(req)
128
if err != nil {
129
return fmt.Errorf("auth: jwks: %w", err)
130
}
131
defer res.Body.Close()
132
raw, err := io.ReadAll(io.LimitReader(res.Body, 1<<20))
133
if err != nil {
134
return err
135
}
136
if res.StatusCode >= 400 {
137
return fmt.Errorf("auth: jwks %s", res.Status)
138
}
139
var doc struct {
140
Keys []jwk `json:"keys"`
141
}
142
if err := json.Unmarshal(raw, &doc); err != nil {
143
return fmt.Errorf("auth: jwks: %w", err)
144
}
145
keys := make(map[string]*rsa.PublicKey, len(doc.Keys))
146
for _, k := range doc.Keys {
147
if k.Kty != "RSA" || k.Kid == "" || k.N == "" || k.E == "" {
148
continue
149
}
150
pub, err := k.rsaPublic()
151
if err != nil {
152
continue
153
}
154
keys[k.Kid] = pub
155
}
156
if len(keys) == 0 {
157
return fmt.Errorf("auth: jwks zonder bruikbare sleutels")
158
}
159
c.mu.Lock()
160
c.keys = keys
161
c.uri = uri
162
c.fetched = time.Now()
163
c.mu.Unlock()
164
return nil
165
}
166
167
type jwk struct {
168
Kty string `json:"kty"`
169
Kid string `json:"kid"`
170
N string `json:"n"`
171
E string `json:"e"`
172
Use string `json:"use"`
173
Alg string `json:"alg"`
174
}
175
176
func (k jwk) rsaPublic() (*rsa.PublicKey, error) {
177
nb, err := b64url(k.N)
178
if err != nil {
179
return nil, err
180
}
181
eb, err := b64url(k.E)
182
if err != nil {
183
return nil, err
184
}
185
var e int
186
if len(eb) < 8 {
187
pad := make([]byte, 8-len(eb))
188
eb = append(pad, eb...)
189
}
190
e = int(binary.BigEndian.Uint64(eb[len(eb)-8:]))
191
if e <= 0 {
192
return nil, fmt.Errorf("ongeldige exponent")
193
}
194
return &rsa.PublicKey{N: new(big.Int).SetBytes(nb), E: e}, nil
195
}
@@ -0,0 +1,195 @@1
package auth2
3
import (4
"context"5
"crypto"6
"crypto/rsa"7
"crypto/sha256"8
"encoding/base64"9
"encoding/binary"10
"encoding/json"11
"fmt"12
"io"13
"math/big"14
"net/http"15
"strings"16
"sync"17
"time"18
)19
20
type jwtHeader struct {21
Alg string `json:"alg"`22
Kid string `json:"kid"`23
Typ string `json:"typ"`24
}25
26
// jsonAudience accepteert "aud" als string of als array.27
type jsonAudience []string28
29
func (a *jsonAudience) UnmarshalJSON(b []byte) error {30
var one string31
if err := json.Unmarshal(b, &one); err == nil {32
*a = []string{one}33
return nil34
}35
var many []string36
if err := json.Unmarshal(b, &many); err != nil {37
return err38
}39
*a = many40
return nil41
}42
43
func (a jsonAudience) includes(want string) bool {44
for _, v := range a {45
if v == want {46
return true47
}48
}49
return false50
}51
52
func parseJWT(raw string) (jwtHeader, []byte, error) {53
parts := strings.Split(raw, ".")54
if len(parts) != 3 {55
return jwtHeader{}, nil, fmt.Errorf("auth: ongeldig jwt")56
}57
hb, err := b64url(parts[0])58
if err != nil {59
return jwtHeader{}, nil, fmt.Errorf("auth: jwt-header: %w", err)60
}61
var hdr jwtHeader62
if err := json.Unmarshal(hb, &hdr); err != nil {63
return jwtHeader{}, nil, fmt.Errorf("auth: jwt-header: %w", err)64
}65
pb, err := b64url(parts[1])66
if err != nil {67
return jwtHeader{}, nil, fmt.Errorf("auth: jwt-payload: %w", err)68
}69
return hdr, pb, nil70
}71
72
func verifyRS256(raw string, key any) error {73
pub, ok := key.(*rsa.PublicKey)74
if !ok || pub == nil {75
return fmt.Errorf("auth: geen rsa-sleutel")76
}77
parts := strings.Split(raw, ".")78
if len(parts) != 3 {79
return fmt.Errorf("auth: ongeldig jwt")80
}81
sig, err := b64url(parts[2])82
if err != nil {83
return fmt.Errorf("auth: jwt-handtekening: %w", err)84
}85
sum := sha256.Sum256([]byte(parts[0] + "." + parts[1]))86
if err := rsa.VerifyPKCS1v15(pub, crypto.SHA256, sum[:], sig); err != nil {87
return fmt.Errorf("auth: jwt-handtekening ongeldig")88
}89
return nil90
}91
92
func b64url(s string) ([]byte, error) {93
return base64.RawURLEncoding.DecodeString(s)94
}95
96
type jwksCache struct {97
mu sync.Mutex98
fetched time.Time99
keys map[string]*rsa.PublicKey100
uri string101
}102
103
func (c *jwksCache) key(ctx context.Context, httpc *http.Client, uri, kid string) (*rsa.PublicKey, error) {104
c.mu.Lock()105
if k := c.keys[kid]; k != nil && c.uri == uri && time.Since(c.fetched) < time.Hour {106
c.mu.Unlock()107
return k, nil108
}109
c.mu.Unlock()110
if err := c.refresh(ctx, httpc, uri); err != nil {111
return nil, err112
}113
c.mu.Lock()114
defer c.mu.Unlock()115
k := c.keys[kid]116
if k == nil {117
return nil, fmt.Errorf("auth: jwks-sleutel %q ontbreekt", kid)118
}119
return k, nil120
}121
122
func (c *jwksCache) refresh(ctx context.Context, httpc *http.Client, uri string) error {123
req, err := http.NewRequestWithContext(ctx, http.MethodGet, uri, nil)124
if err != nil {125
return err126
}127
res, err := httpc.Do(req)128
if err != nil {129
return fmt.Errorf("auth: jwks: %w", err)130
}131
defer res.Body.Close()132
raw, err := io.ReadAll(io.LimitReader(res.Body, 1<<20))133
if err != nil {134
return err135
}136
if res.StatusCode >= 400 {137
return fmt.Errorf("auth: jwks %s", res.Status)138
}139
var doc struct {140
Keys []jwk `json:"keys"`141
}142
if err := json.Unmarshal(raw, &doc); err != nil {143
return fmt.Errorf("auth: jwks: %w", err)144
}145
keys := make(map[string]*rsa.PublicKey, len(doc.Keys))146
for _, k := range doc.Keys {147
if k.Kty != "RSA" || k.Kid == "" || k.N == "" || k.E == "" {148
continue149
}150
pub, err := k.rsaPublic()151
if err != nil {152
continue153
}154
keys[k.Kid] = pub155
}156
if len(keys) == 0 {157
return fmt.Errorf("auth: jwks zonder bruikbare sleutels")158
}159
c.mu.Lock()160
c.keys = keys161
c.uri = uri162
c.fetched = time.Now()163
c.mu.Unlock()164
return nil165
}166
167
type jwk struct {168
Kty string `json:"kty"`169
Kid string `json:"kid"`170
N string `json:"n"`171
E string `json:"e"`172
Use string `json:"use"`173
Alg string `json:"alg"`174
}175
176
func (k jwk) rsaPublic() (*rsa.PublicKey, error) {177
nb, err := b64url(k.N)178
if err != nil {179
return nil, err180
}181
eb, err := b64url(k.E)182
if err != nil {183
return nil, err184
}185
var e int186
if len(eb) < 8 {187
pad := make([]byte, 8-len(eb))188
eb = append(pad, eb...)189
}190
e = int(binary.BigEndian.Uint64(eb[len(eb)-8:]))191
if e <= 0 {192
return nil, fmt.Errorf("ongeldige exponent")193
}194
return &rsa.PublicKey{N: new(big.Int).SetBytes(nb), E: e}, nil195
}@@ -0,0 +1,23 @@
1
package auth
2
3
import (
4
"crypto/rand"
5
"crypto/sha256"
6
"encoding/base64"
7
"fmt"
8
)
9
10
// NewPKCEVerifier maakt een code_verifier (RFC 7636, 43 tekens, unreserved).
11
func NewPKCEVerifier() (string, error) {
12
b := make([]byte, 32)
13
if _, err := rand.Read(b); err != nil {
14
return "", fmt.Errorf("PKCE-verifier: %w", err)
15
}
16
return base64.RawURLEncoding.EncodeToString(b), nil
17
}
18
19
// PKCEChallenge is BASE64URL(SHA256(verifier)), methode S256.
20
func PKCEChallenge(verifier string) string {
21
sum := sha256.Sum256([]byte(verifier))
22
return base64.RawURLEncoding.EncodeToString(sum[:])
23
}
@@ -0,0 +1,23 @@1
package auth2
3
import (4
"crypto/rand"5
"crypto/sha256"6
"encoding/base64"7
"fmt"8
)9
10
// NewPKCEVerifier maakt een code_verifier (RFC 7636, 43 tekens, unreserved).11
func NewPKCEVerifier() (string, error) {12
b := make([]byte, 32)13
if _, err := rand.Read(b); err != nil {14
return "", fmt.Errorf("PKCE-verifier: %w", err)15
}16
return base64.RawURLEncoding.EncodeToString(b), nil17
}18
19
// PKCEChallenge is BASE64URL(SHA256(verifier)), methode S256.20
func PKCEChallenge(verifier string) string {21
sum := sha256.Sum256([]byte(verifier))22
return base64.RawURLEncoding.EncodeToString(sum[:])23
}@@ -42,9 +42,9 @@ type Config struct {
42
42
proxies *realip.Set
43
43
}
44
44
45
// Auth wijst naar auth.timfalken.com of naar de lokale ontwikkelmodus.
45
// Auth wijst naar auth.timfalken.com, Microsoft Entra ID, of de lokale ontwikkelmodus.
46
46
type Auth struct {
47
Mode string `yaml:"mode"`
47
Mode string `yaml:"mode"` // oauth | entra | dev
48
48
BaseURL string `yaml:"base_url"`
49
49
ClientID string `yaml:"client_id"`
50
50
ClientSecret string `yaml:"client_secret"`
@@ -53,6 +53,11 @@ type Auth struct {
53
53
UserAgent string `yaml:"user_agent"`
54
54
DevUser string `yaml:"dev_user"`
55
55
DevAuthID int64 `yaml:"dev_auth_id"`
56
// TenantID is verplicht bij mode entra (directory-/tenant-id).
57
TenantID string `yaml:"tenant_id"`
58
// Issuer overschrijft de Entra-issuer. Leeg: login.microsoftonline.com/{tenant}/v2.0.
59
// Voor tests of andere clouds (bijv. login.microsoftonline.us).
60
Issuer string `yaml:"issuer"`
56
61
}
57
62
58
63
// Git wijst naar de git-binary en de standaardbranch van nieuwe repositories.
@@ -173,7 +178,8 @@ func (c *Config) applyDefaults() {
173
178
if c.Auth.Mode == "" {
174
179
c.Auth.Mode = "oauth"
175
180
}
176
if c.Auth.BaseURL == "" {
181
// base_url hoort bij oauth (auth.timfalken.com). Entra gebruikt issuer/tenant.
182
if c.Auth.Mode == "oauth" && c.Auth.BaseURL == "" {
177
183
c.Auth.BaseURL = "https://auth.timfalken.com"
178
184
}
179
185
if c.Auth.RedirectPath == "" {
@@ -215,6 +221,8 @@ func (c *Config) applyDefaults() {
215
221
c.Runner.Name = strings.TrimSpace(c.Runner.Name)
216
222
}
217
223
c.Auth.BaseURL = strings.TrimRight(c.Auth.BaseURL, "/")
224
c.Auth.Issuer = strings.TrimRight(strings.TrimSpace(c.Auth.Issuer), "/")
225
c.Auth.TenantID = strings.TrimSpace(c.Auth.TenantID)
218
226
c.BaseURL = strings.TrimRight(c.BaseURL, "/")
219
227
}
220
228
@@ -241,12 +249,24 @@ func (c *Config) Validate() error {
241
249
if c.Auth.BaseURL == "" {
242
250
return fmt.Errorf("auth.base_url ontbreekt")
243
251
}
252
case "entra":
253
if c.Auth.TenantID == "" {
254
return fmt.Errorf("entra vereist auth.tenant_id")
255
}
256
if c.Auth.ClientID == "" || c.Auth.ClientSecret == "" {
257
return fmt.Errorf("entra vereist auth.client_id en een clientgeheim (veld, bestand of BLUEGIT_AUTH_CLIENT_SECRET)")
258
}
259
if c.Auth.Issuer != "" {
260
if err := validateIssuer(c.Auth.Issuer); err != nil {
261
return err
262
}
263
}
244
264
case "dev":
245
265
if strings.EqualFold(u.Hostname(), "git.timfalken.com") {
246
266
return fmt.Errorf("auth.mode dev is geweigerd voor git.timfalken.com")
247
267
}
248
268
default:
249
return fmt.Errorf("auth.mode moet oauth of dev zijn")
269
return fmt.Errorf("auth.mode moet oauth, entra of dev zijn")
250
270
}
251
271
if c.BehindProxy {
252
272
return fmt.Errorf("behind_proxy doet niets meer; zet trusted_proxies op het IP of CIDR van de ingress en haal behind_proxy weg")
@@ -329,6 +349,34 @@ func (c Config) RedirectURI() string {
329
349
return c.BaseURL + c.Auth.RedirectPath
330
350
}
331
351
352
// validateIssuer eist een absolute URL. HTTP is alleen toegestaan op localhost.
353
func validateIssuer(issuer string) error {
354
iu, err := url.Parse(issuer)
355
if err != nil || (iu.Scheme != "https" && iu.Scheme != "http") || iu.Host == "" {
356
return fmt.Errorf("auth.issuer moet een absolute http(s)-URL zijn")
357
}
358
if iu.Scheme != "https" && !issuerLoopback(iu.Hostname()) {
359
return fmt.Errorf("auth.issuer moet HTTPS zijn (HTTP alleen op localhost)")
360
}
361
return nil
362
}
363
364
func issuerLoopback(host string) bool {
365
if strings.EqualFold(host, "localhost") {
366
return true
367
}
368
ip := net.ParseIP(host)
369
return ip != nil && ip.IsLoopback()
370
}
371
372
// EntraIssuer is de OIDC-issuer voor mode entra.
373
func (c Config) EntraIssuer() string {
374
if c.Auth.Issuer != "" {
375
return c.Auth.Issuer
376
}
377
return "https://login.microsoftonline.com/" + c.Auth.TenantID + "/v2.0"
378
}
379
332
380
// Example is een startconfiguratie voor de mini-PC.
333
381
func Example() string {
334
382
return `# BlueGit op de mini-PC. Kopieer naar /etc/bluegit/config.yml.
@@ -354,6 +402,12 @@ auth:
354
402
client_secret_file: /etc/bluegit/client_secret
355
403
redirect_path: /auth/callback
356
404
user_agent: BlueGitAccountClient/0.1
405
# Alternatief: Microsoft Entra ID (OIDC, één tenant). Zet mode op entra
406
# en vul tenant_id + client_id; geheim hetzelfde als hierboven.
407
# mode: entra
408
# tenant_id: 00000000-0000-0000-0000-000000000000
409
# client_id: 11111111-1111-1111-1111-111111111111
410
# issuer blijft leeg, tenzij je een andere cloud of testissuer nodig hebt.
357
411
358
412
git:
359
413
binary: git
@@ -42,9 +42,9 @@ type Config struct {42
proxies *realip.Set42
proxies *realip.Set43
}43
}44
44
45
// Auth wijst naar auth.timfalken.com of naar de lokale ontwikkelmodus.45
// Auth wijst naar auth.timfalken.com, Microsoft Entra ID, of de lokale ontwikkelmodus.46
type Auth struct {46
type Auth struct {47
Mode string `yaml:"mode"`47
Mode string `yaml:"mode"` // oauth | entra | dev48
BaseURL string `yaml:"base_url"`48
BaseURL string `yaml:"base_url"`49
ClientID string `yaml:"client_id"`49
ClientID string `yaml:"client_id"`50
ClientSecret string `yaml:"client_secret"`50
ClientSecret string `yaml:"client_secret"`@@ -53,6 +53,11 @@ type Auth struct {53
UserAgent string `yaml:"user_agent"`53
UserAgent string `yaml:"user_agent"`54
DevUser string `yaml:"dev_user"`54
DevUser string `yaml:"dev_user"`55
DevAuthID int64 `yaml:"dev_auth_id"`55
DevAuthID int64 `yaml:"dev_auth_id"`56
// TenantID is verplicht bij mode entra (directory-/tenant-id).57
TenantID string `yaml:"tenant_id"`58
// Issuer overschrijft de Entra-issuer. Leeg: login.microsoftonline.com/{tenant}/v2.0.59
// Voor tests of andere clouds (bijv. login.microsoftonline.us).60
Issuer string `yaml:"issuer"`56
}61
}57
62
58
// Git wijst naar de git-binary en de standaardbranch van nieuwe repositories.63
// Git wijst naar de git-binary en de standaardbranch van nieuwe repositories.@@ -173,7 +178,8 @@ func (c *Config) applyDefaults() {173
if c.Auth.Mode == "" {178
if c.Auth.Mode == "" {174
c.Auth.Mode = "oauth"179
c.Auth.Mode = "oauth"175
}180
}176
if c.Auth.BaseURL == "" {181
// base_url hoort bij oauth (auth.timfalken.com). Entra gebruikt issuer/tenant.182
if c.Auth.Mode == "oauth" && c.Auth.BaseURL == "" {177
c.Auth.BaseURL = "https://auth.timfalken.com"183
c.Auth.BaseURL = "https://auth.timfalken.com"178
}184
}179
if c.Auth.RedirectPath == "" {185
if c.Auth.RedirectPath == "" {@@ -215,6 +221,8 @@ func (c *Config) applyDefaults() {215
c.Runner.Name = strings.TrimSpace(c.Runner.Name)221
c.Runner.Name = strings.TrimSpace(c.Runner.Name)216
}222
}217
c.Auth.BaseURL = strings.TrimRight(c.Auth.BaseURL, "/")223
c.Auth.BaseURL = strings.TrimRight(c.Auth.BaseURL, "/")224
c.Auth.Issuer = strings.TrimRight(strings.TrimSpace(c.Auth.Issuer), "/")225
c.Auth.TenantID = strings.TrimSpace(c.Auth.TenantID)218
c.BaseURL = strings.TrimRight(c.BaseURL, "/")226
c.BaseURL = strings.TrimRight(c.BaseURL, "/")219
}227
}220
228
@@ -241,12 +249,24 @@ func (c *Config) Validate() error {241
if c.Auth.BaseURL == "" {249
if c.Auth.BaseURL == "" {242
return fmt.Errorf("auth.base_url ontbreekt")250
return fmt.Errorf("auth.base_url ontbreekt")243
}251
}252
case "entra":253
if c.Auth.TenantID == "" {254
return fmt.Errorf("entra vereist auth.tenant_id")255
}256
if c.Auth.ClientID == "" || c.Auth.ClientSecret == "" {257
return fmt.Errorf("entra vereist auth.client_id en een clientgeheim (veld, bestand of BLUEGIT_AUTH_CLIENT_SECRET)")258
}259
if c.Auth.Issuer != "" {260
if err := validateIssuer(c.Auth.Issuer); err != nil {261
return err262
}263
}244
case "dev":264
case "dev":245
if strings.EqualFold(u.Hostname(), "git.timfalken.com") {265
if strings.EqualFold(u.Hostname(), "git.timfalken.com") {246
return fmt.Errorf("auth.mode dev is geweigerd voor git.timfalken.com")266
return fmt.Errorf("auth.mode dev is geweigerd voor git.timfalken.com")247
}267
}248
default:268
default:249
return fmt.Errorf("auth.mode moet oauth of dev zijn")269
return fmt.Errorf("auth.mode moet oauth, entra of dev zijn")250
}270
}251
if c.BehindProxy {271
if c.BehindProxy {252
return fmt.Errorf("behind_proxy doet niets meer; zet trusted_proxies op het IP of CIDR van de ingress en haal behind_proxy weg")272
return fmt.Errorf("behind_proxy doet niets meer; zet trusted_proxies op het IP of CIDR van de ingress en haal behind_proxy weg")@@ -329,6 +349,34 @@ func (c Config) RedirectURI() string {329
return c.BaseURL + c.Auth.RedirectPath349
return c.BaseURL + c.Auth.RedirectPath330
}350
}331
351
352
// validateIssuer eist een absolute URL. HTTP is alleen toegestaan op localhost.353
func validateIssuer(issuer string) error {354
iu, err := url.Parse(issuer)355
if err != nil || (iu.Scheme != "https" && iu.Scheme != "http") || iu.Host == "" {356
return fmt.Errorf("auth.issuer moet een absolute http(s)-URL zijn")357
}358
if iu.Scheme != "https" && !issuerLoopback(iu.Hostname()) {359
return fmt.Errorf("auth.issuer moet HTTPS zijn (HTTP alleen op localhost)")360
}361
return nil362
}363
364
func issuerLoopback(host string) bool {365
if strings.EqualFold(host, "localhost") {366
return true367
}368
ip := net.ParseIP(host)369
return ip != nil && ip.IsLoopback()370
}371
372
// EntraIssuer is de OIDC-issuer voor mode entra.373
func (c Config) EntraIssuer() string {374
if c.Auth.Issuer != "" {375
return c.Auth.Issuer376
}377
return "https://login.microsoftonline.com/" + c.Auth.TenantID + "/v2.0"378
}379
332
// Example is een startconfiguratie voor de mini-PC.380
// Example is een startconfiguratie voor de mini-PC.333
func Example() string {381
func Example() string {334
return `# BlueGit op de mini-PC. Kopieer naar /etc/bluegit/config.yml.382
return `# BlueGit op de mini-PC. Kopieer naar /etc/bluegit/config.yml.@@ -354,6 +402,12 @@ auth:354
client_secret_file: /etc/bluegit/client_secret402
client_secret_file: /etc/bluegit/client_secret355
redirect_path: /auth/callback403
redirect_path: /auth/callback356
user_agent: BlueGitAccountClient/0.1404
user_agent: BlueGitAccountClient/0.1405
# Alternatief: Microsoft Entra ID (OIDC, één tenant). Zet mode op entra406
# en vul tenant_id + client_id; geheim hetzelfde als hierboven.407
# mode: entra408
# tenant_id: 00000000-0000-0000-0000-000000000000409
# client_id: 11111111-1111-1111-1111-111111111111410
# issuer blijft leeg, tenzij je een andere cloud of testissuer nodig hebt.357
411
358
git:412
git:359
binary: git413
binary: git@@ -102,6 +102,144 @@ func TestDevModeRefusedOnProductionHost(t *testing.T) {
102
102
}
103
103
}
104
104
105
func TestOAuthDefaultsUnchanged(t *testing.T) {
106
dir := t.TempDir()
107
path := filepath.Join(dir, "config.yml")
108
body := []byte("base_url: https://git.example.test\nauth:\n mode: oauth\n client_id: git.example.test\n")
109
if err := os.WriteFile(path, body, 0o600); err != nil {
110
t.Fatal(err)
111
}
112
t.Setenv("BLUEGIT_AUTH_CLIENT_SECRET", "geheim")
113
cfg, err := Load(path)
114
if err != nil {
115
t.Fatal(err)
116
}
117
if cfg.Auth.Mode != "oauth" || cfg.Auth.BaseURL != "https://auth.timfalken.com" {
118
t.Fatalf("%+v", cfg.Auth)
119
}
120
if cfg.Auth.RedirectPath != "/auth/callback" || cfg.Auth.UserAgent != "BlueGitAccountClient/0.1" {
121
t.Fatalf("%+v", cfg.Auth)
122
}
123
if cfg.Auth.TenantID != "" || cfg.Auth.Issuer != "" {
124
t.Fatalf("entra-velden horen leeg: %+v", cfg.Auth)
125
}
126
}
127
128
func TestEntraConfig(t *testing.T) {
129
dir := t.TempDir()
130
path := filepath.Join(dir, "config.yml")
131
body := []byte(`base_url: https://git.example.test
132
auth:
133
mode: entra
134
tenant_id: 00000000-0000-0000-0000-000000000001
135
client_id: 11111111-1111-1111-1111-111111111111
136
`)
137
if err := os.WriteFile(path, body, 0o600); err != nil {
138
t.Fatal(err)
139
}
140
t.Setenv("BLUEGIT_AUTH_CLIENT_SECRET", "entra-geheim")
141
cfg, err := Load(path)
142
if err != nil {
143
t.Fatal(err)
144
}
145
if cfg.Auth.BaseURL != "" {
146
t.Fatalf("entra zet geen auth.timfalken-default, kreeg %q", cfg.Auth.BaseURL)
147
}
148
if cfg.EntraIssuer() != "https://login.microsoftonline.com/00000000-0000-0000-0000-000000000001/v2.0" {
149
t.Fatal(cfg.EntraIssuer())
150
}
151
if cfg.Auth.ClientSecret != "entra-geheim" || cfg.RedirectURI() != "https://git.example.test/auth/callback" {
152
t.Fatalf("%+v", cfg.Auth)
153
}
154
155
body = []byte(`base_url: https://git.example.test
156
auth:
157
mode: entra
158
tenant_id: 00000000-0000-0000-0000-000000000001
159
client_id: 11111111-1111-1111-1111-111111111111
160
issuer: https://login.test.example/t/v2.0
161
`)
162
if err := os.WriteFile(path, body, 0o600); err != nil {
163
t.Fatal(err)
164
}
165
cfg, err = Load(path)
166
if err != nil {
167
t.Fatal(err)
168
}
169
if cfg.EntraIssuer() != "https://login.test.example/t/v2.0" {
170
t.Fatal(cfg.EntraIssuer())
171
}
172
}
173
174
func TestEntraValidation(t *testing.T) {
175
dir := t.TempDir()
176
path := filepath.Join(dir, "config.yml")
177
t.Setenv("BLUEGIT_AUTH_CLIENT_SECRET", "geheim")
178
cases := []struct {
179
body string
180
want string
181
}{
182
{
183
body: "base_url: https://git.example.test\nauth:\n mode: entra\n client_id: app\n",
184
want: "tenant_id",
185
},
186
{
187
body: "base_url: https://git.example.test\nauth:\n mode: entra\n tenant_id: t1\n",
188
want: "client_id",
189
},
190
{
191
body: "base_url: https://git.example.test\nauth:\n mode: entra\n tenant_id: t1\n client_id: app\n issuer: niet-een-url\n",
192
want: "issuer",
193
},
194
{
195
body: "base_url: https://git.example.test\nauth:\n mode: entra\n tenant_id: t1\n client_id: app\n issuer: http://login.microsoftonline.com/t/v2.0\n",
196
want: "HTTPS",
197
},
198
}
199
for _, tc := range cases {
200
if err := os.WriteFile(path, []byte(tc.body), 0o600); err != nil {
201
t.Fatal(err)
202
}
203
_, err := Load(path)
204
if err == nil || !strings.Contains(err.Error(), tc.want) {
205
t.Fatalf("body %q: verwacht %q, kreeg %v", tc.body, tc.want, err)
206
}
207
}
208
// Zonder geheim:zelfde fouttekst als oauth.
209
t.Setenv("BLUEGIT_AUTH_CLIENT_SECRET", "")
210
body := []byte("base_url: https://git.example.test\nauth:\n mode: entra\n tenant_id: t1\n client_id: app\n")
211
if err := os.WriteFile(path, body, 0o600); err != nil {
212
t.Fatal(err)
213
}
214
_, err := Load(path)
215
if err == nil || !strings.Contains(err.Error(), "clientgeheim") {
216
t.Fatalf("verwacht clientgeheim-fout, kreeg %v", err)
217
}
218
}
219
220
func TestEntraIssuerHTTPLoopback(t *testing.T) {
221
dir := t.TempDir()
222
path := filepath.Join(dir, "config.yml")
223
t.Setenv("BLUEGIT_AUTH_CLIENT_SECRET", "geheim")
224
body := []byte(`base_url: https://git.example.test
225
auth:
226
mode: entra
227
tenant_id: t1
228
client_id: app
229
issuer: http://127.0.0.1:8081/t/v2.0
230
`)
231
if err := os.WriteFile(path, body, 0o600); err != nil {
232
t.Fatal(err)
233
}
234
cfg, err := Load(path)
235
if err != nil {
236
t.Fatal(err)
237
}
238
if cfg.EntraIssuer() != "http://127.0.0.1:8081/t/v2.0" {
239
t.Fatal(cfg.EntraIssuer())
240
}
241
}
242
105
243
func TestSecretFromEnv(t *testing.T) {
106
244
dir := t.TempDir()
107
245
path := filepath.Join(dir, "config.yml")
@@ -102,6 +102,144 @@ func TestDevModeRefusedOnProductionHost(t *testing.T) {102
}102
}103
}103
}104
104
105
func TestOAuthDefaultsUnchanged(t *testing.T) {106
dir := t.TempDir()107
path := filepath.Join(dir, "config.yml")108
body := []byte("base_url: https://git.example.test\nauth:\n mode: oauth\n client_id: git.example.test\n")109
if err := os.WriteFile(path, body, 0o600); err != nil {110
t.Fatal(err)111
}112
t.Setenv("BLUEGIT_AUTH_CLIENT_SECRET", "geheim")113
cfg, err := Load(path)114
if err != nil {115
t.Fatal(err)116
}117
if cfg.Auth.Mode != "oauth" || cfg.Auth.BaseURL != "https://auth.timfalken.com" {118
t.Fatalf("%+v", cfg.Auth)119
}120
if cfg.Auth.RedirectPath != "/auth/callback" || cfg.Auth.UserAgent != "BlueGitAccountClient/0.1" {121
t.Fatalf("%+v", cfg.Auth)122
}123
if cfg.Auth.TenantID != "" || cfg.Auth.Issuer != "" {124
t.Fatalf("entra-velden horen leeg: %+v", cfg.Auth)125
}126
}127
128
func TestEntraConfig(t *testing.T) {129
dir := t.TempDir()130
path := filepath.Join(dir, "config.yml")131
body := []byte(`base_url: https://git.example.test132
auth:133
mode: entra134
tenant_id: 00000000-0000-0000-0000-000000000001135
client_id: 11111111-1111-1111-1111-111111111111136
`)137
if err := os.WriteFile(path, body, 0o600); err != nil {138
t.Fatal(err)139
}140
t.Setenv("BLUEGIT_AUTH_CLIENT_SECRET", "entra-geheim")141
cfg, err := Load(path)142
if err != nil {143
t.Fatal(err)144
}145
if cfg.Auth.BaseURL != "" {146
t.Fatalf("entra zet geen auth.timfalken-default, kreeg %q", cfg.Auth.BaseURL)147
}148
if cfg.EntraIssuer() != "https://login.microsoftonline.com/00000000-0000-0000-0000-000000000001/v2.0" {149
t.Fatal(cfg.EntraIssuer())150
}151
if cfg.Auth.ClientSecret != "entra-geheim" || cfg.RedirectURI() != "https://git.example.test/auth/callback" {152
t.Fatalf("%+v", cfg.Auth)153
}154
155
body = []byte(`base_url: https://git.example.test156
auth:157
mode: entra158
tenant_id: 00000000-0000-0000-0000-000000000001159
client_id: 11111111-1111-1111-1111-111111111111160
issuer: https://login.test.example/t/v2.0161
`)162
if err := os.WriteFile(path, body, 0o600); err != nil {163
t.Fatal(err)164
}165
cfg, err = Load(path)166
if err != nil {167
t.Fatal(err)168
}169
if cfg.EntraIssuer() != "https://login.test.example/t/v2.0" {170
t.Fatal(cfg.EntraIssuer())171
}172
}173
174
func TestEntraValidation(t *testing.T) {175
dir := t.TempDir()176
path := filepath.Join(dir, "config.yml")177
t.Setenv("BLUEGIT_AUTH_CLIENT_SECRET", "geheim")178
cases := []struct {179
body string180
want string181
}{182
{183
body: "base_url: https://git.example.test\nauth:\n mode: entra\n client_id: app\n",184
want: "tenant_id",185
},186
{187
body: "base_url: https://git.example.test\nauth:\n mode: entra\n tenant_id: t1\n",188
want: "client_id",189
},190
{191
body: "base_url: https://git.example.test\nauth:\n mode: entra\n tenant_id: t1\n client_id: app\n issuer: niet-een-url\n",192
want: "issuer",193
},194
{195
body: "base_url: https://git.example.test\nauth:\n mode: entra\n tenant_id: t1\n client_id: app\n issuer: http://login.microsoftonline.com/t/v2.0\n",196
want: "HTTPS",197
},198
}199
for _, tc := range cases {200
if err := os.WriteFile(path, []byte(tc.body), 0o600); err != nil {201
t.Fatal(err)202
}203
_, err := Load(path)204
if err == nil || !strings.Contains(err.Error(), tc.want) {205
t.Fatalf("body %q: verwacht %q, kreeg %v", tc.body, tc.want, err)206
}207
}208
// Zonder geheim:zelfde fouttekst als oauth.209
t.Setenv("BLUEGIT_AUTH_CLIENT_SECRET", "")210
body := []byte("base_url: https://git.example.test\nauth:\n mode: entra\n tenant_id: t1\n client_id: app\n")211
if err := os.WriteFile(path, body, 0o600); err != nil {212
t.Fatal(err)213
}214
_, err := Load(path)215
if err == nil || !strings.Contains(err.Error(), "clientgeheim") {216
t.Fatalf("verwacht clientgeheim-fout, kreeg %v", err)217
}218
}219
220
func TestEntraIssuerHTTPLoopback(t *testing.T) {221
dir := t.TempDir()222
path := filepath.Join(dir, "config.yml")223
t.Setenv("BLUEGIT_AUTH_CLIENT_SECRET", "geheim")224
body := []byte(`base_url: https://git.example.test225
auth:226
mode: entra227
tenant_id: t1228
client_id: app229
issuer: http://127.0.0.1:8081/t/v2.0230
`)231
if err := os.WriteFile(path, body, 0o600); err != nil {232
t.Fatal(err)233
}234
cfg, err := Load(path)235
if err != nil {236
t.Fatal(err)237
}238
if cfg.EntraIssuer() != "http://127.0.0.1:8081/t/v2.0" {239
t.Fatal(cfg.EntraIssuer())240
}241
}242
105
func TestSecretFromEnv(t *testing.T) {243
func TestSecretFromEnv(t *testing.T) {106
dir := t.TempDir()244
dir := t.TempDir()107
path := filepath.Join(dir, "config.yml")245
path := filepath.Join(dir, "config.yml")@@ -0,0 +1,158 @@
1
package gitgraph
2
3
import (
4
"container/list"
5
"context"
6
"strings"
7
"sync"
8
)
9
10
// DefaultMaxBytes is 8 MiB, ruim voor honderden grafieken.
11
const DefaultMaxBytes = 8 << 20
12
13
// Loader leest commits en refs uit git. Wordt alleen bij een miss aangeroepen.
14
type Loader func(ctx context.Context) ([]Commit, []Ref, error)
15
16
// Cache bewaart gelegde grafieken in het geheugen. Geen schijf-I/O.
17
type Cache struct {
18
max int64
19
20
mu sync.Mutex
21
lru *list.List // voorkant = recent
22
items map[string]*list.Element
23
size int64
24
hits int64
25
miss int64
26
}
27
28
type cached struct {
29
key string
30
repo int64
31
graph *Graph
32
bytes int64
33
}
34
35
// NewCache maakt een lege LRU-cache. max <= 0 gebruikt DefaultMaxBytes.
36
func NewCache(max int64) *Cache {
37
if max <= 0 {
38
max = DefaultMaxBytes
39
}
40
return &Cache{max: max, lru: list.New(), items: map[string]*list.Element{}}
41
}
42
43
// Get geeft een cached grafiek, of legt er één vanuit load. load wordt
44
// bij een hit niet aangeroepen.
45
func (c *Cache) Get(ctx context.Context, key, defaultBranch string, load Loader) (*Graph, error) {
46
if c == nil {
47
commits, refs, err := load(ctx)
48
if err != nil {
49
return nil, err
50
}
51
return Layout(commits, refs, defaultBranch), nil
52
}
53
if g, ok := c.lookup(key); ok {
54
return g, nil
55
}
56
commits, refs, err := load(ctx)
57
if err != nil {
58
return nil, err
59
}
60
g := Layout(commits, refs, defaultBranch)
61
c.put(key, repoIDFromKey(key), g)
62
return g, nil
63
}
64
65
func repoIDFromKey(key string) int64 {
66
var id int64
67
for _, r := range key {
68
if r == ':' {
69
break
70
}
71
if r < '0' || r > '9' {
72
return 0
73
}
74
id = id*10 + int64(r-'0')
75
}
76
return id
77
}
78
79
func (c *Cache) lookup(key string) (*Graph, bool) {
80
c.mu.Lock()
81
defer c.mu.Unlock()
82
el, ok := c.items[key]
83
if !ok {
84
c.miss++
85
return nil, false
86
}
87
c.lru.MoveToFront(el)
88
c.hits++
89
return el.Value.(*cached).graph, true
90
}
91
92
func (c *Cache) put(key string, repoID int64, g *Graph) {
93
if c == nil || g == nil {
94
return
95
}
96
n := estimateBytes(g)
97
c.mu.Lock()
98
defer c.mu.Unlock()
99
if el, ok := c.items[key]; ok {
100
c.size -= el.Value.(*cached).bytes
101
c.lru.Remove(el)
102
delete(c.items, key)
103
}
104
c.items[key] = c.lru.PushFront(&cached{key: key, repo: repoID, graph: g, bytes: n})
105
c.size += n
106
c.evictLocked()
107
}
108
109
func estimateBytes(g *Graph) int64 {
110
n := 256
111
for _, r := range g.Rows {
112
n += 128 + len(r.SHA) + len(r.Subject) + len(r.Author) + len(r.Email)
113
for _, lb := range r.Labels {
114
n += 32 + len(lb.Name)
115
}
116
}
117
n += len(g.Edges) * 40
118
return int64(n)
119
}
120
121
func (c *Cache) evictLocked() {
122
for c.size > c.max && c.lru.Len() > 1 {
123
el := c.lru.Back()
124
e := el.Value.(*cached)
125
c.lru.Remove(el)
126
delete(c.items, e.key)
127
c.size -= e.bytes
128
}
129
}
130
131
// Drop vergeet alle grafieken van één repository (na een push of verwijdering).
132
func (c *Cache) Drop(repoID int64) {
133
if c == nil {
134
return
135
}
136
prefix := strings.TrimSpace(strings.SplitN(Key(repoID, nil, "", 0), ":", 2)[0]) + ":"
137
// Key always starts with "<id>:"
138
_ = prefix
139
c.mu.Lock()
140
defer c.mu.Unlock()
141
for key, el := range c.items {
142
if el.Value.(*cached).repo == repoID {
143
c.size -= el.Value.(*cached).bytes
144
c.lru.Remove(el)
145
delete(c.items, key)
146
}
147
}
148
}
149
150
// Stats is hits, misses en huidig geheugengebruik, voor metingen.
151
func (c *Cache) Stats() (hits, misses, entries int64, bytes int64) {
152
if c == nil {
153
return 0, 0, 0, 0
154
}
155
c.mu.Lock()
156
defer c.mu.Unlock()
157
return c.hits, c.miss, int64(len(c.items)), c.size
158
}
@@ -0,0 +1,158 @@1
package gitgraph2
3
import (4
"container/list"5
"context"6
"strings"7
"sync"8
)9
10
// DefaultMaxBytes is 8 MiB, ruim voor honderden grafieken.11
const DefaultMaxBytes = 8 << 2012
13
// Loader leest commits en refs uit git. Wordt alleen bij een miss aangeroepen.14
type Loader func(ctx context.Context) ([]Commit, []Ref, error)15
16
// Cache bewaart gelegde grafieken in het geheugen. Geen schijf-I/O.17
type Cache struct {18
max int6419
20
mu sync.Mutex21
lru *list.List // voorkant = recent22
items map[string]*list.Element23
size int6424
hits int6425
miss int6426
}27
28
type cached struct {29
key string30
repo int6431
graph *Graph32
bytes int6433
}34
35
// NewCache maakt een lege LRU-cache. max <= 0 gebruikt DefaultMaxBytes.36
func NewCache(max int64) *Cache {37
if max <= 0 {38
max = DefaultMaxBytes39
}40
return &Cache{max: max, lru: list.New(), items: map[string]*list.Element{}}41
}42
43
// Get geeft een cached grafiek, of legt er één vanuit load. load wordt44
// bij een hit niet aangeroepen.45
func (c *Cache) Get(ctx context.Context, key, defaultBranch string, load Loader) (*Graph, error) {46
if c == nil {47
commits, refs, err := load(ctx)48
if err != nil {49
return nil, err50
}51
return Layout(commits, refs, defaultBranch), nil52
}53
if g, ok := c.lookup(key); ok {54
return g, nil55
}56
commits, refs, err := load(ctx)57
if err != nil {58
return nil, err59
}60
g := Layout(commits, refs, defaultBranch)61
c.put(key, repoIDFromKey(key), g)62
return g, nil63
}64
65
func repoIDFromKey(key string) int64 {66
var id int6467
for _, r := range key {68
if r == ':' {69
break70
}71
if r < '0' || r > '9' {72
return 073
}74
id = id*10 + int64(r-'0')75
}76
return id77
}78
79
func (c *Cache) lookup(key string) (*Graph, bool) {80
c.mu.Lock()81
defer c.mu.Unlock()82
el, ok := c.items[key]83
if !ok {84
c.miss++85
return nil, false86
}87
c.lru.MoveToFront(el)88
c.hits++89
return el.Value.(*cached).graph, true90
}91
92
func (c *Cache) put(key string, repoID int64, g *Graph) {93
if c == nil || g == nil {94
return95
}96
n := estimateBytes(g)97
c.mu.Lock()98
defer c.mu.Unlock()99
if el, ok := c.items[key]; ok {100
c.size -= el.Value.(*cached).bytes101
c.lru.Remove(el)102
delete(c.items, key)103
}104
c.items[key] = c.lru.PushFront(&cached{key: key, repo: repoID, graph: g, bytes: n})105
c.size += n106
c.evictLocked()107
}108
109
func estimateBytes(g *Graph) int64 {110
n := 256111
for _, r := range g.Rows {112
n += 128 + len(r.SHA) + len(r.Subject) + len(r.Author) + len(r.Email)113
for _, lb := range r.Labels {114
n += 32 + len(lb.Name)115
}116
}117
n += len(g.Edges) * 40118
return int64(n)119
}120
121
func (c *Cache) evictLocked() {122
for c.size > c.max && c.lru.Len() > 1 {123
el := c.lru.Back()124
e := el.Value.(*cached)125
c.lru.Remove(el)126
delete(c.items, e.key)127
c.size -= e.bytes128
}129
}130
131
// Drop vergeet alle grafieken van één repository (na een push of verwijdering).132
func (c *Cache) Drop(repoID int64) {133
if c == nil {134
return135
}136
prefix := strings.TrimSpace(strings.SplitN(Key(repoID, nil, "", 0), ":", 2)[0]) + ":"137
// Key always starts with "<id>:"138
_ = prefix139
c.mu.Lock()140
defer c.mu.Unlock()141
for key, el := range c.items {142
if el.Value.(*cached).repo == repoID {143
c.size -= el.Value.(*cached).bytes144
c.lru.Remove(el)145
delete(c.items, key)146
}147
}148
}149
150
// Stats is hits, misses en huidig geheugengebruik, voor metingen.151
func (c *Cache) Stats() (hits, misses, entries int64, bytes int64) {152
if c == nil {153
return 0, 0, 0, 0154
}155
c.mu.Lock()156
defer c.mu.Unlock()157
return c.hits, c.miss, int64(len(c.items)), c.size158
}@@ -0,0 +1,85 @@
1
package gitgraph
2
3
import (
4
"context"
5
"errors"
6
"testing"
7
)
8
9
func TestCacheHitSkipsLoader(t *testing.T) {
10
c := NewCache(0)
11
commits := commits("c:b", "b:a", "a:")
12
refs := []Ref{{Name: "master", SHA: "c", Kind: "branch"}}
13
key := Key(7, map[string]string{"refs/heads/master": "c"}, "master", 40)
14
var loads int
15
load := func(ctx context.Context) ([]Commit, []Ref, error) {
16
loads++
17
return commits, refs, nil
18
}
19
g1, err := c.Get(context.Background(), key, "master", load)
20
if err != nil || g1 == nil || len(g1.Rows) != 3 {
21
t.Fatalf("koud: %v %+v", err, g1)
22
}
23
if loads != 1 {
24
t.Fatalf("eerste load=%d", loads)
25
}
26
fail := func(ctx context.Context) ([]Commit, []Ref, error) {
27
t.Fatal("loader mag bij een hit niet worden aangeroepen")
28
return nil, nil, errors.New("geen git")
29
}
30
g2, err := c.Get(context.Background(), key, "master", fail)
31
if err != nil || g2 == nil || len(g2.Rows) != 3 {
32
t.Fatalf("warm: %v %+v", err, g2)
33
}
34
hits, misses, entries, _ := c.Stats()
35
if hits != 1 || misses != 1 || entries != 1 {
36
t.Fatalf("stats hits=%d misses=%d entries=%d", hits, misses, entries)
37
}
38
}
39
40
func TestCacheDropOnPush(t *testing.T) {
41
c := NewCache(0)
42
key := Key(3, map[string]string{"refs/heads/master": "c"}, "master", 40)
43
_, err := c.Get(context.Background(), key, "master", func(ctx context.Context) ([]Commit, []Ref, error) {
44
return commits("c:"), []Ref{{Name: "master", SHA: "c", Kind: "branch"}}, nil
45
})
46
if err != nil {
47
t.Fatal(err)
48
}
49
c.Drop(3)
50
var loads int
51
_, err = c.Get(context.Background(), key, "master", func(ctx context.Context) ([]Commit, []Ref, error) {
52
loads++
53
return commits("c:"), []Ref{{Name: "master", SHA: "c", Kind: "branch"}}, nil
54
})
55
if err != nil || loads != 1 {
56
t.Fatalf("na drop opnieuw laden, loads=%d err=%v", loads, err)
57
}
58
c.Drop(99)
59
_, _, entries, _ := c.Stats()
60
if entries != 1 {
61
t.Fatalf("andere repo mag deze entry niet wissen, entries=%d", entries)
62
}
63
}
64
65
func TestCacheLRUEvicts(t *testing.T) {
66
c := NewCache(400) // klein: een paar grafieken
67
load := func(sha string) Loader {
68
return func(ctx context.Context) ([]Commit, []Ref, error) {
69
return []Commit{{SHA: sha, Subject: "lang onderwerp zodat de schatting meetelt " + sha, Parents: nil}}, nil, nil
70
}
71
}
72
for i := 0; i < 40; i++ {
73
key := Key(int64(i), map[string]string{"h": string(rune('a' + i%26))}, "master", 40)
74
if _, err := c.Get(context.Background(), key, "master", load("s")); err != nil {
75
t.Fatal(err)
76
}
77
}
78
_, _, entries, bytes := c.Stats()
79
if entries == 0 || entries == 40 {
80
t.Fatalf("verwacht eviction, entries=%d bytes=%d", entries, bytes)
81
}
82
if entries > 1 && bytes > 400 {
83
t.Fatalf("cache groter dan max: bytes=%d entries=%d", bytes, entries)
84
}
85
}
@@ -0,0 +1,85 @@1
package gitgraph2
3
import (4
"context"5
"errors"6
"testing"7
)8
9
func TestCacheHitSkipsLoader(t *testing.T) {10
c := NewCache(0)11
commits := commits("c:b", "b:a", "a:")12
refs := []Ref{{Name: "master", SHA: "c", Kind: "branch"}}13
key := Key(7, map[string]string{"refs/heads/master": "c"}, "master", 40)14
var loads int15
load := func(ctx context.Context) ([]Commit, []Ref, error) {16
loads++17
return commits, refs, nil18
}19
g1, err := c.Get(context.Background(), key, "master", load)20
if err != nil || g1 == nil || len(g1.Rows) != 3 {21
t.Fatalf("koud: %v %+v", err, g1)22
}23
if loads != 1 {24
t.Fatalf("eerste load=%d", loads)25
}26
fail := func(ctx context.Context) ([]Commit, []Ref, error) {27
t.Fatal("loader mag bij een hit niet worden aangeroepen")28
return nil, nil, errors.New("geen git")29
}30
g2, err := c.Get(context.Background(), key, "master", fail)31
if err != nil || g2 == nil || len(g2.Rows) != 3 {32
t.Fatalf("warm: %v %+v", err, g2)33
}34
hits, misses, entries, _ := c.Stats()35
if hits != 1 || misses != 1 || entries != 1 {36
t.Fatalf("stats hits=%d misses=%d entries=%d", hits, misses, entries)37
}38
}39
40
func TestCacheDropOnPush(t *testing.T) {41
c := NewCache(0)42
key := Key(3, map[string]string{"refs/heads/master": "c"}, "master", 40)43
_, err := c.Get(context.Background(), key, "master", func(ctx context.Context) ([]Commit, []Ref, error) {44
return commits("c:"), []Ref{{Name: "master", SHA: "c", Kind: "branch"}}, nil45
})46
if err != nil {47
t.Fatal(err)48
}49
c.Drop(3)50
var loads int51
_, err = c.Get(context.Background(), key, "master", func(ctx context.Context) ([]Commit, []Ref, error) {52
loads++53
return commits("c:"), []Ref{{Name: "master", SHA: "c", Kind: "branch"}}, nil54
})55
if err != nil || loads != 1 {56
t.Fatalf("na drop opnieuw laden, loads=%d err=%v", loads, err)57
}58
c.Drop(99)59
_, _, entries, _ := c.Stats()60
if entries != 1 {61
t.Fatalf("andere repo mag deze entry niet wissen, entries=%d", entries)62
}63
}64
65
func TestCacheLRUEvicts(t *testing.T) {66
c := NewCache(400) // klein: een paar grafieken67
load := func(sha string) Loader {68
return func(ctx context.Context) ([]Commit, []Ref, error) {69
return []Commit{{SHA: sha, Subject: "lang onderwerp zodat de schatting meetelt " + sha, Parents: nil}}, nil, nil70
}71
}72
for i := 0; i < 40; i++ {73
key := Key(int64(i), map[string]string{"h": string(rune('a' + i%26))}, "master", 40)74
if _, err := c.Get(context.Background(), key, "master", load("s")); err != nil {75
t.Fatal(err)76
}77
}78
_, _, entries, bytes := c.Stats()79
if entries == 0 || entries == 40 {80
t.Fatalf("verwacht eviction, entries=%d bytes=%d", entries, bytes)81
}82
if entries > 1 && bytes > 400 {83
t.Fatalf("cache groter dan max: bytes=%d entries=%d", bytes, entries)84
}85
}@@ -0,0 +1,468 @@
1
// Package gitgraph legt een commitgrafiek over branches en tags en
2
// bewaart die in een begrensde geheugencache.
3
package gitgraph
4
5
import (
6
"crypto/sha256"
7
"encoding/hex"
8
"fmt"
9
"sort"
10
"strings"
11
)
12
13
// DefaultLimit is het aantal recente commits dat in de grafiek past.
14
const DefaultLimit = 40
15
16
// PaletteSize is het aantal kleuren voor niet-hoofdbranches.
17
const PaletteSize = 8
18
19
// RowH, LaneW en DotR zijn de tekenmaten in pixels.
20
const (
21
RowH = 22
22
LaneW = 12
23
DotR = 4.0
24
RefW = 78
25
)
26
27
// Commit is één commit voor de grafiek, met ouders.
28
type Commit struct {
29
SHA, Short, Author, Email, Subject string
30
Unix int64
31
Parents []string
32
}
33
34
// Ref is een branch of tag die naar een commit wijst.
35
type Ref struct {
36
Name string
37
SHA string
38
Kind string // "branch" of "tag"
39
}
40
41
// Label is een verkorte branch- of tagnaam bij een commit.
42
type Label struct {
43
Name, Kind, Color, Class string
44
Default bool
45
}
46
47
// Row is één regel in de gelegde grafiek.
48
type Row struct {
49
Commit
50
Lane int
51
Color string
52
Class string
53
Labels []Label
54
Avatar string
55
Initial string
56
UserURL string
57
}
58
59
// Edge is een lijn van een kind naar een ouder (of het einde van het venster).
60
type Edge struct {
61
FromRow, FromLane, ToRow, ToLane int
62
Color string
63
}
64
65
// Graph is een gelegde commitgrafiek, klaar om te tekenen.
66
type Graph struct {
67
Rows []Row
68
Edges []Edge
69
Lanes int
70
Width int
71
Height int
72
}
73
74
// Color is de CSS-kleur van een branch. De hoofdbranch is altijd --blue.
75
func Color(branch, defaultBranch string) string {
76
if strings.TrimSpace(branch) != "" && branch == defaultBranch {
77
return "var(--blue)"
78
}
79
return fmt.Sprintf("var(--graph-%d)", hashName(branch)%PaletteSize)
80
}
81
82
// ColorClass is een CSS-klasse voor dezelfde kleur, veilig in templates
83
// (html/template weigert var(--…) in een style-attribuut).
84
func ColorClass(color string) string {
85
if color == "var(--blue)" {
86
return "is-main"
87
}
88
if strings.HasPrefix(color, "var(--graph-") && strings.HasSuffix(color, ")") {
89
mid := color[len("var(--graph-") : len(color)-1]
90
if len(mid) == 1 && mid[0] >= '0' && mid[0] < '0'+byte(PaletteSize) {
91
return "c" + mid
92
}
93
}
94
return ""
95
}
96
97
func hashName(name string) int {
98
n := 0
99
for _, r := range strings.ToLower(strings.TrimSpace(name)) {
100
n = n*33 + int(r)
101
}
102
if n < 0 {
103
n = -n
104
}
105
return n
106
}
107
108
// Key is de cachesleutel: repo plus de stand van alle branch- en tag-tips.
109
func Key(repoID int64, tips map[string]string, defaultBranch string, limit int) string {
110
if limit < 1 {
111
limit = DefaultLimit
112
}
113
names := make([]string, 0, len(tips))
114
for n := range tips {
115
names = append(names, n)
116
}
117
sort.Strings(names)
118
var b strings.Builder
119
fmt.Fprintf(&b, "%d\n%d\n%s\n", repoID, limit, defaultBranch)
120
for _, n := range names {
121
b.WriteString(n)
122
b.WriteByte('=')
123
b.WriteString(tips[n])
124
b.WriteByte('\n')
125
}
126
sum := sha256.Sum256([]byte(b.String()))
127
return fmt.Sprintf("%d:%s", repoID, hex.EncodeToString(sum[:16]))
128
}
129
130
type laneState struct {
131
sha string
132
color string
133
}
134
135
// Layout wijst lanes toe en legt lijnen voor merges en forks.
136
// commits staat nieuwste eerst. Ontbrekende ouders lopen tot de onderkant.
137
func Layout(commits []Commit, refs []Ref, defaultBranch string) *Graph {
138
g := &Graph{}
139
if len(commits) == 0 {
140
return g
141
}
142
bySHA := make(map[string]int, len(commits))
143
for i, c := range commits {
144
bySHA[c.SHA] = i
145
if c.Short == "" && len(c.SHA) >= 10 {
146
commits[i].Short = c.SHA[:10]
147
}
148
}
149
labels := labelsBySHA(refs, defaultBranch)
150
mainline := mainlineSHAs(commits, refs, defaultBranch)
151
152
var lanes []laneState
153
// Lane 0 is gereserveerd voor de hoofdbranch, zodat een nieuwere
154
// zijtak die kleur en kolom niet inpikt.
155
if def := defaultTip(refs, defaultBranch); def != "" {
156
lanes = []laneState{{sha: def, color: "var(--blue)"}}
157
}
158
g.Rows = make([]Row, len(commits))
159
occupancy := make([][]laneState, len(commits)+1)
160
161
for i, c := range commits {
162
incoming := findSHA(lanes, c.SHA)
163
if len(incoming) == 0 {
164
col := colorForCommit(c.SHA, labels, defaultBranch, "")
165
if mainline[c.SHA] {
166
col = "var(--blue)"
167
}
168
incoming = []int{allocLane(&lanes, c.SHA, col)}
169
}
170
primary := pickPrimary(incoming, lanes, c.SHA, labels, defaultBranch)
171
if mainline[c.SHA] {
172
// blijf op lane 0 als die op deze commit wacht
173
for _, li := range incoming {
174
if li == 0 {
175
primary = 0
176
break
177
}
178
}
179
}
180
row := Row{Commit: commits[i], Lane: primary, Labels: labels[c.SHA]}
181
if mainline[c.SHA] {
182
row.Color = "var(--blue)"
183
} else {
184
inherit := lanes[primary].color
185
if inherit == "var(--blue)" {
186
inherit = ""
187
}
188
col := colorForCommit(c.SHA, labels, defaultBranch, inherit)
189
if col == "" || col == "var(--blue)" {
190
col = Color(c.SHA, defaultBranch)
191
}
192
row.Color = col
193
}
194
if row.Color == "" {
195
row.Color = "var(--graph-0)"
196
}
197
row.Class = ColorClass(row.Color)
198
lanes[primary].color = row.Color
199
g.Rows[i] = row
200
201
for _, li := range incoming {
202
if li != primary {
203
lanes[li].sha = ""
204
}
205
}
206
if len(c.Parents) == 0 {
207
lanes[primary].sha = ""
208
} else {
209
first := c.Parents[0]
210
if idx := firstLane(lanes, first); idx >= 0 && idx != primary && !mainline[c.SHA] && !mainline[first] {
211
// zijtak: eerste ouder zit al in een andere lane, daarheen mergen
212
lanes[primary].sha = ""
213
} else {
214
lanes[primary].sha = first
215
}
216
for _, p := range c.Parents[1:] {
217
if firstLane(lanes, p) >= 0 {
218
continue
219
}
220
col := colorForCommit(p, labels, defaultBranch, "")
221
if col == "" || col == "var(--blue)" && !mainline[p] {
222
col = Color(p, defaultBranch)
223
}
224
allocLane(&lanes, p, col)
225
}
226
if lanes[primary].sha == "" {
227
if firstLane(lanes, first) < 0 && first != "" {
228
allocLane(&lanes, first, row.Color)
229
}
230
}
231
}
232
occupancy[i+1] = copyLanes(lanes)
233
trimTrailing(&lanes)
234
}
235
occupancy[0] = make([]laneState, len(occupancy[1]))
236
if len(occupancy[0]) > 0 && len(g.Rows) > 0 {
237
// bovenaan: de lane van de nieuwste commit is bezet
238
if g.Rows[0].Lane < len(occupancy[0]) {
239
occupancy[0][g.Rows[0].Lane] = laneState{sha: g.Rows[0].SHA, color: g.Rows[0].Color}
240
}
241
}
242
g.Edges = buildEdges(g.Rows, bySHA, occupancy)
243
g.Lanes = 1
244
for _, r := range g.Rows {
245
if r.Lane+1 > g.Lanes {
246
g.Lanes = r.Lane + 1
247
}
248
}
249
for _, e := range g.Edges {
250
if e.FromLane+1 > g.Lanes {
251
g.Lanes = e.FromLane + 1
252
}
253
if e.ToLane+1 > g.Lanes {
254
g.Lanes = e.ToLane + 1
255
}
256
}
257
g.Width = g.Lanes * LaneW
258
g.Height = len(g.Rows) * RowH
259
return g
260
}
261
262
func labelsBySHA(refs []Ref, defaultBranch string) map[string][]Label {
263
out := map[string][]Label{}
264
for _, r := range refs {
265
if r.SHA == "" || r.Name == "" {
266
continue
267
}
268
lb := Label{Name: shortName(r.Name), Kind: r.Kind, Color: Color(r.Name, defaultBranch), Default: r.Kind == "branch" && r.Name == defaultBranch}
269
if r.Kind == "tag" {
270
lb.Color = "var(--muted)"
271
lb.Class = "is-tag"
272
} else {
273
lb.Class = ColorClass(lb.Color)
274
}
275
out[r.SHA] = append(out[r.SHA], lb)
276
}
277
for sha, list := range out {
278
sort.Slice(list, func(i, j int) bool {
279
if list[i].Default != list[j].Default {
280
return list[i].Default
281
}
282
if list[i].Kind != list[j].Kind {
283
return list[i].Kind == "branch"
284
}
285
return list[i].Name < list[j].Name
286
})
287
out[sha] = list
288
}
289
return out
290
}
291
292
func shortName(name string) string {
293
const max = 18
294
if strings.HasPrefix(name, "refs/heads/") {
295
name = strings.TrimPrefix(name, "refs/heads/")
296
}
297
if strings.HasPrefix(name, "refs/tags/") {
298
name = strings.TrimPrefix(name, "refs/tags/")
299
}
300
runes := []rune(name)
301
if len(runes) <= max {
302
return name
303
}
304
return string(runes[:max-1]) + "…"
305
}
306
307
func colorForCommit(sha string, labels map[string][]Label, defaultBranch, fallback string) string {
308
for _, lb := range labels[sha] {
309
if lb.Default {
310
return "var(--blue)"
311
}
312
}
313
for _, lb := range labels[sha] {
314
if lb.Kind == "branch" {
315
return lb.Color
316
}
317
}
318
if fallback != "" {
319
return fallback
320
}
321
if defaultBranch != "" {
322
return Color(sha, defaultBranch) // stabiel, maar niet --blue
323
}
324
return "var(--graph-0)"
325
}
326
327
func findSHA(lanes []laneState, sha string) []int {
328
var out []int
329
for i, l := range lanes {
330
if l.sha == sha {
331
out = append(out, i)
332
}
333
}
334
return out
335
}
336
337
func firstLane(lanes []laneState, sha string) int {
338
for i, l := range lanes {
339
if l.sha == sha {
340
return i
341
}
342
}
343
return -1
344
}
345
346
func pickPrimary(incoming []int, lanes []laneState, sha string, labels map[string][]Label, defaultBranch string) int {
347
want := colorForCommit(sha, labels, defaultBranch, "")
348
for _, i := range incoming {
349
if lanes[i].color == want || (want == "var(--blue)" && lanes[i].color == "var(--blue)") {
350
return i
351
}
352
}
353
return incoming[0]
354
}
355
356
func allocLane(lanes *[]laneState, sha, color string) int {
357
for i, l := range *lanes {
358
if l.sha == "" {
359
(*lanes)[i] = laneState{sha: sha, color: color}
360
return i
361
}
362
}
363
*lanes = append(*lanes, laneState{sha: sha, color: color})
364
return len(*lanes) - 1
365
}
366
367
func copyLanes(lanes []laneState) []laneState {
368
out := make([]laneState, len(lanes))
369
copy(out, lanes)
370
return out
371
}
372
373
func trimTrailing(lanes *[]laneState) {
374
n := len(*lanes)
375
for n > 0 && (*lanes)[n-1].sha == "" {
376
n--
377
}
378
*lanes = (*lanes)[:n]
379
}
380
381
func buildEdges(rows []Row, bySHA map[string]int, occ [][]laneState) []Edge {
382
var edges []Edge
383
seen := map[[4]int]bool{}
384
add := func(e Edge) {
385
if e.FromRow < 0 || e.ToRow < e.FromRow {
386
return
387
}
388
k := [4]int{e.FromRow, e.FromLane, e.ToRow, e.ToLane}
389
if seen[k] {
390
return
391
}
392
seen[k] = true
393
edges = append(edges, e)
394
}
395
// Van elke commit naar zijn ouders in het venster, of naar de onderkant.
396
for i, r := range rows {
397
if len(r.Parents) == 0 {
398
continue
399
}
400
for pi, p := range r.Parents {
401
toRow, toLane := len(rows)-1, r.Lane
402
if j, ok := bySHA[p]; ok {
403
toRow = j
404
toLane = rows[j].Lane
405
} else {
406
// ouder buiten het venster: zoek de lane waarin we die sha bewaren
407
toLane = r.Lane
408
if i+1 < len(occ) {
409
if idx := firstLane(occ[i+1], p); idx >= 0 {
410
toLane = idx
411
}
412
}
413
toRow = len(rows) - 1
414
}
415
col := r.Color
416
if pi == 0 && r.Color != "" {
417
col = r.Color
418
}
419
// Tussenliggende verticale stukken volgen de gereserveerde lane.
420
fromLane := r.Lane
421
if pi > 0 && i+1 < len(occ) {
422
if idx := firstLane(occ[i+1], p); idx >= 0 {
423
fromLane = idx
424
// boog vanaf de merge-commit naar de ouder-lane op de volgende rij
425
add(Edge{FromRow: i, FromLane: r.Lane, ToRow: i + 1, ToLane: fromLane, Color: col})
426
if toRow > i+1 {
427
add(Edge{FromRow: i + 1, FromLane: fromLane, ToRow: toRow, ToLane: toLane, Color: col})
428
}
429
continue
430
}
431
}
432
add(Edge{FromRow: i, FromLane: fromLane, ToRow: toRow, ToLane: toLane, Color: col})
433
}
434
}
435
return edges
436
}
437
438
func defaultTip(refs []Ref, defaultBranch string) string {
439
for _, r := range refs {
440
if r.Kind == "branch" && r.Name == defaultBranch {
441
return r.SHA
442
}
443
}
444
return ""
445
}
446
447
func mainlineSHAs(commits []Commit, refs []Ref, defaultBranch string) map[string]bool {
448
out := map[string]bool{}
449
tip := defaultTip(refs, defaultBranch)
450
if tip == "" {
451
return out
452
}
453
parents := map[string][]string{}
454
for _, c := range commits {
455
parents[c.SHA] = c.Parents
456
}
457
seen := map[string]bool{}
458
for sha := tip; sha != "" && !seen[sha]; {
459
seen[sha] = true
460
out[sha] = true
461
ps := parents[sha]
462
if len(ps) == 0 {
463
break
464
}
465
sha = ps[0]
466
}
467
return out
468
}
@@ -0,0 +1,468 @@1
// Package gitgraph legt een commitgrafiek over branches en tags en2
// bewaart die in een begrensde geheugencache.3
package gitgraph4
5
import (6
"crypto/sha256"7
"encoding/hex"8
"fmt"9
"sort"10
"strings"11
)12
13
// DefaultLimit is het aantal recente commits dat in de grafiek past.14
const DefaultLimit = 4015
16
// PaletteSize is het aantal kleuren voor niet-hoofdbranches.17
const PaletteSize = 818
19
// RowH, LaneW en DotR zijn de tekenmaten in pixels.20
const (21
RowH = 2222
LaneW = 1223
DotR = 4.024
RefW = 7825
)26
27
// Commit is één commit voor de grafiek, met ouders.28
type Commit struct {29
SHA, Short, Author, Email, Subject string30
Unix int6431
Parents []string32
}33
34
// Ref is een branch of tag die naar een commit wijst.35
type Ref struct {36
Name string37
SHA string38
Kind string // "branch" of "tag"39
}40
41
// Label is een verkorte branch- of tagnaam bij een commit.42
type Label struct {43
Name, Kind, Color, Class string44
Default bool45
}46
47
// Row is één regel in de gelegde grafiek.48
type Row struct {49
Commit50
Lane int51
Color string52
Class string53
Labels []Label54
Avatar string55
Initial string56
UserURL string57
}58
59
// Edge is een lijn van een kind naar een ouder (of het einde van het venster).60
type Edge struct {61
FromRow, FromLane, ToRow, ToLane int62
Color string63
}64
65
// Graph is een gelegde commitgrafiek, klaar om te tekenen.66
type Graph struct {67
Rows []Row68
Edges []Edge69
Lanes int70
Width int71
Height int72
}73
74
// Color is de CSS-kleur van een branch. De hoofdbranch is altijd --blue.75
func Color(branch, defaultBranch string) string {76
if strings.TrimSpace(branch) != "" && branch == defaultBranch {77
return "var(--blue)"78
}79
return fmt.Sprintf("var(--graph-%d)", hashName(branch)%PaletteSize)80
}81
82
// ColorClass is een CSS-klasse voor dezelfde kleur, veilig in templates83
// (html/template weigert var(--…) in een style-attribuut).84
func ColorClass(color string) string {85
if color == "var(--blue)" {86
return "is-main"87
}88
if strings.HasPrefix(color, "var(--graph-") && strings.HasSuffix(color, ")") {89
mid := color[len("var(--graph-") : len(color)-1]90
if len(mid) == 1 && mid[0] >= '0' && mid[0] < '0'+byte(PaletteSize) {91
return "c" + mid92
}93
}94
return ""95
}96
97
func hashName(name string) int {98
n := 099
for _, r := range strings.ToLower(strings.TrimSpace(name)) {100
n = n*33 + int(r)101
}102
if n < 0 {103
n = -n104
}105
return n106
}107
108
// Key is de cachesleutel: repo plus de stand van alle branch- en tag-tips.109
func Key(repoID int64, tips map[string]string, defaultBranch string, limit int) string {110
if limit < 1 {111
limit = DefaultLimit112
}113
names := make([]string, 0, len(tips))114
for n := range tips {115
names = append(names, n)116
}117
sort.Strings(names)118
var b strings.Builder119
fmt.Fprintf(&b, "%d\n%d\n%s\n", repoID, limit, defaultBranch)120
for _, n := range names {121
b.WriteString(n)122
b.WriteByte('=')123
b.WriteString(tips[n])124
b.WriteByte('\n')125
}126
sum := sha256.Sum256([]byte(b.String()))127
return fmt.Sprintf("%d:%s", repoID, hex.EncodeToString(sum[:16]))128
}129
130
type laneState struct {131
sha string132
color string133
}134
135
// Layout wijst lanes toe en legt lijnen voor merges en forks.136
// commits staat nieuwste eerst. Ontbrekende ouders lopen tot de onderkant.137
func Layout(commits []Commit, refs []Ref, defaultBranch string) *Graph {138
g := &Graph{}139
if len(commits) == 0 {140
return g141
}142
bySHA := make(map[string]int, len(commits))143
for i, c := range commits {144
bySHA[c.SHA] = i145
if c.Short == "" && len(c.SHA) >= 10 {146
commits[i].Short = c.SHA[:10]147
}148
}149
labels := labelsBySHA(refs, defaultBranch)150
mainline := mainlineSHAs(commits, refs, defaultBranch)151
152
var lanes []laneState153
// Lane 0 is gereserveerd voor de hoofdbranch, zodat een nieuwere154
// zijtak die kleur en kolom niet inpikt.155
if def := defaultTip(refs, defaultBranch); def != "" {156
lanes = []laneState{{sha: def, color: "var(--blue)"}}157
}158
g.Rows = make([]Row, len(commits))159
occupancy := make([][]laneState, len(commits)+1)160
161
for i, c := range commits {162
incoming := findSHA(lanes, c.SHA)163
if len(incoming) == 0 {164
col := colorForCommit(c.SHA, labels, defaultBranch, "")165
if mainline[c.SHA] {166
col = "var(--blue)"167
}168
incoming = []int{allocLane(&lanes, c.SHA, col)}169
}170
primary := pickPrimary(incoming, lanes, c.SHA, labels, defaultBranch)171
if mainline[c.SHA] {172
// blijf op lane 0 als die op deze commit wacht173
for _, li := range incoming {174
if li == 0 {175
primary = 0176
break177
}178
}179
}180
row := Row{Commit: commits[i], Lane: primary, Labels: labels[c.SHA]}181
if mainline[c.SHA] {182
row.Color = "var(--blue)"183
} else {184
inherit := lanes[primary].color185
if inherit == "var(--blue)" {186
inherit = ""187
}188
col := colorForCommit(c.SHA, labels, defaultBranch, inherit)189
if col == "" || col == "var(--blue)" {190
col = Color(c.SHA, defaultBranch)191
}192
row.Color = col193
}194
if row.Color == "" {195
row.Color = "var(--graph-0)"196
}197
row.Class = ColorClass(row.Color)198
lanes[primary].color = row.Color199
g.Rows[i] = row200
201
for _, li := range incoming {202
if li != primary {203
lanes[li].sha = ""204
}205
}206
if len(c.Parents) == 0 {207
lanes[primary].sha = ""208
} else {209
first := c.Parents[0]210
if idx := firstLane(lanes, first); idx >= 0 && idx != primary && !mainline[c.SHA] && !mainline[first] {211
// zijtak: eerste ouder zit al in een andere lane, daarheen mergen212
lanes[primary].sha = ""213
} else {214
lanes[primary].sha = first215
}216
for _, p := range c.Parents[1:] {217
if firstLane(lanes, p) >= 0 {218
continue219
}220
col := colorForCommit(p, labels, defaultBranch, "")221
if col == "" || col == "var(--blue)" && !mainline[p] {222
col = Color(p, defaultBranch)223
}224
allocLane(&lanes, p, col)225
}226
if lanes[primary].sha == "" {227
if firstLane(lanes, first) < 0 && first != "" {228
allocLane(&lanes, first, row.Color)229
}230
}231
}232
occupancy[i+1] = copyLanes(lanes)233
trimTrailing(&lanes)234
}235
occupancy[0] = make([]laneState, len(occupancy[1]))236
if len(occupancy[0]) > 0 && len(g.Rows) > 0 {237
// bovenaan: de lane van de nieuwste commit is bezet238
if g.Rows[0].Lane < len(occupancy[0]) {239
occupancy[0][g.Rows[0].Lane] = laneState{sha: g.Rows[0].SHA, color: g.Rows[0].Color}240
}241
}242
g.Edges = buildEdges(g.Rows, bySHA, occupancy)243
g.Lanes = 1244
for _, r := range g.Rows {245
if r.Lane+1 > g.Lanes {246
g.Lanes = r.Lane + 1247
}248
}249
for _, e := range g.Edges {250
if e.FromLane+1 > g.Lanes {251
g.Lanes = e.FromLane + 1252
}253
if e.ToLane+1 > g.Lanes {254
g.Lanes = e.ToLane + 1255
}256
}257
g.Width = g.Lanes * LaneW258
g.Height = len(g.Rows) * RowH259
return g260
}261
262
func labelsBySHA(refs []Ref, defaultBranch string) map[string][]Label {263
out := map[string][]Label{}264
for _, r := range refs {265
if r.SHA == "" || r.Name == "" {266
continue267
}268
lb := Label{Name: shortName(r.Name), Kind: r.Kind, Color: Color(r.Name, defaultBranch), Default: r.Kind == "branch" && r.Name == defaultBranch}269
if r.Kind == "tag" {270
lb.Color = "var(--muted)"271
lb.Class = "is-tag"272
} else {273
lb.Class = ColorClass(lb.Color)274
}275
out[r.SHA] = append(out[r.SHA], lb)276
}277
for sha, list := range out {278
sort.Slice(list, func(i, j int) bool {279
if list[i].Default != list[j].Default {280
return list[i].Default281
}282
if list[i].Kind != list[j].Kind {283
return list[i].Kind == "branch"284
}285
return list[i].Name < list[j].Name286
})287
out[sha] = list288
}289
return out290
}291
292
func shortName(name string) string {293
const max = 18294
if strings.HasPrefix(name, "refs/heads/") {295
name = strings.TrimPrefix(name, "refs/heads/")296
}297
if strings.HasPrefix(name, "refs/tags/") {298
name = strings.TrimPrefix(name, "refs/tags/")299
}300
runes := []rune(name)301
if len(runes) <= max {302
return name303
}304
return string(runes[:max-1]) + "…"305
}306
307
func colorForCommit(sha string, labels map[string][]Label, defaultBranch, fallback string) string {308
for _, lb := range labels[sha] {309
if lb.Default {310
return "var(--blue)"311
}312
}313
for _, lb := range labels[sha] {314
if lb.Kind == "branch" {315
return lb.Color316
}317
}318
if fallback != "" {319
return fallback320
}321
if defaultBranch != "" {322
return Color(sha, defaultBranch) // stabiel, maar niet --blue323
}324
return "var(--graph-0)"325
}326
327
func findSHA(lanes []laneState, sha string) []int {328
var out []int329
for i, l := range lanes {330
if l.sha == sha {331
out = append(out, i)332
}333
}334
return out335
}336
337
func firstLane(lanes []laneState, sha string) int {338
for i, l := range lanes {339
if l.sha == sha {340
return i341
}342
}343
return -1344
}345
346
func pickPrimary(incoming []int, lanes []laneState, sha string, labels map[string][]Label, defaultBranch string) int {347
want := colorForCommit(sha, labels, defaultBranch, "")348
for _, i := range incoming {349
if lanes[i].color == want || (want == "var(--blue)" && lanes[i].color == "var(--blue)") {350
return i351
}352
}353
return incoming[0]354
}355
356
func allocLane(lanes *[]laneState, sha, color string) int {357
for i, l := range *lanes {358
if l.sha == "" {359
(*lanes)[i] = laneState{sha: sha, color: color}360
return i361
}362
}363
*lanes = append(*lanes, laneState{sha: sha, color: color})364
return len(*lanes) - 1365
}366
367
func copyLanes(lanes []laneState) []laneState {368
out := make([]laneState, len(lanes))369
copy(out, lanes)370
return out371
}372
373
func trimTrailing(lanes *[]laneState) {374
n := len(*lanes)375
for n > 0 && (*lanes)[n-1].sha == "" {376
n--377
}378
*lanes = (*lanes)[:n]379
}380
381
func buildEdges(rows []Row, bySHA map[string]int, occ [][]laneState) []Edge {382
var edges []Edge383
seen := map[[4]int]bool{}384
add := func(e Edge) {385
if e.FromRow < 0 || e.ToRow < e.FromRow {386
return387
}388
k := [4]int{e.FromRow, e.FromLane, e.ToRow, e.ToLane}389
if seen[k] {390
return391
}392
seen[k] = true393
edges = append(edges, e)394
}395
// Van elke commit naar zijn ouders in het venster, of naar de onderkant.396
for i, r := range rows {397
if len(r.Parents) == 0 {398
continue399
}400
for pi, p := range r.Parents {401
toRow, toLane := len(rows)-1, r.Lane402
if j, ok := bySHA[p]; ok {403
toRow = j404
toLane = rows[j].Lane405
} else {406
// ouder buiten het venster: zoek de lane waarin we die sha bewaren407
toLane = r.Lane408
if i+1 < len(occ) {409
if idx := firstLane(occ[i+1], p); idx >= 0 {410
toLane = idx411
}412
}413
toRow = len(rows) - 1414
}415
col := r.Color416
if pi == 0 && r.Color != "" {417
col = r.Color418
}419
// Tussenliggende verticale stukken volgen de gereserveerde lane.420
fromLane := r.Lane421
if pi > 0 && i+1 < len(occ) {422
if idx := firstLane(occ[i+1], p); idx >= 0 {423
fromLane = idx424
// boog vanaf de merge-commit naar de ouder-lane op de volgende rij425
add(Edge{FromRow: i, FromLane: r.Lane, ToRow: i + 1, ToLane: fromLane, Color: col})426
if toRow > i+1 {427
add(Edge{FromRow: i + 1, FromLane: fromLane, ToRow: toRow, ToLane: toLane, Color: col})428
}429
continue430
}431
}432
add(Edge{FromRow: i, FromLane: fromLane, ToRow: toRow, ToLane: toLane, Color: col})433
}434
}435
return edges436
}437
438
func defaultTip(refs []Ref, defaultBranch string) string {439
for _, r := range refs {440
if r.Kind == "branch" && r.Name == defaultBranch {441
return r.SHA442
}443
}444
return ""445
}446
447
func mainlineSHAs(commits []Commit, refs []Ref, defaultBranch string) map[string]bool {448
out := map[string]bool{}449
tip := defaultTip(refs, defaultBranch)450
if tip == "" {451
return out452
}453
parents := map[string][]string{}454
for _, c := range commits {455
parents[c.SHA] = c.Parents456
}457
seen := map[string]bool{}458
for sha := tip; sha != "" && !seen[sha]; {459
seen[sha] = true460
out[sha] = true461
ps := parents[sha]462
if len(ps) == 0 {463
break464
}465
sha = ps[0]466
}467
return out468
}@@ -0,0 +1,244 @@
1
package gitgraph
2
3
import (
4
"strings"
5
"testing"
6
)
7
8
func commits(pairs ...string) []Commit {
9
// pairs: "sha:parent,parent" or "sha:" for root. Order is newest first.
10
var out []Commit
11
for _, p := range pairs {
12
sha, rest, _ := strings.Cut(p, ":")
13
var parents []string
14
if rest != "" {
15
parents = strings.Split(rest, ",")
16
}
17
out = append(out, Commit{SHA: sha, Short: sha, Subject: "msg-" + sha, Parents: parents})
18
}
19
return out
20
}
21
22
func TestLayoutLinear(t *testing.T) {
23
g := Layout(commits("c:b", "b:a", "a:"), nil, "master")
24
if g.Lanes != 1 {
25
t.Fatalf("lanes=%d, wil 1", g.Lanes)
26
}
27
for i, want := range []string{"c", "b", "a"} {
28
if g.Rows[i].SHA != want || g.Rows[i].Lane != 0 {
29
t.Fatalf("rij %d: %+v", i, g.Rows[i])
30
}
31
}
32
}
33
34
func TestLayoutFork(t *testing.T) {
35
// feature (d) en master (c) splitsen vanaf b.
36
refs := []Ref{
37
{Name: "master", SHA: "c", Kind: "branch"},
38
{Name: "feature", SHA: "d", Kind: "branch"},
39
}
40
g := Layout(commits("d:b", "c:b", "b:a", "a:"), refs, "master")
41
if g.Lanes < 2 {
42
t.Fatalf("verwacht minstens 2 lanes, kreeg %d", g.Lanes)
43
}
44
laneOf := map[string]int{}
45
for _, r := range g.Rows {
46
laneOf[r.SHA] = r.Lane
47
}
48
if laneOf["d"] == laneOf["c"] {
49
t.Fatalf("forks moeten andere lanes hebben: %v", laneOf)
50
}
51
if laneOf["b"] != laneOf["a"] {
52
t.Fatalf("stam blijft op één lane: %v", laneOf)
53
}
54
// master is blauw
55
for _, r := range g.Rows {
56
if r.SHA == "c" && r.Color != "var(--blue)" {
57
t.Fatalf("master-tip kleur %s", r.Color)
58
}
59
}
60
// merge/fork-lijn van d of c naar b
61
if !hasEdgeTo(g, "b") {
62
t.Fatalf("geen lijn naar b: %+v", g.Edges)
63
}
64
}
65
66
func TestLayoutMerge(t *testing.T) {
67
// m merget feature (f) in master (c).
68
refs := []Ref{
69
{Name: "master", SHA: "m", Kind: "branch"},
70
{Name: "feature", SHA: "f", Kind: "branch"},
71
}
72
g := Layout(commits("m:c,f", "f:b", "c:b", "b:a", "a:"), refs, "master")
73
if g.Lanes < 2 {
74
t.Fatalf("merge heeft een tweede lane nodig, kreeg %d", g.Lanes)
75
}
76
laneOf := map[string]int{}
77
colorOf := map[string]string{}
78
for _, r := range g.Rows {
79
laneOf[r.SHA] = r.Lane
80
colorOf[r.SHA] = r.Color
81
}
82
if laneOf["f"] == laneOf["c"] {
83
t.Fatalf("feature en master voor de merge op dezelfde lane: %v", laneOf)
84
}
85
if colorOf["m"] != "var(--blue)" {
86
t.Fatalf("merge-commit op master moet blauw zijn, kreeg %s", colorOf["m"])
87
}
88
if !hasEdgeBetween(g, "m", "f") && !hasEdgeBetween(g, "m", "c") {
89
t.Fatalf("verwacht lijnen van de merge naar beide ouders: %+v", g.Edges)
90
}
91
}
92
93
func TestLayoutMergeAndForkTogether(t *testing.T) {
94
// master: a-b-c-m, feature: b-d-e, m merget e.
95
refs := []Ref{
96
{Name: "master", SHA: "m", Kind: "branch"},
97
{Name: "feature", SHA: "e", Kind: "branch"},
98
{Name: "v1", SHA: "c", Kind: "tag"},
99
}
100
g := Layout(commits("m:c,e", "e:d", "d:b", "c:b", "b:a", "a:"), refs, "master")
101
if len(g.Rows) != 6 {
102
t.Fatalf("rijen=%d", len(g.Rows))
103
}
104
var hasTag, hasMaster, hasFeature bool
105
for _, r := range g.Rows {
106
for _, lb := range r.Labels {
107
switch {
108
case lb.Kind == "tag" && lb.Name == "v1":
109
hasTag = true
110
case lb.Default && lb.Name == "master":
111
hasMaster = true
112
case lb.Name == "feature":
113
hasFeature = true
114
}
115
}
116
}
117
if !hasTag || !hasMaster || !hasFeature {
118
t.Fatalf("labels ontbreken: tag=%v master=%v feature=%v", hasTag, hasMaster, hasFeature)
119
}
120
}
121
122
func TestColorDeterministicAndMainIsBlue(t *testing.T) {
123
if Color("master", "master") != "var(--blue)" {
124
t.Fatal("hoofdbranch moet --blue zijn")
125
}
126
if Color("main", "main") != "var(--blue)" {
127
t.Fatal("hoofdbranch main moet --blue zijn")
128
}
129
if Color("feature", "master") == "var(--blue)" {
130
t.Fatal("andere branch mag niet de hoofd-blauw zijn")
131
}
132
if Color("feature", "master") != Color("feature", "master") {
133
t.Fatal("kleur moet deterministisch zijn")
134
}
135
if Color("feature", "master") != Color("FEATURE", "master") {
136
t.Fatal("kleur is case-insensitive")
137
}
138
if Color("feature", "master") == Color("other", "master") {
139
t.Fatal("verschillende namen moeten meestal een andere kleur krijgen")
140
}
141
seen := map[string]bool{}
142
for _, n := range []string{"a", "b", "c", "d", "e", "f", "g", "h", "i", "j"} {
143
seen[Color(n, "master")] = true
144
}
145
if len(seen) < 2 {
146
t.Fatalf("palet wordt niet gebruikt: %v", seen)
147
}
148
for c := range seen {
149
if !strings.HasPrefix(c, "var(--graph-") {
150
t.Fatalf("onverwachte kleur %s", c)
151
}
152
}
153
}
154
155
func TestKeyChangesWithTips(t *testing.T) {
156
a := Key(1, map[string]string{"refs/heads/master": "aaa"}, "master", 40)
157
b := Key(1, map[string]string{"refs/heads/master": "bbb"}, "master", 40)
158
c := Key(1, map[string]string{"refs/heads/master": "aaa"}, "master", 40)
159
if a == b {
160
t.Fatal("andere tip moet andere sleutel geven")
161
}
162
if a != c {
163
t.Fatal("zelfde stand moet dezelfde sleutel geven")
164
}
165
if Key(2, map[string]string{"refs/heads/master": "aaa"}, "master", 40) == a {
166
t.Fatal("andere repo moet andere sleutel geven")
167
}
168
}
169
170
func hasEdgeTo(g *Graph, sha string) bool {
171
idx := -1
172
for i, r := range g.Rows {
173
if r.SHA == sha {
174
idx = i
175
break
176
}
177
}
178
if idx < 0 {
179
return false
180
}
181
for _, e := range g.Edges {
182
if e.ToRow == idx {
183
return true
184
}
185
}
186
return false
187
}
188
189
func hasEdgeBetween(g *Graph, from, to string) bool {
190
fi, ti := -1, -1
191
for i, r := range g.Rows {
192
if r.SHA == from {
193
fi = i
194
}
195
if r.SHA == to {
196
ti = i
197
}
198
}
199
if fi < 0 || ti < 0 {
200
return false
201
}
202
for _, e := range g.Edges {
203
if e.FromRow == fi && e.ToRow == ti {
204
return true
205
}
206
}
207
// via een tussenliggende lane (merge-boog plus verticaal)
208
for _, e := range g.Edges {
209
if e.FromRow == fi && e.ToLane == g.Rows[ti].Lane {
210
return true
211
}
212
}
213
return false
214
}
215
216
func TestMainlineStaysBlueOnLaneZero(t *testing.T) {
217
// Nieuwere zijtak docs bovenop master-merge mag lane 0 en blauw niet inpikken.
218
refs := []Ref{
219
{Name: "master", SHA: "m", Kind: "branch"},
220
{Name: "docs", SHA: "d", Kind: "branch"},
221
}
222
g := Layout(commits("d:m", "m:c,f", "f:b", "c:b", "b:"), refs, "master")
223
for _, r := range g.Rows {
224
switch r.SHA {
225
case "m", "c", "b":
226
if r.Color != "var(--blue)" {
227
t.Fatalf("%s moet blauw zijn, kreeg %s (class %s)", r.SHA, r.Color, r.Class)
228
}
229
if r.Lane != 0 {
230
t.Fatalf("%s moet op lane 0, kreeg %d", r.SHA, r.Lane)
231
}
232
if r.Class != "is-main" {
233
t.Fatalf("%s class=%s", r.SHA, r.Class)
234
}
235
case "d":
236
if r.Lane == 0 {
237
t.Fatalf("zijtak docs mag lane 0 niet stelen")
238
}
239
if r.Color == "var(--blue)" {
240
t.Fatalf("zijtak mag niet de hoofd-blauw zijn")
241
}
242
}
243
}
244
}
@@ -0,0 +1,244 @@1
package gitgraph2
3
import (4
"strings"5
"testing"6
)7
8
func commits(pairs ...string) []Commit {9
// pairs: "sha:parent,parent" or "sha:" for root. Order is newest first.10
var out []Commit11
for _, p := range pairs {12
sha, rest, _ := strings.Cut(p, ":")13
var parents []string14
if rest != "" {15
parents = strings.Split(rest, ",")16
}17
out = append(out, Commit{SHA: sha, Short: sha, Subject: "msg-" + sha, Parents: parents})18
}19
return out20
}21
22
func TestLayoutLinear(t *testing.T) {23
g := Layout(commits("c:b", "b:a", "a:"), nil, "master")24
if g.Lanes != 1 {25
t.Fatalf("lanes=%d, wil 1", g.Lanes)26
}27
for i, want := range []string{"c", "b", "a"} {28
if g.Rows[i].SHA != want || g.Rows[i].Lane != 0 {29
t.Fatalf("rij %d: %+v", i, g.Rows[i])30
}31
}32
}33
34
func TestLayoutFork(t *testing.T) {35
// feature (d) en master (c) splitsen vanaf b.36
refs := []Ref{37
{Name: "master", SHA: "c", Kind: "branch"},38
{Name: "feature", SHA: "d", Kind: "branch"},39
}40
g := Layout(commits("d:b", "c:b", "b:a", "a:"), refs, "master")41
if g.Lanes < 2 {42
t.Fatalf("verwacht minstens 2 lanes, kreeg %d", g.Lanes)43
}44
laneOf := map[string]int{}45
for _, r := range g.Rows {46
laneOf[r.SHA] = r.Lane47
}48
if laneOf["d"] == laneOf["c"] {49
t.Fatalf("forks moeten andere lanes hebben: %v", laneOf)50
}51
if laneOf["b"] != laneOf["a"] {52
t.Fatalf("stam blijft op één lane: %v", laneOf)53
}54
// master is blauw55
for _, r := range g.Rows {56
if r.SHA == "c" && r.Color != "var(--blue)" {57
t.Fatalf("master-tip kleur %s", r.Color)58
}59
}60
// merge/fork-lijn van d of c naar b61
if !hasEdgeTo(g, "b") {62
t.Fatalf("geen lijn naar b: %+v", g.Edges)63
}64
}65
66
func TestLayoutMerge(t *testing.T) {67
// m merget feature (f) in master (c).68
refs := []Ref{69
{Name: "master", SHA: "m", Kind: "branch"},70
{Name: "feature", SHA: "f", Kind: "branch"},71
}72
g := Layout(commits("m:c,f", "f:b", "c:b", "b:a", "a:"), refs, "master")73
if g.Lanes < 2 {74
t.Fatalf("merge heeft een tweede lane nodig, kreeg %d", g.Lanes)75
}76
laneOf := map[string]int{}77
colorOf := map[string]string{}78
for _, r := range g.Rows {79
laneOf[r.SHA] = r.Lane80
colorOf[r.SHA] = r.Color81
}82
if laneOf["f"] == laneOf["c"] {83
t.Fatalf("feature en master voor de merge op dezelfde lane: %v", laneOf)84
}85
if colorOf["m"] != "var(--blue)" {86
t.Fatalf("merge-commit op master moet blauw zijn, kreeg %s", colorOf["m"])87
}88
if !hasEdgeBetween(g, "m", "f") && !hasEdgeBetween(g, "m", "c") {89
t.Fatalf("verwacht lijnen van de merge naar beide ouders: %+v", g.Edges)90
}91
}92
93
func TestLayoutMergeAndForkTogether(t *testing.T) {94
// master: a-b-c-m, feature: b-d-e, m merget e.95
refs := []Ref{96
{Name: "master", SHA: "m", Kind: "branch"},97
{Name: "feature", SHA: "e", Kind: "branch"},98
{Name: "v1", SHA: "c", Kind: "tag"},99
}100
g := Layout(commits("m:c,e", "e:d", "d:b", "c:b", "b:a", "a:"), refs, "master")101
if len(g.Rows) != 6 {102
t.Fatalf("rijen=%d", len(g.Rows))103
}104
var hasTag, hasMaster, hasFeature bool105
for _, r := range g.Rows {106
for _, lb := range r.Labels {107
switch {108
case lb.Kind == "tag" && lb.Name == "v1":109
hasTag = true110
case lb.Default && lb.Name == "master":111
hasMaster = true112
case lb.Name == "feature":113
hasFeature = true114
}115
}116
}117
if !hasTag || !hasMaster || !hasFeature {118
t.Fatalf("labels ontbreken: tag=%v master=%v feature=%v", hasTag, hasMaster, hasFeature)119
}120
}121
122
func TestColorDeterministicAndMainIsBlue(t *testing.T) {123
if Color("master", "master") != "var(--blue)" {124
t.Fatal("hoofdbranch moet --blue zijn")125
}126
if Color("main", "main") != "var(--blue)" {127
t.Fatal("hoofdbranch main moet --blue zijn")128
}129
if Color("feature", "master") == "var(--blue)" {130
t.Fatal("andere branch mag niet de hoofd-blauw zijn")131
}132
if Color("feature", "master") != Color("feature", "master") {133
t.Fatal("kleur moet deterministisch zijn")134
}135
if Color("feature", "master") != Color("FEATURE", "master") {136
t.Fatal("kleur is case-insensitive")137
}138
if Color("feature", "master") == Color("other", "master") {139
t.Fatal("verschillende namen moeten meestal een andere kleur krijgen")140
}141
seen := map[string]bool{}142
for _, n := range []string{"a", "b", "c", "d", "e", "f", "g", "h", "i", "j"} {143
seen[Color(n, "master")] = true144
}145
if len(seen) < 2 {146
t.Fatalf("palet wordt niet gebruikt: %v", seen)147
}148
for c := range seen {149
if !strings.HasPrefix(c, "var(--graph-") {150
t.Fatalf("onverwachte kleur %s", c)151
}152
}153
}154
155
func TestKeyChangesWithTips(t *testing.T) {156
a := Key(1, map[string]string{"refs/heads/master": "aaa"}, "master", 40)157
b := Key(1, map[string]string{"refs/heads/master": "bbb"}, "master", 40)158
c := Key(1, map[string]string{"refs/heads/master": "aaa"}, "master", 40)159
if a == b {160
t.Fatal("andere tip moet andere sleutel geven")161
}162
if a != c {163
t.Fatal("zelfde stand moet dezelfde sleutel geven")164
}165
if Key(2, map[string]string{"refs/heads/master": "aaa"}, "master", 40) == a {166
t.Fatal("andere repo moet andere sleutel geven")167
}168
}169
170
func hasEdgeTo(g *Graph, sha string) bool {171
idx := -1172
for i, r := range g.Rows {173
if r.SHA == sha {174
idx = i175
break176
}177
}178
if idx < 0 {179
return false180
}181
for _, e := range g.Edges {182
if e.ToRow == idx {183
return true184
}185
}186
return false187
}188
189
func hasEdgeBetween(g *Graph, from, to string) bool {190
fi, ti := -1, -1191
for i, r := range g.Rows {192
if r.SHA == from {193
fi = i194
}195
if r.SHA == to {196
ti = i197
}198
}199
if fi < 0 || ti < 0 {200
return false201
}202
for _, e := range g.Edges {203
if e.FromRow == fi && e.ToRow == ti {204
return true205
}206
}207
// via een tussenliggende lane (merge-boog plus verticaal)208
for _, e := range g.Edges {209
if e.FromRow == fi && e.ToLane == g.Rows[ti].Lane {210
return true211
}212
}213
return false214
}215
216
func TestMainlineStaysBlueOnLaneZero(t *testing.T) {217
// Nieuwere zijtak docs bovenop master-merge mag lane 0 en blauw niet inpikken.218
refs := []Ref{219
{Name: "master", SHA: "m", Kind: "branch"},220
{Name: "docs", SHA: "d", Kind: "branch"},221
}222
g := Layout(commits("d:m", "m:c,f", "f:b", "c:b", "b:"), refs, "master")223
for _, r := range g.Rows {224
switch r.SHA {225
case "m", "c", "b":226
if r.Color != "var(--blue)" {227
t.Fatalf("%s moet blauw zijn, kreeg %s (class %s)", r.SHA, r.Color, r.Class)228
}229
if r.Lane != 0 {230
t.Fatalf("%s moet op lane 0, kreeg %d", r.SHA, r.Lane)231
}232
if r.Class != "is-main" {233
t.Fatalf("%s class=%s", r.SHA, r.Class)234
}235
case "d":236
if r.Lane == 0 {237
t.Fatalf("zijtak docs mag lane 0 niet stelen")238
}239
if r.Color == "var(--blue)" {240
t.Fatalf("zijtak mag niet de hoofd-blauw zijn")241
}242
}243
}244
}@@ -0,0 +1,63 @@
1
package gitgraph
2
3
import (
4
"fmt"
5
"html"
6
"strings"
7
)
8
9
// SVG tekent de lanelijnen. Alleen getallen en paletkleuren, veilig als HTML.
10
func (g *Graph) SVG() string {
11
if g == nil || len(g.Rows) == 0 || g.Lanes < 1 {
12
return ""
13
}
14
w, h := g.Width, g.Height
15
var b strings.Builder
16
b.WriteString(fmt.Sprintf(`<svg class="commitgraph-svg" viewBox="0 0 %d %d" width="%d" height="%d" aria-hidden="true">`, w, h, w, h))
17
for _, e := range g.Edges {
18
col := safeColor(e.Color)
19
x1, y1 := laneX(e.FromLane), rowY(e.FromRow)
20
x2, y2 := laneX(e.ToLane), rowY(e.ToRow)
21
if e.FromLane == e.ToLane {
22
fmt.Fprintf(&b, `<path d="M %.1f %.1f V %.1f" fill="none" stroke="%s" stroke-width="2" stroke-linecap="round"/>`, x1, y1, y2, col)
23
continue
24
}
25
// Boog tussen lanes: horizontaal op halve rij, dan verticaal.
26
midY := y1 + float64(RowH)/2
27
if e.ToRow == e.FromRow+1 {
28
// korte merge/fork naar de volgende rij
29
fmt.Fprintf(&b, `<path d="M %.1f %.1f C %.1f %.1f, %.1f %.1f, %.1f %.1f" fill="none" stroke="%s" stroke-width="2" stroke-linecap="round"/>`,
30
x1, y1, x1, midY, x2, midY, x2, y2, col)
31
continue
32
}
33
fmt.Fprintf(&b, `<path d="M %.1f %.1f C %.1f %.1f, %.1f %.1f, %.1f %.1f V %.1f" fill="none" stroke="%s" stroke-width="2" stroke-linecap="round"/>`,
34
x1, y1, x1, midY, x2, midY, x2, y1+float64(RowH), y2, col)
35
}
36
for i, r := range g.Rows {
37
fmt.Fprintf(&b, `<circle cx="%.1f" cy="%.1f" r="%.1f" fill="%s"/>`, laneX(r.Lane), rowY(i), DotR, safeColor(r.Color))
38
}
39
b.WriteString(`</svg>`)
40
return b.String()
41
}
42
43
func laneX(lane int) float64 {
44
return float64(lane)*float64(LaneW) + float64(LaneW)/2
45
}
46
47
func rowY(row int) float64 {
48
return float64(row)*float64(RowH) + float64(RowH)/2
49
}
50
51
func safeColor(c string) string {
52
c = strings.TrimSpace(c)
53
if c == "var(--blue)" || c == "var(--muted)" {
54
return html.EscapeString(c)
55
}
56
if strings.HasPrefix(c, "var(--graph-") && strings.HasSuffix(c, ")") {
57
mid := c[len("var(--graph-") : len(c)-1]
58
if len(mid) == 1 && mid[0] >= '0' && mid[0] < '0'+byte(PaletteSize) {
59
return html.EscapeString(c)
60
}
61
}
62
return "var(--muted)"
63
}
@@ -0,0 +1,63 @@1
package gitgraph2
3
import (4
"fmt"5
"html"6
"strings"7
)8
9
// SVG tekent de lanelijnen. Alleen getallen en paletkleuren, veilig als HTML.10
func (g *Graph) SVG() string {11
if g == nil || len(g.Rows) == 0 || g.Lanes < 1 {12
return ""13
}14
w, h := g.Width, g.Height15
var b strings.Builder16
b.WriteString(fmt.Sprintf(`<svg class="commitgraph-svg" viewBox="0 0 %d %d" width="%d" height="%d" aria-hidden="true">`, w, h, w, h))17
for _, e := range g.Edges {18
col := safeColor(e.Color)19
x1, y1 := laneX(e.FromLane), rowY(e.FromRow)20
x2, y2 := laneX(e.ToLane), rowY(e.ToRow)21
if e.FromLane == e.ToLane {22
fmt.Fprintf(&b, `<path d="M %.1f %.1f V %.1f" fill="none" stroke="%s" stroke-width="2" stroke-linecap="round"/>`, x1, y1, y2, col)23
continue24
}25
// Boog tussen lanes: horizontaal op halve rij, dan verticaal.26
midY := y1 + float64(RowH)/227
if e.ToRow == e.FromRow+1 {28
// korte merge/fork naar de volgende rij29
fmt.Fprintf(&b, `<path d="M %.1f %.1f C %.1f %.1f, %.1f %.1f, %.1f %.1f" fill="none" stroke="%s" stroke-width="2" stroke-linecap="round"/>`,30
x1, y1, x1, midY, x2, midY, x2, y2, col)31
continue32
}33
fmt.Fprintf(&b, `<path d="M %.1f %.1f C %.1f %.1f, %.1f %.1f, %.1f %.1f V %.1f" fill="none" stroke="%s" stroke-width="2" stroke-linecap="round"/>`,34
x1, y1, x1, midY, x2, midY, x2, y1+float64(RowH), y2, col)35
}36
for i, r := range g.Rows {37
fmt.Fprintf(&b, `<circle cx="%.1f" cy="%.1f" r="%.1f" fill="%s"/>`, laneX(r.Lane), rowY(i), DotR, safeColor(r.Color))38
}39
b.WriteString(`</svg>`)40
return b.String()41
}42
43
func laneX(lane int) float64 {44
return float64(lane)*float64(LaneW) + float64(LaneW)/245
}46
47
func rowY(row int) float64 {48
return float64(row)*float64(RowH) + float64(RowH)/249
}50
51
func safeColor(c string) string {52
c = strings.TrimSpace(c)53
if c == "var(--blue)" || c == "var(--muted)" {54
return html.EscapeString(c)55
}56
if strings.HasPrefix(c, "var(--graph-") && strings.HasSuffix(c, ")") {57
mid := c[len("var(--graph-") : len(c)-1]58
if len(mid) == 1 && mid[0] >= '0' && mid[0] < '0'+byte(PaletteSize) {59
return html.EscapeString(c)60
}61
}62
return "var(--muted)"63
}@@ -0,0 +1,99 @@
1
package gitrepo
2
3
import (
4
"context"
5
"strconv"
6
"strings"
7
8
"gitlab.com/Timfa/bluegit/internal/gitgraph"
9
)
10
11
// GraphHistory leest de recente commits over alle branches en tags, met ouders.
12
func GraphHistory(ctx context.Context, gitBin, dir string, limit int) ([]gitgraph.Commit, []gitgraph.Ref, error) {
13
if limit < 1 {
14
limit = gitgraph.DefaultLimit
15
}
16
out, err := run(ctx, gitBin, nil, "-C", dir, "log", "--all", "--date-order",
17
"--format=%H%x1f%P%x1f%an%x1f%ae%x1f%at%x1f%s%x1e",
18
"-n"+strconv.Itoa(limit))
19
if err != nil {
20
msg := err.Error()
21
if strings.Contains(msg, "does not have any commits") || strings.Contains(msg, "bad default revision") || strings.Contains(msg, "ambiguous argument") || strings.Contains(msg, "does not have any refs") {
22
return nil, nil, nil
23
}
24
return nil, nil, err
25
}
26
commits := parseGraphLog(out)
27
refs, err := graphRefs(ctx, gitBin, dir)
28
if err != nil {
29
return commits, nil, err
30
}
31
return commits, refs, nil
32
}
33
34
func parseGraphLog(out string) []gitgraph.Commit {
35
var commits []gitgraph.Commit
36
for _, rec := range strings.Split(out, "\x1e") {
37
rec = strings.TrimSpace(rec)
38
if rec == "" {
39
continue
40
}
41
parts := strings.Split(rec, "\x1f")
42
if len(parts) < 6 {
43
continue
44
}
45
c := gitgraph.Commit{
46
SHA: parts[0],
47
Author: parts[2],
48
Email: parts[3],
49
Subject: parts[5],
50
}
51
c.Unix, _ = strconv.ParseInt(parts[4], 10, 64)
52
if len(c.SHA) >= 10 {
53
c.Short = c.SHA[:10]
54
}
55
if parts[1] != "" {
56
c.Parents = strings.Fields(parts[1])
57
}
58
commits = append(commits, c)
59
}
60
return commits
61
}
62
63
func graphRefs(ctx context.Context, gitBin, dir string) ([]gitgraph.Ref, error) {
64
out, err := run(ctx, gitBin, nil, "-C", dir, "for-each-ref",
65
"--format=%(objectname)%00%(*objectname)%00%(refname)",
66
"refs/heads", "refs/tags")
67
if err != nil {
68
return nil, err
69
}
70
var refs []gitgraph.Ref
71
for _, line := range strings.Split(out, "\n") {
72
line = strings.TrimRight(line, "\r")
73
if line == "" {
74
continue
75
}
76
parts := strings.Split(line, "\x00")
77
if len(parts) < 3 {
78
continue
79
}
80
sha, peeled, name := parts[0], parts[1], parts[2]
81
if peeled != "" {
82
sha = peeled
83
}
84
kind := "branch"
85
if strings.HasPrefix(name, "refs/tags/") {
86
kind = "tag"
87
name = strings.TrimPrefix(name, "refs/tags/")
88
} else if strings.HasPrefix(name, "refs/heads/") {
89
name = strings.TrimPrefix(name, "refs/heads/")
90
} else {
91
continue
92
}
93
if sha == "" || name == "" {
94
continue
95
}
96
refs = append(refs, gitgraph.Ref{Name: name, SHA: sha, Kind: kind})
97
}
98
return refs, nil
99
}
@@ -0,0 +1,99 @@1
package gitrepo2
3
import (4
"context"5
"strconv"6
"strings"7
8
"gitlab.com/Timfa/bluegit/internal/gitgraph"9
)10
11
// GraphHistory leest de recente commits over alle branches en tags, met ouders.12
func GraphHistory(ctx context.Context, gitBin, dir string, limit int) ([]gitgraph.Commit, []gitgraph.Ref, error) {13
if limit < 1 {14
limit = gitgraph.DefaultLimit15
}16
out, err := run(ctx, gitBin, nil, "-C", dir, "log", "--all", "--date-order",17
"--format=%H%x1f%P%x1f%an%x1f%ae%x1f%at%x1f%s%x1e",18
"-n"+strconv.Itoa(limit))19
if err != nil {20
msg := err.Error()21
if strings.Contains(msg, "does not have any commits") || strings.Contains(msg, "bad default revision") || strings.Contains(msg, "ambiguous argument") || strings.Contains(msg, "does not have any refs") {22
return nil, nil, nil23
}24
return nil, nil, err25
}26
commits := parseGraphLog(out)27
refs, err := graphRefs(ctx, gitBin, dir)28
if err != nil {29
return commits, nil, err30
}31
return commits, refs, nil32
}33
34
func parseGraphLog(out string) []gitgraph.Commit {35
var commits []gitgraph.Commit36
for _, rec := range strings.Split(out, "\x1e") {37
rec = strings.TrimSpace(rec)38
if rec == "" {39
continue40
}41
parts := strings.Split(rec, "\x1f")42
if len(parts) < 6 {43
continue44
}45
c := gitgraph.Commit{46
SHA: parts[0],47
Author: parts[2],48
Email: parts[3],49
Subject: parts[5],50
}51
c.Unix, _ = strconv.ParseInt(parts[4], 10, 64)52
if len(c.SHA) >= 10 {53
c.Short = c.SHA[:10]54
}55
if parts[1] != "" {56
c.Parents = strings.Fields(parts[1])57
}58
commits = append(commits, c)59
}60
return commits61
}62
63
func graphRefs(ctx context.Context, gitBin, dir string) ([]gitgraph.Ref, error) {64
out, err := run(ctx, gitBin, nil, "-C", dir, "for-each-ref",65
"--format=%(objectname)%00%(*objectname)%00%(refname)",66
"refs/heads", "refs/tags")67
if err != nil {68
return nil, err69
}70
var refs []gitgraph.Ref71
for _, line := range strings.Split(out, "\n") {72
line = strings.TrimRight(line, "\r")73
if line == "" {74
continue75
}76
parts := strings.Split(line, "\x00")77
if len(parts) < 3 {78
continue79
}80
sha, peeled, name := parts[0], parts[1], parts[2]81
if peeled != "" {82
sha = peeled83
}84
kind := "branch"85
if strings.HasPrefix(name, "refs/tags/") {86
kind = "tag"87
name = strings.TrimPrefix(name, "refs/tags/")88
} else if strings.HasPrefix(name, "refs/heads/") {89
name = strings.TrimPrefix(name, "refs/heads/")90
} else {91
continue92
}93
if sha == "" || name == "" {94
continue95
}96
refs = append(refs, gitgraph.Ref{Name: name, SHA: sha, Kind: kind})97
}98
return refs, nil99
}@@ -0,0 +1,79 @@
1
package gitrepo
2
3
import (
4
"context"
5
"os"
6
"path/filepath"
7
"testing"
8
9
"gitlab.com/Timfa/bluegit/internal/gitgraph"
10
)
11
12
func TestGraphHistoryMergeAndTag(t *testing.T) {
13
bare, work := testRepo(t)
14
gitOK(t, work, "checkout", "-qb", "feature")
15
if err := os.WriteFile(filepath.Join(work, "f"), []byte("b\n"), 0o644); err != nil {
16
t.Fatal(err)
17
}
18
gitOK(t, work, "add", "f")
19
gitOK(t, work, "commit", "-qm", "feature-work")
20
gitOK(t, work, "push", "-q", "origin", "feature")
21
gitOK(t, work, "checkout", "-q", "master")
22
if err := os.WriteFile(filepath.Join(work, "g"), []byte("c\n"), 0o644); err != nil {
23
t.Fatal(err)
24
}
25
gitOK(t, work, "add", "g")
26
gitOK(t, work, "commit", "-qm", "on-master")
27
gitOK(t, work, "tag", "v1")
28
gitOK(t, work, "merge", "-q", "--no-ff", "-m", "merge feature", "feature")
29
gitOK(t, work, "push", "-q", "origin", "master", "--tags")
30
gitOK(t, work, "push", "-q", "origin", "feature")
31
32
commits, refs, err := GraphHistory(context.Background(), "git", bare, 20)
33
if err != nil {
34
t.Fatal(err)
35
}
36
if len(commits) < 3 {
37
t.Fatalf("te weinig commits: %+v", commits)
38
}
39
var hasMerge, hasFeature, hasMaster, hasTag bool
40
for _, c := range commits {
41
if len(c.Parents) == 2 && c.Subject == "merge feature" {
42
hasMerge = true
43
}
44
}
45
for _, r := range refs {
46
switch {
47
case r.Kind == "branch" && r.Name == "master":
48
hasMaster = true
49
case r.Kind == "branch" && r.Name == "feature":
50
hasFeature = true
51
case r.Kind == "tag" && r.Name == "v1":
52
hasTag = true
53
}
54
}
55
if !hasMerge || !hasFeature || !hasMaster || !hasTag {
56
t.Fatalf("history onvolledig: merge=%v feature=%v master=%v tag=%v refs=%+v", hasMerge, hasFeature, hasMaster, hasTag, refs)
57
}
58
g := gitgraph.Layout(commits, refs, "master")
59
if g.Lanes < 2 {
60
t.Fatalf("verwacht meerdere lanes, kreeg %d", g.Lanes)
61
}
62
if g.Rows[0].Color != "var(--blue)" {
63
t.Fatalf("nieuwste (master) moet blauw zijn, kreeg %s", g.Rows[0].Color)
64
}
65
}
66
67
func TestGraphHistoryEmpty(t *testing.T) {
68
dir := t.TempDir()
69
if err := Init("git", dir, "master", "/bin/true"); err != nil {
70
t.Fatal(err)
71
}
72
commits, refs, err := GraphHistory(context.Background(), "git", dir, 10)
73
if err != nil {
74
t.Fatal(err)
75
}
76
if len(commits) != 0 || len(refs) != 0 {
77
t.Fatalf("lege repo: commits=%v refs=%v", commits, refs)
78
}
79
}
@@ -0,0 +1,79 @@1
package gitrepo2
3
import (4
"context"5
"os"6
"path/filepath"7
"testing"8
9
"gitlab.com/Timfa/bluegit/internal/gitgraph"10
)11
12
func TestGraphHistoryMergeAndTag(t *testing.T) {13
bare, work := testRepo(t)14
gitOK(t, work, "checkout", "-qb", "feature")15
if err := os.WriteFile(filepath.Join(work, "f"), []byte("b\n"), 0o644); err != nil {16
t.Fatal(err)17
}18
gitOK(t, work, "add", "f")19
gitOK(t, work, "commit", "-qm", "feature-work")20
gitOK(t, work, "push", "-q", "origin", "feature")21
gitOK(t, work, "checkout", "-q", "master")22
if err := os.WriteFile(filepath.Join(work, "g"), []byte("c\n"), 0o644); err != nil {23
t.Fatal(err)24
}25
gitOK(t, work, "add", "g")26
gitOK(t, work, "commit", "-qm", "on-master")27
gitOK(t, work, "tag", "v1")28
gitOK(t, work, "merge", "-q", "--no-ff", "-m", "merge feature", "feature")29
gitOK(t, work, "push", "-q", "origin", "master", "--tags")30
gitOK(t, work, "push", "-q", "origin", "feature")31
32
commits, refs, err := GraphHistory(context.Background(), "git", bare, 20)33
if err != nil {34
t.Fatal(err)35
}36
if len(commits) < 3 {37
t.Fatalf("te weinig commits: %+v", commits)38
}39
var hasMerge, hasFeature, hasMaster, hasTag bool40
for _, c := range commits {41
if len(c.Parents) == 2 && c.Subject == "merge feature" {42
hasMerge = true43
}44
}45
for _, r := range refs {46
switch {47
case r.Kind == "branch" && r.Name == "master":48
hasMaster = true49
case r.Kind == "branch" && r.Name == "feature":50
hasFeature = true51
case r.Kind == "tag" && r.Name == "v1":52
hasTag = true53
}54
}55
if !hasMerge || !hasFeature || !hasMaster || !hasTag {56
t.Fatalf("history onvolledig: merge=%v feature=%v master=%v tag=%v refs=%+v", hasMerge, hasFeature, hasMaster, hasTag, refs)57
}58
g := gitgraph.Layout(commits, refs, "master")59
if g.Lanes < 2 {60
t.Fatalf("verwacht meerdere lanes, kreeg %d", g.Lanes)61
}62
if g.Rows[0].Color != "var(--blue)" {63
t.Fatalf("nieuwste (master) moet blauw zijn, kreeg %s", g.Rows[0].Color)64
}65
}66
67
func TestGraphHistoryEmpty(t *testing.T) {68
dir := t.TempDir()69
if err := Init("git", dir, "master", "/bin/true"); err != nil {70
t.Fatal(err)71
}72
commits, refs, err := GraphHistory(context.Background(), "git", dir, 10)73
if err != nil {74
t.Fatal(err)75
}76
if len(commits) != 0 || len(refs) != 0 {77
t.Fatalf("lege repo: commits=%v refs=%v", commits, refs)78
}79
}@@ -0,0 +1,24 @@
1
package i18n
2
3
func init() {
4
addCatalog(en, graphEN)
5
addCatalog(nl, graphNL)
6
addCatalog(de, graphDE)
7
addCatalog(fr, graphFR)
8
}
9
10
var graphEN = map[string]string{
11
"graph.label": "Commit graph",
12
}
13
14
var graphNL = map[string]string{
15
"graph.label": "Commitgrafiek",
16
}
17
18
var graphDE = map[string]string{
19
"graph.label": "Commit-Grafik",
20
}
21
22
var graphFR = map[string]string{
23
"graph.label": "Graphe des commits",
24
}
@@ -0,0 +1,24 @@1
package i18n2
3
func init() {4
addCatalog(en, graphEN)5
addCatalog(nl, graphNL)6
addCatalog(de, graphDE)7
addCatalog(fr, graphFR)8
}9
10
var graphEN = map[string]string{11
"graph.label": "Commit graph",12
}13
14
var graphNL = map[string]string{15
"graph.label": "Commitgrafiek",16
}17
18
var graphDE = map[string]string{19
"graph.label": "Commit-Grafik",20
}21
22
var graphFR = map[string]string{23
"graph.label": "Graphe des commits",24
}@@ -7,6 +7,7 @@ import (
7
7
"strings"
8
8
"time"
9
9
10
"gitlab.com/Timfa/bluegit/internal/auth"
10
11
"gitlab.com/Timfa/bluegit/internal/store"
11
12
)
12
13
@@ -16,7 +17,7 @@ func (s *Server) login(w http.ResponseWriter, r *http.Request) {
16
17
return
17
18
}
18
19
if s.Dev {
19
id, err := s.Auth.Exchange(r.Context(), "dev", s.Cfg.RedirectURI())
20
id, err := s.Auth.Exchange(r.Context(), "dev", s.Cfg.RedirectURI(), "", "")
20
21
if err != nil {
21
22
http.Error(w, err.Error(), http.StatusBadGateway)
22
23
return
@@ -29,12 +30,30 @@ func (s *Server) login(w http.ResponseWriter, r *http.Request) {
29
30
http.Error(w, s.tr(r, "err.session"), http.StatusInternalServerError)
30
31
return
31
32
}
33
nonce, err := randomState()
34
if err != nil {
35
http.Error(w, s.tr(r, "err.session"), http.StatusInternalServerError)
36
return
37
}
38
verifier, err := auth.NewPKCEVerifier()
39
if err != nil {
40
http.Error(w, s.tr(r, "err.session"), http.StatusInternalServerError)
41
return
42
}
32
43
secure := strings.HasPrefix(s.Cfg.BaseURL, "https://")
33
44
http.SetCookie(w, &http.Cookie{
34
45
Name: "bluegit_oauth_state", Value: state, Path: "/", MaxAge: 600,
35
46
HttpOnly: true, Secure: secure, SameSite: http.SameSiteLaxMode,
36
47
})
37
http.Redirect(w, r, s.Auth.AuthorizeURL(state, s.Cfg.RedirectURI()), http.StatusFound)
48
http.SetCookie(w, &http.Cookie{
49
Name: "bluegit_oauth_nonce", Value: nonce, Path: "/", MaxAge: 600,
50
HttpOnly: true, Secure: secure, SameSite: http.SameSiteLaxMode,
51
})
52
http.SetCookie(w, &http.Cookie{
53
Name: "bluegit_oauth_pkce", Value: verifier, Path: "/", MaxAge: 600,
54
HttpOnly: true, Secure: secure, SameSite: http.SameSiteLaxMode,
55
})
56
http.Redirect(w, r, s.Auth.AuthorizeURL(state, nonce, s.Cfg.RedirectURI(), auth.PKCEChallenge(verifier)), http.StatusFound)
38
57
}
39
58
40
59
func (s *Server) callback(w http.ResponseWriter, r *http.Request) {
@@ -51,8 +70,20 @@ func (s *Server) callback(w http.ResponseWriter, r *http.Request) {
51
70
http.Error(w, s.tr(r, "err.oauthState"), http.StatusBadRequest)
52
71
return
53
72
}
73
nonceCookie, err := r.Cookie("bluegit_oauth_nonce")
74
nonce := ""
75
if err == nil {
76
nonce = nonceCookie.Value
77
}
78
pkceCookie, err := r.Cookie("bluegit_oauth_pkce")
79
verifier := ""
80
if err == nil {
81
verifier = pkceCookie.Value
82
}
54
83
http.SetCookie(w, &http.Cookie{Name: "bluegit_oauth_state", Value: "", Path: "/", MaxAge: -1})
55
id, err := s.Auth.Exchange(r.Context(), r.URL.Query().Get("code"), s.Cfg.RedirectURI())
84
http.SetCookie(w, &http.Cookie{Name: "bluegit_oauth_nonce", Value: "", Path: "/", MaxAge: -1})
85
http.SetCookie(w, &http.Cookie{Name: "bluegit_oauth_pkce", Value: "", Path: "/", MaxAge: -1})
86
id, err := s.Auth.Exchange(r.Context(), r.URL.Query().Get("code"), s.Cfg.RedirectURI(), nonce, verifier)
56
87
if err != nil {
57
88
s.Log.Error("oauth", "err", err)
58
89
s.redirect(w, r, "/", "", s.tr(r, "err.oauthFail"))
@@ -7,6 +7,7 @@ import (7
"strings"7
"strings"8
"time"8
"time"9
9
10
"gitlab.com/Timfa/bluegit/internal/auth"10
"gitlab.com/Timfa/bluegit/internal/store"11
"gitlab.com/Timfa/bluegit/internal/store"11
)12
)12
13
@@ -16,7 +17,7 @@ func (s *Server) login(w http.ResponseWriter, r *http.Request) {16
return17
return17
}18
}18
if s.Dev {19
if s.Dev {19
id, err := s.Auth.Exchange(r.Context(), "dev", s.Cfg.RedirectURI())20
id, err := s.Auth.Exchange(r.Context(), "dev", s.Cfg.RedirectURI(), "", "")20
if err != nil {21
if err != nil {21
http.Error(w, err.Error(), http.StatusBadGateway)22
http.Error(w, err.Error(), http.StatusBadGateway)22
return23
return@@ -29,12 +30,30 @@ func (s *Server) login(w http.ResponseWriter, r *http.Request) {29
http.Error(w, s.tr(r, "err.session"), http.StatusInternalServerError)30
http.Error(w, s.tr(r, "err.session"), http.StatusInternalServerError)30
return31
return31
}32
}33
nonce, err := randomState()34
if err != nil {35
http.Error(w, s.tr(r, "err.session"), http.StatusInternalServerError)36
return37
}38
verifier, err := auth.NewPKCEVerifier()39
if err != nil {40
http.Error(w, s.tr(r, "err.session"), http.StatusInternalServerError)41
return42
}32
secure := strings.HasPrefix(s.Cfg.BaseURL, "https://")43
secure := strings.HasPrefix(s.Cfg.BaseURL, "https://")33
http.SetCookie(w, &http.Cookie{44
http.SetCookie(w, &http.Cookie{34
Name: "bluegit_oauth_state", Value: state, Path: "/", MaxAge: 600,45
Name: "bluegit_oauth_state", Value: state, Path: "/", MaxAge: 600,35
HttpOnly: true, Secure: secure, SameSite: http.SameSiteLaxMode,46
HttpOnly: true, Secure: secure, SameSite: http.SameSiteLaxMode,36
})47
})37
http.Redirect(w, r, s.Auth.AuthorizeURL(state, s.Cfg.RedirectURI()), http.StatusFound)48
http.SetCookie(w, &http.Cookie{49
Name: "bluegit_oauth_nonce", Value: nonce, Path: "/", MaxAge: 600,50
HttpOnly: true, Secure: secure, SameSite: http.SameSiteLaxMode,51
})52
http.SetCookie(w, &http.Cookie{53
Name: "bluegit_oauth_pkce", Value: verifier, Path: "/", MaxAge: 600,54
HttpOnly: true, Secure: secure, SameSite: http.SameSiteLaxMode,55
})56
http.Redirect(w, r, s.Auth.AuthorizeURL(state, nonce, s.Cfg.RedirectURI(), auth.PKCEChallenge(verifier)), http.StatusFound)38
}57
}39
58
40
func (s *Server) callback(w http.ResponseWriter, r *http.Request) {59
func (s *Server) callback(w http.ResponseWriter, r *http.Request) {@@ -51,8 +70,20 @@ func (s *Server) callback(w http.ResponseWriter, r *http.Request) {51
http.Error(w, s.tr(r, "err.oauthState"), http.StatusBadRequest)70
http.Error(w, s.tr(r, "err.oauthState"), http.StatusBadRequest)52
return71
return53
}72
}73
nonceCookie, err := r.Cookie("bluegit_oauth_nonce")74
nonce := ""75
if err == nil {76
nonce = nonceCookie.Value77
}78
pkceCookie, err := r.Cookie("bluegit_oauth_pkce")79
verifier := ""80
if err == nil {81
verifier = pkceCookie.Value82
}54
http.SetCookie(w, &http.Cookie{Name: "bluegit_oauth_state", Value: "", Path: "/", MaxAge: -1})83
http.SetCookie(w, &http.Cookie{Name: "bluegit_oauth_state", Value: "", Path: "/", MaxAge: -1})55
id, err := s.Auth.Exchange(r.Context(), r.URL.Query().Get("code"), s.Cfg.RedirectURI())84
http.SetCookie(w, &http.Cookie{Name: "bluegit_oauth_nonce", Value: "", Path: "/", MaxAge: -1})85
http.SetCookie(w, &http.Cookie{Name: "bluegit_oauth_pkce", Value: "", Path: "/", MaxAge: -1})86
id, err := s.Auth.Exchange(r.Context(), r.URL.Query().Get("code"), s.Cfg.RedirectURI(), nonce, verifier)56
if err != nil {87
if err != nil {57
s.Log.Error("oauth", "err", err)88
s.Log.Error("oauth", "err", err)58
s.redirect(w, r, "/", "", s.tr(r, "err.oauthFail"))89
s.redirect(w, r, "/", "", s.tr(r, "err.oauthFail"))@@ -0,0 +1,92 @@
1
package server
2
3
import (
4
"context"
5
"html/template"
6
"net/http"
7
8
"gitlab.com/Timfa/bluegit/internal/gitgraph"
9
"gitlab.com/Timfa/bluegit/internal/gitrepo"
10
"gitlab.com/Timfa/bluegit/internal/i18n"
11
"gitlab.com/Timfa/bluegit/internal/store"
12
)
13
14
// GraphView is de commitgrafiek op de project-overzichtspagina.
15
type GraphView struct {
16
Rows []gitgraph.Row
17
Lanes int
18
Width, Height int
19
SVG template.HTML
20
}
21
22
func (s *Server) graphs() *gitgraph.Cache {
23
s.graphOnce.Do(func() {
24
s.graphCache = gitgraph.NewCache(gitgraph.DefaultMaxBytes)
25
})
26
return s.graphCache
27
}
28
29
func (s *Server) fillGraph(r *http.Request, v *View, repo store.Repo) {
30
g, err := s.repoGraph(r.Context(), repo)
31
if err != nil || g == nil || len(g.Rows) == 0 {
32
return
33
}
34
v.Graph = presentGraph(r.Context(), s, repo.ID, g, i18n.Parse(v.Lang))
35
}
36
37
func (s *Server) repoGraph(ctx context.Context, repo store.Repo) (*gitgraph.Graph, error) {
38
def := repo.DefaultBranch
39
// Sleutel op repo + hoofdbranch + limiet. De tip-stand zit niet in de
40
// lookup: die zou bij elke pageview git- of schijf-I/O vragen. Bij een
41
// push wist refsChanged de entry (Drop) en vult refreshCache hem opnieuw.
42
key := gitgraph.Key(repo.ID, nil, def, gitgraph.DefaultLimit)
43
return s.graphs().Get(ctx, key, def, func(ctx context.Context) ([]gitgraph.Commit, []gitgraph.Ref, error) {
44
return gitrepo.GraphHistory(ctx, s.Git, s.gdir(repo), gitgraph.DefaultLimit)
45
})
46
}
47
48
func presentGraph(ctx context.Context, s *Server, repoID int64, g *gitgraph.Graph, lang i18n.Lang) *GraphView {
49
rows := make([]gitgraph.Row, len(g.Rows))
50
copy(rows, g.Rows)
51
if s != nil {
52
in := make([]gitrepo.Commit, 0, len(rows))
53
for _, r := range rows {
54
in = append(in, gitrepo.Commit{
55
SHA: r.SHA, Short: r.Short, Author: r.Author, Email: r.Email,
56
Unix: r.Unix, Subject: r.Subject,
57
})
58
}
59
people := s.presentCommits(ctx, repoID, in, lang)
60
for i := range rows {
61
if i >= len(people) {
62
break
63
}
64
p := people[i]
65
rows[i].Avatar = p.Avatar
66
rows[i].Initial = p.Initial
67
rows[i].UserURL = p.UserURL
68
if rows[i].Initial == "" {
69
rows[i].Initial = initialOf(rows[i].Author)
70
}
71
}
72
}
73
for i := range rows {
74
if rows[i].Initial == "" {
75
rows[i].Initial = initialOf(rows[i].Author)
76
}
77
}
78
return &GraphView{
79
Rows: rows,
80
Lanes: g.Lanes,
81
Width: g.Width,
82
Height: g.Height,
83
SVG: template.HTML(g.SVG()),
84
}
85
}
86
87
func (s *Server) dropGraph(repo store.Repo) {
88
if s == nil {
89
return
90
}
91
s.graphs().Drop(repo.ID)
92
}
@@ -0,0 +1,92 @@1
package server2
3
import (4
"context"5
"html/template"6
"net/http"7
8
"gitlab.com/Timfa/bluegit/internal/gitgraph"9
"gitlab.com/Timfa/bluegit/internal/gitrepo"10
"gitlab.com/Timfa/bluegit/internal/i18n"11
"gitlab.com/Timfa/bluegit/internal/store"12
)13
14
// GraphView is de commitgrafiek op de project-overzichtspagina.15
type GraphView struct {16
Rows []gitgraph.Row17
Lanes int18
Width, Height int19
SVG template.HTML20
}21
22
func (s *Server) graphs() *gitgraph.Cache {23
s.graphOnce.Do(func() {24
s.graphCache = gitgraph.NewCache(gitgraph.DefaultMaxBytes)25
})26
return s.graphCache27
}28
29
func (s *Server) fillGraph(r *http.Request, v *View, repo store.Repo) {30
g, err := s.repoGraph(r.Context(), repo)31
if err != nil || g == nil || len(g.Rows) == 0 {32
return33
}34
v.Graph = presentGraph(r.Context(), s, repo.ID, g, i18n.Parse(v.Lang))35
}36
37
func (s *Server) repoGraph(ctx context.Context, repo store.Repo) (*gitgraph.Graph, error) {38
def := repo.DefaultBranch39
// Sleutel op repo + hoofdbranch + limiet. De tip-stand zit niet in de40
// lookup: die zou bij elke pageview git- of schijf-I/O vragen. Bij een41
// push wist refsChanged de entry (Drop) en vult refreshCache hem opnieuw.42
key := gitgraph.Key(repo.ID, nil, def, gitgraph.DefaultLimit)43
return s.graphs().Get(ctx, key, def, func(ctx context.Context) ([]gitgraph.Commit, []gitgraph.Ref, error) {44
return gitrepo.GraphHistory(ctx, s.Git, s.gdir(repo), gitgraph.DefaultLimit)45
})46
}47
48
func presentGraph(ctx context.Context, s *Server, repoID int64, g *gitgraph.Graph, lang i18n.Lang) *GraphView {49
rows := make([]gitgraph.Row, len(g.Rows))50
copy(rows, g.Rows)51
if s != nil {52
in := make([]gitrepo.Commit, 0, len(rows))53
for _, r := range rows {54
in = append(in, gitrepo.Commit{55
SHA: r.SHA, Short: r.Short, Author: r.Author, Email: r.Email,56
Unix: r.Unix, Subject: r.Subject,57
})58
}59
people := s.presentCommits(ctx, repoID, in, lang)60
for i := range rows {61
if i >= len(people) {62
break63
}64
p := people[i]65
rows[i].Avatar = p.Avatar66
rows[i].Initial = p.Initial67
rows[i].UserURL = p.UserURL68
if rows[i].Initial == "" {69
rows[i].Initial = initialOf(rows[i].Author)70
}71
}72
}73
for i := range rows {74
if rows[i].Initial == "" {75
rows[i].Initial = initialOf(rows[i].Author)76
}77
}78
return &GraphView{79
Rows: rows,80
Lanes: g.Lanes,81
Width: g.Width,82
Height: g.Height,83
SVG: template.HTML(g.SVG()),84
}85
}86
87
func (s *Server) dropGraph(repo store.Repo) {88
if s == nil {89
return90
}91
s.graphs().Drop(repo.ID)92
}@@ -0,0 +1,226 @@
1
package server
2
3
import (
4
"context"
5
"net/http"
6
"net/http/cookiejar"
7
"net/http/httptest"
8
"net/url"
9
"path/filepath"
10
"strings"
11
"testing"
12
"time"
13
14
"gitlab.com/Timfa/bluegit/internal/auth"
15
"gitlab.com/Timfa/bluegit/internal/config"
16
"gitlab.com/Timfa/bluegit/internal/gitgraph"
17
"gitlab.com/Timfa/bluegit/internal/store"
18
)
19
20
func TestOverviewRendersCommitGraph(t *testing.T) {
21
ts, client, repo := graphTestRepo(t)
22
page := read(t, mustGet(t, client, ts.URL+"/tim/grafiek"))
23
if !strings.Contains(page, `class="commitgraph"`) {
24
t.Fatalf("geen grafiek op het overzicht:\n%s", page)
25
}
26
if !strings.Contains(page, `aria-label="Commit graph"`) && !strings.Contains(page, `aria-label="Commitgrafiek"`) {
27
t.Fatalf("geen toegankelijk label:\n%s", page)
28
}
29
if !strings.Contains(page, "is-default") || !strings.Contains(page, ">master<") {
30
t.Fatalf("hoofdbranch-label ontbreekt:\n%s", page)
31
}
32
if !strings.Contains(page, ">feature<") || !strings.Contains(page, "is-tag") || !strings.Contains(page, ">v1<") {
33
t.Fatalf("feature of tag ontbreekt:\n%s", page)
34
}
35
if !strings.Contains(page, `stroke="var(--blue)"`) && !strings.Contains(page, `fill="var(--blue)"`) {
36
t.Fatalf("hoofdbranch is niet blauw:\n%s", page)
37
}
38
if strings.Contains(page, "ZgotmplZ") {
39
t.Fatalf("css-kleur werd weggestreept:\n%s", page)
40
}
41
if !strings.Contains(page, "/tim/grafiek/-/commit/") {
42
t.Fatalf("geen commitlinks")
43
}
44
if !strings.Contains(page, "merge feature") && !strings.Contains(page, "feature-work") {
45
t.Fatalf("commitberichten ontbreken")
46
}
47
// Tweede request: nog steeds dezelfde grafiek (cache).
48
page2 := read(t, mustGet(t, client, ts.URL+"/tim/grafiek"))
49
if !strings.Contains(page2, `class="commitgraph"`) {
50
t.Fatal("grafiek verdween bij herladen")
51
}
52
_ = repo
53
}
54
55
func TestGraphCacheHitSkipsGit(t *testing.T) {
56
ts, client, repo := graphTestRepo(t)
57
// Eerste opbouw via de pagina, daarna git-binary onbruikbaar maken.
58
_ = read(t, mustGet(t, client, ts.URL+"/tim/grafiek"))
59
srv := repo
60
srv.Git = filepath.Join(t.TempDir(), "niet-bestaande-git")
61
g, err := srv.repoGraph(context.Background(), mustStoreRepo(t, srv))
62
if err != nil || g == nil || len(g.Rows) == 0 {
63
t.Fatalf("cache-hit had geen git nodig, kreeg err=%v g=%v", err, g)
64
}
65
hits, misses, _, _ := srv.graphs().Stats()
66
if hits < 1 || misses < 1 {
67
t.Fatalf("verwacht miss+hit, hits=%d misses=%d", hits, misses)
68
}
69
}
70
71
func TestGraphColdWarmTimes(t *testing.T) {
72
storage := t.TempDir()
73
st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
74
if err != nil {
75
t.Fatal(err)
76
}
77
t.Cleanup(func() { _ = st.Close() })
78
cfg := config.Config{
79
BaseURL: "http://git.example", Listen: "127.0.0.1:0", StoragePath: storage,
80
Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
81
Git: config.Git{Binary: "git", DefaultBranch: "master"},
82
}
83
srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
84
ts := httptest.NewServer(srv.Handler())
85
t.Cleanup(ts.Close)
86
jar, _ := cookiejar.New(nil)
87
client := &http.Client{Jar: jar}
88
page := read(t, mustGet(t, client, ts.URL+"/login"))
89
page = read(t, mustPost(t, client, ts.URL+"/new/repo", url.Values{"csrf": {csrfOf(t, page)}, "name": {"tijden"}, "visibility": {"public"}}))
90
page = read(t, mustPost(t, client, ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"tim"}}))
91
token := between(page, `<p class="code">`, "</p>")
92
93
work := t.TempDir()
94
git(t, work, "init", "-b", "master")
95
git(t, work, "config", "user.email", "tim@example")
96
git(t, work, "config", "user.name", "tim")
97
remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/tijden.git"
98
git(t, work, "remote", "add", "origin", remote)
99
for i := 0; i < 24; i++ {
100
writeFile(t, filepath.Join(work, "f"), string(rune('a'+i%26))+"\n")
101
git(t, work, "add", "f")
102
git(t, work, "commit", "-m", "c"+string(rune('a'+i%26)))
103
}
104
git(t, work, "checkout", "-b", "feature")
105
for i := 0; i < 8; i++ {
106
writeFile(t, filepath.Join(work, "g"), "g"+string(rune('a'+i))+"\n")
107
git(t, work, "add", "g")
108
git(t, work, "commit", "-m", "f"+string(rune('a'+i)))
109
}
110
git(t, work, "checkout", "master")
111
git(t, work, "merge", "--no-ff", "-m", "merge feature", "feature")
112
git(t, work, "push", "-u", "origin", "master")
113
git(t, work, "push", "origin", "feature")
114
115
row, err := st.RepoByPath(context.Background(), "tim", "tijden")
116
if err != nil {
117
t.Fatal(err)
118
}
119
ctx := context.Background()
120
// De push heeft de cache al via refsChanged gevuld; eerst legen voor een echte koude meting.
121
time.Sleep(50 * time.Millisecond)
122
srv.dropGraph(row)
123
start := time.Now()
124
g, err := srv.repoGraph(ctx, row)
125
cold := time.Since(start)
126
if err != nil || g == nil || len(g.Rows) == 0 {
127
t.Fatalf("koud: %v", err)
128
}
129
start = time.Now()
130
g2, err := srv.repoGraph(ctx, row)
131
warm := time.Since(start)
132
if err != nil || g2 == nil {
133
t.Fatalf("warm: %v", err)
134
}
135
t.Logf("commitgrafiek koud=%s warm=%s rijen=%d lanes=%d", cold, warm, len(g.Rows), g.Lanes)
136
if warm > cold && warm > 20*time.Millisecond {
137
t.Fatalf("warm (%s) zou ruim onder koud (%s) moeten liggen", warm, cold)
138
}
139
// Alleen rapporteren; een minieme warm-meting kan door ruis iets hoger zijn
140
// als beide sub-milliseconde zijn. Dan is het alsnog een cache-hit.
141
hits, _, _, _ := srv.graphs().Stats()
142
if hits < 1 {
143
t.Fatal("geen cache-hit bij de warme meting")
144
}
145
}
146
147
func graphTestRepo(t *testing.T) (*httptest.Server, *http.Client, *Server) {
148
t.Helper()
149
storage := t.TempDir()
150
st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
151
if err != nil {
152
t.Fatal(err)
153
}
154
t.Cleanup(func() { _ = st.Close() })
155
cfg := config.Config{
156
BaseURL: "http://git.example", Listen: "127.0.0.1:0", StoragePath: storage,
157
Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
158
Git: config.Git{Binary: "git", DefaultBranch: "master"},
159
}
160
srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
161
ts := httptest.NewServer(srv.Handler())
162
t.Cleanup(ts.Close)
163
jar, _ := cookiejar.New(nil)
164
client := &http.Client{Jar: jar}
165
page := read(t, mustGet(t, client, ts.URL+"/login"))
166
page = read(t, mustPost(t, client, ts.URL+"/new/repo", url.Values{"csrf": {csrfOf(t, page)}, "name": {"grafiek"}, "visibility": {"public"}}))
167
page = read(t, mustPost(t, client, ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"tim"}}))
168
token := between(page, `<p class="code">`, "</p>")
169
170
work := t.TempDir()
171
git(t, work, "init", "-b", "master")
172
git(t, work, "config", "user.email", "tim@example")
173
git(t, work, "config", "user.name", "tim")
174
writeFile(t, filepath.Join(work, "README.md"), "start\n")
175
git(t, work, "add", ".")
176
git(t, work, "commit", "-m", "start")
177
git(t, work, "checkout", "-b", "feature")
178
writeFile(t, filepath.Join(work, "extra.txt"), "meer\n")
179
git(t, work, "add", "extra.txt")
180
git(t, work, "commit", "-m", "feature-work")
181
git(t, work, "checkout", "master")
182
writeFile(t, filepath.Join(work, "on-master.txt"), "c\n")
183
git(t, work, "add", "on-master.txt")
184
git(t, work, "commit", "-m", "on-master")
185
git(t, work, "tag", "v1")
186
git(t, work, "merge", "--no-ff", "-m", "merge feature", "feature")
187
remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/grafiek.git"
188
git(t, work, "remote", "add", "origin", remote)
189
git(t, work, "push", "-u", "origin", "master", "--tags")
190
git(t, work, "push", "-u", "origin", "feature")
191
return ts, client, srv
192
}
193
194
func mustStoreRepo(t *testing.T, s *Server) store.Repo {
195
t.Helper()
196
row, err := s.Store.RepoByPath(context.Background(), "tim", "grafiek")
197
if err != nil {
198
t.Fatal(err)
199
}
200
return row
201
}
202
203
func TestSVGColorsAreSafe(t *testing.T) {
204
g := gitgraph.Layout(
205
[]gitgraph.Commit{
206
{SHA: "m", Subject: `<script>`, Parents: []string{"c", "f"}},
207
{SHA: "f", Subject: "x", Parents: []string{"b"}},
208
{SHA: "c", Subject: "y", Parents: []string{"b"}},
209
{SHA: "b", Subject: "z", Parents: nil},
210
},
211
[]gitgraph.Ref{{Name: "master", SHA: "m", Kind: "branch"}, {Name: "feature", SHA: "f", Kind: "branch"}},
212
"master",
213
)
214
svg := g.SVG()
215
if strings.Contains(svg, "<script") || strings.Contains(svg, `subject`) {
216
t.Fatalf("svg lekt tekst: %s", svg)
217
}
218
if !strings.Contains(svg, "var(--blue)") {
219
t.Fatalf("blauw ontbreekt: %s", svg)
220
}
221
for _, token := range []string{"stroke=\"var(--", "fill=\"var(--"} {
222
if !strings.Contains(svg, token) {
223
t.Fatalf("verwacht %s in %s", token, svg)
224
}
225
}
226
}
@@ -0,0 +1,226 @@1
package server2
3
import (4
"context"5
"net/http"6
"net/http/cookiejar"7
"net/http/httptest"8
"net/url"9
"path/filepath"10
"strings"11
"testing"12
"time"13
14
"gitlab.com/Timfa/bluegit/internal/auth"15
"gitlab.com/Timfa/bluegit/internal/config"16
"gitlab.com/Timfa/bluegit/internal/gitgraph"17
"gitlab.com/Timfa/bluegit/internal/store"18
)19
20
func TestOverviewRendersCommitGraph(t *testing.T) {21
ts, client, repo := graphTestRepo(t)22
page := read(t, mustGet(t, client, ts.URL+"/tim/grafiek"))23
if !strings.Contains(page, `class="commitgraph"`) {24
t.Fatalf("geen grafiek op het overzicht:\n%s", page)25
}26
if !strings.Contains(page, `aria-label="Commit graph"`) && !strings.Contains(page, `aria-label="Commitgrafiek"`) {27
t.Fatalf("geen toegankelijk label:\n%s", page)28
}29
if !strings.Contains(page, "is-default") || !strings.Contains(page, ">master<") {30
t.Fatalf("hoofdbranch-label ontbreekt:\n%s", page)31
}32
if !strings.Contains(page, ">feature<") || !strings.Contains(page, "is-tag") || !strings.Contains(page, ">v1<") {33
t.Fatalf("feature of tag ontbreekt:\n%s", page)34
}35
if !strings.Contains(page, `stroke="var(--blue)"`) && !strings.Contains(page, `fill="var(--blue)"`) {36
t.Fatalf("hoofdbranch is niet blauw:\n%s", page)37
}38
if strings.Contains(page, "ZgotmplZ") {39
t.Fatalf("css-kleur werd weggestreept:\n%s", page)40
}41
if !strings.Contains(page, "/tim/grafiek/-/commit/") {42
t.Fatalf("geen commitlinks")43
}44
if !strings.Contains(page, "merge feature") && !strings.Contains(page, "feature-work") {45
t.Fatalf("commitberichten ontbreken")46
}47
// Tweede request: nog steeds dezelfde grafiek (cache).48
page2 := read(t, mustGet(t, client, ts.URL+"/tim/grafiek"))49
if !strings.Contains(page2, `class="commitgraph"`) {50
t.Fatal("grafiek verdween bij herladen")51
}52
_ = repo53
}54
55
func TestGraphCacheHitSkipsGit(t *testing.T) {56
ts, client, repo := graphTestRepo(t)57
// Eerste opbouw via de pagina, daarna git-binary onbruikbaar maken.58
_ = read(t, mustGet(t, client, ts.URL+"/tim/grafiek"))59
srv := repo60
srv.Git = filepath.Join(t.TempDir(), "niet-bestaande-git")61
g, err := srv.repoGraph(context.Background(), mustStoreRepo(t, srv))62
if err != nil || g == nil || len(g.Rows) == 0 {63
t.Fatalf("cache-hit had geen git nodig, kreeg err=%v g=%v", err, g)64
}65
hits, misses, _, _ := srv.graphs().Stats()66
if hits < 1 || misses < 1 {67
t.Fatalf("verwacht miss+hit, hits=%d misses=%d", hits, misses)68
}69
}70
71
func TestGraphColdWarmTimes(t *testing.T) {72
storage := t.TempDir()73
st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())74
if err != nil {75
t.Fatal(err)76
}77
t.Cleanup(func() { _ = st.Close() })78
cfg := config.Config{79
BaseURL: "http://git.example", Listen: "127.0.0.1:0", StoragePath: storage,80
Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},81
Git: config.Git{Binary: "git", DefaultBranch: "master"},82
}83
srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}84
ts := httptest.NewServer(srv.Handler())85
t.Cleanup(ts.Close)86
jar, _ := cookiejar.New(nil)87
client := &http.Client{Jar: jar}88
page := read(t, mustGet(t, client, ts.URL+"/login"))89
page = read(t, mustPost(t, client, ts.URL+"/new/repo", url.Values{"csrf": {csrfOf(t, page)}, "name": {"tijden"}, "visibility": {"public"}}))90
page = read(t, mustPost(t, client, ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"tim"}}))91
token := between(page, `<p class="code">`, "</p>")92
93
work := t.TempDir()94
git(t, work, "init", "-b", "master")95
git(t, work, "config", "user.email", "tim@example")96
git(t, work, "config", "user.name", "tim")97
remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/tijden.git"98
git(t, work, "remote", "add", "origin", remote)99
for i := 0; i < 24; i++ {100
writeFile(t, filepath.Join(work, "f"), string(rune('a'+i%26))+"\n")101
git(t, work, "add", "f")102
git(t, work, "commit", "-m", "c"+string(rune('a'+i%26)))103
}104
git(t, work, "checkout", "-b", "feature")105
for i := 0; i < 8; i++ {106
writeFile(t, filepath.Join(work, "g"), "g"+string(rune('a'+i))+"\n")107
git(t, work, "add", "g")108
git(t, work, "commit", "-m", "f"+string(rune('a'+i)))109
}110
git(t, work, "checkout", "master")111
git(t, work, "merge", "--no-ff", "-m", "merge feature", "feature")112
git(t, work, "push", "-u", "origin", "master")113
git(t, work, "push", "origin", "feature")114
115
row, err := st.RepoByPath(context.Background(), "tim", "tijden")116
if err != nil {117
t.Fatal(err)118
}119
ctx := context.Background()120
// De push heeft de cache al via refsChanged gevuld; eerst legen voor een echte koude meting.121
time.Sleep(50 * time.Millisecond)122
srv.dropGraph(row)123
start := time.Now()124
g, err := srv.repoGraph(ctx, row)125
cold := time.Since(start)126
if err != nil || g == nil || len(g.Rows) == 0 {127
t.Fatalf("koud: %v", err)128
}129
start = time.Now()130
g2, err := srv.repoGraph(ctx, row)131
warm := time.Since(start)132
if err != nil || g2 == nil {133
t.Fatalf("warm: %v", err)134
}135
t.Logf("commitgrafiek koud=%s warm=%s rijen=%d lanes=%d", cold, warm, len(g.Rows), g.Lanes)136
if warm > cold && warm > 20*time.Millisecond {137
t.Fatalf("warm (%s) zou ruim onder koud (%s) moeten liggen", warm, cold)138
}139
// Alleen rapporteren; een minieme warm-meting kan door ruis iets hoger zijn140
// als beide sub-milliseconde zijn. Dan is het alsnog een cache-hit.141
hits, _, _, _ := srv.graphs().Stats()142
if hits < 1 {143
t.Fatal("geen cache-hit bij de warme meting")144
}145
}146
147
func graphTestRepo(t *testing.T) (*httptest.Server, *http.Client, *Server) {148
t.Helper()149
storage := t.TempDir()150
st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())151
if err != nil {152
t.Fatal(err)153
}154
t.Cleanup(func() { _ = st.Close() })155
cfg := config.Config{156
BaseURL: "http://git.example", Listen: "127.0.0.1:0", StoragePath: storage,157
Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},158
Git: config.Git{Binary: "git", DefaultBranch: "master"},159
}160
srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}161
ts := httptest.NewServer(srv.Handler())162
t.Cleanup(ts.Close)163
jar, _ := cookiejar.New(nil)164
client := &http.Client{Jar: jar}165
page := read(t, mustGet(t, client, ts.URL+"/login"))166
page = read(t, mustPost(t, client, ts.URL+"/new/repo", url.Values{"csrf": {csrfOf(t, page)}, "name": {"grafiek"}, "visibility": {"public"}}))167
page = read(t, mustPost(t, client, ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"tim"}}))168
token := between(page, `<p class="code">`, "</p>")169
170
work := t.TempDir()171
git(t, work, "init", "-b", "master")172
git(t, work, "config", "user.email", "tim@example")173
git(t, work, "config", "user.name", "tim")174
writeFile(t, filepath.Join(work, "README.md"), "start\n")175
git(t, work, "add", ".")176
git(t, work, "commit", "-m", "start")177
git(t, work, "checkout", "-b", "feature")178
writeFile(t, filepath.Join(work, "extra.txt"), "meer\n")179
git(t, work, "add", "extra.txt")180
git(t, work, "commit", "-m", "feature-work")181
git(t, work, "checkout", "master")182
writeFile(t, filepath.Join(work, "on-master.txt"), "c\n")183
git(t, work, "add", "on-master.txt")184
git(t, work, "commit", "-m", "on-master")185
git(t, work, "tag", "v1")186
git(t, work, "merge", "--no-ff", "-m", "merge feature", "feature")187
remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/grafiek.git"188
git(t, work, "remote", "add", "origin", remote)189
git(t, work, "push", "-u", "origin", "master", "--tags")190
git(t, work, "push", "-u", "origin", "feature")191
return ts, client, srv192
}193
194
func mustStoreRepo(t *testing.T, s *Server) store.Repo {195
t.Helper()196
row, err := s.Store.RepoByPath(context.Background(), "tim", "grafiek")197
if err != nil {198
t.Fatal(err)199
}200
return row201
}202
203
func TestSVGColorsAreSafe(t *testing.T) {204
g := gitgraph.Layout(205
[]gitgraph.Commit{206
{SHA: "m", Subject: `<script>`, Parents: []string{"c", "f"}},207
{SHA: "f", Subject: "x", Parents: []string{"b"}},208
{SHA: "c", Subject: "y", Parents: []string{"b"}},209
{SHA: "b", Subject: "z", Parents: nil},210
},211
[]gitgraph.Ref{{Name: "master", SHA: "m", Kind: "branch"}, {Name: "feature", SHA: "f", Kind: "branch"}},212
"master",213
)214
svg := g.SVG()215
if strings.Contains(svg, "<script") || strings.Contains(svg, `subject`) {216
t.Fatalf("svg lekt tekst: %s", svg)217
}218
if !strings.Contains(svg, "var(--blue)") {219
t.Fatalf("blauw ontbreekt: %s", svg)220
}221
for _, token := range []string{"stroke=\"var(--", "fill=\"var(--"} {222
if !strings.Contains(svg, token) {223
t.Fatalf("verwacht %s in %s", token, svg)224
}225
}226
}@@ -171,18 +171,19 @@ func (s *Server) cDoc(ctx context.Context, repo store.Repo, rev, path string, ma
171
171
// op de achtergrond opnieuw.
172
172
func (s *Server) refsChanged(repo store.Repo) {
173
173
c := s.ReadCache()
174
if c == nil {
175
return
174
if c != nil {
175
c.DropRefs(repo.ID)
176
176
}
177
c.DropRefs(repo.ID)
177
s.dropGraph(repo)
178
178
go s.refreshCache(repo)
179
179
}
180
180
181
181
func (s *Server) refreshCache(repo store.Repo) {
182
ctx := context.Background()
183
_, _ = s.repoGraph(ctx, repo)
182
184
if s.ReadCache() == nil {
183
185
return
184
186
}
185
ctx := context.Background()
186
187
_, _ = s.cRefs(ctx, repo)
187
188
_, _ = s.cBranches(ctx, repo)
188
189
_, _ = s.cBranchTips(ctx, repo)
@@ -171,18 +171,19 @@ func (s *Server) cDoc(ctx context.Context, repo store.Repo, rev, path string, ma171
// op de achtergrond opnieuw.171
// op de achtergrond opnieuw.172
func (s *Server) refsChanged(repo store.Repo) {172
func (s *Server) refsChanged(repo store.Repo) {173
c := s.ReadCache()173
c := s.ReadCache()174
if c == nil {174
if c != nil {175
return175
c.DropRefs(repo.ID)176
}176
}177
c.DropRefs(repo.ID)177
s.dropGraph(repo)178
go s.refreshCache(repo)178
go s.refreshCache(repo)179
}179
}180
180
181
func (s *Server) refreshCache(repo store.Repo) {181
func (s *Server) refreshCache(repo store.Repo) {182
ctx := context.Background()183
_, _ = s.repoGraph(ctx, repo)182
if s.ReadCache() == nil {184
if s.ReadCache() == nil {183
return185
return184
}186
}185
ctx := context.Background()186
_, _ = s.cRefs(ctx, repo)187
_, _ = s.cRefs(ctx, repo)187
_, _ = s.cBranches(ctx, repo)188
_, _ = s.cBranches(ctx, repo)188
_, _ = s.cBranchTips(ctx, repo)189
_, _ = s.cBranchTips(ctx, repo)@@ -20,6 +20,7 @@ import (
20
20
func (s *Server) fillOverview(r *http.Request, v *View, repo store.Repo) {
21
21
v.Page = "overview"
22
22
s.branchList(r, v, repo)
23
s.fillGraph(r, v, repo)
23
24
lang := i18n.Parse(v.Lang)
24
25
if c, err := s.cLastCommit(r.Context(), repo, v.Rev, ""); err == nil && c.SHA != "" {
25
26
if rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, lang); len(rows) > 0 {
@@ -20,6 +20,7 @@ import (20
func (s *Server) fillOverview(r *http.Request, v *View, repo store.Repo) {20
func (s *Server) fillOverview(r *http.Request, v *View, repo store.Repo) {21
v.Page = "overview"21
v.Page = "overview"22
s.branchList(r, v, repo)22
s.branchList(r, v, repo)23
s.fillGraph(r, v, repo)23
lang := i18n.Parse(v.Lang)24
lang := i18n.Parse(v.Lang)24
if c, err := s.cLastCommit(r.Context(), repo, v.Rev, ""); err == nil && c.SHA != "" {25
if c, err := s.cLastCommit(r.Context(), repo, v.Rev, ""); err == nil && c.SHA != "" {25
if rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, lang); len(rows) > 0 {26
if rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, lang); len(rows) > 0 {@@ -26,6 +26,7 @@ import (
26
26
"gitlab.com/Timfa/bluegit/internal/card"
27
27
"gitlab.com/Timfa/bluegit/internal/cispec"
28
28
"gitlab.com/Timfa/bluegit/internal/config"
29
"gitlab.com/Timfa/bluegit/internal/gitgraph"
29
30
"gitlab.com/Timfa/bluegit/internal/i18n"
30
31
"gitlab.com/Timfa/bluegit/internal/realip"
31
32
"gitlab.com/Timfa/bluegit/internal/runner"
@@ -71,6 +72,9 @@ type Server struct {
71
72
72
73
cacheMu sync.RWMutex
73
74
rcache *readcache.Cache
75
76
graphOnce sync.Once
77
graphCache *gitgraph.Cache
74
78
}
75
79
76
80
type principal struct {
@@ -752,6 +756,7 @@ type View struct {
752
756
IsImage bool // rasterafbeelding met kloppende magic bytes
753
757
FileName string
754
758
RevProtected bool
759
Graph *GraphView
755
760
Heat *activity.Calendar
756
761
Notes []NoteRow
757
762
Profile *store.User
@@ -26,6 +26,7 @@ import (26
"gitlab.com/Timfa/bluegit/internal/card"26
"gitlab.com/Timfa/bluegit/internal/card"27
"gitlab.com/Timfa/bluegit/internal/cispec"27
"gitlab.com/Timfa/bluegit/internal/cispec"28
"gitlab.com/Timfa/bluegit/internal/config"28
"gitlab.com/Timfa/bluegit/internal/config"29
"gitlab.com/Timfa/bluegit/internal/gitgraph"29
"gitlab.com/Timfa/bluegit/internal/i18n"30
"gitlab.com/Timfa/bluegit/internal/i18n"30
"gitlab.com/Timfa/bluegit/internal/realip"31
"gitlab.com/Timfa/bluegit/internal/realip"31
"gitlab.com/Timfa/bluegit/internal/runner"32
"gitlab.com/Timfa/bluegit/internal/runner"@@ -71,6 +72,9 @@ type Server struct {71
72
72
cacheMu sync.RWMutex73
cacheMu sync.RWMutex73
rcache *readcache.Cache74
rcache *readcache.Cache75
76
graphOnce sync.Once77
graphCache *gitgraph.Cache74
}78
}75
79
76
type principal struct {80
type principal struct {@@ -752,6 +756,7 @@ type View struct {752
IsImage bool // rasterafbeelding met kloppende magic bytes756
IsImage bool // rasterafbeelding met kloppende magic bytes753
FileName string757
FileName string754
RevProtected bool758
RevProtected bool759
Graph *GraphView755
Heat *activity.Calendar760
Heat *activity.Calendar756
Notes []NoteRow761
Notes []NoteRow757
Profile *store.User762
Profile *store.User@@ -27,6 +27,19 @@
27
27
--sidebar: 240px;
28
28
--content: 1180px;
29
29
--top-h: 48px;
30
--graph-w: 236px;
31
--graph-gap: 12px;
32
--graph-ref-w: 78px;
33
--graph-row: 22px;
34
--graph-lane: 12px;
35
--graph-0: #0e7490;
36
--graph-1: #6f42c1;
37
--graph-2: #1f6b3a;
38
--graph-3: #9d174d;
39
--graph-4: #b45309;
40
--graph-5: #0f766e;
41
--graph-6: #7c3aed;
42
--graph-7: #9a3412;
30
43
font-family: var(--font);
31
44
}
32
45
* { box-sizing: border-box; }
@@ -53,7 +66,7 @@ h2 { font-size: 16px; font-weight: 600; }
53
66
.top button { background: transparent; border: 1px solid rgba(255,255,255,.35); color: white; }
54
67
.frame { display: flex; align-items: flex-start; min-height: calc(100vh - var(--top-h)); }
55
68
.frame.with-side .content { flex: 1; min-width: 0; }
56
.content { flex: 1; min-width: 0; display: flex; justify-content: center; align-items: flex-start; }
69
.content { flex: 1; min-width: 0; display: flex; justify-content: center; align-items: flex-start; container-type: inline-size; container-name: maincol; }
57
70
main, main.wide {
58
71
width: min(100%, var(--content));
59
72
max-width: var(--content);
@@ -1515,3 +1528,106 @@ li.rel-asset form.rel-asset-actions { display: inline-flex; align-items: center;
1515
1528
.pipewait { display: flex; align-items: center; gap: 0.5rem; flex-wrap: wrap; background: #fff8ec; border: 1px solid #f0d9a8; border-radius: 8px; padding: 0.5rem 0.75rem; }
1516
1529
.status.waiting_for_job { background: #fff4e0; color: #8a5a00; }
1517
1530
form.cancelform { display: inline; }
1531
1532
/* Commitgrafiek in de lege ruimte naast de centrale kolom. Buiten de
1533
flow (slotbreedte 0), zodat de bestaande kolom niet verschuift. */
1534
.commitgraph-slot {
1535
display: none;
1536
position: sticky;
1537
top: calc(var(--top-h) + var(--sp-4));
1538
width: 0;
1539
flex: none;
1540
align-self: flex-start;
1541
z-index: 5;
1542
}
1543
.commitgraph {
1544
position: relative;
1545
left: calc(-1 * var(--graph-w) - var(--graph-gap) + 8px);
1546
width: var(--graph-w);
1547
max-height: calc(100vh - var(--top-h) - var(--sp-6));
1548
overflow: hidden;
1549
font-size: var(--fs-sm);
1550
color: var(--ink);
1551
}
1552
.commitgraph-list { list-style: none; margin: 0; padding: 0; position: relative; }
1553
.commitgraph-svg {
1554
position: absolute;
1555
top: 0;
1556
left: var(--graph-ref-w);
1557
pointer-events: none;
1558
z-index: 0;
1559
}
1560
.commitgraph-row {
1561
display: grid;
1562
grid-template-columns: var(--graph-ref-w) calc(var(--lanes, 1) * var(--graph-lane) + 16px) minmax(0, 1fr);
1563
align-items: center;
1564
height: var(--graph-row);
1565
position: relative;
1566
}
1567
.commitgraph-refs {
1568
display: flex; gap: 2px; justify-content: flex-end; align-items: center;
1569
min-width: 0; overflow: hidden; padding-right: 4px;
1570
}
1571
.commitgraph-ref {
1572
flex: 0 1 auto;
1573
min-width: 0;
1574
max-width: 100%;
1575
font-size: 10px; font-weight: 600; line-height: 15px;
1576
white-space: nowrap; overflow: hidden; text-overflow: ellipsis;
1577
border: 1px solid currentColor; border-radius: 999px;
1578
padding: 0 5px; background: var(--card);
1579
}
1580
.commitgraph-ref.is-tag, .commitgraph-ref.tag { border-style: dashed; font-weight: 500; color: var(--muted); }
1581
.commitgraph-ref.is-default { background: var(--blue-soft); }
1582
.commitgraph-node.is-main, .commitgraph-ref.is-main { --c: var(--blue); color: var(--blue); }
1583
.commitgraph-node.c0, .commitgraph-ref.c0 { --c: var(--graph-0); color: var(--graph-0); }
1584
.commitgraph-node.c1, .commitgraph-ref.c1 { --c: var(--graph-1); color: var(--graph-1); }
1585
.commitgraph-node.c2, .commitgraph-ref.c2 { --c: var(--graph-2); color: var(--graph-2); }
1586
.commitgraph-node.c3, .commitgraph-ref.c3 { --c: var(--graph-3); color: var(--graph-3); }
1587
.commitgraph-node.c4, .commitgraph-ref.c4 { --c: var(--graph-4); color: var(--graph-4); }
1588
.commitgraph-node.c5, .commitgraph-ref.c5 { --c: var(--graph-5); color: var(--graph-5); }
1589
.commitgraph-node.c6, .commitgraph-ref.c6 { --c: var(--graph-6); color: var(--graph-6); }
1590
.commitgraph-node.c7, .commitgraph-ref.c7 { --c: var(--graph-7); color: var(--graph-7); }
1591
.commitgraph-node {
1592
position: absolute;
1593
left: calc(var(--graph-ref-w) + var(--lane, 0) * var(--graph-lane) + var(--graph-lane) / 2 - 8px);
1594
width: 16px; height: 16px; border-radius: 50%;
1595
z-index: 1;
1596
overflow: hidden;
1597
background: var(--c, var(--blue));
1598
color: #fff;
1599
font-size: 9px; font-weight: 700;
1600
display: grid; place-items: center;
1601
text-decoration: none;
1602
box-shadow: 0 0 0 2px var(--paper);
1603
}
1604
.commitgraph-node img { width: 16px; height: 16px; object-fit: cover; display: block; }
1605
.commitgraph-msg {
1606
min-width: 0;
1607
color: var(--ink);
1608
text-decoration: none;
1609
white-space: nowrap; overflow: hidden; text-overflow: ellipsis;
1610
}
1611
.commitgraph-msg:hover { color: var(--blue-deep); text-decoration: underline; }
1612
/* Toon links als er naast de 1180px-kolom ruimte is voor de grafiek.
1613
Beide zijden van de gecentreerde kolom zijn even breed; rechts is
1614
dezelfde drempel, dus links wint altijd als er plek is. */
1615
/* De centrale kolom blijft gecentreerd, dus de vrije ruimte is
1616
aan twee kanten gelijk. De grafiek past links als
1617
(content - 1180) / 2 >= --graph-w + --graph-gap - 8px ≈ 240px,
1618
dus content >= 1660px. Met sidebar (240px) is dat 1900px breedte. */
1619
@container maincol (min-width: 1660px) {
1620
.commitgraph-slot { display: block; }
1621
}
1622
@media (min-width: 1900px) {
1623
.frame.with-side .commitgraph-slot { display: block; }
1624
}
1625
@media (min-width: 1660px) {
1626
.frame:not(.with-side) .commitgraph-slot { display: block; }
1627
}
1628
@media (max-width: 1659px) {
1629
.frame:not(.with-side) .commitgraph-slot { display: none; }
1630
}
1631
@media (max-width: 1899px) {
1632
.frame.with-side .commitgraph-slot { display: none; }
1633
}
@@ -27,6 +27,19 @@27
--sidebar: 240px;27
--sidebar: 240px;28
--content: 1180px;28
--content: 1180px;29
--top-h: 48px;29
--top-h: 48px;30
--graph-w: 236px;31
--graph-gap: 12px;32
--graph-ref-w: 78px;33
--graph-row: 22px;34
--graph-lane: 12px;35
--graph-0: #0e7490;36
--graph-1: #6f42c1;37
--graph-2: #1f6b3a;38
--graph-3: #9d174d;39
--graph-4: #b45309;40
--graph-5: #0f766e;41
--graph-6: #7c3aed;42
--graph-7: #9a3412;30
font-family: var(--font);43
font-family: var(--font);31
}44
}32
* { box-sizing: border-box; }45
* { box-sizing: border-box; }@@ -53,7 +66,7 @@ h2 { font-size: 16px; font-weight: 600; }53
.top button { background: transparent; border: 1px solid rgba(255,255,255,.35); color: white; }66
.top button { background: transparent; border: 1px solid rgba(255,255,255,.35); color: white; }54
.frame { display: flex; align-items: flex-start; min-height: calc(100vh - var(--top-h)); }67
.frame { display: flex; align-items: flex-start; min-height: calc(100vh - var(--top-h)); }55
.frame.with-side .content { flex: 1; min-width: 0; }68
.frame.with-side .content { flex: 1; min-width: 0; }56
.content { flex: 1; min-width: 0; display: flex; justify-content: center; align-items: flex-start; }69
.content { flex: 1; min-width: 0; display: flex; justify-content: center; align-items: flex-start; container-type: inline-size; container-name: maincol; }57
main, main.wide {70
main, main.wide {58
width: min(100%, var(--content));71
width: min(100%, var(--content));59
max-width: var(--content);72
max-width: var(--content);@@ -1515,3 +1528,106 @@ li.rel-asset form.rel-asset-actions { display: inline-flex; align-items: center;1515
.pipewait { display: flex; align-items: center; gap: 0.5rem; flex-wrap: wrap; background: #fff8ec; border: 1px solid #f0d9a8; border-radius: 8px; padding: 0.5rem 0.75rem; }1528
.pipewait { display: flex; align-items: center; gap: 0.5rem; flex-wrap: wrap; background: #fff8ec; border: 1px solid #f0d9a8; border-radius: 8px; padding: 0.5rem 0.75rem; }1516
.status.waiting_for_job { background: #fff4e0; color: #8a5a00; }1529
.status.waiting_for_job { background: #fff4e0; color: #8a5a00; }1517
form.cancelform { display: inline; }1530
form.cancelform { display: inline; }1531
1532
/* Commitgrafiek in de lege ruimte naast de centrale kolom. Buiten de1533
flow (slotbreedte 0), zodat de bestaande kolom niet verschuift. */1534
.commitgraph-slot {1535
display: none;1536
position: sticky;1537
top: calc(var(--top-h) + var(--sp-4));1538
width: 0;1539
flex: none;1540
align-self: flex-start;1541
z-index: 5;1542
}1543
.commitgraph {1544
position: relative;1545
left: calc(-1 * var(--graph-w) - var(--graph-gap) + 8px);1546
width: var(--graph-w);1547
max-height: calc(100vh - var(--top-h) - var(--sp-6));1548
overflow: hidden;1549
font-size: var(--fs-sm);1550
color: var(--ink);1551
}1552
.commitgraph-list { list-style: none; margin: 0; padding: 0; position: relative; }1553
.commitgraph-svg {1554
position: absolute;1555
top: 0;1556
left: var(--graph-ref-w);1557
pointer-events: none;1558
z-index: 0;1559
}1560
.commitgraph-row {1561
display: grid;1562
grid-template-columns: var(--graph-ref-w) calc(var(--lanes, 1) * var(--graph-lane) + 16px) minmax(0, 1fr);1563
align-items: center;1564
height: var(--graph-row);1565
position: relative;1566
}1567
.commitgraph-refs {1568
display: flex; gap: 2px; justify-content: flex-end; align-items: center;1569
min-width: 0; overflow: hidden; padding-right: 4px;1570
}1571
.commitgraph-ref {1572
flex: 0 1 auto;1573
min-width: 0;1574
max-width: 100%;1575
font-size: 10px; font-weight: 600; line-height: 15px;1576
white-space: nowrap; overflow: hidden; text-overflow: ellipsis;1577
border: 1px solid currentColor; border-radius: 999px;1578
padding: 0 5px; background: var(--card);1579
}1580
.commitgraph-ref.is-tag, .commitgraph-ref.tag { border-style: dashed; font-weight: 500; color: var(--muted); }1581
.commitgraph-ref.is-default { background: var(--blue-soft); }1582
.commitgraph-node.is-main, .commitgraph-ref.is-main { --c: var(--blue); color: var(--blue); }1583
.commitgraph-node.c0, .commitgraph-ref.c0 { --c: var(--graph-0); color: var(--graph-0); }1584
.commitgraph-node.c1, .commitgraph-ref.c1 { --c: var(--graph-1); color: var(--graph-1); }1585
.commitgraph-node.c2, .commitgraph-ref.c2 { --c: var(--graph-2); color: var(--graph-2); }1586
.commitgraph-node.c3, .commitgraph-ref.c3 { --c: var(--graph-3); color: var(--graph-3); }1587
.commitgraph-node.c4, .commitgraph-ref.c4 { --c: var(--graph-4); color: var(--graph-4); }1588
.commitgraph-node.c5, .commitgraph-ref.c5 { --c: var(--graph-5); color: var(--graph-5); }1589
.commitgraph-node.c6, .commitgraph-ref.c6 { --c: var(--graph-6); color: var(--graph-6); }1590
.commitgraph-node.c7, .commitgraph-ref.c7 { --c: var(--graph-7); color: var(--graph-7); }1591
.commitgraph-node {1592
position: absolute;1593
left: calc(var(--graph-ref-w) + var(--lane, 0) * var(--graph-lane) + var(--graph-lane) / 2 - 8px);1594
width: 16px; height: 16px; border-radius: 50%;1595
z-index: 1;1596
overflow: hidden;1597
background: var(--c, var(--blue));1598
color: #fff;1599
font-size: 9px; font-weight: 700;1600
display: grid; place-items: center;1601
text-decoration: none;1602
box-shadow: 0 0 0 2px var(--paper);1603
}1604
.commitgraph-node img { width: 16px; height: 16px; object-fit: cover; display: block; }1605
.commitgraph-msg {1606
min-width: 0;1607
color: var(--ink);1608
text-decoration: none;1609
white-space: nowrap; overflow: hidden; text-overflow: ellipsis;1610
}1611
.commitgraph-msg:hover { color: var(--blue-deep); text-decoration: underline; }1612
/* Toon links als er naast de 1180px-kolom ruimte is voor de grafiek.1613
Beide zijden van de gecentreerde kolom zijn even breed; rechts is1614
dezelfde drempel, dus links wint altijd als er plek is. */1615
/* De centrale kolom blijft gecentreerd, dus de vrije ruimte is1616
aan twee kanten gelijk. De grafiek past links als1617
(content - 1180) / 2 >= --graph-w + --graph-gap - 8px ≈ 240px,1618
dus content >= 1660px. Met sidebar (240px) is dat 1900px breedte. */1619
@container maincol (min-width: 1660px) {1620
.commitgraph-slot { display: block; }1621
}1622
@media (min-width: 1900px) {1623
.frame.with-side .commitgraph-slot { display: block; }1624
}1625
@media (min-width: 1660px) {1626
.frame:not(.with-side) .commitgraph-slot { display: block; }1627
}1628
@media (max-width: 1659px) {1629
.frame:not(.with-side) .commitgraph-slot { display: none; }1630
}1631
@media (max-width: 1899px) {1632
.frame.with-side .commitgraph-slot { display: none; }1633
}@@ -0,0 +1,17 @@
1
{{define "commitgraph"}}
2
<div class="commitgraph-slot">
3
<aside class="commitgraph" aria-label="{{t "graph.label"}}" style="--lanes: {{.Graph.Lanes}}">
4
{{.Graph.SVG}}
5
<ol class="commitgraph-list">
6
{{range .Graph.Rows}}
7
<li class="commitgraph-row" style="--lane: {{.Lane}}">
8
<span class="commitgraph-refs">{{range .Labels}}<span class="commitgraph-ref {{.Kind}}{{if .Default}} is-default{{end}} {{.Class}}" title="{{.Name}}">{{.Name}}</span>{{end}}</span>
9
<span class="commitgraph-lanes" aria-hidden="true"></span>
10
<a class="commitgraph-msg" href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}" title="{{.Subject}}">{{.Subject}}</a>
11
<a class="commitgraph-node {{.Class}}" href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}" title="{{.Short}}">{{if .Avatar}}<img src="{{.Avatar}}" alt="">{{else}}<span>{{.Initial}}</span>{{end}}</a>
12
</li>
13
{{end}}
14
</ol>
15
</aside>
16
</div>
17
{{end}}
@@ -0,0 +1,17 @@1
{{define "commitgraph"}}2
<div class="commitgraph-slot">3
<aside class="commitgraph" aria-label="{{t "graph.label"}}" style="--lanes: {{.Graph.Lanes}}">4
{{.Graph.SVG}}5
<ol class="commitgraph-list">6
{{range .Graph.Rows}}7
<li class="commitgraph-row" style="--lane: {{.Lane}}">8
<span class="commitgraph-refs">{{range .Labels}}<span class="commitgraph-ref {{.Kind}}{{if .Default}} is-default{{end}} {{.Class}}" title="{{.Name}}">{{.Name}}</span>{{end}}</span>9
<span class="commitgraph-lanes" aria-hidden="true"></span>10
<a class="commitgraph-msg" href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}" title="{{.Subject}}">{{.Subject}}</a>11
<a class="commitgraph-node {{.Class}}" href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}" title="{{.Short}}">{{if .Avatar}}<img src="{{.Avatar}}" alt="">{{else}}<span>{{.Initial}}</span>{{end}}</a>12
</li>13
{{end}}14
</ol>15
</aside>16
</div>17
{{end}}@@ -50,6 +50,7 @@
50
50
<div class="frame{{if or .Repo .Group .Info .Help .User}} with-side{{end}}">
51
51
{{if .Repo}}{{template "reposide" .}}{{else if .Group}}{{template "groupside" .}}{{else if .Info}}{{template "infoside" .}}{{else if .Help}}{{template "helpside" .}}{{else if .User}}{{template "dashside" .}}{{end}}
52
52
<div class="content">
53
{{if and (eq .Page "overview") .Graph}}{{template "commitgraph" .}}{{end}}
53
54
<main{{if eq .Page "files"}} class="fill"{{else if .Wide}} class="wide"{{end}}>
54
55
{{if .Notice}}<p class="flash">{{.Notice}}</p>{{end}}
55
56
{{if .Err}}<p class="flash bad">{{.Err}}</p>{{end}}
@@ -50,6 +50,7 @@50
<div class="frame{{if or .Repo .Group .Info .Help .User}} with-side{{end}}">50
<div class="frame{{if or .Repo .Group .Info .Help .User}} with-side{{end}}">51
{{if .Repo}}{{template "reposide" .}}{{else if .Group}}{{template "groupside" .}}{{else if .Info}}{{template "infoside" .}}{{else if .Help}}{{template "helpside" .}}{{else if .User}}{{template "dashside" .}}{{end}}51
{{if .Repo}}{{template "reposide" .}}{{else if .Group}}{{template "groupside" .}}{{else if .Info}}{{template "infoside" .}}{{else if .Help}}{{template "helpside" .}}{{else if .User}}{{template "dashside" .}}{{end}}52
<div class="content">52
<div class="content">53
{{if and (eq .Page "overview") .Graph}}{{template "commitgraph" .}}{{end}}53
<main{{if eq .Page "files"}} class="fill"{{else if .Wide}} class="wide"{{end}}>54
<main{{if eq .Page "files"}} class="fill"{{else if .Wide}} class="wide"{{end}}>54
{{if .Notice}}<p class="flash">{{.Notice}}</p>{{end}}55
{{if .Notice}}<p class="flash">{{.Notice}}</p>{{end}}55
{{if .Err}}<p class="flash bad">{{.Err}}</p>{{end}}56
{{if .Err}}<p class="flash bad">{{.Err}}</p>{{end}}@@ -23,6 +23,10 @@ auth:
23
23
client_secret_file: /etc/bluegit/client_secret
24
24
redirect_path: /auth/callback
25
25
user_agent: BlueGitAccountClient/0.1
26
# Alternatief: Microsoft Entra ID (OIDC, één tenant). Zie docs/AUTH.md.
27
# mode: entra
28
# tenant_id: 00000000-0000-0000-0000-000000000000
29
# client_id: 11111111-1111-1111-1111-111111111111
26
30
27
31
git:
28
32
binary: git
@@ -23,6 +23,10 @@ auth:23
client_secret_file: /etc/bluegit/client_secret23
client_secret_file: /etc/bluegit/client_secret24
redirect_path: /auth/callback24
redirect_path: /auth/callback25
user_agent: BlueGitAccountClient/0.125
user_agent: BlueGitAccountClient/0.126
# Alternatief: Microsoft Entra ID (OIDC, één tenant). Zie docs/AUTH.md.27
# mode: entra28
# tenant_id: 00000000-0000-0000-0000-00000000000029
# client_id: 11111111-1111-1111-1111-11111111111126
30
27
git:31
git:28
binary: git32
binary: git