mirror of
				https://github.com/ClusterCockpit/cc-backend
				synced 2025-11-04 01:25:06 +01:00 
			
		
		
		
	Put privilege drop to previous location
This commit is contained in:
		@@ -212,13 +212,6 @@ func main() {
 | 
			
		||||
		serverStart()
 | 
			
		||||
	}()
 | 
			
		||||
 | 
			
		||||
	// Because this program will want to bind to a privileged port (like 80), the listener must
 | 
			
		||||
	// be established first, then the user can be changed, and after that,
 | 
			
		||||
	// the actual http server can be started.
 | 
			
		||||
	if err := runtimeEnv.DropPrivileges(config.Keys.Group, config.Keys.User); err != nil {
 | 
			
		||||
		log.Fatalf("error while preparing server start: %s", err.Error())
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	wg.Add(1)
 | 
			
		||||
	sigs := make(chan os.Signal, 1)
 | 
			
		||||
	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
 | 
			
		||||
 
 | 
			
		||||
@@ -27,6 +27,7 @@ import (
 | 
			
		||||
	"github.com/ClusterCockpit/cc-backend/internal/graph/generated"
 | 
			
		||||
	"github.com/ClusterCockpit/cc-backend/internal/routerConfig"
 | 
			
		||||
	"github.com/ClusterCockpit/cc-backend/pkg/log"
 | 
			
		||||
	"github.com/ClusterCockpit/cc-backend/pkg/runtimeEnv"
 | 
			
		||||
	"github.com/ClusterCockpit/cc-backend/web"
 | 
			
		||||
	"github.com/gorilla/handlers"
 | 
			
		||||
	"github.com/gorilla/mux"
 | 
			
		||||
@@ -298,6 +299,13 @@ func serverStart() {
 | 
			
		||||
	} else {
 | 
			
		||||
		fmt.Printf("HTTP server listening at %s...", config.Keys.Addr)
 | 
			
		||||
	}
 | 
			
		||||
	//
 | 
			
		||||
	// Because this program will want to bind to a privileged port (like 80), the listener must
 | 
			
		||||
	// be established first, then the user can be changed, and after that,
 | 
			
		||||
	// the actual http server can be started.
 | 
			
		||||
	if err := runtimeEnv.DropPrivileges(config.Keys.Group, config.Keys.User); err != nil {
 | 
			
		||||
		log.Fatalf("error while preparing server start: %s", err.Error())
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if err = server.Serve(listener); err != nil && err != http.ErrServerClosed {
 | 
			
		||||
		log.Fatalf("starting server failed: %v", err)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user