From 39e57bb3d3cfd60815da57445384b3d50fb3e35b Mon Sep 17 00:00:00 2001 From: dawn Date: Mon, 26 Oct 2026 07:14:34 +0300 Subject: [PATCH] cilogs: find a repo's spindle from its manifest so ci logs over ssh need no appview Signed-off-by: dawn --- appview/state/state.go | 8 ++- .../pipelines/ssh => cilogs}/cihelpers.go | 2 +- {appview/pipelines/ssh => cilogs}/error.go | 2 +- .../pipelines/ssh => cilogs}/logstream.go | 2 +- {appview/pipelines/ssh => cilogs}/server.go | 27 ++++---- {appview/pipelines/ssh => cilogs}/session.go | 36 ++++------ cilogs/spindles.go | 69 +++++++++++++++++++ {appview/pipelines/ssh => cilogs}/tui.go | 2 +- spindle/knotclient/knotclient.go | 8 ++- 9 files changed, 113 insertions(+), 43 deletions(-) rename {appview/pipelines/ssh => cilogs}/cihelpers.go (98%) rename {appview/pipelines/ssh => cilogs}/error.go (97%) rename {appview/pipelines/ssh => cilogs}/logstream.go (98%) rename {appview/pipelines/ssh => cilogs}/server.go (67%) rename {appview/pipelines/ssh => cilogs}/session.go (58%) create mode 100644 cilogs/spindles.go rename {appview/pipelines/ssh => cilogs}/tui.go (99%) diff --git a/appview/state/state.go b/appview/state/state.go index 1772ace5b..746322ef7 100644 --- a/appview/state/state.go +++ b/appview/state/state.go @@ -32,9 +32,9 @@ import ( phnotify "tangled.org/core/appview/notify/posthog" "tangled.org/core/appview/oauth" "tangled.org/core/appview/pages" - pipelinessh "tangled.org/core/appview/pipelines/ssh" "tangled.org/core/appview/reporesolver" "tangled.org/core/appview/sitefeed" + "tangled.org/core/cilogs" "tangled.org/core/consts" "tangled.org/core/idresolver" "tangled.org/core/jetstream" @@ -252,8 +252,10 @@ func (s *State) Close() error { return s.db.Close() } -func (s *State) NewSSHServer() *pipelinessh.Server { - return pipelinessh.New(s.db, s.config, log.SubLogger(s.logger, "pipelinessh")) +func (s *State) NewSSHServer() *cilogs.Server { + cfg := cilogs.Config{ListenAddr: s.config.SSH.ListenAddr, HostKeyPath: s.config.SSH.HostKeyPath} + spindles := cilogs.NewSpindles(s.idResolver.Directory(), s.config.Core.Dev) + return cilogs.New(cfg, spindles, log.SubLogger(s.logger, "pipelinessh")) } func (s *State) SecurityTxt(w http.ResponseWriter, r *http.Request) { diff --git a/appview/pipelines/ssh/cihelpers.go b/cilogs/cihelpers.go similarity index 98% rename from appview/pipelines/ssh/cihelpers.go rename to cilogs/cihelpers.go index e0297b1d6..b86cd4369 100644 --- a/appview/pipelines/ssh/cihelpers.go +++ b/cilogs/cihelpers.go @@ -1,4 +1,4 @@ -package ssh +package cilogs import ( "time" diff --git a/appview/pipelines/ssh/error.go b/cilogs/error.go similarity index 97% rename from appview/pipelines/ssh/error.go rename to cilogs/error.go index d8ed4aab2..69ef2f0c9 100644 --- a/appview/pipelines/ssh/error.go +++ b/cilogs/error.go @@ -1,4 +1,4 @@ -package ssh +package cilogs import ( tea "github.com/charmbracelet/bubbletea" diff --git a/appview/pipelines/ssh/logstream.go b/cilogs/logstream.go similarity index 98% rename from appview/pipelines/ssh/logstream.go rename to cilogs/logstream.go index 1525c3259..49d9be36c 100644 --- a/appview/pipelines/ssh/logstream.go +++ b/cilogs/logstream.go @@ -1,4 +1,4 @@ -package ssh +package cilogs import ( "context" diff --git a/appview/pipelines/ssh/server.go b/cilogs/server.go similarity index 67% rename from appview/pipelines/ssh/server.go rename to cilogs/server.go index 4920b7b27..5ce697287 100644 --- a/appview/pipelines/ssh/server.go +++ b/cilogs/server.go @@ -1,4 +1,4 @@ -package ssh +package cilogs import ( "context" @@ -8,31 +8,34 @@ import ( "github.com/charmbracelet/ssh" "github.com/charmbracelet/wish" tea "github.com/charmbracelet/wish/bubbletea" - "tangled.org/core/appview/config" - "tangled.org/core/appview/db" ) +type Config struct { + ListenAddr string + HostKeyPath string +} + type Server struct { - db *db.DB - config *config.Config - logger *slog.Logger + config Config + spindles *Spindles + logger *slog.Logger } -func New(db *db.DB, cfg *config.Config, logger *slog.Logger) *Server { - return &Server{db: db, config: cfg, logger: logger} +func New(cfg Config, spindles *Spindles, logger *slog.Logger) *Server { + return &Server{config: cfg, spindles: spindles, logger: logger} } func (s *Server) ListenAndServe(ctx context.Context) error { opts := []ssh.Option{ - wish.WithAddress(s.config.SSH.ListenAddr), + wish.WithAddress(s.config.ListenAddr), wish.WithMiddleware( tea.Middleware(s.teaHandler), requirePty, ), } - if s.config.SSH.HostKeyPath != "" { - opts = append(opts, wish.WithHostKeyPath(s.config.SSH.HostKeyPath)) + if s.config.HostKeyPath != "" { + opts = append(opts, wish.WithHostKeyPath(s.config.HostKeyPath)) } srv, err := wish.NewServer(opts...) @@ -46,7 +49,7 @@ func (s *Server) ListenAndServe(ctx context.Context) error { srv.Close() }() - s.logger.Info("SSH log server listening", "address", s.config.SSH.ListenAddr) + s.logger.Info("SSH log server listening", "address", s.config.ListenAddr) if err := srv.ListenAndServe(); err != ssh.ErrServerClosed { return err } diff --git a/appview/pipelines/ssh/session.go b/cilogs/session.go similarity index 58% rename from appview/pipelines/ssh/session.go rename to cilogs/session.go index 57fa8dd70..21732dcde 100644 --- a/appview/pipelines/ssh/session.go +++ b/cilogs/session.go @@ -1,18 +1,14 @@ -package ssh +package cilogs import ( + "errors" "fmt" "github.com/bluesky-social/indigo/atproto/syntax" - indigoxrpc "github.com/bluesky-social/indigo/xrpc" tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/ssh" wishtea "github.com/charmbracelet/wish/bubbletea" "tangled.org/core/api/tangled" - "tangled.org/core/appview/db" - "tangled.org/core/hostutil" - extlexutil "tangled.org/core/lexutil" - "tangled.org/core/orm" ) func (s *Server) teaHandler(sess ssh.Session) (tea.Model, []tea.ProgramOption) { @@ -34,26 +30,22 @@ func (s *Server) teaHandler(sess ssh.Session) (tea.Model, []tea.ProgramOption) { l = l.With("repoDID", repoDID, "sha", sha) - repo, err := db.GetRepo(s.db, orm.FilterEq("repo_did", repoDID)) + repo, err := syntax.ParseDID(repoDID) if err != nil { - l.Warn("repo not found", "err", err) - return newErrorModel(renderer, fmt.Sprintf("repo %s not found", repoDID)), wishtea.MakeOptions(sess) + l.Warn("bad repo did", "err", err) + return newErrorModel(renderer, fmt.Sprintf("%q is not a repo did", repoDID)), wishtea.MakeOptions(sess) } - if repo.Spindle == "" { - l.Warn("no spindle configured") - return newErrorModel(renderer, "no spindle configured for this repo"), wishtea.MakeOptions(sess) - } - - l = l.With("spindle", repo.Spindle) - - host, err := hostutil.EnsureHttpScheme(repo.Spindle) + xrpcc, err := s.spindles.Of(sess.Context(), repo) if err != nil { - l.Warn("invalid spindlie hostname", "err", err) - return newErrorModel(renderer, fmt.Sprintf("invalid spindle host %q", repo.Spindle)), wishtea.MakeOptions(sess) + l.Warn("no spindle for repo", "err", err) + if errors.Is(err, ErrNoSpindle) { + return newErrorModel(renderer, fmt.Sprintf("no spindle configured for repo %s", repoDID)), wishtea.MakeOptions(sess) + } + return newErrorModel(renderer, fmt.Sprintf("could not look up the spindle for repo %s", repoDID)), wishtea.MakeOptions(sess) } + l = l.With("spindle", xrpcc.Host) - xrpcc := extlexutil.Client{Client: indigoxrpc.Client{Host: host}} - out, err := tangled.CiQueryPipelines(sess.Context(), &xrpcc, []string{sha}, "", nil, 1, repoDID) + out, err := tangled.CiQueryPipelines(sess.Context(), xrpcc, []string{sha}, "", nil, 1, repoDID) if err != nil || len(out.Pipelines) == 0 { l.Warn("pipeline not found", "err", err) return newErrorModel(renderer, fmt.Sprintf("pipeline not found for repo %s @ %s", repoDID, sha)), wishtea.MakeOptions(sess) @@ -68,5 +60,5 @@ func (s *Server) teaHandler(sess ssh.Session) (tea.Model, []tea.ProgramOption) { l.Info("serving pipeline", "pipeline", pipeline.Id, "workflows", len(pipeline.Workflows)) pty, _, _ := sess.Pty() opts := append(wishtea.MakeOptions(sess), tea.WithAltScreen()) - return newPipelineModel(renderer, &xrpcc, pipeline, pty.Window.Width, pty.Window.Height), opts + return newPipelineModel(renderer, xrpcc, pipeline, pty.Window.Width, pty.Window.Height), opts } diff --git a/cilogs/spindles.go b/cilogs/spindles.go new file mode 100644 index 000000000..96dc67b9a --- /dev/null +++ b/cilogs/spindles.go @@ -0,0 +1,69 @@ +package cilogs + +import ( + "context" + "errors" + "fmt" + "net" + "net/http" + "net/url" + "strings" + + "github.com/bluesky-social/indigo/atproto/identity" + "github.com/bluesky-social/indigo/atproto/syntax" + indigoxrpc "github.com/bluesky-social/indigo/xrpc" + "github.com/gorilla/websocket" + "tangled.org/core/api/org_tangled" + "tangled.org/core/hostutil" + extlexutil "tangled.org/core/lexutil" + "tangled.org/core/spindle/knotclient" +) + +var ErrNoSpindle = errors.New("no spindle configured for this repo") + +type Spindles struct { + knots *knotclient.Client + http *http.Client + dialer *net.Dialer +} + +// the manifest can name any host, so outside dev the calls refuse special addresses +func NewSpindles(dir identity.Directory, dev bool) *Spindles { + httpc := knotclient.HTTPClient(dev) + return &Spindles{knots: knotclient.New(dir, httpc, dev), http: httpc, dialer: knotclient.Dialer(dev)} +} + +func (s *Spindles) Of(ctx context.Context, repo syntax.DID) (*extlexutil.Client, error) { + knot, err := s.knots.KnotOf(ctx, repo) + if err != nil { + return nil, err + } + var manifest org_tangled.RepoManifest + if err := s.knots.GetRecord(ctx, knot, repo, org_tangled.RepoManifestNSID, knotclient.ManifestRkey, &manifest); err != nil { + return nil, err + } + if manifest.Spindle == nil || *manifest.Spindle == "" { + return nil, ErrNoSpindle + } + base, err := spindleURL(*manifest.Spindle) + if err != nil { + return nil, err + } + return &extlexutil.Client{ + Client: indigoxrpc.Client{Host: base, Client: s.http}, + Dialer: websocket.Dialer{NetDialContext: s.dialer.DialContext}, + }, nil +} + +// the spindle serves xrpc on the did:web host, like hostForKnot in web +func spindleURL(did string) (string, error) { + host, ok := strings.CutPrefix(did, "did:web:") + if !ok || strings.Contains(host, ":") { + return "", fmt.Errorf("spindle %q is not a did:web host", did) + } + host, err := url.PathUnescape(host) + if err != nil { + return "", fmt.Errorf("spindle %q: %w", did, err) + } + return hostutil.EnsureHttpScheme(host) +} diff --git a/appview/pipelines/ssh/tui.go b/cilogs/tui.go similarity index 99% rename from appview/pipelines/ssh/tui.go rename to cilogs/tui.go index 10500c852..fcabde919 100644 --- a/appview/pipelines/ssh/tui.go +++ b/cilogs/tui.go @@ -1,4 +1,4 @@ -package ssh +package cilogs import ( "context" diff --git a/spindle/knotclient/knotclient.go b/spindle/knotclient/knotclient.go index 9df509220..baa098e18 100644 --- a/spindle/knotclient/knotclient.go +++ b/spindle/knotclient/knotclient.go @@ -55,14 +55,18 @@ type Client struct { } // a did doc can point at any host, internal ones included, so refuse special addresses unless dev -func HTTPClient(dev bool) *http.Client { +func Dialer(dev bool) *net.Dialer { dialer := &net.Dialer{Timeout: timeout} if !dev { dialer.Control = netguard.RefuseSpecialPurposeAddrs } + return dialer +} + +func HTTPClient(dev bool) *http.Client { return &http.Client{ Timeout: timeout, - Transport: &http.Transport{DialContext: dialer.DialContext, TLSHandshakeTimeout: tlsTimeout}, + Transport: &http.Transport{DialContext: Dialer(dev).DialContext, TLSHandshakeTimeout: tlsTimeout}, } } -- knotmirror 0.0.1