Unix socket

Author: thomiceli

config.yml

@@ -44,14 +44,16 @@ sqlite.journal-mode: WAL
 # HTTP server configuration
 # Host to bind to. Default: 0.0.0.0
 # Use an IP address for network binding. Use a path for Unix socket binding (e.g. /run/opengist.sock)
-http.host: 0.0.0.0
+http.host: /tmp/opengist.sock
 
 # Port to bind to. Default: 6157
 http.port: 6157
 
 # Enable or disable git operations (clone, pull, push) via HTTP (either `true` or `false`). Default: true
 http.git-enabled: true
 
+unix-socket-permissions: 0666
+
 # Enable or disable the metrics endpoint (either `true` or `false`). Default: false
 metrics.enabled: false
 

internal/cli/main.go

@@ -15,6 +15,7 @@ import (
 	"os/signal"
 	"path"
 	"path/filepath"
+	"strings"
 	"syscall"
 )
 
@@ -37,7 +38,7 @@ var CmdStart = cli.Command{
 		Initialize(ctx)
 
 		server := server.NewServer(os.Getenv("OG_DEV") == "1", path.Join(config.GetHomeDir(), "sessions"), false)
-		go server.StartUnixSocket()
+		go server.StartAuto()
 		go ssh.Start()
 
 		<-stopCtx.Done()
@@ -142,7 +143,12 @@ func shutdown(server *server.Server) {
 		index.Close()
 	}
 
-	server.StopUnixSocket()
+	// Stop the server - determine type based on config
+	if strings.Contains(config.C.HttpHost, "/") || strings.Contains(config.C.HttpHost, "\\") {
+		server.StopUnixSocket()
+	} else {
+		server.Stop()
+	}
 
 	log.Info().Msg("Shutdown complete")
 }

internal/config/config.go

@@ -51,6 +51,8 @@ type config struct {
 	HttpPort string `yaml:"http.port" env:"OG_HTTP_PORT"`
 	HttpGit  bool   `yaml:"http.git-enabled" env:"OG_HTTP_GIT_ENABLED"`
 
+	UnixSocketPermissions string `yaml:"unix-socket-permissions" env:"OG_UNIX_SOCKET_PERMISSIONS"`
+
 	SshGit            bool   `yaml:"ssh.git-enabled" env:"OG_SSH_GIT_ENABLED"`
 	SshHost           string `yaml:"ssh.host" env:"OG_SSH_HOST"`
 	SshPort           string `yaml:"ssh.port" env:"OG_SSH_PORT"`
@@ -113,6 +115,8 @@ func configWithDefaults() (*config, error) {
 	c.HttpPort = "6157"
 	c.HttpGit = true
 
+	c.UnixSocketPermissions = "0666"
+
 	c.SshGit = true
 	c.SshHost = "0.0.0.0"
 	c.SshPort = "2222"

internal/web/server/server.go

@@ -1,10 +1,14 @@
 package server
 
 import (
+	"fmt"
 	"github.com/thomiceli/opengist/internal/validator"
 	"net"
 	"net/http"
 	"os"
+	"path/filepath"
+	"strconv"
+	"strings"
 
 	"github.com/labstack/echo/v4"
 	"github.com/rs/zerolog/log"
@@ -47,7 +51,19 @@ func NewServer(isDev bool, sessionsPath string, ignoreCsrf bool) *Server {
 	return s
 }
 
+func isSocketPath(host string) bool {
+	return strings.Contains(host, "/") || strings.Contains(host, "\\")
+}
+
 func (s *Server) Start() {
+	if isSocketPath(config.C.HttpHost) {
+		s.startUnixSocket()
+	} else {
+		s.startHTTP()
+	}
+}
+
+func (s *Server) startHTTP() {
 	addr := config.C.HttpHost + ":" + config.C.HttpPort
 
 	log.Info().Msg("Starting HTTP server on http://" + addr)
@@ -56,19 +72,44 @@ func (s *Server) Start() {
 	}
 }
 
-func (s *Server) StartUnixSocket() {
-	socketPath := "/tmp/opengist.sock"
+func (s *Server) startUnixSocket() {
+	socketPath := config.C.HttpHost
+	if socketPath == "" {
+		socketPath = "/tmp/opengist.sock"
+	}
+
+	if dir := filepath.Dir(socketPath); dir != "." {
+		if err := os.MkdirAll(dir, 0755); err != nil {
+			log.Warn().Err(err).Str("dir", dir).Msg("Failed to create socket directory")
+		}
+	}
 	if err := os.Remove(socketPath); err != nil && !os.IsNotExist(err) {
 		log.Warn().Err(err).Str("socket", socketPath).Msg("Failed to remove existing socket file")
 	}
 
+	pidPath := strings.TrimSuffix(socketPath, filepath.Ext(socketPath)) + ".pid"
+	if err := s.createPidFile(pidPath); err != nil {
+		log.Warn().Err(err).Str("pid-file", pidPath).Msg("Failed to create PID file")
+	}
+
 	listener, err := net.Listen("unix", socketPath)
 	if err != nil {
 		log.Fatal().Err(err).Msg("Failed to start Unix socket server")
 	}
 	s.echo.Listener = listener
 
-	log.Info().Msgf("Starting Unix socket server on " + socketPath)
+	if config.C.UnixSocketPermissions != "" {
+		if perm, err := strconv.ParseUint(config.C.UnixSocketPermissions, 8, 32); err == nil {
+			if err := os.Chmod(socketPath, os.FileMode(perm)); err != nil {
+				log.Warn().Err(err).Str("socket", socketPath).Str("permissions", config.C.UnixSocketPermissions).Msg("Failed to set socket permissions")
+			}
+		} else {
+			log.Warn().Err(err).Str("permissions", config.C.UnixSocketPermissions).Msg("Invalid socket permissions format")
+		}
+	}
+
+	log.Info().Str("socket", socketPath).Msg("Starting Unix socket server")
+	log.Info().Str("pid-file", pidPath).Msg("PID file created")
 	server := new(http.Server)
 	if err := s.echo.StartServer(server); err != nil && err != http.ErrServerClosed {
 		log.Fatal().Err(err).Msg("Failed to start Unix socket server")
@@ -101,9 +142,27 @@ func (s *Server) StopUnixSocket() {
 		} else {
 			log.Info().Str("socket", socketPath).Msg("Socket file removed")
 		}
+
+		pidPath := strings.TrimSuffix(socketPath, filepath.Ext(socketPath)) + ".pid"
+		if err := os.Remove(pidPath); err != nil && !os.IsNotExist(err) {
+			log.Error().Err(err).Str("pid-file", pidPath).Msg("Failed to remove PID file")
+		} else {
+			log.Info().Str("pid-file", pidPath).Msg("PID file removed")
+		}
 	}
 }
 
+func (s *Server) createPidFile(pidPath string) error {
+	pid := os.Getpid()
+	pidContent := fmt.Sprintf("%d\n", pid)
+
+	if err := os.WriteFile(pidPath, []byte(pidContent), 0644); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	s.echo.ServeHTTP(w, r)
 }