Hi… I am well aware that this diff view is very suboptimal. It will be fixed when the refactored server comes along!
Add some stubs
package misc
import (
"errors"
"fmt"
"net"
"syscall"
)
func ListenUnixSocket(path string) (listener net.Listener, replaced bool, err error) {
listener, err = net.Listen("unix", path)
if errors.Is(err, syscall.EADDRINUSE) {
replaced = true
if unlinkErr := syscall.Unlink(path); unlinkErr != nil {
return listener, false, fmt.Errorf("remove existing socket %q: %w", path, unlinkErr)
}
listener, err = net.Listen("unix", path)
}
if err != nil {
return listener, replaced, fmt.Errorf("listen on unix socket %q: %w", path, err)
}
return listener, replaced, nil
}
func Listen(net_, addr string) (listener net.Listener, err error) {
if net_ == "unix" {
listener, _, err = ListenUnixSocket(addr)
if err != nil {
return listener, fmt.Errorf("listen unix socket for web: %w", err)
}
} else {
listener, err = net.Listen(net_, addr)
if err != nil {
return listener, fmt.Errorf("listen %s for web: %w", net_, err)
}
}
return listener, nil
}
package misc
import (
"errors"
"fmt"
"net"
"syscall"
)
func ListenUnixSocket(path string) (listener net.Listener, replaced bool, err error) {
listener, err = net.Listen("unix", path)
if errors.Is(err, syscall.EADDRINUSE) {
replaced = true
if unlinkErr := syscall.Unlink(path); unlinkErr != nil {
return listener, false, fmt.Errorf("remove existing socket %q: %w", path, unlinkErr)
}
listener, err = net.Listen("unix", path)
}
if err != nil {
return listener, replaced, fmt.Errorf("listen on unix socket %q: %w", path, err)
}
return listener, replaced, nil
}
package hooks
import (
"fmt"
"net"
"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) (pool *Server) {
func New(config Config) (server *Server) {
return &Server{
socketPath: config.Socket,
executablesPath: config.Execs,
}
}
func (pool *Server) Run() error {
listener, _, err := misc.ListenUnixSocket(pool.socketPath)
func (server *Server) Run() error {
listener, _, err := misc.ListenUnixSocket(server.socketPath)
if err != nil {
return fmt.Errorf("listen unix socket for hooks: %w", err)
}
for {
conn, err := listener.Accept()
if err != nil {
return fmt.Errorf("accept conn: %w", err)
}
go pool.handleConn(conn)
go server.handleConn(conn)
} }
func (pool *Server) handleConn(conn net.Conn) {
func (server *Server) handleConn(conn net.Conn) {
panic("TODO: handle hook connection")
}
package lmtp
import (
"fmt"
"net"
"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) (pool *Server) {
func New(config Config) (server *Server) {
return &Server{
socket: config.Socket,
domain: config.Domain,
maxSize: config.MaxSize,
writeTimeout: config.WriteTimeout,
readTimeout: config.ReadTimeout,
}
}
func (pool *Server) Run() error {
listener, _, err := misc.ListenUnixSocket(pool.socket)
func (server *Server) Run() error {
listener, _, err := misc.ListenUnixSocket(server.socket)
if err != nil {
return fmt.Errorf("listen unix socket for LMTP: %w", err)
}
for {
conn, err := listener.Accept()
if err != nil {
return fmt.Errorf("accept conn: %w", err)
}
go pool.handleConn(conn)
go server.handleConn(conn)
} }
func (pool *Server) handleConn(conn net.Conn) {
func (server *Server) handleConn(conn net.Conn) {
panic("TODO: handle LMTP connection")
}
package ssh
type Server struct{}
import ( "fmt" "os" 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"`
}
type Server struct {
gliderServer *gliderssh.Server
privkey gossh.Signer
pubkeyString string
pubkeyFP string
net string
addr string
root string
}
func New(config Config) (server *Server, err error) {
server = &Server{
net: config.Net,
addr: config.Addr,
root: config.Root,
}
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() (err error) {
listener, err := misc.Listen(server.net, server.addr)
if err = server.gliderServer.Serve(listener); err != 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 "net/http"
import ( "fmt" "net/http" "time" "go.lindenii.runxiyu.org/forge/forged/internal/common/misc" )
type Server struct {
net string addr string root string
httpServer *http.Server }
type handler struct{}
func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
type Config struct {
Net string `scfg:"net"` Addr string `scfg:"addr"` CookieExpiry int `scfg:"cookie_expiry"` Root string `scfg:"root"` ReadTimeout uint32 `scfg:"read_timeout"` WriteTimeout uint32 `scfg:"write_timeout"` IdleTimeout uint32 `scfg:"idle_timeout"` ReverseProxy bool `scfg:"reverse_proxy"`
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"`
}
func New(config Config) (server *Server) {
handler := &handler{}
return &Server{
net: config.Net,
addr: config.Addr,
root: config.Root,
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() (err error) {
listener, err := misc.Listen(server.net, server.addr)
if err = server.httpServer.Serve(listener); err != nil {
return fmt.Errorf("serve web: %w", err)
}
panic("unreachable")
}
package server
import (
"context"
"fmt"
"log"
"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"
)
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(ctx context.Context, 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)
}
// TODO: Should this belong here, or in Run()?
server.database, err = database.Open(ctx, server.config.DB)
if err != nil {
return server, fmt.Errorf("open database: %w", err)
}
server.hookServer = hooks.New(server.config.Hooks)
server.lmtpServer = lmtp.New(server.config.LMTP)
// TODO: Add HTTP and SSH servers
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 (s *Server) Run() error {
// TODO: Not running git2d because it should be run separately.
// This needs to be documented somewhere, hence a TODO here for now.
go func() {
if err := s.hookServer.Run(); err != nil {
log.Fatalf("run hook pool: %v", err)
log.Fatalf("run hook server: %v", err)
}
}()
go func() {
if err := s.lmtpServer.Run(); err != nil {
log.Fatalf("run LMTP pool: %v", err)
log.Fatalf("run LMTP server: %v", err)
}
}()
go func() {
if err := s.webServer.Run(); err != nil {
log.Fatalf("run web server: %v", err)
}
}()
go func() {
if err := s.sshServer.Run(); err != nil {
log.Fatalf("run SSH server: %v", err)
} }() return nil }