Unified ssh remote connection job and prov scripts job wrongly hardcode port 22

Wrong hardocofing of root user on /etc/mysql/conf.d/dbjob.cnf in compliance when non root user is used to ssh connect
Add option onpremise-ssh-start-db-script to enable start database with user define scripts
Add option onpremise-ssh-start-proxy-script to enable start proxy with user define scripts
Remove sudo from embeded ssh start scipts

Author: svaroqui

cluster/configurator/configurator_get.go

@@ -328,3 +328,17 @@ func (configurator *Configurator) GetProxyMemorySize() string {
 func (configurator *Configurator) GetProxyDiskSize() string {
 	return configurator.ClusterConfig.ProvProxDisk
 }
+
+func (configurator *Configurator) GetSshStartDBScript() string {
+	dbtype := "mariadb"
+	if configurator.ClusterConfig.OnPremiseSSHStartDbScript != "" {
+		return configurator.ClusterConfig.OnPremiseSSHStartDbScript
+	}
+	if configurator.HaveDBTag("rpm") {
+		return configurator.ClusterConfig.HttpRoot + "/static/configurator/onpremise/repository/redhat/" + dbtype + "/start"
+	}
+	if configurator.HaveDBTag("package") {
+		return configurator.ClusterConfig.HttpRoot + "/static/configurator/onpremise/package/linux/" + dbtype + "/start"
+	}
+	return configurator.ClusterConfig.HttpRoot + "/static/configurator/onpremise/repository/debian/" + dbtype + "/start"
+}

cluster/prov_onpremise_db.go

@@ -143,21 +143,8 @@ func (cluster *Cluster) OnPremiseStartDatabaseService(server *ServerMonitor) err
 		return err
 	}
 	defer client.Close()
-	//	err = cluster.OnPremiseSetEnv(client, server)
 
