.vagrant/machines/default/libvirt/created_networks

@@ -3,5 +3,3 @@
 5533801d-70e3-4c21-9942-82d20930c789
 5533801d-70e3-4c21-9942-82d20930c789
 5533801d-70e3-4c21-9942-82d20930c789
-5533801d-70e3-4c21-9942-82d20930c789
-5533801d-70e3-4c21-9942-82d20930c789

Makefile

@@ -1,6 +1,4 @@
 
-.PHONY: release dev deps install skel
-
 release: deps
 	CGO_ENABLED=1 go build -buildvcs=true .
 
@@ -14,15 +12,9 @@ deps:
 
 install: 
 	cp podterminal /usr/local/bin/podterminal
-	ifeq ($(shell id podterminal 2>/dev/null))
+	mkdir -p /etc/podterminal
 	useradd -r -s /bin/false podterminal 
-	endif
-	mkdir -p /etc/podterminal/skel
-	cp -n ./exampleconfig.yaml /etc/podterminal/config.yaml
-	cp -n podterminal.service /etc/systemd/system/
+	cp ./exampleconfig.yaml /etc/podterminal/config.yaml
+	cp podterminal.service /etc/systemd/system/
 	systemctl daemon-reload
 	systemctl enable --now podterminal
-
-skel:
-	echo "Taring up /etc/podterminal/skel/"
-	tar -czvf /etc/podterminal/skel.tar.gz -C /etc/podterminal/skel .

exampleconfig.yaml

@@ -14,10 +14,8 @@ image: lscr.io/linuxserver/webtop
 maxage: 10800
 # Port Podterminal should listen to
 port: 80
-# Files that will be copied into container userhome on startup
+# Files that will be copied into container on startup
 skel: /etc/podterminal/skel/
 ssl: false
 ssl_cert: /etc/ssl/certs/ssl-cert-snakeoil.pem
 ssl_cert_key: /etc/ssl/private/ssl-cert-snakeoil.key
-# Blocks accessing /files and /files/socket.io to avoid File transfer
-block_filebrowser: false

go.mod

