client(bootstrap): bootstrap webhook secret on init (#652)

ubclaunchpad · Mar 19, 2020 · 1dc8d02 · 1dc8d02
1 parent 818dbde
commit 1dc8d02
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 9 deletions.
diff --git a/client/bootstrap/bootstrap_test.go b/client/bootstrap/bootstrap_test.go
@@ -26,7 +26,8 @@ func newIntegrationClient() *client.Client {
 			SSHPort:      "69",
 		},
 		Daemon: &cfg.Daemon{
-			Port: "4303",
+			Port:          "4303",
+			WebHookSecret: "sekret",
 		},
 	}
 	return client.NewClient(remote, client.Options{

diff --git a/client/internal/compiled.go b/client/internal/compiled.go
diff --git a/client/scripts/daemon-up.sh b/client/scripts/daemon-up.sh
@@ -9,6 +9,7 @@ set -e
 DAEMON_RELEASE="%[1]s"
 DAEMON_PORT="%[2]s"
 HOST_ADDRESS="%[3]s"
+WEBHOOK_SECRET="%[4]s"
 
 # Inertia image details.
 DAEMON_NAME=inertia-daemon
@@ -62,4 +63,4 @@ sudo docker run -d \
     -e HOME="$HOME" \
     -e SSH_KNOWN_HOSTS='/app/host/.ssh/known_hosts' \
     --name "$DAEMON_NAME" \
-    "$IMAGE" "$HOST_ADDRESS" > /dev/null # 2>&1
+    "$IMAGE" "$HOST_ADDRESS --webhook.secret $WEBHOOK_SECRET" > /dev/null # 2>&1
diff --git a/client/sshc.go b/client/sshc.go
@@ -33,7 +33,7 @@ func (s *SSHClient) DaemonUp() error {
 		return fmt.Errorf("could not initialize script: %w", err)
 	}
 	var daemonCmdStr = fmt.Sprintf(string(scriptBytes),
-		s.remote.Version, s.remote.Daemon.Port, s.remote.IP)
+		s.remote.Version, s.remote.Daemon.Port, s.remote.IP, s.remote.Daemon.WebHookSecret)
 	return s.ssh.RunStream(daemonCmdStr, false)
 }
 

diff --git a/client/sshc_test.go b/client/sshc_test.go
@@ -57,7 +57,7 @@ func TestSSHClient_DaemonUp(t *testing.T) {
 	// Get original script for comparison
 	script, err := ioutil.ReadFile("scripts/daemon-up.sh")
 	assert.NoError(t, err)
-	actualCommand := fmt.Sprintf(string(script), "test", "4303", "127.0.0.1")
+	actualCommand := fmt.Sprintf(string(script), "test", "4303", "127.0.0.1", "")
 
 	// Get SSH runner
 	sshc, err := client.GetSSHClient()
@@ -68,6 +68,13 @@ func TestSSHClient_DaemonUp(t *testing.T) {
 	call, interact := session.RunStreamArgsForCall(0)
 	assert.False(t, interact)
 	assert.Equal(t, actualCommand, call)
+
+	// Check with WEBHOOK_SECRET provided, make sure the right command is run.
+	sshc.remote.Daemon.WebHookSecret = "sekret"
+	assert.NoError(t, sshc.DaemonUp())
+	call, interact = session.RunStreamArgsForCall(1)
+	assert.False(t, interact)
+	assert.Contains(t, call, "sekret")
 }
 
 func TestSSHClient_DaemonDown(t *testing.T) {

diff --git a/daemon/inertiad/daemon/up.go b/daemon/inertiad/daemon/up.go
@@ -30,7 +30,9 @@ func (s *Server) upHandler(w http.ResponseWriter, r *http.Request) {
 	var gitOpts = upReq.GitOptions
 
 	// apply configuration updates
-	s.state.WebhookSecret = upReq.WebHookSecret
+	if upReq.WebHookSecret != "" {
+		s.state.WebhookSecret = upReq.WebHookSecret
+	}
 	s.deployment.SetConfig(project.DeploymentConfig{
 		ProjectName:            upReq.Project,
 		BuildType:              upReq.BuildType,

diff --git a/daemon/inertiad/main.go b/daemon/inertiad/main.go
@@ -26,11 +26,15 @@ var runCmd = &cobra.Command{
 host address as an argument.
 
 Example:
-    inertia daemon run 0.0.0.0 -p 8081`,
+    inertia daemon run 0.0.0.0 --port 8081`,
 	Args: cobra.MinimumNArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		var conf = cfg.New()
 
+		// Init webhook secret
+		var webhookSecret, _ = cmd.Flags().GetString("webhook.secret")
+		conf.WebhookSecret = webhookSecret
+
 		// Set up deployment
 		var projectDatabasePath = path.Join(conf.DataDirectory, "project.db")
 		var projectDatabaseKeypath = path.Join(conf.SecretsDirectory, "db.key")