Use a script to setup environment

gitpod-io · Oct 28, 2021 · 0033510 · 0033510
1 parent 9aee9f8
commit 0033510
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 0 deletions.
diff --git a/components/supervisor/BUILD.yaml b/components/supervisor/BUILD.yaml
@@ -19,6 +19,7 @@ packages:
     type: docker
     srcs:
       - "supervisor-config.json"
+      - ssh-connect.sh
     deps:
       - :app
       - components/supervisor/frontend:app

diff --git a/components/supervisor/leeway.Dockerfile b/components/supervisor/leeway.Dockerfile
@@ -20,5 +20,6 @@ COPY components-supervisor--app/supervisor \
 WORKDIR "/.supervisor/ssh"
 COPY components-supervisor-openssh--app/usr/sbin/sshd .
 COPY components-supervisor-openssh--app/usr/bin/ssh-keygen .
+COPY ssh-connect.sh .
 
 ENTRYPOINT ["/.supervisor/supervisor"]
diff --git a/components/supervisor/pkg/supervisor/ssh.go b/components/supervisor/pkg/supervisor/ssh.go
@@ -78,6 +78,8 @@ func (s *sshServer) handleConn(ctx context.Context, conn net.Conn) {
 		return
 	}
 
+	connectCommand := filepath.Join(filepath.Dir(bin), "ssh", "ssh-connect.sh")
+
 	args := []string{
 		"-iedD", "-f/dev/null",
 		"-oProtocol 2",
@@ -92,6 +94,7 @@ func (s *sshServer) handleConn(ctx context.Context, conn net.Conn) {
 		"-oPidFile /dev/null",
 		"-oUseDNS no", // Disable DNS lookups.
 		"-oSubsystem sftp internal-sftp",
+		"-oForceCommand " + connectCommand,
 	}
 
 	if os.Getenv("SUPERVISOR_DEBUG_ENABLE") != "" {

diff --git a/components/supervisor/ssh-connect.sh b/components/supervisor/ssh-connect.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+# Copyright (c) 2021 Gitpod GmbH. All rights reserved.
+# Licensed under the GNU Affero General Public License (AGPL).
+# See License-AGPL.txt in the project root for license information.
+
+
+if [ -f "${HOME}/.profile" ]; then
+    # shellcheck disable=SC1090
+    source ~/.profile
+fi;
+
+if  [ -z "$SSH_ORIGINAL_COMMAND" ]; then
+    $SHELL --login
+else
+    eval "${SSH_ORIGINAL_COMMAND}"
+fi