update getting launched user in various scripts

Author: yungwine

modules/backups.py

@@ -7,6 +7,7 @@
 
 from modules.module import MtcModule
 from mypylib.mypylib import color_print, ip2int, run_as_root, parse, MyPyClass
+from mytonctrl.utils import get_current_user
 from mytoninstaller.config import get_own_ip
 
 
@@ -29,8 +30,9 @@ def create_tmp_ton_dir(self):
 
     @staticmethod
     def run_create_backup(args):
+        user = get_current_user()
         backup_script_path = pkg_resources.resource_filename('mytonctrl', 'scripts/create_backup.sh')
-        return subprocess.run(["bash", backup_script_path] + args, timeout=5)
+        return subprocess.run(["bash", backup_script_path, "-u", user] + args, timeout=5)
 
     def create_backup(self, args):
         if len(args) > 1:
@@ -52,8 +54,9 @@ def create_backup(self, args):
 
     @staticmethod
     def run_restore_backup(args):
+        user = get_current_user()
         restore_script_path = pkg_resources.resource_filename('mytonctrl', 'scripts/restore_backup.sh')
-        return run_as_root(["bash", restore_script_path] + args)
+        return run_as_root(["bash", restore_script_path, "-u", user] + args)
 
     def restore_backup(self, args):
         if len(args) == 0 or len(args) > 3:

modules/btc_teleport.py

@@ -6,6 +6,7 @@
 
 from modules.module import MtcModule
 from mypylib.mypylib import run_as_root, color_print, bcolors, print_table
+from mytonctrl.utils import get_current_user
 
 
 class BtcTeleportModule(MtcModule):
@@ -59,12 +60,13 @@ def create_env_file(self, reinit=False):
     def add_daemon(self):
         start = f'{self.bin_dir}/oracle'
         script_path = pkg_resources.resource_filename('mytoninstaller', 'scripts/add2systemd.sh')
-        user = os.environ.get("USER", "root")
+        user = get_current_user()
         run_as_root(['bash', script_path, '-n', 'btc_teleport', '-u', user, '-g', user, '-s', start, '-w', self.bin_dir])
 
     def install(self, branch):
         script_path = pkg_resources.resource_filename('mytonctrl', 'scripts/btc_teleport1.sh')
-        exit_code = run_as_root(["bash", script_path, "-s", '/usr/src', "-r", self.repo_name, "-b", branch])
+        user = get_current_user()
+        exit_code = run_as_root(["bash", script_path, "-s", '/usr/src', "-r", self.repo_name, "-b", branch, "-u", user])
         if exit_code != 0:
             raise Exception('Failed to install btc_teleport')
         script_path = pkg_resources.resource_filename('mytonctrl', 'scripts/btc_teleport2.sh')

mytonctrl/scripts/btc_teleport1.sh

@@ -1,14 +1,15 @@
 REPO=""
 SRC_DIR=""
-USER=$(logname)
+USER=${SUDO_USER:-$(logname)}
 BRANCH=master
 
-while getopts s:r:b: flag
+while getopts s:r:b:u: flag
 do
 	case "${flag}" in
 		s) SRC_DIR=${OPTARG};;
     r) REPO=${OPTARG};;
     b) BRANCH=${OPTARG};;
+    u) USER=${OPTARG};;
     *) echo "Flag -${flag} is not recognized. Aborting"; exit 1 ;;
 	esac
 done

mytonctrl/scripts/create_backup.sh

@@ -1,16 +1,17 @@
 dest="mytonctrl_backup_$(hostname)_$(date +%s).tar.gz"
 mtc_dir="$HOME/.local/share/mytoncore"
-user=$(logname)
+user=${SUDO_USER:-$(logname)}
 ton_dir="/var/ton-work"
 keys_dir="/var/ton-work/keys"
 # Get arguments
-while getopts d:m:t:k: flag
+while getopts d:m:t:k:u: flag
 do
 	case "${flag}" in
 		d) dest=${OPTARG};;
     m) mtc_dir=${OPTARG};;
     t) ton_dir=${OPTARG};;
     k) keys_dir=${OPTARG};;
+    u) user=${OPTARG};;
     *)
         echo "Flag -${flag} is not recognized. Aborting"
         exit 1 ;;

mytonctrl/scripts/restore_backup.sh

@@ -1,7 +1,7 @@
 name="backup.tar.gz"
 mtc_dir="$HOME/.local/share/mytoncore"
 ip=0
