diff options
| author |   Bartek Grzybowski <b.grzybowski@partner.samsung.com> | 2020-06-12 12:20:48 +0200 |
|---|---|---|
| committer |   Morgan Richomme <morgan.richomme@orange.com> | 2020-06-15 14:09:30 +0000 |
| commit | 9ab2f40cb067f43b13098f16811d50c8693fcf1d (patch) | |
| tree | f29ed7fed81462113233341311112b0e7f77ecfb /test | |
| parent | e2f20d07585afd9e1826ecdb48590553e7e4566f (diff) | |
Generate vsftpd config file in bootstrap phase
Change-Id: I963ff2ed9dd79f36c8fcb4e19529c4b549f92823
Issue-ID: INT-1621
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
Diffstat (limited to 'test')
| -rwxr-xr-x | test/mocks/mass-pnf-sim/MassPnfSim.py | 14 | ||||
| -rw-r--r-- | test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/vsftpd_ssl-TEMPLATE.conf | 4 |
2 files changed, 13 insertions, 5 deletions
diff --git a/test/mocks/mass-pnf-sim/MassPnfSim.py b/test/mocks/mass-pnf-sim/MassPnfSim.py index 9801d8e74..87673dd6b 100755 --- a/test/mocks/mass-pnf-sim/MassPnfSim.py +++ b/test/mocks/mass-pnf-sim/MassPnfSim.py @@ -4,7 +4,7 @@ from subprocess import run, CalledProcessError import argparse import ipaddress from sys import exit -from os import chdir, getcwd, path, popen, kill, getuid, stat, mkdir +from os import chdir, getcwd, path, popen, kill, getuid, stat, mkdir, getlogin from shutil import copytree, rmtree, move from json import loads, dumps from yaml import load, SafeLoader, dump @@ -83,6 +83,8 @@ class MassPnfSim: log_lvl = logging.INFO sim_compose_template = 'docker-compose-template.yml' + sim_vsftpd_template = 'config/vsftpd_ssl-TEMPLATE.conf' + sim_vsftpd_config = 'config/vsftpd_ssl.conf' sim_config = 'config/config.yml' sim_msg_config = 'config/config.json' sim_port = 5000 @@ -287,14 +289,20 @@ class MassPnfSim: FTPS_PASV_MIN = str(ftps_pasv_port_start), FTPS_PASV_MAX = str(ftps_pasv_port_end), TIMEZONE = tzname[daylight]) + # generate vsftpd config file for the simulator instance + self._generate_config_file(self.sim_vsftpd_template, self.sim_vsftpd_config, + I = i, USER = getlogin(), + FTPS_PASV_MIN = str(ftps_pasv_port_start), + FTPS_PASV_MAX = str(ftps_pasv_port_end), + IPFILESERVER = str(self.args.ipfileserver)) ftps_pasv_port_start += ftps_pasv_port_num_of_ports + 1 ftps_pasv_port_end += ftps_pasv_port_num_of_ports + 1 # ugly hack to chown vsftpd config file to root if getuid(): - self._run_cmd('sudo chown root config/vsftpd_ssl.conf', f'{self.sim_dirname_pattern}{i}') - self.logger.debug(f"vsftpd_ssl.conf file owner UID: {stat(self.sim_dirname_pattern + str(i) + '/config/vsftpd_ssl.conf').st_uid}") + self._run_cmd(f'sudo chown root {self.sim_vsftpd_config}', f'{self.sim_dirname_pattern}{i}') + self.logger.debug(f"vsftpd config file owner UID: {stat(self.sim_dirname_pattern + str(i) + '/' + self.sim_vsftpd_config).st_uid}") self.logger.info(f'Done setting up instance #{i}') diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/vsftpd_ssl-TEMPLATE.conf b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/vsftpd_ssl-TEMPLATE.conf index 75bb974a3..52fcdfc3f 100644 --- a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/vsftpd_ssl-TEMPLATE.conf +++ b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/vsftpd_ssl-TEMPLATE.conf @@ -11,8 +11,8 @@ pam_service_name=vsftpd_virtual virtual_use_local_privs=YES chmod_enable=NO user_config_dir=/etc/vsftpd/user_conf -user_sub_token=$USER -#local_root=/srv/$USER +user_sub_token=${USER} +#local_root=/srv/${USER} local_root=/srv/ userlist_enable=NO allow_writeable_chroot=YES |