all: reallocate server to cmd/occamyd

Author: changkun

Makefile

@@ -10,23 +10,19 @@ HOME = changkun.de/x/occamy
 IMAGE = occamy
 
 compile:
-	go build -mod vendor -x -o occamyd
+	go build -x -o occamyd cmd/occamyd/*
 .PHONY: compile
 
 build:
-	docker build -t $(IMAGE):$(VERSION) -t $(IMAGE):latest -f docker/Dockerfile .
+	docker build --platform linux/x86_64 -t $(IMAGE):$(VERSION) -t $(IMAGE):latest -f docker/Dockerfile .
 .PHONY: occamy
 
-run:
+up:
 	cd docker && docker-compose up -d
 
-stop:
+down:
 	cd docker && docker-compose down
 
-test:
-	go test -cover -coverprofile=cover.test -v ./...
-	go tool cover -html=cover.test -o cover.html
-
 clean:
 	docker images -f "dangling=true" -q | xargs docker rmi -f
 	docker image prune -f

server/connection.go renamed to cmd/occamyd/connection.go

@@ -2,13 +2,12 @@
 // Use of this source code is governed by a MIT
 // license that can be found in the LICENSE file.
 
-package server
+package main
 
 import (
 	"context"
 	"log"
 	"net/http"
-	"net/http/pprof"
 	"os"
 	"os/signal"
 	"sync"
@@ -28,7 +27,7 @@ func init() {
 // Run is an export method that serves occamy proxy
 func Run() {
 	proxy := &proxy{
-		sessions: make(map[string]*Session),
+		// sessions: make(map[string]*Session),
 		upgrader: &websocket.Upgrader{
 			ReadBufferSize:  protocol.MaxInstructionLength,
 			WriteBufferSize: protocol.MaxInstructionLength,
@@ -44,9 +43,7 @@ type proxy struct {
 	jwtm     *jwt.GinJWTMiddleware
 	upgrader *websocket.Upgrader
 	engine   *gin.Engine
-
-	mu       sync.Mutex
-	sessions map[string]*Session
+	sess     sync.Map // map[string]*Session
 }
 
 func (p *proxy) serve() {
@@ -90,9 +87,6 @@ func (p *proxy) routers() *gin.Engine {
 	auth := v1.Group("/connect")
 	auth.Use(p.jwtm.MiddlewareFunc())
 	auth.GET("", p.serveWS)
-	if gin.Mode() == gin.DebugMode {
-		p.profile()
-	}
 	return p.engine
 }
 
@@ -129,42 +123,3 @@ func (p *proxy) initJWT() {
 	}
 	p.jwtm = jwtm
 }
-
-// profile the standard HandlerFuncs from the net/http/pprof package with
-// the provided gin.Engine. prefixOptions is a optional. If not prefixOptions,
-// the default path prefix is used, otherwise first prefixOptions will be path prefix.
-//
-// Basic Usage:
-//
-// - use the pprof tool to look at the heap profile:
-//   go tool pprof http://0.0.0.0:5636/debug/pprof/heap
-// - look at a 30-second CPU profile:
-//   go tool pprof http://0.0.0.0:5636/debug/pprof/profile
-// - look at the goroutine blocking profile, after calling runtime.SetBlockProfileRate:
-//   go tool pprof http://0.0.0.0:5636/debug/pprof/block
-// - collect a 5-second execution trace:
-//   wget http://0.0.0.0:5636/debug/pprof/trace?seconds=5
-//
-func (p *proxy) profile() {
-	pprofHandler := func(h http.HandlerFunc) gin.HandlerFunc {
-		handler := http.HandlerFunc(h)
-		return func(c *gin.Context) {
-			handler.ServeHTTP(c.Writer, c.Request)
-		}
-	}
-	r := p.engine.Group("/debug/pprof")
-	{
-		r.GET("/", pprofHandler(pprof.Index))
-		r.GET("/cmdline", pprofHandler(pprof.Cmdline))
-		r.GET("/profile", pprofHandler(pprof.Profile))
-		r.POST("/symbol", pprofHandler(pprof.Symbol))
-		r.GET("/symbol", pprofHandler(pprof.Symbol))
-		r.GET("/trace", pprofHandler(pprof.Trace))
-		r.GET("/allocs", pprofHandler(pprof.Handler("allocs").ServeHTTP))
-		r.GET("/block", pprofHandler(pprof.Handler("block").ServeHTTP))
-		r.GET("/goroutine", pprofHandler(pprof.Handler("goroutine").ServeHTTP))
-		r.GET("/heap", pprofHandler(pprof.Handler("heap").ServeHTTP))
-		r.GET("/mutex", pprofHandler(pprof.Handler("mutex").ServeHTTP))
-		r.GET("/threadcreate", pprofHandler(pprof.Handler("threadcreate").ServeHTTP))
-	}
-}

occamy.go renamed to cmd/occamyd/occamyd.go

@@ -4,6 +4,4 @@
 
 package main
 
-import "changkun.de/x/occamy/server"
-
-func main() { server.Run() }
+func main() { Run() }

server/routers.go renamed to cmd/occamyd/routers.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT
 // license that can be found in the LICENSE file.
 
-package server
+package main
 
 import (
 	"log"
@@ -39,25 +39,25 @@ func (p *proxy) serveWS(c *gin.Context) {
 }
 
 func (p *proxy) routeConn(ws *websocket.Conn, jwt *config.JWT) (err error) {
-	p.mu.Lock()
-	s, ok := p.sessions[jwt.GenerateID()]
-	if ok {
-		err = s.Join(ws, jwt, false, func() { p.mu.Unlock() })
-		return
-	}
+	jwtId := jwt.GenerateID()
 
-	s, err = NewSession(jwt.Protocol)
+	// Creating a new session because there was no session yet.
+	s, err := NewSession(jwt.Protocol)
 	if err != nil {
-		p.mu.Unlock()
 		return
 	}
-
-	p.sessions[jwt.GenerateID()] = s
 	log.Printf("new session was created: %s", s.ID)
-	err = s.Join(ws, jwt, true, func() { p.mu.Unlock() }) // block here
 
-	p.mu.Lock()
-	delete(p.sessions, jwt.GenerateID())
-	p.mu.Unlock()
+	// Check if there are already a session. If so, join.
+	ss, loaded := p.sess.LoadOrStore(jwtId, s)
+	if loaded {
+		s.Close()
+		s = ss.(*Session)
+		log.Printf("already had old session: %s", s.ID)
+	}
+
+	err = s.Join(ws, jwt, true) // block here
+	p.sess.Delete(jwtId)
+	s.Close()
 	return
 }

server/session.go renamed to cmd/occamyd/session.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT
 // license that can be found in the LICENSE file.
 
-package server
+package main
 
 import (
 	"fmt"
@@ -13,7 +13,7 @@ import (
 	"syscall"
 
 	"changkun.de/x/occamy/internal/config"
-	"changkun.de/x/occamy/internal/lib"
+	"changkun.de/x/occamy/internal/guacd"
 	"changkun.de/x/occamy/internal/protocol"
 	"github.com/gorilla/websocket"
 )
@@ -24,14 +24,14 @@ type Session struct {
 	ID             string
 	connectedUsers uint64
 	once           sync.Once
-	client         *lib.Client // shared client in a session
+	client         *guacd.Client // shared client in a session
 }
 
 // NewSession creates a new occamy proxy session
 func NewSession(proto string) (*Session, error) {
 	runtime.LockOSThread() // without unlock to exit the Go thread
 
-	cli, err := lib.NewClient()
+	cli, err := guacd.NewClient()
 	if err != nil {
 		return nil, fmt.Errorf("occamy-lib: new client error: %w", err)
 	}
@@ -40,7 +40,7 @@ func NewSession(proto string) (*Session, error) {
 	s.client.InitLogLevel(config.Runtime.Mode)
 	err = s.client.LoadProtocolPlugin(proto)
 	if err != nil {
-		s.close()
+		s.Close()
 		return nil, fmt.Errorf("occamy-lib: load protocol plugin failed: %w", err)
 	}
 	s.ID = s.client.ID
@@ -51,26 +51,24 @@ func NewSession(proto string) (*Session, error) {
 // reading/writing from the socket via read/write threads. The given socket,
 // parser, and any associated resources will be freed unless the user is not
 // added successfully.
-func (s *Session) Join(ws *websocket.Conn, jwt *config.JWT, owner bool, unlock func()) error {
-	defer s.close()
-	lib.ResetErrors()
+func (s *Session) Join(ws *websocket.Conn, jwt *config.JWT, owner bool) error {
+	guacd.ResetErrors()
 
 	// 1. prepare socket pair
 	fds, err := syscall.Socketpair(syscall.AF_UNIX, syscall.SOCK_STREAM, 0)
 	if err != nil {
-		unlock()
 		return fmt.Errorf("new socket pair error: %w", err)
 	}
 
 	// 2. create guac socket using fds[0]
-	sock, err := lib.NewSocket(fds[0])
+	sock, err := guacd.NewSocket(fds[0])
 	if err != nil {
 		return fmt.Errorf("occamy-lib: create guac socket error: %w", err)
 	}
 	defer sock.Close()
 
 	// 3. create guac user using created guac socket
-	u, err := lib.NewUser(sock, s.client, owner, jwt)
+	u, err := guacd.NewUser(sock, s.client, owner, jwt)
 	if err != nil {
 		return fmt.Errorf("occamy-lib: create guac user error: %w", err)
 	}
@@ -83,10 +81,10 @@ func (s *Session) Join(ws *websocket.Conn, jwt *config.JWT, owner bool, unlock f
 	// 5. preparing connection
 	err = u.Prepare()
 	if err != nil {
-		unlock()
 		return fmt.Errorf("occamy-lib: handle user connection error: %w", err)
 	}
-	unlock()
+
+	log.Println("start to handle connections...")
 
 	// 6. handle connection
 	done := make(chan struct{}, 1)
@@ -102,7 +100,7 @@ func (s *Session) Join(ws *websocket.Conn, jwt *config.JWT, owner bool, unlock f
 }
 
 // Close closes a session.
-func (s *Session) close() {
+func (s *Session) Close() {
 	if atomic.LoadUint64(&s.connectedUsers) > 0 {
 		return
 	}

docker/Dockerfile

@@ -31,7 +31,7 @@ ENV LC_ALL=en_US.UTF-8                \
         libtool                       \
         libvncserver-devel            \
         make"                         \
-    GO_VERSION=1.15.7
+    GO_VERSION=1.17.3
 RUN yum -y update                                                         && \
     yum -y install epel-release $RUNTIME_DEPENDENCIES $BUILD_DEPENDENCIES && \
     # see: https://github.com/Zer0CoolX/guacamole-install-rhel/issues/78#issuecomment-534620524
@@ -49,7 +49,7 @@ RUN mkdir /golang                                      && \
     tar -xvf go${GO_VERSION}.linux-amd64.tar.gz
 ADD . .
 RUN ./guacamole/src/build-libguac.sh /occamy/guacamole
-RUN /golang/go/bin/go build -mod vendor -x -o occamyd
+RUN /golang/go/bin/go build -x -o occamyd cmd/occamyd/*
 
 EXPOSE 5636
 CMD ["/occamy/occamyd"]

docker/docker-compose.yaml

@@ -27,24 +27,24 @@ services:
     networks:
       occamy_network:
         ipv4_address: 172.16.239.11
-  rdp:
-    # user: root, password: Docker
-    image: umis/xubuntu-office-xrdp-desktop:v1.0
-    container_name: rdp
-    environment:
-      - "USERNAME:root"
-      - "PASSWORD:Docker"
-    networks:
-      occamy_network:
-        ipv4_address: 172.16.239.12
+  # rdp:
+  #   # user: root, password: Docker
+  #   image: umis/xubuntu-office-xrdp-desktop:v1.0
+  #   container_name: rdp
+  #   environment:
+  #     - "USERNAME:root"
+  #     - "PASSWORD:Docker"
+  #   networks:
+  #     occamy_network:
+  #       ipv4_address: 172.16.239.12
 
-  ssh:
-    # user: root, password: root
-    image: rastasheep/ubuntu-sshd:14.04
-    container_name: ssh
-    networks:
-      occamy_network:
-        ipv4_address: 172.16.239.13
+  # ssh:
+  #   # user: root, password: root
+  #   image: rastasheep/ubuntu-sshd:14.04
+  #   container_name: ssh
+  #   networks:
+  #     occamy_network:
+  #       ipv4_address: 172.16.239.13
 
 networks:
   occamy_network: