Hi… I am well aware that this diff view is very suboptimal. It will be fixed when the refactored server comes along!
Add shutdown timeouts
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"`
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
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,
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)
defer func() {
_ = listener.Close()
}()
go func() {
<-ctx.Done()
_ = server.gliderServer.Close() _ = listener.Close() // unnecessary? // TODO: Log the error
shCtx, cancel := context.WithTimeout(context.Background(), time.Duration(server.shutdownTimeout)*time.Second) defer cancel() _ = server.gliderServer.Shutdown(shCtx) _ = listener.Close()
}()
if err = server.gliderServer.Serve(listener); err != nil {
if errors.Is(err, gliderssh.ErrServerClosed) {
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/http"
"time"
"go.lindenii.runxiyu.org/forge/forged/internal/common/misc"
)
type Server struct {
net string addr string root string httpServer *http.Server
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"`
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,
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) {
listener, err := misc.Listen(server.net, server.addr)
defer func() {
_ = listener.Close()
}()
go func() {
<-ctx.Done()
_ = server.httpServer.Close() _ = listener.Close() // unnecessary? // TODO: Log the error
shCtx, cancel := context.WithTimeout(context.Background(), time.Duration(server.shutdownTimeout)*time.Second) defer cancel() _ = server.httpServer.Shutdown(shCtx) _ = listener.Close()
}()
if err = server.httpServer.Serve(listener); err != nil {
if err == http.ErrServerClosed {
return nil
}
return fmt.Errorf("serve web: %w", err)
}
panic("unreachable")
}