Merge pull request 'fix: prevent subdomain change to already-in-use subdomains' (#54) from staging into main

Reviewed-on: #54

.gitea/workflows/build.yml

@@ -5,8 +5,6 @@ on:
     branches:
       - main
       - staging
-    tags:
-      - 'v*'
     paths:
       - '**.go'
       - 'go.mod'
@@ -17,9 +15,8 @@ on:
       - '.gitea/workflows/build.yml'
 
 jobs:
-  build-and-push-branches:
+  build-and-push:
     runs-on: ubuntu-latest
-    if: github.ref_type == 'branch'
 
     steps:
       - name: Checkout repository
@@ -35,17 +32,6 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Set version variables
-        id: vars
-        run: |
-          if [ "${{ github.ref }}" == "refs/heads/main" ]; then
-            echo "VERSION=dev-main" >> $GITHUB_OUTPUT
-          else
-            echo "VERSION=dev-staging" >> $GITHUB_OUTPUT
-          fi
-          echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
-          echo "COMMIT=${{ github.sha }}" >> $GITHUB_OUTPUT
-
       - name: Build and push Docker image for main
         uses: docker/build-push-action@v6
         with:
@@ -54,10 +40,6 @@ jobs:
           tags: |
             git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnel-please:latest
           platforms: linux/amd64,linux/arm64
-          build-args: |
-            VERSION=${{ steps.vars.outputs.VERSION }}
-            BUILD_DATE=${{ steps.vars.outputs.BUILD_DATE }}
-            COMMIT=${{ steps.vars.outputs.COMMIT }}
         if: github.ref == 'refs/heads/main'
 
       - name: Build and push Docker image for staging
@@ -68,85 +50,4 @@ jobs:
           tags: |
             git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnel-please:staging
           platforms: linux/amd64,linux/arm64
-          build-args: |
-            VERSION=${{ steps.vars.outputs.VERSION }}
-            BUILD_DATE=${{ steps.vars.outputs.BUILD_DATE }}
-            COMMIT=${{ steps.vars.outputs.COMMIT }}
         if: github.ref == 'refs/heads/staging'
-
-  build-and-push-tags:
-    runs-on: ubuntu-latest
-    if: github.ref_type == 'tag' && startsWith(github.ref, 'refs/tags/v')
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          registry: git.fossy.my.id
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Extract version and determine release type
-        id: version
-        run: |
-          VERSION=${GITHUB_REF#refs/tags/v}
-          echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
-          echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
-          echo "COMMIT=${{ github.sha }}" >> $GITHUB_OUTPUT
-          
-          if echo "$VERSION" | grep -qE '^[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.]+)?$'; then
-            MAJOR=$(echo "$VERSION" | cut -d. -f1)
-            MINOR=$(echo "$VERSION" | cut -d. -f2)
-            
-            echo "MAJOR=$MAJOR" >> $GITHUB_OUTPUT
-            echo "MINOR=$MINOR" >> $GITHUB_OUTPUT
-            
-            if echo "$VERSION" | grep -q '-'; then
-              echo "IS_PRERELEASE=true" >> $GITHUB_OUTPUT
-              echo "ADDITIONAL_TAG=staging" >> $GITHUB_OUTPUT
-            else
-              echo "IS_PRERELEASE=false" >> $GITHUB_OUTPUT
-              echo "ADDITIONAL_TAG=latest" >> $GITHUB_OUTPUT
-            fi
-          else
-            echo "Invalid version format: $VERSION"
-            exit 1
-          fi
-
-      - name: Build and push Docker image for release
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          push: true
-          tags: |
-            git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnel-please:v${{ steps.version.outputs.VERSION }}
-            git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnel-please:v${{ steps.version.outputs.MAJOR }}.${{ steps.version.outputs.MINOR }}
-            git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnel-please:v${{ steps.version.outputs.MAJOR }}
-            git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnel-please:${{ steps.version.outputs.ADDITIONAL_TAG }}
-          platforms: linux/amd64,linux/arm64
-          build-args: |
-            VERSION=${{ steps.version.outputs.VERSION }}
-            BUILD_DATE=${{ steps.version.outputs.BUILD_DATE }}
-            COMMIT=${{ steps.version.outputs.COMMIT }}
-        if: steps.version.outputs.IS_PRERELEASE == 'false'
-
-      - name: Build and push Docker image for pre-release
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          push: true
-          tags: |
-            git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnel-please:v${{ steps.version.outputs.VERSION }}
-            git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnel-please:${{ steps.version.outputs.ADDITIONAL_TAG }}
-          platforms: linux/amd64,linux/arm64
-          build-args: |
-            VERSION=${{ steps.version.outputs.VERSION }}
-            BUILD_DATE=${{ steps.version.outputs.BUILD_DATE }}
-            COMMIT=${{ steps.version.outputs.COMMIT }}
-        if: steps.version.outputs.IS_PRERELEASE == 'true'

Dockerfile

@@ -1,9 +1,5 @@
 FROM golang:1.25.5-alpine AS go_builder
 
-ARG VERSION=dev
-ARG BUILD_DATE=unknown
-ARG COMMIT=unknown
-
 RUN apk update && apk upgrade && \
     apk add --no-cache ca-certificates tzdata git && \
     update-ca-certificates
@@ -22,7 +18,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \
     --mount=type=cache,target=/root/.cache/go-build \
     CGO_ENABLED=0 GOOS=linux \
     go build -trimpath \
-    -ldflags="-w -s -X tunnel_pls/version.Version=${VERSION} -X tunnel_pls/version.BuildDate=${BUILD_DATE} -X tunnel_pls/version.Commit=${COMMIT}" \
+    -ldflags="-w -s" \
     -o /app/tunnel_pls \
     .
 
@@ -32,10 +28,6 @@ RUN adduser -D -u 10001 -g '' appuser && \
 
 FROM scratch
 
-ARG VERSION=dev
-ARG BUILD_DATE=unknown
-ARG COMMIT=unknown
-
 COPY --from=go_builder /usr/share/zoneinfo /usr/share/zoneinfo
 COPY --from=go_builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 COPY --from=go_builder /etc/passwd /etc/passwd
@@ -51,9 +43,6 @@ ENV TZ=Asia/Jakarta
 EXPOSE 2200 8080 8443
 
 LABEL org.opencontainers.image.title="Tunnel Please" \
-      org.opencontainers.image.description="SSH-based tunnel server" \
+      org.opencontainers.image.description="SSH-based tunnel server"
-      org.opencontainers.image.version="${VERSION}" \
-      org.opencontainers.image.revision="${COMMIT}" \
-      org.opencontainers.image.created="${BUILD_DATE}"
 
 ENTRYPOINT ["/app/tunnel_pls"]

internal/config/config.go

@@ -1,35 +0,0 @@
-package config
-
-import (
-	"log"
-	"os"
-	"strconv"
-
-	"github.com/joho/godotenv"
-)
-
-func init() {
-	if _, err := os.Stat(".env"); err == nil {
-		if err := godotenv.Load(".env"); err != nil {
-			log.Printf("Warning: Failed to load .env file: %s", err)
-		}
-	}
-}
-
-func Getenv(key, defaultValue string) string {
-	val := os.Getenv(key)
-	if val == "" {
-		val = defaultValue
-	}
-
-	return val
-}
-
-func GetBufferSize() int {
-	sizeStr := Getenv("BUFFER_SIZE", "32768")
-	size, err := strconv.Atoi(sizeStr)
-	if err != nil || size < 4096 || size > 1048576 {
-		return 32768
-	}
-	return size
-}

internal/port/port.go

@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"strings"
 	"sync"
-	"tunnel_pls/internal/config"
+	"tunnel_pls/utils"
 )
 
 type Manager interface {
@@ -28,7 +28,7 @@ var Default Manager = &manager{
 }
 
 func init() {
-	rawRange := config.Getenv("ALLOWED_PORTS", "")
+	rawRange := utils.Getenv("ALLOWED_PORTS", "")
 	if rawRange == "" {
 		return
 	}

internal/random/random.go

@@ -1,18 +0,0 @@
-package random
-
-import (
-	mathrand "math/rand"
-	"strings"
-	"time"
-)
-
-func GenerateRandomString(length int) string {
-	const charset = "abcdefghijklmnopqrstuvwxyz"
-	seededRand := mathrand.New(mathrand.NewSource(time.Now().UnixNano() + int64(mathrand.Intn(9999))))
-	var result strings.Builder
-	for i := 0; i < length; i++ {
-		randomIndex := seededRand.Intn(len(charset))
-		result.WriteString(string(charset[randomIndex]))
-	}
-	return result.String()
-}

main.go

@@ -6,29 +6,19 @@ import (
 	"net/http"
 	_ "net/http/pprof"
 	"os"
-	"tunnel_pls/internal/config"
-	"tunnel_pls/internal/key"
 	"tunnel_pls/server"
-	"tunnel_pls/session"
+	"tunnel_pls/utils"
-	"tunnel_pls/version"
 
 	"golang.org/x/crypto/ssh"
 )
 
 func main() {
-	if len(os.Args) > 1 && (os.Args[1] == "--version" || os.Args[1] == "-v") {
-		fmt.Println(version.GetVersion())
-		os.Exit(0)
-	}
-
 	log.SetOutput(os.Stdout)
 	log.SetFlags(log.LstdFlags | log.Lshortfile)
 
-	log.Printf("Starting %s", version.GetVersion())
+	pprofEnabled := utils.Getenv("PPROF_ENABLED", "false")
-
-	pprofEnabled := config.Getenv("PPROF_ENABLED", "false")
 	if pprofEnabled == "true" {
-		pprofPort := config.Getenv("PPROF_PORT", "6060")
+		pprofPort := utils.Getenv("PPROF_PORT", "6060")
 		go func() {
 			pprofAddr := fmt.Sprintf("localhost:%s", pprofPort)
 			log.Printf("Starting pprof server on http://%s/debug/pprof/", pprofAddr)
@@ -40,11 +30,11 @@ func main() {
 
 	sshConfig := &ssh.ServerConfig{
 		NoClientAuth:  true,
-		ServerVersion: fmt.Sprintf("SSH-2.0-TunnlPls-%s", version.GetShortVersion()),
+		ServerVersion: "SSH-2.0-TunnlPls-1.0",
 	}
 
 	sshKeyPath := "certs/ssh/id_rsa"
-	if err := key.GenerateSSHKeyIfNotExist(sshKeyPath); err != nil {
+	if err := utils.GenerateSSHKeyIfNotExist(sshKeyPath); err != nil {
 		log.Fatalf("Failed to generate SSH key: %s", err)
 	}
 
@@ -59,11 +49,6 @@ func main() {
 	}
 
 	sshConfig.AddHostKey(private)
-	sessionRegistry := session.NewRegistry()
+	app := server.NewServer(sshConfig)
-
-	app, err := server.NewServer(sshConfig, sessionRegistry)
-	if err != nil {
-		log.Fatalf("Failed to start server: %s", err)
-	}
 	app.Start()
 }

server/handler.go

@@ -0,0 +1,28 @@
+package server
+
+import (
+	"log"
+	"net"
+	"tunnel_pls/session"
+
+	"golang.org/x/crypto/ssh"
+)
+
+func (s *Server) handleConnection(conn net.Conn) {
+	sshConn, chans, forwardingReqs, err := ssh.NewServerConn(conn, s.config)
+	if err != nil {
+		log.Printf("failed to establish SSH connection: %v", err)
+		err := conn.Close()
+		if err != nil {
+			log.Printf("failed to close SSH connection: %v", err)
+			return
+		}
+		return
+	}
+
+	log.Println("SSH connection established:", sshConn.User())
+
+	session.New(sshConn, forwardingReqs, chans)
+
+	return
+}

server/http.go

@@ -11,15 +11,21 @@ import (
 	"regexp"
 	"strings"
 	"time"
-	"tunnel_pls/internal/config"
 	"tunnel_pls/session"
+	"tunnel_pls/utils"
 
 	"golang.org/x/crypto/ssh"
 )
 
+type Interaction interface {
+	SendMessage(message string)
+}
+
 type HTTPWriter interface {
 	io.Reader
 	io.Writer
+	SetInteraction(interaction Interaction)
+	AddInteraction(interaction Interaction)
 	GetRemoteAddr() net.Addr
 	GetWriter() io.Writer
 	AddResponseMiddleware(mw ResponseMiddleware)
@@ -36,11 +42,16 @@ type customWriter struct {
 	buf         []byte
 	respHeader  ResponseHeaderManager
 	reqHeader   RequestHeaderManager
+	interaction Interaction
 	respMW      []ResponseMiddleware
 	reqStartMW  []RequestMiddleware
 	reqEndMW    []RequestMiddleware
 }
 
+func (cw *customWriter) SetInteraction(interaction Interaction) {
+	cw.interaction = interaction
+}
+
 func (cw *customWriter) GetRemoteAddr() net.Addr {
 	return cw.remoteAddr
 }
@@ -128,6 +139,7 @@ func NewCustomWriter(writer io.Writer, reader io.Reader, remoteAddr net.Addr) HT
 		writer:      writer,
 		reader:      reader,
 		buf:         make([]byte, 0, 4096),
+		interaction: nil,
 	}
 }
 
@@ -212,29 +224,19 @@ func (cw *customWriter) Write(p []byte) (int, error) {
 	return len(p), nil
 }
 
+func (cw *customWriter) AddInteraction(interaction Interaction) {
+	cw.interaction = interaction
+}
+
 var redirectTLS = false
 
-type HTTPServer interface {
+func NewHTTPServer() error {
-	ListenAndServe() error
+	httpPort := utils.Getenv("HTTP_PORT", "8080")
-	ListenAndServeTLS() error
-	handler(conn net.Conn)
-	handlerTLS(conn net.Conn)
-}
-type httpServer struct {
-	sessionRegistry session.Registry
-}
-
-func NewHTTPServer(sessionRegistry session.Registry) HTTPServer {
-	return &httpServer{sessionRegistry: sessionRegistry}
-}
-
-func (hs *httpServer) ListenAndServe() error {
-	httpPort := config.Getenv("HTTP_PORT", "8080")
 	listener, err := net.Listen("tcp", ":"+httpPort)
 	if err != nil {
 		return errors.New("Error listening: " + err.Error())
 	}
-	if config.Getenv("TLS_ENABLED", "false") == "true" && config.Getenv("TLS_REDIRECT", "false") == "true" {
+	if utils.Getenv("TLS_ENABLED", "false") == "true" && utils.Getenv("TLS_REDIRECT", "false") == "true" {
 		redirectTLS = true
 	}
 	go func() {
@@ -249,13 +251,13 @@ func (hs *httpServer) ListenAndServe() error {
 				continue
 			}
 
-			go hs.handler(conn)
+			go Handler(conn)
 		}
 	}()
 	return nil
 }
 
-func (hs *httpServer) handler(conn net.Conn) {
+func Handler(conn net.Conn) {
 	defer func() {
 		err := conn.Close()
 		if err != nil && !errors.Is(err, net.ErrClosed) {
@@ -286,7 +288,7 @@ func (hs *httpServer) handler(conn net.Conn) {
 
 	if redirectTLS {
 		_, err = conn.Write([]byte("HTTP/1.1 301 Moved Permanently\r\n" +
-			fmt.Sprintf("Location: https://%s.%s/\r\n", slug, config.Getenv("DOMAIN", "localhost")) +
+			fmt.Sprintf("Location: https://%s.%s/\r\n", slug, utils.Getenv("DOMAIN", "localhost")) +
 			"Content-Length: 0\r\n" +
 			"Connection: close\r\n" +
 			"\r\n"))
@@ -314,8 +316,8 @@ func (hs *httpServer) handler(conn net.Conn) {
 		return
 	}
 
-	sshSession, exist := hs.sessionRegistry.Get(slug)
+	sshSession, ok := session.Clients[slug]
-	if !exist {
+	if !ok {
 		_, err = conn.Write([]byte("HTTP/1.1 301 Moved Permanently\r\n" +
 			fmt.Sprintf("Location: https://tunnl.live/tunnel-not-found?slug=%s\r\n", slug) +
 			"Content-Length: 0\r\n" +

server/https.go

@@ -8,12 +8,13 @@ import (
 	"log"
 	"net"
 	"strings"
-	"tunnel_pls/internal/config"
+	"tunnel_pls/session"
+	"tunnel_pls/utils"
 )
 
-func (hs *httpServer) ListenAndServeTLS() error {
+func NewHTTPSServer() error {
-	domain := config.Getenv("DOMAIN", "localhost")
+	domain := utils.Getenv("DOMAIN", "localhost")
-	httpsPort := config.Getenv("HTTPS_PORT", "8443")
+	httpsPort := utils.Getenv("HTTPS_PORT", "8443")
 
 	tlsConfig, err := NewTLSConfig(domain)
 	if err != nil {
@@ -37,13 +38,13 @@ func (hs *httpServer) ListenAndServeTLS() error {
 				continue
 			}
 
-			go hs.handlerTLS(conn)
+			go HandlerTLS(conn)
 		}
 	}()
 	return nil
 }
 
-func (hs *httpServer) handlerTLS(conn net.Conn) {
+func HandlerTLS(conn net.Conn) {
 	defer func() {
 		err := conn.Close()
 		if err != nil {
@@ -89,8 +90,8 @@ func (hs *httpServer) handlerTLS(conn net.Conn) {
 		return
 	}
 
-	sshSession, exist := hs.sessionRegistry.Get(slug)
+	sshSession, ok := session.Clients[slug]
-	if !exist {
+	if !ok {
 		_, err = conn.Write([]byte("HTTP/1.1 301 Moved Permanently\r\n" +
 			fmt.Sprintf("Location: https://tunnl.live/tunnel-not-found?slug=%s\r\n", slug) +
 			"Content-Length: 0\r\n" +

server/server.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"log"
 	"net"
-	"tunnel_pls/internal/config"
+	"net/http"
-	"tunnel_pls/session"
+	"tunnel_pls/utils"
 
 	"golang.org/x/crypto/ssh"
 )
@@ -13,36 +13,41 @@ import (
 type Server struct {
 	conn       *net.Listener
 	config     *ssh.ServerConfig
-	sessionRegistry session.Registry
+	httpServer *http.Server
 }
 
-func NewServer(sshConfig *ssh.ServerConfig, sessionRegistry session.Registry) (*Server, error) {
+func (s *Server) GetConn() *net.Listener {
-	listener, err := net.Listen("tcp", fmt.Sprintf(":%s", config.Getenv("PORT", "2200")))
+	return s.conn
+}
+
+func (s *Server) GetConfig() *ssh.ServerConfig {
+	return s.config
+}
+
+func (s *Server) GetHttpServer() *http.Server {
+	return s.httpServer
+}
+
+func NewServer(config *ssh.ServerConfig) *Server {
+	listener, err := net.Listen("tcp", fmt.Sprintf(":%s", utils.Getenv("PORT", "2200")))
 	if err != nil {
 		log.Fatalf("failed to listen on port 2200: %v", err)
-		return nil, err
+		return nil
 	}
-
+	if utils.Getenv("TLS_ENABLED", "false") == "true" {
-	HttpServer := NewHTTPServer(sessionRegistry)
+		err = NewHTTPSServer()
-	err = HttpServer.ListenAndServe()
-	if err != nil {
-		log.Fatalf("failed to start http server: %v", err)
-		return nil, err
-	}
-
-	if config.Getenv("TLS_ENABLED", "false") == "true" {
-		err = HttpServer.ListenAndServeTLS()
 		if err != nil {
 			log.Fatalf("failed to start https server: %v", err)
-			return nil, err
 		}
 	}
-
+	err = NewHTTPServer()
+	if err != nil {
+		log.Fatalf("failed to start http server: %v", err)
+	}
 	return &Server{
 		conn:   &listener,
-		config:          sshConfig,
+		config: config,
-		sessionRegistry: sessionRegistry,
+	}
-	}, nil
 }
 
 func (s *Server) Start() {
@@ -57,26 +62,3 @@ func (s *Server) Start() {
 		go s.handleConnection(conn)
 	}
 }
-
-func (s *Server) handleConnection(conn net.Conn) {
-	sshConn, chans, forwardingReqs, err := ssh.NewServerConn(conn, s.config)
-	if err != nil {
-		log.Printf("failed to establish SSH connection: %v", err)
-		err := conn.Close()
-		if err != nil {
-			log.Printf("failed to close SSH connection: %v", err)
-			return
-		}
-		return
-	}
-
-	log.Println("SSH connection established:", sshConn.User())
-
-	sshSession := session.New(sshConn, forwardingReqs, chans, s.sessionRegistry)
-	err = sshSession.Start()
-	if err != nil {
-		log.Printf("SSH session ended with error: %v", err)
-		return
-	}
-	return
-}

server/tls.go

@@ -10,7 +10,7 @@ import (
 	"os"
 	"sync"
 	"time"
-	"tunnel_pls/internal/config"
+	"tunnel_pls/utils"
 
 	"github.com/caddyserver/certmagic"
 	"github.com/libdns/cloudflare"
@@ -92,7 +92,7 @@ func NewTLSConfig(domain string) (*tls.Config, error) {
 }
 
 func isACMEConfigComplete() bool {
-	cfAPIToken := config.Getenv("CF_API_TOKEN", "")
+	cfAPIToken := utils.Getenv("CF_API_TOKEN", "")
 	return cfAPIToken != ""
 }
 
@@ -241,9 +241,9 @@ func (tm *tlsManager) initCertMagic() error {
 		return fmt.Errorf("failed to create cert storage directory: %w", err)
 	}
 
-	acmeEmail := config.Getenv("ACME_EMAIL", "admin@"+tm.domain)
+	acmeEmail := utils.Getenv("ACME_EMAIL", "admin@"+tm.domain)
-	cfAPIToken := config.Getenv("CF_API_TOKEN", "")
+	cfAPIToken := utils.Getenv("CF_API_TOKEN", "")
-	acmeStaging := config.Getenv("ACME_STAGING", "false") == "true"
+	acmeStaging := utils.Getenv("ACME_STAGING", "false") == "true"
 
 	if cfAPIToken == "" {
 		return fmt.Errorf("CF_API_TOKEN environment variable is required for automatic certificate generation")

session/forwarder/forwarder.go

@@ -10,16 +10,16 @@ import (
 	"strconv"
 	"sync"
 	"time"
-	"tunnel_pls/internal/config"
 	"tunnel_pls/session/slug"
 	"tunnel_pls/types"
+	"tunnel_pls/utils"
 
 	"golang.org/x/crypto/ssh"
 )
 
 var bufferPool = sync.Pool{
 	New: func() interface{} {
-		bufSize := config.GetBufferSize()
+		bufSize := utils.GetBufferSize()
 		return make([]byte, bufSize)
 	},
 }
@@ -152,26 +152,25 @@ func (f *Forwarder) HandleConnection(dst io.ReadWriter, src ssh.Channel, remoteA
 
 	log.Printf("Handling new forwarded connection from %s", remoteAddr)
 
-	var wg sync.WaitGroup
+	done := make(chan struct{}, 2)
-	wg.Add(2)
 
 	go func() {
-		defer wg.Done()
-		_, err := copyWithBuffer(dst, src)
-		if err != nil && !errors.Is(err, io.EOF) && !errors.Is(err, net.ErrClosed) {
-			log.Printf("Error copying src→dst: %v", err)
-		}
-	}()
-
-	go func() {
-		defer wg.Done()
 		_, err := copyWithBuffer(src, dst)
 		if err != nil && !errors.Is(err, io.EOF) && !errors.Is(err, net.ErrClosed) {
-			log.Printf("Error copying dst→src: %v", err)
+			log.Printf("Error copying from conn.Reader to channel: %v", err)
 		}
+		done <- struct{}{}
 	}()
 
-	wg.Wait()
+	go func() {
+		_, err := copyWithBuffer(dst, src)
+		if err != nil && !errors.Is(err, io.EOF) && !errors.Is(err, net.ErrClosed) {
+			log.Printf("Error copying from channel to conn.Writer: %v", err)
+		}
+		done <- struct{}{}
+	}()
+
+	<-done
 }
 
 func (f *Forwarder) SetType(tunnelType types.TunnelType) {

session/handler.go

@@ -7,9 +7,10 @@ import (
 	"log"
 	"net"
 	portUtil "tunnel_pls/internal/port"
-	"tunnel_pls/internal/random"
 	"tunnel_pls/types"
 
+	"tunnel_pls/utils"
+
 	"golang.org/x/crypto/ssh"
 )
 
@@ -106,6 +107,7 @@ func (s *SSHSession) HandleTCPIPForward(req *ssh.Request) {
 	}
 
 	portToBind := uint16(rawPortToBind)
+
 	if isBlockedPort(portToBind) {
 		log.Printf("Port %d is blocked or restricted", portToBind)
 		err := req.Reply(false, nil)
@@ -163,9 +165,16 @@ func (s *SSHSession) HandleTCPIPForward(req *ssh.Request) {
 }
 
 func (s *SSHSession) HandleHTTPForward(req *ssh.Request, portToBind uint16) {
-	slug := random.GenerateRandomString(20)
+	slug := generateUniqueSlug()
+	if slug == "" {
+		err := req.Reply(false, nil)
+		if err != nil {
+			log.Println("Failed to reply to request:", err)
+		}
+		return
+	}
 
-	if !s.registry.Register(slug, s) {
+	if !registerClient(slug, s) {
 		log.Printf("Failed to register client with slug: %s", slug)
 		err := req.Reply(false, nil)
 		if err != nil {
@@ -178,7 +187,7 @@ func (s *SSHSession) HandleHTTPForward(req *ssh.Request, portToBind uint16) {
 	err := binary.Write(buf, binary.BigEndian, uint32(portToBind))
 	if err != nil {
 		log.Println("Failed to write port to buffer:", err)
-		s.registry.Remove(slug)
+		unregisterClient(slug)
 		err = req.Reply(false, nil)
 		if err != nil {
 			log.Println("Failed to reply to request:", err)
@@ -190,7 +199,7 @@ func (s *SSHSession) HandleHTTPForward(req *ssh.Request, portToBind uint16) {
 	err = req.Reply(true, buf.Bytes())
 	if err != nil {
 		log.Println("Failed to reply to request:", err)
-		s.registry.Remove(slug)
+		unregisterClient(slug)
 		err = req.Reply(false, nil)
 		if err != nil {
 			log.Println("Failed to reply to request:", err)
@@ -263,6 +272,25 @@ func (s *SSHSession) HandleTCPForward(req *ssh.Request, addr string, portToBind
 	s.interaction.Start()
 }
 
+func generateUniqueSlug() string {
+	maxAttempts := 5
+
+	for i := 0; i < maxAttempts; i++ {
+		slug := utils.GenerateRandomString(20)
+
+		clientsMutex.RLock()
+		_, exists := Clients[slug]
+		clientsMutex.RUnlock()
+
+		if !exists {
+			return slug
+		}
+	}
+
+	log.Println("Failed to generate unique slug after multiple attempts")
+	return ""
+}
+
 func readSSHString(reader *bytes.Reader) (string, error) {
 	var length uint32
 	if err := binary.Read(reader, binary.BigEndian, &length); err != nil {

session/interaction/interaction.go

@@ -6,10 +6,9 @@ import (
 	"log"
 	"strings"
 	"time"
-	"tunnel_pls/internal/config"
-	"tunnel_pls/internal/random"
 	"tunnel_pls/session/slug"
 	"tunnel_pls/types"
+	"tunnel_pls/utils"
 
 	"github.com/charmbracelet/bubbles/help"
 	"github.com/charmbracelet/bubbles/key"
@@ -114,7 +113,7 @@ func (i *Interaction) SetChannel(channel ssh.Channel) {
 	i.channel = channel
 }
 
-func (i *Interaction) SetSlugModificator(modificator func(oldSlug, newSlug string) (success bool)) {
+func (i *Interaction) SetSlugModificator(modificator func(oldSlug, newSlug string) bool) {
 	i.updateClientSlug = modificator
 }
 
@@ -199,11 +198,6 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		}
 
 		if m.editingSlug {
-			if m.tunnelType != types.HTTP {
-				m.editingSlug = false
-				m.slugError = ""
-				return m, tea.Batch(tea.ClearScreen, textinput.Blink)
-			}
 			switch msg.String() {
 			case "esc":
 				m.editingSlug = false
@@ -728,9 +722,9 @@ func (m model) View() string {
 func (i *Interaction) Start() {
 	lipgloss.SetColorProfile(termenv.TrueColor)
 
-	domain := config.Getenv("DOMAIN", "localhost")
+	domain := utils.Getenv("DOMAIN", "localhost")
 	protocol := "http"
-	if config.Getenv("TLS_ENABLED", "false") == "true" {
+	if utils.Getenv("TLS_ENABLED", "false") == "true" {
 		protocol = "https"
 	}
 
@@ -817,7 +811,7 @@ func buildURL(protocol, subdomain, domain string) string {
 }
 
 func generateRandomSubdomain() string {
-	return random.GenerateRandomString(20)
+	return utils.GenerateRandomString(20)
 }
 
 func isValidSlug(slug string) bool {

session/registry.go

@@ -1,66 +0,0 @@
-package session
-
-import "sync"
-
-type Registry interface {
-	Get(slug string) (session *SSHSession, exist bool)
-	Update(oldSlug, newSlug string) (success bool)
-	Register(slug string, session *SSHSession) (success bool)
-	Remove(slug string)
-}
-type registry struct {
-	mu      sync.RWMutex
-	clients map[string]*SSHSession
-}
-
-func NewRegistry() Registry {
-	return &registry{
-		clients: make(map[string]*SSHSession),
-	}
-}
-
-func (r *registry) Get(slug string) (session *SSHSession, exist bool) {
-	r.mu.RLock()
-	defer r.mu.RUnlock()
-
-	session, exist = r.clients[slug]
-	return
-}
-
-func (r *registry) Update(oldSlug, newSlug string) (success bool) {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-
-	if _, exists := r.clients[newSlug]; exists && newSlug != oldSlug {
-		return false
-	}
-
-	client, ok := r.clients[oldSlug]
-	if !ok {
-		return false
-	}
-
-	delete(r.clients, oldSlug)
-	client.slugManager.Set(newSlug)
-	r.clients[newSlug] = client
-	return true
-}
-
-func (r *registry) Register(slug string, session *SSHSession) (success bool) {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-
-	if _, exists := r.clients[slug]; exists {
-		return false
-	}
-
-	r.clients[slug] = session
-	return true
-}
-
-func (r *registry) Remove(slug string) {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-
-	delete(r.clients, slug)
-}

session/session.go

@@ -1,18 +1,23 @@
 package session
 
 import (
-	"fmt"
 	"log"
+	"sync"
 	"time"
-	"tunnel_pls/internal/config"
 	"tunnel_pls/session/forwarder"
 	"tunnel_pls/session/interaction"
 	"tunnel_pls/session/lifecycle"
 	"tunnel_pls/session/slug"
+	"tunnel_pls/utils"
 
 	"golang.org/x/crypto/ssh"
 )
 
+var (
+	clientsMutex sync.RWMutex
+	Clients      = make(map[string]*SSHSession)
+)
+
 type Session interface {
 	HandleGlobalRequest(ch <-chan *ssh.Request)
 	HandleTCPIPForward(req *ssh.Request)
@@ -21,13 +26,10 @@ type Session interface {
 }
 
 type SSHSession struct {
-	initialReq    <-chan *ssh.Request
-	sshReqChannel <-chan ssh.NewChannel
 	lifecycle   lifecycle.SessionLifecycle
 	interaction interaction.Controller
 	forwarder   forwarder.ForwardingController
 	slugManager slug.Manager
-	registry      Registry
 }
 
 func (s *SSHSession) GetLifecycle() lifecycle.SessionLifecycle {
@@ -46,64 +48,55 @@ func (s *SSHSession) GetSlugManager() slug.Manager {
 	return s.slugManager
 }
 
-func New(conn *ssh.ServerConn, forwardingReq <-chan *ssh.Request, sshChan <-chan ssh.NewChannel, sessionRegistry Registry) *SSHSession {
+func New(conn *ssh.ServerConn, forwardingReq <-chan *ssh.Request, sshChan <-chan ssh.NewChannel) {
 	slugManager := slug.NewManager()
 	forwarderManager := forwarder.NewForwarder(slugManager)
 	interactionManager := interaction.NewInteraction(slugManager, forwarderManager)
 	lifecycleManager := lifecycle.NewLifecycle(conn, forwarderManager, slugManager)
 
 	interactionManager.SetLifecycle(lifecycleManager)
-	interactionManager.SetSlugModificator(sessionRegistry.Update)
+	interactionManager.SetSlugModificator(updateClientSlug)
 	forwarderManager.SetLifecycle(lifecycleManager)
-	lifecycleManager.SetUnregisterClient(sessionRegistry.Remove)
+	lifecycleManager.SetUnregisterClient(unregisterClient)
 
-	return &SSHSession{
+	session := &SSHSession{
-		initialReq:    forwardingReq,
-		sshReqChannel: sshChan,
 		lifecycle:   lifecycleManager,
 		interaction: interactionManager,
 		forwarder:   forwarderManager,
 		slugManager: slugManager,
-		registry:      sessionRegistry,
-	}
 	}
 
-func (s *SSHSession) Start() error {
+	var once sync.Once
-	channel := <-s.sshReqChannel
+	for channel := range sshChan {
 		ch, reqs, err := channel.Accept()
 		if err != nil {
 			log.Printf("failed to accept channel: %v", err)
-		return err
+			continue
 		}
-	go s.HandleGlobalRequest(reqs)
+		once.Do(func() {
+			session.lifecycle.SetChannel(ch)
+			session.interaction.SetChannel(ch)
 
-	tcpipReq := s.waitForTCPIPForward()
+			tcpipReq := session.waitForTCPIPForward(forwardingReq)
 			if tcpipReq == nil {
-		_, err := ch.Write([]byte(fmt.Sprintf("Port forwarding request not received. Ensure you ran the correct command with -R flag. Example: ssh %s -p %s -R 80:localhost:3000", config.Getenv("DOMAIN", "localhost"), config.Getenv("PORT", "2200"))))
+				log.Printf("Port forwarding request not received. Ensure you ran the correct command with -R flag. Example: ssh %s -p %s -R 80:localhost:3000", utils.Getenv("DOMAIN", "localhost"), utils.Getenv("PORT", "2200"))
-		if err != nil {
+				if err := session.lifecycle.Close(); err != nil {
-			return err
-		}
-		if err := s.lifecycle.Close(); err != nil {
 					log.Printf("failed to close session: %v", err)
 				}
-		return fmt.Errorf("No forwarding Request")
+				return
 			}
-
+			go session.HandleTCPIPForward(tcpipReq)
-	s.lifecycle.SetChannel(ch)
+		})
-	s.interaction.SetChannel(ch)
+		session.HandleGlobalRequest(reqs)
-
+	}
-	s.HandleTCPIPForward(tcpipReq)
+	if err := session.lifecycle.Close(); err != nil {
-
-	if err := s.lifecycle.Close(); err != nil {
 		log.Printf("failed to close session: %v", err)
-		return err
 	}
-	return nil
 }
 
-func (s *SSHSession) waitForTCPIPForward() *ssh.Request {
+func (s *SSHSession) waitForTCPIPForward(forwardingReq <-chan *ssh.Request) *ssh.Request {
 	select {
-	case req, ok := <-s.initialReq:
+	case req, ok := <-forwardingReq:
 		if !ok {
 			log.Println("Forwarding request channel closed")
 			return nil
@@ -121,3 +114,41 @@ func (s *SSHSession) waitForTCPIPForward() *ssh.Request {
 		return nil
 	}
 }
+
+func updateClientSlug(oldSlug, newSlug string) bool {
+	clientsMutex.Lock()
+	defer clientsMutex.Unlock()
+
+	if _, exists := Clients[newSlug]; exists && newSlug != oldSlug {
+		return false
+	}
+
+	client, ok := Clients[oldSlug]
+	if !ok {
+		return false
+	}
+
+	delete(Clients, oldSlug)
+	client.slugManager.Set(newSlug)
+	Clients[newSlug] = client
+	return true
+}
+
+func registerClient(slug string, session *SSHSession) bool {
+	clientsMutex.Lock()
+	defer clientsMutex.Unlock()
+
+	if _, exists := Clients[slug]; exists {
+		return false
+	}
+
+	Clients[slug] = session
+	return true
+}
+
+func unregisterClient(slug string) {
+	clientsMutex.Lock()
+	defer clientsMutex.Unlock()
+
+	delete(Clients, slug)
+}

session/slug/slug.go

@@ -1,5 +1,7 @@
 package slug
 
+import "sync"
+
 type Manager interface {
 	Get() string
 	Set(slug string)
@@ -7,18 +9,24 @@ type Manager interface {
 
 type manager struct {
 	slug   string
+	slugMu sync.RWMutex
 }
 
 func NewManager() Manager {
 	return &manager{
 		slug:   "",
+		slugMu: sync.RWMutex{},
 	}
 }
 
 func (s *manager) Get() string {
+	s.slugMu.RLock()
+	defer s.slugMu.RUnlock()
 	return s.slug
 }
 
 func (s *manager) Set(slug string) {
+	s.slugMu.Lock()
 	s.slug = slug
+	s.slugMu.Unlock()
 }

utils/utils.go

@@ -1,4 +1,4 @@
-package key
+package utils
 
 import (
 	"crypto/rand"
@@ -6,12 +6,54 @@ import (
 	"crypto/x509"
 	"encoding/pem"
 	"log"
+	mathrand "math/rand"
 	"os"
 	"path/filepath"
+	"strconv"
+	"strings"
+	"time"
 
+	"github.com/joho/godotenv"
 	"golang.org/x/crypto/ssh"
 )
 
+func init() {
+	if _, err := os.Stat(".env"); err == nil {
+		if err := godotenv.Load(".env"); err != nil {
+			log.Printf("Warning: Failed to load .env file: %s", err)
+		}
+	}
+}
+
+func GenerateRandomString(length int) string {
+	const charset = "abcdefghijklmnopqrstuvwxyz"
+	seededRand := mathrand.New(mathrand.NewSource(time.Now().UnixNano() + int64(mathrand.Intn(9999))))
+	var result strings.Builder
+	for i := 0; i < length; i++ {
+		randomIndex := seededRand.Intn(len(charset))
+		result.WriteString(string(charset[randomIndex]))
+	}
+	return result.String()
+}
+
+func Getenv(key, defaultValue string) string {
+	val := os.Getenv(key)
+	if val == "" {
+		val = defaultValue
+	}
+
+	return val
+}
+
+func GetBufferSize() int {
+	sizeStr := Getenv("BUFFER_SIZE", "32768")
+	size, err := strconv.Atoi(sizeStr)
+	if err != nil || size < 4096 || size > 1048576 {
+		return 32768
+	}
+	return size
+}
+
 func GenerateSSHKeyIfNotExist(keyPath string) error {
 	if _, err := os.Stat(keyPath); err == nil {
 		log.Printf("SSH key already exists at %s", keyPath)

version/version.go

@@ -1,17 +0,0 @@
-package version
-
-import "fmt"
-
-var (
-	Version   = "dev"
-	BuildDate = "unknown"
-	Commit    = "unknown"
-)
-
-func GetVersion() string {
-	return fmt.Sprintf("tunnel_pls %s (commit: %s, built: %s)", Version, Commit, BuildDate)
-}
-
-func GetShortVersion() string {
-	return Version
-}