Merge pull request #64 from antoniomika/admin_features

Added admin features
antoniomika · Dec 26, 2019 · 71e5b6e · 71e5b6e
2 parents 7939ecd + 839a731
commit 71e5b6e
Show file tree

Hide file tree

Showing 14 changed files with 972 additions and 14 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -14,20 +14,22 @@ jobs:
       uses: crazy-max/ghaction-docker-buildx@v1
       with:
         version: latest
-    - name: Login to GitHub Docker Registry
+    - name: Login to Docker Registry
       env:
         DOCKER_USERNAME: ${{ secrets.GITHUB_DOCKER_USERNAME }}
         DOCKER_PASSWORD: ${{ secrets.GITHUB_DOCKER_PASSWORD }}
       run: echo ${DOCKER_PASSWORD} | docker login -u ${DOCKER_USERNAME} --password-stdin
     - name: Build and push the Docker images
       run: |
+        BRANCH_NAME="${GITHUB_REF#refs/heads/}"
         DATE="$(date -u +%Y-%m-%dT%H:%M:%SZ)"
+        REF="${BRANCH_NAME:-master}"
         OTHER_TAGS=""
-        REF="master"
+
         if [[ ${GITHUB_REF} =~ ^refs\/tags\/v.*$ ]]
         then
           REF="${GITHUB_REF//refs\/tags\/}"
-          OTHER_TAGS="${OTHER_TAGS} -t ${GITHUB_REPOSITORY}:${REF} -t ${GITHUB_REPOSITORY}:latest"
+          OTHER_TAGS="${OTHER_TAGS} -t ${GITHUB_REPOSITORY}:latest"
         fi
 
         docker buildx build \
@@ -37,4 +39,5 @@ jobs:
           --build-arg COMMIT=${GITHUB_SHA} \
           --build-arg DATE=${DATE} \
           -t ${GITHUB_REPOSITORY}:${GITHUB_SHA} \
+          -t ${GITHUB_REPOSITORY}:${REF} \
           ${OTHER_TAGS} .
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -31,5 +31,5 @@ archives:
     files:
       - LICENSE*
       - README*
-      - keys/
       - pubkeys/
+      - templates/
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -23,7 +23,9 @@
         "-sish.bindrandom=false",
         "-sish.tcpalias=true",
         "-sish.proxyprotoenabled=false",
-        "-sish.logtoclient=true"
+        "-sish.logtoclient=true",
+        "-sish.adminenabled=true",
+        "-sish.serviceconsoleenabled=true"
       ]
     }
   ]

diff --git a/Dockerfile b/Dockerfile
@@ -26,7 +26,10 @@ FROM scratch
 LABEL maintainer="Antonio Mika <[email protected]>"
 
 WORKDIR /app
-COPY --from=builder /go/bin/sish /app/sish
+
 COPY --from=builder /tmp /tmp
+COPY --from=builder /app/pubkeys /app/pubkeys
+COPY --from=builder /app/templates /app/templates
+COPY --from=builder /go/bin/sish /app/sish
 
 ENTRYPOINT ["/app/sish"]
diff --git a/README.md b/README.md
@@ -102,6 +102,12 @@ sh-3.2# ./sish -h
 Usage of ./sish:
   -sish.addr string
         The address to listen for SSH connections (default "localhost:2222")
+  -sish.adminenabled
+        Whether or not to enable the admin console
+  -sish.admintoken string
+        The token to use for admin access (default "S3Cr3tP4$$W0rD")
+  -sish.appendusertosubdomain
+        Whether or not to append the user to the subdomain
   -sish.auth
         Whether or not to require auth on the SSH service
   -sish.bannedcountries string
@@ -154,6 +160,10 @@ Usage of ./sish:
         Whether or not to redirect the root domain (default true)
   -sish.redirectrootlocation string
         Where to redirect the root domain to (default "https://github.com/antoniomika/sish")
+  -sish.serviceconsoleenabled
+        Whether or not to enable the admin console for each service and send the info to users
+  -sish.serviceconsoletoken string
+        The token to use for service access. Auto generated if empty.
   -sish.subdomainlen int
         The length of the random subdomain to generate (default 3)
   -sish.tcpalias

diff --git a/channels.go b/channels.go
@@ -122,7 +122,7 @@ func handleAlias(newChannel ssh.NewChannel, sshConn *SSHConnection, state *State
 		return
 	}
 
-	sshConn.Listeners.Store(conn.RemoteAddr(), nil)
+	sshConn.Listeners.Store(conn.RemoteAddr(), conn)
 
 	copyBoth(conn, connection)
-Original file line number
+Diff line change
@@ Expand Up @@
     		return
     	}
-    	sshConn.Listeners.Store(conn.RemoteAddr(), nil)
+    	sshConn.Listeners.Store(conn.RemoteAddr(), conn)
     	copyBoth(conn, connection)
@@ Expand Down @@