From 178b168bfddc57d47cea611c51bf5da4a23c53d2 Mon Sep 17 00:00:00 2001 From: Ilker Manap Date: Mon, 19 Oct 2026 11:10:43 +0200 Subject: [PATCH] A broken directory setting, or a second server, no longer takes the cluster down Found trying auth.ldap against a Samba DC on the PoC. A CA file a control plane could not use made every control plane exit, and no ctl config could then put the setting right: directory sign-in is now turned off there, and said. `llmgw server check` ran a whole server that, its ports taken, held the leader's lease for three hours: server refuses words it does not know and takes its ports before anything else. The guides now say auth is set with ctl config, not server.yaml. Co-Authored-By: Claude Opus 5.5 (1M context) --- CHANGELOG.md | 14 +++++++++++ docs/install.md | 18 +++++++++++--- internal/cli/server.go | 36 ++++++++++++++++------------ internal/cli/server_args_test.go | 39 +++++++++++++++++++++++++++++++ internal/router/directory_test.go | 30 ++++++++++++++++++++++++ internal/router/router.go | 14 +++++++---- 6 files changed, 128 insertions(+), 23 deletions(-) create mode 100644 internal/cli/server_args_test.go create mode 100644 internal/router/directory_test.go diff --git a/CHANGELOG.md b/CHANGELOG.md index 556b901a..56424363 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,20 @@ is only released once its **exit criterion** is met, not when its code lands. Until v1.0.0 the minor version is the breaking one: configuration formats and Go APIs change between minors without a deprecation period. +## Unreleased + +### Fixed + +- **A broken `auth.ldap` no longer stops every control plane.** It is the cluster's setting. A CA file that one + machine could not use made `llmgw server` exit on every control plane, and no `ctl config` could then put it right. + Directory sign-in is now turned off on that control plane, with an error in its log. Local accounts still sign in. +- **A second `llmgw server` on a machine stops before it competes to lead.** `llmgw server check` (no such command) + ran a whole server. Its ports were taken, yet it went on to hold the leader's lease for three hours while the real + control planes stood by. `server` now refuses words it does not know and takes its ports before anything else. +- **The single sign-on and Active Directory guides said `server.yaml`.** On a cluster with a store, `auth` is in the + cluster's settings and the file's block is not read. They now say `llmgw ctl config edit`, and what certificate a + domain controller needs. + ## v0.14.8 — 2026-10-18 Sign-in with an on-premises Active Directory, and Entra ID made safe for diff --git a/docs/install.md b/docs/install.md index ebc19dd3..08a2784c 100644 --- a/docs/install.md +++ b/docs/install.md @@ -2491,8 +2491,10 @@ Google, Okta, Authentik, anything that speaks OpenID Connect. 1. Register a client there with the redirect address `https:///login/oidc/callback`. -2. Put its secret in a file only root reads. -3. Add to `server.yaml`: +2. Put its secret in a file the llmgw user reads, on every control plane. +3. Add this to the cluster's settings with `llmgw ctl config edit`. On a + cluster with a store, `auth` is the cluster's: the same block in + `server.yaml` is not read, and the log says so. ```yaml auth: @@ -2568,7 +2570,10 @@ the secret token to the contents of `auth.scim.token_file`. With an on-premises Active Directory, people sign in on the gateway's own form with their AD username (`ada`, `CORP\ada`, `ada@corp.example`) and -password. The gateway checks them with the domain controllers over LDAPS: +password. The gateway checks them with the domain controllers over LDAPS. +Put this in the cluster's settings with `llmgw ctl config edit` (or `llmgw +ctl config set auth.ldap '{…}'`); the files it names must be on every control +plane: ```yaml auth: @@ -2595,6 +2600,13 @@ auth: checked by binding as them, and is never stored. - **Encryption:** `ldaps://`, or `ldap://` with `start_tls: true`. Plaintext LDAP is refused, since passwords would cross the network. +- **Certificate:** the domain controller's certificate must name it in + its subject alternative names: a name in the CN only is refused, as are + certificates with a negative serial number. Samba's own autogenerated + certificate is both, so a Samba DC needs one from a CA (`tls certfile` + in smb.conf). A CA file a control plane cannot read turns directory + sign-in off on that control plane, said in its log. Local accounts still + sign in. - **Who may sign in:** enabled user objects under `base_dn` that match `user_filter`. The example admits members of `llmgw-users`, nested groups included. diff --git a/internal/cli/server.go b/internal/cli/server.go index 45423339..503ddec3 100644 --- a/internal/cli/server.go +++ b/internal/cli/server.go @@ -76,6 +76,7 @@ func newServerCmd() *cobra.Command { cmd := &cobra.Command{ Use: "server", + Args: cobra.NoArgs, Short: "Run the router (phase 1; the control plane arrives in phase 3)", Long: "Serves the OpenAI API in front of a set of engine replicas.\n\n" + "In this phase the replica list is static: give it in the config file, or\n" + @@ -138,6 +139,26 @@ func newServerCmd() *cobra.Command { _ = shutdownTracing(sctx) }() + // The ports before anything else: a second server on this machine, + // whose ports are taken, must stop here, not go on to compete for + // the lease and lead a cluster no request can reach. + apiLn, err := net.Listen("tcp", cfg.Listen) + if err != nil { + return fmt.Errorf("listening on %s: %w", cfg.Listen, err) + } + if cfg.MaxConnections > 0 { + // Past this, new connections wait in the kernel's backlog + // rather than each taking a goroutine and its buffers. + apiLn = netutil.LimitListener(apiLn, cfg.MaxConnections) + } + adminLn, err := net.Listen("tcp", cfg.AdminListen) + if err != nil { + _ = apiLn.Close() + return fmt.Errorf("listening on %s: %w", cfg.AdminListen, err) + } + defer apiLn.Close() + defer adminLn.Close() + rt, err := router.New(cfg, log) if err != nil { return err @@ -661,21 +682,6 @@ func newServerCmd() *cobra.Command { ReadTimeout: time.Minute, }) - apiLn, err := net.Listen("tcp", cfg.Listen) - if err != nil { - return fmt.Errorf("listening on %s: %w", cfg.Listen, err) - } - if cfg.MaxConnections > 0 { - // Past this, new connections wait in the kernel's backlog - // rather than each taking a goroutine and its buffers. - apiLn = netutil.LimitListener(apiLn, cfg.MaxConnections) - } - adminLn, err := net.Listen("tcp", cfg.AdminListen) - if err != nil { - _ = apiLn.Close() - return fmt.Errorf("listening on %s: %w", cfg.AdminListen, err) - } - // A metrics-only listener, when one is configured. Started after // AdminHandler, which is where the registry it serves is built. var metricsSrv *http.Server diff --git a/internal/cli/server_args_test.go b/internal/cli/server_args_test.go new file mode 100644 index 00000000..2a28d5ef --- /dev/null +++ b/internal/cli/server_args_test.go @@ -0,0 +1,39 @@ +package cli + +import ( + "context" + "net" + "strings" + "testing" + "time" +) + +// `llmgw server check` once ran a whole second server: words after server +// that name no subcommand are refused. +func TestServerTakesNoWordsItDoesNotKnow(t *testing.T) { + cmd := newServerCmd() + cmd.SetArgs([]string{"check", "--config", "/nonexistent"}) + cmd.SilenceUsage, cmd.SilenceErrors = true, true + if err := cmd.Execute(); err == nil || !strings.Contains(err.Error(), "unknown command") { + t.Errorf("err %v", err) + } +} + +// A second server whose port is taken stops at once, before the router or +// any control plane is built. +func TestAServerWhosePortIsTakenStopsFirst(t *testing.T) { + taken, err := net.Listen("tcp", "127.0.0.1:0") + if err != nil { + t.Fatal(err) + } + defer taken.Close() + ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) + defer cancel() + cmd := newServerCmd() + cmd.SetArgs([]string{"--listen", taken.Addr().String(), "--admin-listen", "127.0.0.1:0", + "--endpoint", "a=http://127.0.0.1:1=m"}) + cmd.SilenceUsage, cmd.SilenceErrors = true, true + if err := cmd.ExecuteContext(ctx); err == nil || !strings.Contains(err.Error(), "listening on") { + t.Errorf("err %v", err) + } +} diff --git a/internal/router/directory_test.go b/internal/router/directory_test.go new file mode 100644 index 00000000..e195bb94 --- /dev/null +++ b/internal/router/directory_test.go @@ -0,0 +1,30 @@ +package router + +import ( + "net/http" + "net/http/httptest" + "path/filepath" + "strings" + "testing" + + "gitea.mynodes.xyz/ilker/llmgw/internal/config" +) + +// auth.ldap is the cluster's: a CA file one machine lacks must not keep its +// control plane from starting, where nothing could put the setting right. +func TestADirectoryThatCannotBeUsedHereLeavesTheGatewayUp(t *testing.T) { + cfg := baseConfig(config.Endpoint{ID: "a", URL: "http://127.0.0.1:1", Models: []string{"m"}}) + cfg.Auth.Enabled = true + cfg.Auth.Store = filepath.Join(t.TempDir(), "store.db") + cfg.Auth.LDAP = config.LDAP{URLs: []string{"ldaps://dc1"}, CAFile: filepath.Join(t.TempDir(), "missing.pem"), + BindDN: "CN=svc", BindPasswordFile: "/nonexistent", BaseDN: "DC=corp"} + r := newTestRouter(t, cfg) + if r.directory != nil { + t.Fatal("a directory was set up from a CA file that is not there") + } + w := httptest.NewRecorder() + r.Handler().ServeHTTP(w, httptest.NewRequest(http.MethodGet, "/login", nil)) + if w.Code != http.StatusOK || !strings.Contains(w.Body.String(), `type="email"`) { + t.Errorf("/login: %d", w.Code) + } +} diff --git a/internal/router/router.go b/internal/router/router.go index a419c9aa..1bfd0137 100644 --- a/internal/router/router.go +++ b/internal/router/router.go @@ -398,12 +398,16 @@ func New(cfg config.Server, log *slog.Logger) (*Router, error) { SignupOpen: cfg.Auth.SignupOpen, }, log) if cfg.Auth.LDAP.Enabled() { - d, err := newLDAPDirectory(cfg.Auth.LDAP, st, log) - if err != nil { - return nil, err + // A setting every control plane shares: one that cannot be used + // here (a CA file missing on this machine) must not keep them all + // down, where nothing could be used to put it right. Local + // accounts still sign in. + if d, err := newLDAPDirectory(cfg.Auth.LDAP, st, log); err != nil { + log.Error("sign-in with the directory is off on this control plane", "err", err) + } else { + r.directory = d + r.accounts.SetDirectory(d) } - r.directory = d - r.accounts.SetDirectory(d) } r.acct = accounting.New(