Reorganized the placement of server and client files.

Author: rajch

.gitignore

@@ -56,3 +56,5 @@ public/js/client.js
 public/js/xterm.js
 public/css/xterm.css
 
+# output of all builds
+out/

Dockerfile

@@ -1,20 +1,24 @@
-FROM node:6.11-alpine AS nodebuilder
+FROM node:12.19-alpine AS nodebuilder
 RUN apk update && apk add git
-WORKDIR /root/vdc
+WORKDIR /vdc
 COPY client/ client/
 COPY public/ public/
-COPY package.json package.json
-RUN npm install && npm run build-public && npm run build-client-debug
+COPY package.json .
+COPY package-lock.json .
+RUN npm install && npm run build-public && npm run build-client-release
 
-FROM golang:1.8.3-alpine AS gobuilder
+FROM golang:1.16.4-alpine AS gobuilder
 RUN apk update && apk add git
-COPY server/ /go/src/github.com/rajch/voxel-dockerclient/server/
-WORKDIR /go/src/github.com/rajch/voxel-dockerclient/server/
-RUN go get golang.org/x/crypto/bcrypt
-RUN CGO_ENABLED='0' go build
+WORKDIR /vds
+COPY server/ ./server
+COPY go.* ./
+RUN go mod tidy
+RUN CGO_ENABLED='0' go build -o out/voxel-dockerserver server/*.go
 
-FROM scratch
-COPY --from=gobuilder /go/src/github.com/rajch/voxel-dockerclient/server/server /server/server
-COPY --from=nodebuilder /root/vdc/public/ public/
-ENTRYPOINT ["/server/server"]
-EXPOSE 80
+FROM scratch AS final
+WORKDIR /app
+COPY --from=nodebuilder /vdc/out .
+COPY --from=gobuilder /vds/out/voxel-dockerserver .
+ENTRYPOINT ["/app/voxel-dockerserver"]
+EXPOSE 8080
+VOLUME [ "/app/data" ]

docker-compose.yml

@@ -1,11 +1,16 @@
 version: '3.4'
 
+volumes:
+  vdcvol1:
+
 services:
   vdcservice:
+    image: rajchaudhuri/voxel-dockerclient:latest
     build:
       context: .
       dockerfile: Dockerfile
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
+      - vdcvol1:/app/data
     ports:
-      - 5000:8080
+      - 8080:8080

package.json

@@ -5,18 +5,16 @@
   "main": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build-public": "copyfiles -f node_modules/xterm/dist/xterm.js public/js && copyfiles -f node_modules/xterm/dist/xterm.css public/css",
-    "clean-public": "rimraf public/js/xterm.js public/css/xterm.css",
-    "build-client-debug": "browserify --debug client/main.js -o public/js/client.js",
-    "build-client-release": "browserify client/main.js -o public/js/client.js",
-    "clean-client": "rimraf public/js/client.js",
-    "build-server": "CGO_ENABLED='0' go build -o server/server server/*.go",
-    "clean-server": "rimraf server/server",
-    "build-docker": "docker build -f server/Dockerfile -t voxel-dockerclient:goserver .",
-    "build-all": "npm run build-public && npm run build-client-debug && npm run build-server && npm run build-docker",
-    "build-all-release": "npm run build-public && npm run build-client-release && npm run build-server && npm run build-docker",
-    "clean-all": "npm run clean-public && npm run clean-client && npm run clean-server",
-    "run-docker": "docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -p 8080:80 voxel-dockerclient:goserver",
+    "build-public": "copyfiles --up 1 public/css/* public/fonts/* public/js/* public/textures/* public/*.html out && copyfiles -f node_modules/xterm/dist/xterm.js out/js && copyfiles -f node_modules/xterm/dist/xterm.css out/css",
+    "clean-public": "rimraf out/css out/fonts out/js/*dialog.js out/js/xterm.js out/textures out/*.html",
+    "build-client-debug": "browserify --debug client/main.js -o out/js/client.js",
+    "build-client-release": "browserify client/main.js -o out/js/client.js",
+    "clean-client": "rimraf out/js/client.js",
+    "build-server": "CGO_ENABLED='0' go build -o out/voxel-dockerserver server/*.go",
+    "clean-server": "rimraf out/server",
+    "build-debug": "npm run build-public && npm run build-client-debug && npm run build-server",
+    "build": "npm run build-public && npm run build-client-release && npm run build-server",
+    "clean": "rimraf out/",
     "standard": "standard client/** public/js/**"
   },
   "repository": {

server/auth.go

@@ -8,8 +8,12 @@ import (
 	"time"
 )
 
-const timeOUT = 120
-const sessionCOOKIENAME = "vdc.sid"
+const timeOut = 120
+const sessionCookieName = "vdc.sid"
+
+const loginDialogFile = "logindialog.html"
+const loggedInDialogFile = "loggedindialog.html"
+const signUpDialogFile = "signupdialog.html"
 
 type session struct {
 	SessionID    string
@@ -31,9 +35,7 @@ func generateRandomString(n int) (string, error) {
 
 func authorize(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		// log.Printf("Sessions:\n%v\n", currentSessions)
-
-		sessioncookie, _ := r.Cookie(sessionCOOKIENAME)
+		sessioncookie, _ := r.Cookie(sessionCookieName)
 		if sessioncookie == nil {
 			http.Error(w, "Not logged in at all.", http.StatusUnauthorized)
 			return
@@ -52,7 +54,7 @@ func authorize(next http.Handler) http.Handler {
 		}
 
 		// Expire session on extra idle time
-		if time.Since(currentsession.lastActionAt).Seconds() > timeOUT {
+		if time.Since(currentsession.lastActionAt).Seconds() > timeOut {
 
 			// Expire cookie
 			sessioncookie.Expires = time.Now().AddDate(-1, 0, 0)
@@ -82,27 +84,26 @@ func handleLogin(w http.ResponseWriter, r *http.Request) {
 			password := r.PostFormValue("password")
 
 			// Validate user
-			//if username == "admin" && password == "Pass@word1" {
 			if validateUser(username, password) {
 
 				sessionid, _ := generateRandomString(12)
 
-				sessioncookie := http.Cookie{Name: sessionCOOKIENAME, Value: sessionid, Path: "/", HttpOnly: true}
+				sessioncookie := http.Cookie{Name: sessionCookieName, Value: sessionid, Path: "/", HttpOnly: true}
 				http.SetCookie(w, &sessioncookie)
 
 				sessionsLock.Lock()
 				currentSessions[sessionid] = session{SessionID: sessionid, lastActionAt: time.Now()}
 				sessionsLock.Unlock()
 
-				http.ServeFile(w, r, "../public/loggedindialog.html")
+				http.ServeFile(w, r, loggedInDialogFile)
 
 				return
 			}
 
 		}
 	}
 
-	http.ServeFile(w, r, "../public/logindialog.html")
+	http.ServeFile(w, r, loginDialogFile)
 }
 
 func handleSignUp(w http.ResponseWriter, r *http.Request) {
@@ -119,7 +120,7 @@ func handleSignUp(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	http.ServeFile(w, r, "../public/signupdialog.html")
+	http.ServeFile(w, r, signUpDialogFile)
 }
 
 func signin() http.Handler {
@@ -134,7 +135,7 @@ func signin() http.Handler {
 
 func signout() http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		sessioncookie, _ := r.Cookie(sessionCOOKIENAME)
+		sessioncookie, _ := r.Cookie(sessionCookieName)
 		if sessioncookie != nil {
 			sessionid := sessioncookie.Value
 
@@ -143,7 +144,7 @@ func signout() http.Handler {
 			sessionsLock.Unlock()
 		}
 
-		sessioncookie = &http.Cookie{Name: sessionCOOKIENAME, Path: "/", MaxAge: -1}
+		sessioncookie = &http.Cookie{Name: sessionCookieName, Path: "/", MaxAge: -1}
 		http.SetCookie(w, sessioncookie)
 	})
 }
@@ -154,7 +155,7 @@ func cleanupSessions() {
 	sessionsLock.Lock()
 
 	for key, value := range currentSessions {
-		if time.Since(value.lastActionAt) > (time.Second * timeOUT) {
+		if time.Since(value.lastActionAt) > (time.Second * timeOut) {
 			sessionsToClean = append(sessionsToClean, key)
 		}
 	}

server/dockerproxy.go

@@ -63,7 +63,7 @@ func initDockerProxy(mux *http.ServeMux) {
 		<-errc
 	})
 
-	// Hook the patch /api to the docker api
+	// Hook the path /api to the docker api
 	// Authorize it
 	mux.Handle("/api/", authorize(http.StripPrefix("/api/", revProxy)))
 

server/server.go

@@ -36,7 +36,8 @@ func main() {
 	// Set up docker proxy, routes /api (authorized) and /websocket
 	initDockerProxy(serverMux)
 
-	serverMux.Handle("/", http.FileServer(http.Dir("../public")))
+	// Set up static content from application directory
+	serverMux.Handle("/", http.FileServer(http.Dir(".")))
 
 	// Set up a custom server object
 	srv := http.Server{Addr: ":8080", Handler: serverMux}
@@ -83,7 +84,7 @@ func main() {
 	}()
 
 	// Start listening using the server
-	log.Println("Server starting...")
+	log.Println("Server starting on port 8080...")
 	if err := srv.ListenAndServe(); err != http.ErrServerClosed {
 		log.Fatalf("The server failed with the following error:%v\n", err)
 	}

server/user.go

@@ -9,16 +9,16 @@ import (
 	"golang.org/x/crypto/bcrypt"
 )
 
-var dataDIR = "/run/secrets/"
-var dataFILE = "/run/secrets/vdcpassword"
+var dataDIR = ""
+var dataFILE = "vdcpassword"
 
 const cryptCOST = 12
 
 var isUserInit bool
 var passwordhashstring string
 
 func initUser() {
-	dataDIR = filepath.Join(".", "../data")
+	dataDIR = filepath.Join(".", "data")
 	dataFILE = filepath.Join(dataDIR, "vdcpassword")
 
 	passwordhash, err := ioutil.ReadFile(dataFILE)
@@ -29,7 +29,7 @@ func initUser() {
 }
 
 func validateUser(username string, password string) bool {
-	if username == "admin" {
+	if isUserInit && username == "admin" {
 		err := bcrypt.CompareHashAndPassword([]byte(passwordhashstring), []byte(password))
 		if err == nil {
 			return true

stack.yml

@@ -0,0 +1,13 @@
+version: '3.4'
+
+volumes:
+  vdcvol1:
+
+services:
+  vdcservice:
+    image: rajchaudhuri/voxel-dockerclient:latest
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - vdcvol1:/app/data
+    ports:
+      - 8080:8080