@@ -9,7 +9,6 @@ require (
 	github.com/google/uuid v1.4.0
 	github.com/opencontainers/runtime-spec v1.1.1-0.20230922153023-c0e90434df2a
 	github.com/spf13/viper v1.18.2
-	golang.org/x/sync v0.5.0
 )
 
 require (
@@ -148,6 +147,7 @@ require (
 	golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
 	golang.org/x/mod v0.13.0 // indirect
 	golang.org/x/net v0.19.0 // indirect
+	golang.org/x/sync v0.5.0 // indirect
 	golang.org/x/sys v0.15.0 // indirect
 	golang.org/x/term v0.15.0 // indirect
 	golang.org/x/text v0.14.0 // indirect

main.go

@@ -2,7 +2,9 @@ package main
 
 import (
 	"log"
+	"os"
 
+	"github.com/spf13/viper"
 	"golang.org/x/sync/errgroup"
 
 	"git.jmbit.de/jmb/podterminal/pods"
@@ -31,3 +33,35 @@ func main() {
 		log.Fatal(err)
 	}
 }
+
+func readConfigFile() {
+	log.Println("Reading Config")
+	viper.SetConfigFile("/etc/podterminal/config.yaml")
+	viper.SetDefault("port", 80)
+	viper.SetDefault("ip_addr", "0.0.0.0")
+	viper.SetDefault("image", "lscr.io/linuxserver/webtop")
+	viper.SetDefault("maxAge", 10800)
+	viper.SetDefault("dri", false)
+	viper.SetDefault("dir_node", "/dev/dri/renderD128")
+	viper.SetDefault("skel", "/etc/podterminal/skel")
+	viper.SetDefault("envvars",
+		map[string]string{
+			"CUSTOM_USER": "user",
+			"PASSWORD":    "",
+			"TITLE":       "Podterminal",
+		},
+	)
+	if _, err := os.Stat("/etc/podterminal/config.yaml"); os.IsNotExist(err) {
+		log.Println("Config file does not exist, creating")
+		os.MkdirAll("/etc/podterminal", 755)
+		err := viper.WriteConfig()
+		if err != nil {
+			log.Fatalln("could not write default config", err)
+		}
+	}
+	err := viper.ReadInConfig()
+	if err != nil {
+		log.Fatalln("could not read config file", err)
+	}
+	log.Println("Finished reading Config")
+}

pods/skel.go

@@ -1,54 +0,0 @@
-package pods
-
-import (
-	"bytes"
-	"log"
-	"os"
-
-	"github.com/containers/podman/v4/pkg/bindings/containers"
-	"github.com/spf13/viper"
-)
-
-// CopySkelToContainer copies an Archive into the containers home directory
-// (Assumes the use of a Webtop container)
-func CopySkelToContainer(id string) error {
-	trueVar := true
-	log.Println("Copying skel Archive to container")
-	var buf bytes.Buffer
-	var err error
-
-	file, err := os.Open(viper.GetString("skel"))
-	if err != nil {
-		log.Println("Could not open skel archive", err)
-		return err
-	}
-	defer file.Close()
-
-	// Use 'FileInfo' to get the size of the file
-	fileInfo, err := file.Stat()
-	if err != nil {
-		log.Println("Could not get size of skel archive", err)
-		return err
-	}
-
-	// Create a buffer with the size of the file
-	buffer := bytes.NewBuffer(make([]byte, 0, fileInfo.Size()))
-
-	// Copy the file contents to the buffer
-	_, err = buffer.ReadFrom(file)
-	if err != nil {
-		log.Println("Could not get read in skel archive", err)
-		return err
-	}
-
-	log.Println("Writing file from buffer to container")
-	copyOptions := &containers.CopyOptions{
-		Chown: &trueVar,
-	}
-	_, err = containers.CopyFromArchiveWithOptions(Socket, id, "/config/", &buf, copyOptions)
-	if err != nil {
-		log.Print("Error copying to Container: ", err)
-	}
-
-	return err
-}

readConfig.go

@@ -1,41 +0,0 @@
-package main
-
-import (
-	"log"
-	"os"
-
-	"github.com/spf13/viper"
-)
-
-func readConfigFile() {
-	log.Println("Reading Config")
-	viper.SetConfigFile("/etc/podterminal/config.yaml")
-	viper.SetDefault("port", 80)
-	viper.SetDefault("ip_addr", "0.0.0.0")
-	viper.SetDefault("image", "lscr.io/linuxserver/webtop")
-	viper.SetDefault("maxAge", 10800)
-	viper.SetDefault("dri", false)
-	viper.SetDefault("dir_node", "/dev/dri/renderD128")
-	viper.SetDefault("skel", "/etc/podterminal/skel.tar.gz")
-	viper.SetDefault("block_filebrowser", false)
-	viper.SetDefault("envvars",
-		map[string]string{
-			"CUSTOM_USER": "user",
-			"PASSWORD":    "",
-			"TITLE":       "Podterminal",
-		},
-	)
-	if _, err := os.Stat("/etc/podterminal/config.yaml"); os.IsNotExist(err) {
-		log.Println("Config file does not exist, creating")
-		os.MkdirAll("/etc/podterminal", 755)
-		err := viper.WriteConfig()
-		if err != nil {
-			log.Fatalln("could not write default config", err)
-		}
-	}
-	err := viper.ReadInConfig()
-	if err != nil {
-		log.Fatalln("could not read config file", err)
-	}
-	log.Println("Finished reading Config")
-}

web/reverseProxy.go

@@ -1,98 +0,0 @@
-package web
-
-import (
-	"fmt"
-	"log"
-	"net/http/httputil"
-	"net/url"
-	"time"
-
-	"github.com/gin-contrib/sessions"
-	"github.com/gin-gonic/gin"
-
-	"git.jmbit.de/jmb/podterminal/pods"
-)
-
-func createReverseProxy(backendService string) (*httputil.ReverseProxy, error) {
-	var err error
-	log.Println("Creating reverse Proxy for ", backendService)
-
-	backendURL, err := url.Parse(backendService)
-	if err != nil {
-		log.Printf("Could not parse backend URL: %v", err)
-	}
-
-	proxy := &httputil.ReverseProxy{
-		Rewrite: func(request *httputil.ProxyRequest) {
-			request.SetURL(backendURL)
-			request.Out.Host = request.In.Host
-		},
-	}
-
-	return proxy, err
-}
-
-func containerProxy(c *gin.Context) {
-	session := sessions.Default(c)
-	session.Save()
-	sessionID := session.ID()
-	if session.Get("ct") == nil {
-		log.Println("Creating Container for Session ", sessionID)
-		ct, err := pods.CreateContainer()
-		if err != nil {
-			c.HTML(500, "Error", fmt.Sprintf("[%s] Could not create Container: %v", sessionID, err))
-			c.Abort()
-		}
-		err = pods.StartContainer(ct)
-		if err != nil {
-			c.HTML(500, "Error", fmt.Sprintf("[%s] Could not start Container: %v", sessionID, err))
-			c.Abort()
-		}
-		// Hack to wait for Container to start up and get assigned an IP
-		time.Sleep(3 * time.Second)
-		ctip, err := pods.GetContainerIP(ct)
-
-		if err != nil {
-			c.HTML(500, "Error", fmt.Sprintf("[%s] Could not get Container ip: %v", sessionID, err))
-			c.Abort()
-		}
-
-		err = pods.CopySkelToContainer(ct)
-
-		if err != nil {
-			c.HTML(
-				500,
-				"Error",
-				fmt.Sprintf("[%s] Could not copy skel archive to container: %v", sessionID, err),
-			)
-			c.Abort()
-		}
-
-		proxies[ct], err = createReverseProxy(fmt.Sprintf("http://%s:3000", ctip))
-
-		if err != nil {
-			c.HTML(
-				500,
-				"Error",
-				fmt.Sprintf("[%s] Could not create Container Proxy: %v", sessionID, err),
-			)
-			c.Abort()
-		}
-		session.Set("ct", ct)
-		session.Save()
-		c.Redirect(301, "/")
-	} else {
-		sessionCT := session.Get("ct")
-		switch sessionCT.(type) {
-		case string:
-
-		default:
-			c.HTML(500, "Error", "Session Container ID is not a string")
-			c.Abort()
-		}
-		id := session.Get("ct").(string)
-		proxy := proxies[id]
-		proxy.ServeHTTP(c.Writer, c.Request)
-	}
-
-}

web/router.go

@@ -4,12 +4,16 @@ import (
 	"fmt"
 	"log"
 	"net/http/httputil"
+	"net/url"
+	"time"
 
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-contrib/sessions/cookie"
 	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
 	"github.com/spf13/viper"
+
+	"git.jmbit.de/jmb/podterminal/pods"
 )
 
 var proxies = make(map[string]*httputil.ReverseProxy)
@@ -48,9 +52,6 @@ func setupRouter() *gin.Engine {
 	router.Use(gin.Recovery())
 	router.Use(sessions.Sessions("session", store))
 	//router.Use(urlLog())
-	if viper.GetBool("block_filebrowser") == true {
-		router.Use(blockFilebrowser)
-	}
 	router.Use(containerProxy)
 	// router.Any("/", containerProxy)
 	return router
@@ -68,17 +69,75 @@ func urlLog() gin.HandlerFunc {
 	}
 }
 
-// blockFilebrowser blocks the URLs used by the Kclient File browser
-func blockFilebrowser(c *gin.Context) {
-	switch c.Request.URL.RawPath {
-	case "/files":
+func createReverseProxy(backendService string) (*httputil.ReverseProxy, error) {
+	var err error
+	log.Println("Creating reverse Proxy for ", backendService)
+
+	backendURL, err := url.Parse(backendService)
+	if err != nil {
+		log.Printf("Could not parse backend URL: %v", err)
+	}
+
+	proxy := &httputil.ReverseProxy{
+		Rewrite: func(request *httputil.ProxyRequest) {
+			request.SetURL(backendURL)
+			request.Out.Host = request.In.Host
+		},
+	}
+
+	return proxy, err
+}
+
+func containerProxy(c *gin.Context) {
+	session := sessions.Default(c)
+	session.Save()
+	sessionID := session.ID()
+	if session.Get("ct") == nil {
+		log.Println("Creating Container for Session ", sessionID)
+		ct, err := pods.CreateContainer()
+		if err != nil {
+			c.HTML(500, "Error", fmt.Sprintf("[%s] Could not create Container: %v", sessionID, err))
 			c.Abort()
-	case "/filebrowser.js":
+		}
+		err = pods.StartContainer(ct)
+		if err != nil {
+			c.HTML(500, "Error", fmt.Sprintf("[%s] Could not start Container: %v", sessionID, err))
 			c.Abort()
-	case "/files/socket.io":
+		}
+		// Hack to wait for Container to start up and get assigned an IP
+		time.Sleep(3 * time.Second)
+		ctip, err := pods.GetContainerIP(ct)
+
+		if err != nil {
+			c.HTML(500, "Error", fmt.Sprintf("[%s] Could not get Container ip: %v", sessionID, err))
 			c.Abort()
+		}
+
+		proxies[ct], err = createReverseProxy(fmt.Sprintf("http://%s:3000", ctip))
+
+		if err != nil {
+			c.HTML(
+				500,
+				"Error",
+				fmt.Sprintf("[%s] Could not create Container Proxy: %v", sessionID, err),
+			)
+			c.Abort()
+		}
+		session.Set("ct", ct)
+		session.Save()
+		c.Redirect(301, "/")
+	} else {
+		sessionCT := session.Get("ct")
+		switch sessionCT.(type) {
+		case string:
 
 		default:
-		c.Next()
+			c.HTML(500, "Error", "Session Container ID is not a string")
+			c.Abort()
 		}
+		id := session.Get("ct").(string)
+		proxy := proxies[id]
+		proxy.ServeHTTP(c.Writer, c.Request)
+	}
+
 }