From f852237e33b332ecc56483b08dea78d552b67215 Mon Sep 17 00:00:00 2001
From: Javier Aguirre <contacto@javaguirre.net>
Date: Thu, 26 Jan 2023 23:13:33 +0100
Subject: [PATCH] [MM-48825] "plugin configured with a nil SecureConfig"
 warning logged when starting each plugin (#21869)

---
 plugin/supervisor.go | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/plugin/supervisor.go b/plugin/supervisor.go
index 49dc70bc54..8ac0f56784 100644
--- a/plugin/supervisor.go
+++ b/plugin/supervisor.go
@@ -4,7 +4,10 @@
 package plugin
 
 import (
+	"crypto/sha256"
 	"fmt"
+	"io"
+	"os"
 	"os/exec"
 	"path/filepath"
 	"runtime"
@@ -62,6 +65,14 @@ func newSupervisor(pluginInfo *model.BundleInfo, apiImpl API, driver Driver, par
 
 	cmd := exec.Command(executable)
 
+	// This doesn't add more security than before
+	// but removes the SecureConfig is nil warning.
+	// https://mattermost.atlassian.net/browse/MM-49167
+	pluginChecksum, err := getPluginExecutableChecksum(executable)
+	if err != nil {
+		return nil, fmt.Errorf("unable to generate a checksum for the plugin %s", pluginInfo.Path)
+	}
+
 	sup.client = plugin.NewClient(&plugin.ClientConfig{
 		HandshakeConfig: handshake,
 		Plugins:         pluginMap,
@@ -70,6 +81,10 @@ func newSupervisor(pluginInfo *model.BundleInfo, apiImpl API, driver Driver, par
 		SyncStderr:      wrappedLogger.With(mlog.String("source", "plugin_stderr")).StdLogWriter(),
 		Logger:          hclogAdaptedLogger,
 		StartTimeout:    time.Second * 3,
+		SecureConfig: &plugin.SecureConfig{
+			Checksum: pluginChecksum,
+			Hash:     sha256.New(),
+		},
 	})
 
 	rpcClient, err := sup.client.Client()
@@ -158,3 +173,21 @@ func (sup *supervisor) Implements(hookId int) bool {
 	defer sup.lock.RUnlock()
 	return sup.implemented[hookId]
 }
+
+func getPluginExecutableChecksum(executablePath string) ([]byte, error) {
+	pathHash := sha256.New()
+	file, err := os.Open(executablePath)
+
+	if err != nil {
+		return nil, err
+	}
+
+	defer file.Close()
+
+	_, err = io.Copy(pathHash, file)
+	if err != nil {
+		return nil, err
+	}
+
+	return pathHash.Sum(nil), nil
+}