-	//if err != nil {
-	//	server.ClusterGroup.LogPrintf(LvlErr, "OnPremise start database failed in env setup : %s", err)
-	//	return err
-	//	}
-	dbtype := "mariadb"
-
-	cmd := cluster.Conf.HttpRoot + "/static/configurator/onpremise/repository/debian/" + dbtype + "/start"
-	if cluster.Configurator.HaveDBTag("rpm") {
-		cmd = cluster.Conf.HttpRoot + "/static/configurator/onpremise/repository/redhat/" + dbtype + "/start"
-	}
-	if cluster.Configurator.HaveDBTag("package") {
-		cmd = cluster.Conf.HttpRoot + "/static/configurator/onpremise/package/linux/" + dbtype + "/start"
-	}
+	cmd := cluster.Configurator.GetSshStartDBScript()
 
 	filerc, err := os.Open(cmd)
 	if err != nil {
@@ -174,7 +161,7 @@ func (cluster *Cluster) OnPremiseStartDatabaseService(server *ServerMonitor) err
 	if user, ok := server.ClusterGroup.APIUsers[adminuser]; ok {
 		adminpassword = user.Password
 	}
-	buf2 := strings.NewReader("sudo su - root\nexport MYSQL_ROOT_PASSWORD=\"" + server.Pass + "\";export REPLICATION_MANAGER_URL=\"https://" + server.ClusterGroup.Conf.MonitorAddress + ":" + server.ClusterGroup.Conf.APIPort + "\";export REPLICATION_MANAGER_USER=\"" + adminuser + "\";export REPLICATION_MANAGER_PASSWORD=\"" + adminpassword + "\";export REPLICATION_MANAGER_HOST_NAME=\"" + server.Host + "\";export REPLICATION_MANAGER_HOST_PORT=\"" + server.Port + "\";export REPLICATION_MANAGER_CLUSTER_NAME=\"" + server.ClusterGroup.Name + "\"\n")
+	buf2 := strings.NewReader("export MYSQL_ROOT_PASSWORD=\"" + server.Pass + "\";export REPLICATION_MANAGER_URL=\"https://" + server.ClusterGroup.Conf.MonitorAddress + ":" + server.ClusterGroup.Conf.APIPort + "\";export REPLICATION_MANAGER_USER=\"" + adminuser + "\";export REPLICATION_MANAGER_PASSWORD=\"" + adminpassword + "\";export REPLICATION_MANAGER_HOST_NAME=\"" + server.Host + "\";export REPLICATION_MANAGER_HOST_PORT=\"" + server.Port + "\";export REPLICATION_MANAGER_CLUSTER_NAME=\"" + server.ClusterGroup.Name + "\"\n")
 	r := io.MultiReader(buf2, buf)
 
 	var (
@@ -186,7 +173,7 @@ func (cluster *Cluster) OnPremiseStartDatabaseService(server *ServerMonitor) err
 	}
 	out := stdout.String()
 
-	server.ClusterGroup.LogPrintf(LvlInfo, "OnPremise start scipt: %s ,out: %s ,err: %s", cmd, out, stderr.String())
+	server.ClusterGroup.LogPrintf(LvlInfo, "OnPremise start script: %s ,out: %s ,err: %s", cmd, out, stderr.String())
 	/*	out, err := client.Cmd(cmd).SmartOutput()
 		if err != nil {
 			server.ClusterGroup.LogPrintf(LvlErr, "OnPremise start database : %s", err)

cluster/srv.go

@@ -1385,7 +1385,7 @@ func (server *ServerMonitor) Shutdown() error {
 		return errors.New("No database connection pool")
 	}
 	cmd := "SHUTDOWN"
-	if server.DBVersion.IsMariaDB() && server.DBVersion.Major >= 10 && server.DBVersion.Minor >= 4 {
+	if server.DBVersion.IsMariaDB() && server.DBVersion.Major >= 10 && server.DBVersion.Minor >= 4 && server.IsMaster() {
 		cmd = "SHUTDOWN WAIT FOR ALL SLAVES"
 	}
 	_, err := server.Conn.Exec(cmd)

cluster/srv_job.go

@@ -27,7 +27,6 @@ import (
 	"sync"
 	"time"
 
-	sshcli "github.com/helloyi/go-sshclient"
 	dumplingext "github.com/pingcap/dumpling/v4/export"
 	"github.com/signal18/replication-manager/config"
 	"github.com/signal18/replication-manager/utils/dbhelper"
@@ -874,11 +873,9 @@ func (server *ServerMonitor) JobRunViaSSH() error {
 	if server.ClusterGroup.IsInFailover() {
 		return errors.New("Cancel dbjob via ssh during failover")
 	}
-	user, _ := misc.SplitPair(server.ClusterGroup.Conf.OnPremiseSSHCredential)
-	key := server.ClusterGroup.OnPremiseGetSSHKey(user)
-	client, err := sshcli.DialWithKey(misc.Unbracket(server.Host)+":22", user, key)
+	client, err := server.GetCluster().OnPremiseConnect(server)
 	if err != nil {
-		server.ClusterGroup.LogPrintf(LvlErr, "JobRunViaSSH %s", err)
+		server.ClusterGroup.LogPrintf(LvlErr, "OnPremise run  job  %s", err)
 		return err
 	}
 	defer client.Close()
@@ -887,9 +884,9 @@ func (server *ServerMonitor) JobRunViaSSH() error {
 		stdout bytes.Buffer
 		stderr bytes.Buffer
 	)
-	filerc, err := os.Open(server.Datadir + "/init/init/dbjobs_new")
-	if err != nil {
-		server.ClusterGroup.LogPrintf(LvlErr, "JobRunViaSSH %s", err)
+	filerc, err2 := os.Open(server.Datadir + "/init/init/dbjobs_new")
+	if err2 != nil {
+		server.ClusterGroup.LogPrintf(LvlErr, "JobRunViaSSH %s", err2)
 		return errors.New("Cancel dbjob can't open script")
 
 	}
@@ -908,7 +905,7 @@ func (server *ServerMonitor) JobRunViaSSH() error {
 			return errors.New("JobRunViaSSH Setup env variables via SSH %s" + err.Error())
 		}*/
 
-	buf2 := strings.NewReader("sudo su - root\nexport MYSQL_ROOT_PASSWORD=\"" + server.Pass + "\"\n")
+	buf2 := strings.NewReader("export MYSQL_ROOT_PASSWORD=\"" + server.Pass + "\"\n")
 	r := io.MultiReader(buf2, buf)
 	if client.Shell().SetStdio(r, &stdout, &stderr).Start(); err != nil {
 		server.ClusterGroup.LogPrintf(LvlErr, "Database jobs run via SSH: %s", stderr.String())

config/config.go

@@ -332,6 +332,8 @@ type Config struct {
 	OnPremiseSSHPort                          int    `mapstructure:"onpremise-ssh-port" toml:"onpremise-ssh-port" json:"onpremiseSshPort"`
 	OnPremiseSSHCredential                    string `mapstructure:"onpremise-ssh-credential" toml:"onpremise-ssh-credential" json:"onpremiseSshCredential"`
 	OnPremiseSSHPrivateKey                    string `mapstructure:"onpremise-ssh-private-key" toml:"onpremise-ssh-private-key" json:"onpremiseSshPrivateKey"`
+	OnPremiseSSHStartDbScript                 string `mapstructure:"onpremise-ssh-start-db-script" toml:"onpremise-ssh-start-db-script" json:"onpremiseSshStartDbScript"`
+	OnPremiseSSHStartProxyScript              string `mapstructure:"onpremise-ssh-start-proxy-script" toml:"onpremise-ssh-start-proxy-script" json:"onpremiseSshStartProxyScript"`
 	ProvOpensvcP12Certificate                 string `mapstructure:"opensvc-p12-certificate" toml:"opensvc-p12-certificat" json:"opensvcP12Certificate"`
 	ProvOpensvcP12Secret                      string `mapstructure:"opensvc-p12-secret" toml:"opensvc-p12-secret" json:"opensvcP12Secret"`
 	ProvOpensvcUseCollectorAPI                bool   `mapstructure:"opensvc-use-collector-api" toml:"opensvc-use-collector-api" json:"opensvcUseCollectorApi"`

dashboard/static/configurator/onpremise/package/linux/mariadb/bootstrap

@@ -26,7 +26,7 @@ get $REPLICATION_MANAGER_URL/api/clusters/$REPLICATION_MANAGER_CLUSTER_NAME/serv
 if [ $? -eq 0 ]; then
 	mkdir /bootstrap
 	cat config.tar.gz  | tar xzvf - -C /bootstrap
-	chwon -R mysql:mysql /bootstrap
+	chown -R mysql:mysql /bootstrap
 	mkdir -p /var/lib/replication-manager/$REPLICATION_MANAGER_CLUSTER_NAME/$REPLICATION_MANAGER_HOST_NAME_$REPLICATION_MANAGER_HOST_PORT
 	cp -rpn /bootstrap/* /var/lib/replication-manager/$REPLICATION_MANAGER_CLUSTER_NAME/$REPLICATION_MANAGER_HOST_NAME_$REPLICATION_MANAGER_HOST_PORT/
 	rm -rf /var/lib/replication-manager/$REPLICATION_MANAGER_CLUSTER_NAME/$REPLICATION_MANAGER_HOST_NAME_$REPLICATION_MANAGER_HOST_PORT/etc/mysql/conf.d

dashboard/static/configurator/onpremise/package/linux/mariadb/start

@@ -24,13 +24,13 @@ function get {
 
 get $REPLICATION_MANAGER_URL/api/clusters/$REPLICATION_MANAGER_CLUSTER_NAME/servers/$REPLICATION_MANAGER_HOST_NAME/$REPLICATION_MANAGER_HOST_PORT/config > config.tar.gz
 if [ $? -eq 0 ]; then
-	mkdir /bootstrap
-	cat config.tar.gz  | tar xzvf - -C /bootstrap
-	chwon -R mysql:mysql /bootstrap
+	mkdir bootstrap
+	cat config.tar.gz  | tar xzvf - -C bootstrap
+	chown -R mysql:mysql bootstrap
 	mkdir -p /var/lib/replication-manager/$REPLICATION_MANAGER_CLUSTER_NAME/$REPLICATION_MANAGER_HOST_NAME_$REPLICATION_MANAGER_HOST_PORT
-	cp -rpn /bootstrap/* /var/lib/replication-manager/$REPLICATION_MANAGER_CLUSTER_NAME/$REPLICATION_MANAGER_HOST_NAME_$REPLICATION_MANAGER_HOST_PORT/
+	cp -rpn bootstrap/* /var/lib/replication-manager/$REPLICATION_MANAGER_CLUSTER_NAME/$REPLICATION_MANAGER_HOST_NAME_$REPLICATION_MANAGER_HOST_PORT/
 	rm -rf /var/lib/replication-manager/$REPLICATION_MANAGER_CLUSTER_NAME/$REPLICATION_MANAGER_HOST_NAME_$REPLICATION_MANAGER_HOST_PORT/etc/mysql/conf.d
-	cp -r /bootstrap/etc/mysql/* /var/lib/replication-manager/$REPLICATION_MANAGER_CLUSTER_NAME/$REPLICATION_MANAGER_HOST_NAME_$REPLICATION_MANAGER_HOST_PORT/etc/mysql/
+	cp -r bootstrap/etc/mysql/* /var/lib/replication-manager/$REPLICATION_MANAGER_CLUSTER_NAME/$REPLICATION_MANAGER_HOST_NAME_$REPLICATION_MANAGER_HOST_PORT/etc/mysql/
 	rm -rf config.tar.gz
-	rm -rf  /bootstrap
+	rm -rf  bootstrap
 fi

dashboard/static/configurator/onpremise/repository/debian/mariadb/bootstrap

@@ -30,8 +30,8 @@ if [ $? -eq 0 ]; then
 	cat config.tar.gz  | tar xzvf - -C /bootstrap
 	rm -rf  $REPLICATION_MANAGER_HOST_BASEDIR/var/lib/mysql
   mkdir -p $REPLICATION_MANAGER_HOST_BASEDIR/var/lib/mysql
-	chwon -R mysql:mysql  $REPLICATION_MANAGER_HOST_BASEDIR/var/lib/mysql
-  chwon -R mysql:mysql /bootstrap/data/.system
+	chown -R mysql:mysql  $REPLICATION_MANAGER_HOST_BASEDIR/var/lib/mysql
+  chown -R mysql:mysql /bootstrap/data/.system
 	cp -rpn /bootstrap/data/.system $REPLICATION_MANAGER_HOST_BASEDIR/var/lib/mysql
 	cp -r /bootstrap/etc/mysql/* $REPLICATION_MANAGER_HOST_BASEDIR/etc/mysql/
 	rm -rf config.tar.gz

dashboard/static/configurator/onpremise/repository/debian/mariadb/start

@@ -26,7 +26,7 @@ get $REPLICATION_MANAGER_URL/api/clusters/$REPLICATION_MANAGER_CLUSTER_NAME/serv
 if [ $? -eq 0 ]; then
 	mkdir /bootstrap
 	cat config.tar.gz  | tar xzvf - -C /bootstrap
-	chwon -R mysql:mysql /bootstrap/data/.system
+	chown -R mysql:mysql /bootstrap/data/.system
 	cp -rpn /bootstrap/data/.system /var/lib/mysql
 	cp -r /bootstrap/etc/mysql/* /etc/mysql/
 	rm -rf config.tar.gz

dashboard/static/configurator/onpremise/repository/redhat/mariadb/bootstrap

@@ -30,8 +30,8 @@ if [ $? -eq 0 ]; then
 	cat config.tar.gz  | tar xzvf - -C /bootstrap
 	rm -rf  $REPLICATION_MANAGER_HOST_BASEDIR/var/lib/mysql
   mkdir -p $REPLICATION_MANAGER_HOST_BASEDIR/var/lib/mysql
-	chwon -R mysql:mysql  $REPLICATION_MANAGER_HOST_BASEDIR/var/lib/mysql
-  chwon -R mysql:mysql /bootstrap/data/.system
+	chown -R mysql:mysql  $REPLICATION_MANAGER_HOST_BASEDIR/var/lib/mysql
+  chown -R mysql:mysql /bootstrap/data/.system
 	cp -rpn /bootstrap/data/.system $REPLICATION_MANAGER_HOST_BASEDIR/var/lib/mysql
 	cp -r /bootstrap/etc/mysql/* $REPLICATION_MANAGER_HOST_BASEDIR/etc/mysql/
 	rm -rf config.tar.gz

dashboard/static/configurator/onpremise/repository/redhat/mariadb/start

@@ -27,7 +27,7 @@ get $REPLICATION_MANAGER_URL/api/clusters/$REPLICATION_MANAGER_CLUSTER_NAME/serv
 if [ $? -eq 0 ]; then
 	mkdir /bootstrap
 	cat config.tar.gz  | tar xzvf - -C /bootstrap
-	chwon -R mysql:mysql /bootstrap/data/.system
+	chown -R mysql:mysql /bootstrap/data/.system
 	cp -rpn /bootstrap/data/.system /var/lib/mysql
 	cp -r /bootstrap/etc/mysql/* /etc/mysql/
 	rm -rf config.tar.gz

server/server_monitor.go

@@ -432,6 +432,8 @@ func init() {
 	monitorCmd.Flags().StringVar(&conf.OnPremiseSSHPrivateKey, "onpremise-ssh-private-key", "", "Private key for ssh if none use the user HOME directory")
 	monitorCmd.Flags().IntVar(&conf.OnPremiseSSHPort, "onpremise-ssh-port", 22, "Connect to host via SSH using ssh port")
 	monitorCmd.Flags().StringVar(&conf.OnPremiseSSHCredential, "onpremise-ssh-credential", "root:", "User:password for ssh if no password using current user private key")
+	monitorCmd.Flags().StringVar(&conf.OnPremiseSSHStartDbScript, "onpremise-ssh-start-db-script", "", "Run via ssh a custom script to start database")
+	monitorCmd.Flags().StringVar(&conf.OnPremiseSSHStartProxyScript, "onpremise-ssh-start-proxy-script", "", "Run via ssh a custom script to start proxy")
 	if WithProvisioning == "ON" {
 		monitorCmd.Flags().StringVar(&conf.ProvDatadirVersion, "prov-db-datadir-version", "10.2", "Empty datadir to deploy for localtest")
 		monitorCmd.Flags().StringVar(&conf.ProvDiskSystemSize, "prov-db-disk-system-size", "2", "Disk in g for micro service VM")