Hi… I am well aware that this diff view is very suboptimal. It will be fixed when the refactored server comes along!
A few other context fixes
package hooks import ( "context" "errors" "fmt" "net"
"time"
"github.com/gliderlabs/ssh"
"go.lindenii.runxiyu.org/forge/forged/internal/common/cmap"
"go.lindenii.runxiyu.org/forge/forged/internal/common/misc"
)
type Server struct {
hookMap cmap.Map[string, hookInfo]
socketPath string
executablesPath string
}
type Config struct {
Socket string `scfg:"socket"`
Execs string `scfg:"execs"`
}
type hookInfo struct {
session ssh.Session
pubkey string
directAccess bool
repoPath string
userID int
userType string
repoID int
groupPath []string
repoName string
contribReq string
}
func New(config Config) (server *Server) {
return &Server{
socketPath: config.Socket,
executablesPath: config.Execs,
}
}
func (server *Server) Run(ctx context.Context) error {
listener, _, err := misc.ListenUnixSocket(server.socketPath)
if err != nil {
return fmt.Errorf("listen unix socket for hooks: %w", err)
}
defer func() {
_ = listener.Close()
}()
go func() {
<-ctx.Done()
stop := context.AfterFunc(ctx, func() {
_ = listener.Close()
// TODO: Log the error }()
}) defer stop()
for {
conn, err := listener.Accept()
if err != nil {
if errors.Is(err, net.ErrClosed) {
if errors.Is(err, net.ErrClosed) || ctx.Err() != nil {
return nil
}
return fmt.Errorf("accept conn: %w", err)
}
go server.handleConn(conn)
go server.handleConn(ctx, conn)
} }
func (server *Server) handleConn(conn net.Conn) {
panic("TODO: handle hook connection")
func (server *Server) handleConn(ctx context.Context, conn net.Conn) {
defer conn.Close()
unblock := context.AfterFunc(ctx, func() {
_ = conn.SetDeadline(time.Now())
_ = conn.Close()
})
defer unblock()
}
package lmtp import ( "context" "errors" "fmt" "net"
"time"
"go.lindenii.runxiyu.org/forge/forged/internal/common/misc"
)
type Server struct {
socket string
domain string
maxSize int64
writeTimeout uint32
readTimeout uint32
}
type Config struct {
Socket string `scfg:"socket"`
Domain string `scfg:"domain"`
MaxSize int64 `scfg:"max_size"`
WriteTimeout uint32 `scfg:"write_timeout"`
ReadTimeout uint32 `scfg:"read_timeout"`
}
func New(config Config) (server *Server) {
return &Server{
socket: config.Socket,
domain: config.Domain,
maxSize: config.MaxSize,
writeTimeout: config.WriteTimeout,
readTimeout: config.ReadTimeout,
}
}
func (server *Server) Run(ctx context.Context) error {
listener, _, err := misc.ListenUnixSocket(server.socket)
if err != nil {
return fmt.Errorf("listen unix socket for LMTP: %w", err)
}
defer func() {
_ = listener.Close()
}()
go func() {
<-ctx.Done()
stop := context.AfterFunc(ctx, func() {
_ = listener.Close()
// TODO: Log the error }()
}) defer stop()
for {
conn, err := listener.Accept()
if err != nil {
if errors.Is(err, net.ErrClosed) {
if errors.Is(err, net.ErrClosed) || ctx.Err() != nil {
return nil
}
return fmt.Errorf("accept conn: %w", err)
}
go server.handleConn(conn)
go server.handleConn(ctx, conn)
} }
func (server *Server) handleConn(conn net.Conn) {
panic("TODO: handle LMTP connection")
func (server *Server) handleConn(ctx context.Context, conn net.Conn) {
defer conn.Close()
unblock := context.AfterFunc(ctx, func() {
_ = conn.SetDeadline(time.Now())
_ = conn.Close()
})
defer unblock()
}
package ssh
import (
"context"
"errors"
"fmt"
"os"
"time"
gliderssh "github.com/gliderlabs/ssh"
"go.lindenii.runxiyu.org/forge/forged/internal/common/misc"
gossh "golang.org/x/crypto/ssh"
)
type Config struct {
Net string `scfg:"net"`
Addr string `scfg:"addr"`
Key string `scfg:"key"`
Root string `scfg:"root"`
ShutdownTimeout uint32 `scfg:"shutdown_timeout"`
}
type Server struct {
gliderServer *gliderssh.Server
privkey gossh.Signer
pubkeyString string
pubkeyFP string
net string
addr string
root string
shutdownTimeout uint32
}
func New(config Config) (server *Server, err error) {
server = &Server{
net: config.Net,
addr: config.Addr,
root: config.Root,
shutdownTimeout: config.ShutdownTimeout,
}
var privkeyBytes []byte
if privkeyBytes, err = os.ReadFile(config.Key); err != nil {
return server, fmt.Errorf("read SSH private key: %w", err)
}
if server.privkey, err = gossh.ParsePrivateKey(privkeyBytes); err != nil {
return server, fmt.Errorf("parse SSH private key: %w", err)
}
server.pubkeyString = misc.BytesToString(gossh.MarshalAuthorizedKey(server.privkey.PublicKey()))
server.pubkeyFP = gossh.FingerprintSHA256(server.privkey.PublicKey())
server.gliderServer = &gliderssh.Server{
Handler: handle,
PublicKeyHandler: func(ctx gliderssh.Context, key gliderssh.PublicKey) bool { return true },
KeyboardInteractiveHandler: func(ctx gliderssh.Context, challenge gossh.KeyboardInteractiveChallenge) bool { return true },
}
server.gliderServer.AddHostKey(server.privkey)
return
}
func (server *Server) Run(ctx context.Context) (err error) {
listener, err := misc.Listen(server.net, server.addr)
if err != nil {
return fmt.Errorf("listen for SSH: %w", err)
}
defer func() {
_ = listener.Close()
}()
go func() {
<-ctx.Done()
shCtx, cancel := context.WithTimeout(context.Background(), time.Duration(server.shutdownTimeout)*time.Second)
stop := context.AfterFunc(ctx, func() {
shCtx, cancel := context.WithTimeout(context.WithoutCancel(ctx), time.Duration(server.shutdownTimeout)*time.Second)
defer cancel() _ = server.gliderServer.Shutdown(shCtx) _ = listener.Close()
}()
}) defer stop()
if err = server.gliderServer.Serve(listener); err != nil {
if errors.Is(err, gliderssh.ErrServerClosed) {
if errors.Is(err, gliderssh.ErrServerClosed) || ctx.Err() != nil {
return nil
}
return fmt.Errorf("serve SSH: %w", err)
}
panic("unreachable")
}
func handle(session gliderssh.Session) {
panic("SSH server handler not implemented yet")
}
package web import ( "context" "fmt"
"net"
"net/http"
"time"
"go.lindenii.runxiyu.org/forge/forged/internal/common/misc"
)
type Server struct {
net string
addr string
root string
httpServer *http.Server
shutdownTimeout uint32
}
type handler struct{}
func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
type Config struct {
Net string `scfg:"net"`
Addr string `scfg:"addr"`
Root string `scfg:"root"`
CookieExpiry int `scfg:"cookie_expiry"`
ReadTimeout uint32 `scfg:"read_timeout"`
WriteTimeout uint32 `scfg:"write_timeout"`
IdleTimeout uint32 `scfg:"idle_timeout"`
MaxHeaderBytes int `scfg:"max_header_bytes"`
ReverseProxy bool `scfg:"reverse_proxy"`
ShutdownTimeout uint32 `scfg:"shutdown_timeout"`
}
func New(config Config) (server *Server) {
handler := &handler{}
return &Server{
net: config.Net,
addr: config.Addr,
root: config.Root,
shutdownTimeout: config.ShutdownTimeout,
httpServer: &http.Server{
Handler: handler,
ReadTimeout: time.Duration(config.ReadTimeout) * time.Second,
WriteTimeout: time.Duration(config.WriteTimeout) * time.Second,
IdleTimeout: time.Duration(config.IdleTimeout) * time.Second,
MaxHeaderBytes: config.MaxHeaderBytes,
},
}
}
func (server *Server) Run(ctx context.Context) (err error) {
server.httpServer.BaseContext = func(_ net.Listener) context.Context { return ctx }
listener, err := misc.Listen(server.net, server.addr)
if err != nil {
return fmt.Errorf("listen for web: %w", err)
}
defer func() {
_ = listener.Close()
}()
go func() {
<-ctx.Done()
shCtx, cancel := context.WithTimeout(context.Background(), time.Duration(server.shutdownTimeout)*time.Second)
stop := context.AfterFunc(ctx, func() {
shCtx, cancel := context.WithTimeout(context.WithoutCancel(ctx), time.Duration(server.shutdownTimeout)*time.Second)
defer cancel() _ = server.httpServer.Shutdown(shCtx) _ = listener.Close()
}()
}) defer stop()
if err = server.httpServer.Serve(listener); err != nil {
if err == http.ErrServerClosed {
if err == http.ErrServerClosed || ctx.Err() != nil {
return nil
}
return fmt.Errorf("serve web: %w", err)
}
panic("unreachable")
}
package server import ( "context" "fmt" "go.lindenii.runxiyu.org/forge/forged/internal/config" "go.lindenii.runxiyu.org/forge/forged/internal/database" "go.lindenii.runxiyu.org/forge/forged/internal/incoming/hooks" "go.lindenii.runxiyu.org/forge/forged/internal/incoming/lmtp" "go.lindenii.runxiyu.org/forge/forged/internal/incoming/ssh" "go.lindenii.runxiyu.org/forge/forged/internal/incoming/web"
"golang.org/x/sync/errgroup"
)
type Server struct {
config config.Config
database database.Database
hookServer *hooks.Server
lmtpServer *lmtp.Server
webServer *web.Server
sshServer *ssh.Server
globalData struct {
SSHPubkey string
SSHFingerprint string
Version string
}
}
func New(configPath string) (server *Server, err error) {
server = &Server{}
server.config, err = config.Open(configPath)
if err != nil {
return server, fmt.Errorf("open config: %w", err)
}
server.hookServer = hooks.New(server.config.Hooks)
server.lmtpServer = lmtp.New(server.config.LMTP)
server.webServer = web.New(server.config.Web)
server.sshServer, err = ssh.New(server.config.SSH)
if err != nil {
return server, fmt.Errorf("create SSH server: %w", err)
}
return server, nil
}
func (server *Server) Run(ctx context.Context) (err error) {
// TODO: Not running git2d because it should be run separately.
// This needs to be documented somewhere, hence a TODO here for now.
subCtx, cancel := context.WithCancel(ctx) defer cancel()
g, gctx := errgroup.WithContext(ctx)
server.database, err = database.Open(subCtx, server.config.DB)
server.database, err = database.Open(gctx, server.config.DB)
if err != nil {
return fmt.Errorf("open database: %w", err)
}
errCh := make(chan error)
go func() {
if err := server.hookServer.Run(subCtx); err != nil {
select {
case errCh <- err:
default:
}
}
}()
go func() {
if err := server.lmtpServer.Run(subCtx); err != nil {
select {
case errCh <- err:
default:
}
}
}()
go func() {
if err := server.webServer.Run(subCtx); err != nil {
select {
case errCh <- err:
default:
}
}
}()
defer server.database.Close()
go func() {
if err := server.sshServer.Run(subCtx); err != nil {
select {
case errCh <- err:
default:
}
}
}()
g.Go(func() error { return server.hookServer.Run(gctx) })
g.Go(func() error { return server.lmtpServer.Run(gctx) })
g.Go(func() error { return server.webServer.Run(gctx) })
g.Go(func() error { return server.sshServer.Run(gctx) })
select {
case err := <-errCh:
if err := g.Wait(); err != nil {
return fmt.Errorf("server error: %w", err)
case <-ctx.Done():
}
return nil
return ctx.Err()
}