-user=$(logname)
+user=${SUDO_USER:-$(logname)}
 # Get arguments
 while getopts n:m:i:u: flag
 do

mytonctrl/utils.py

@@ -1,3 +1,5 @@
+import os
+import pwd
 import subprocess
 import time
 
@@ -57,3 +59,6 @@ def GetColorInt(data, border, logic, ending=None):
             result = bcolors.red_text(data, ending)
     return result
 # end define
+
+def get_current_user():
+    return pwd.getpwuid(os.getuid()).pw_name

mytoninstaller/mytoninstaller.py

@@ -11,6 +11,7 @@
 
 from mypylib.mypylib import MyPyClass, run_as_root, color_print
 from mypyconsole.mypyconsole import MyPyConsole
+from mytonctrl.utils import get_current_user
 
 from mytoninstaller.config import GetLiteServerConfig, get_ls_proxy_config
 from mytoninstaller.node_args import get_node_args
@@ -48,8 +49,7 @@ def Init(local, console):
 
 
 	# create variables
-	user = os.environ.get("USER", "root")
-	local.buffer.user = user
+	local.buffer.user = get_current_user()
 	local.buffer.vuser = "validator"
 	local.buffer.cport = random.randint(2000, 65000)
 	local.buffer.lport = random.randint(2000, 65000)
@@ -207,7 +207,7 @@ def CreateLocalConfigFile(local, args):
 		init_block["rootHash"] = b642hex(config_init_block['root_hash'])
 		init_block["fileHash"] = b642hex(config_init_block['file_hash'])
 	init_block_b64 = dict2b64(init_block)
-	user = local.buffer.user or os.environ.get("USER", "root")
+	user = local.buffer.user or get_current_user()
 	args = ["python3", "-m", "mytoninstaller", "-u", user, "-e", "clc", "-i", init_block_b64]
 	run_as_root(args)
 #end define

mytoninstaller/scripts/ton_http_api_installer.sh

@@ -7,6 +7,16 @@ if [ "$(id -u)" != "0" ]; then
 	exit 1
 fi
 
+user=${SUDO_USER:-$(logname)}
+
+while getopts u: flag
+do
+	case "${flag}" in
+    u) user=${OPTARG};;
+    *) echo "Flag -${flag} is not recognized. Aborting"; exit 1 ;;
+	esac
+done
+
 # Цвета
 COLOR='\033[92m'
 ENDC='\033[0m'
@@ -21,7 +31,6 @@ virtualenv ${venv_path}
 
 # install python3 packages
 echo -e "${COLOR}[2/4]${ENDC} Installing required packages"
-user=$(logname)
 venv_pip3="${venv_path}/bin/pip3"
 ${venv_pip3} install ton-http-api
 chown -R ${user}:${user} ${venv_path}

mytoninstaller/settings.py

@@ -22,6 +22,7 @@
 	ip2int,
 	Dict, int2ip
 )
+from mytonctrl.utils import get_current_user
 from mytoninstaller.utils import StartValidator, StartMytoncore, start_service, stop_service, get_ed25519_pubkey, \
 	disable_service, is_testnet, get_block_from_toncenter
 from mytoninstaller.config import SetConfig, GetConfig, get_own_ip, backup_config
@@ -729,8 +730,9 @@ def do_enable_ton_http_api(local):
 	if not os.path.exists('/usr/bin/ton/local.config.json'):
 		from mytoninstaller.mytoninstaller import CreateLocalConfigFile
 		CreateLocalConfigFile(local, [])
+	user = local.buffer.user or get_current_user()
 	ton_http_api_installer_path = pkg_resources.resource_filename('mytoninstaller.scripts', 'ton_http_api_installer.sh')
-	exit_code = run_as_root(["bash", ton_http_api_installer_path])
+	exit_code = run_as_root(["bash", ton_http_api_installer_path, "-u", user])
 	if exit_code == 0:
 		text = "do_enable_ton_http_api - {green}OK{endc}"
 	else:

scripts/install.sh

@@ -169,7 +169,7 @@ if [ "${user}" = "" ]; then  # no user
     parent_name=$(ps -p $PPID -o comm=)
     user=$(whoami)
     if [ "$parent_name" = "sudo" ] || [ "$parent_name" = "su" ] || [ "$parent_name" = "python3" ]; then
-        user=$(logname)
+        user=${SUDO_USER:-$(logname)}
     fi
 fi
 echo "User: $user"