Skip to content

Commit

Permalink
Revert "Make sure configured user is properly set by Salt (bsc#121099…
Browse files Browse the repository at this point in the history
…4) (#596)" (#614)

This reverts commit 5ea4add.
  • Loading branch information
meaksh committed Oct 29, 2024
1 parent 995c4eb commit 6b44ea7
Show file tree
Hide file tree
Showing 7 changed files with 3 additions and 41 deletions.
1 change: 0 additions & 1 deletion pkg/common/salt-master.service
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ LimitNOFILE=100000
Type=notify
NotifyAccess=all
ExecStart=/usr/bin/salt-master
User=salt

[Install]
WantedBy=multi-user.target
1 change: 0 additions & 1 deletion pkg/old/deb/salt-master.service
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ LimitNOFILE=16384
Type=notify
NotifyAccess=all
ExecStart=/usr/bin/salt-master
User=salt

[Install]
WantedBy=multi-user.target
1 change: 0 additions & 1 deletion pkg/old/suse/salt-master.service
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ LimitNOFILE=100000
Type=simple
ExecStart=/usr/bin/salt-master
TasksMax=infinity
User=salt

[Install]
WantedBy=multi-user.target
27 changes: 0 additions & 27 deletions salt/cli/daemons.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import os
import warnings

import salt.defaults.exitcodes
import salt.utils.kinds as kinds
from salt.exceptions import SaltClientError, SaltSystemExit, get_error_message
from salt.utils import migrations
Expand Down Expand Up @@ -73,16 +72,6 @@ def verify_hash_type(self):
self.__class__.__name__,
)

def verify_user(self):
"""
Verify Salt configured user for Salt and shutdown daemon if not valid.
:return:
"""
if not check_user(self.config["user"]):
self.action_log_info("Cannot switch to configured user for Salt. Exiting")
self.shutdown(salt.defaults.exitcodes.EX_NOUSER)

def action_log_info(self, action):
"""
Say daemon starting.
Expand Down Expand Up @@ -208,10 +197,6 @@ def prepare(self):
self.config["interface"] = ip_bracket(self.config["interface"])
migrations.migrate_paths(self.config)

# Ensure configured user is valid and environment is properly set
# before initializating rest of the stack.
self.verify_user()

# Late import so logging works correctly
import salt.master

Expand Down Expand Up @@ -324,10 +309,6 @@ def prepare(self):

transport = self.config.get("transport").lower()

# Ensure configured user is valid and environment is properly set
# before initializating rest of the stack.
self.verify_user()

try:
# Late import so logging works correctly
import salt.minion
Expand Down Expand Up @@ -516,10 +497,6 @@ def prepare(self):
self.action_log_info("An instance is already running. Exiting")
self.shutdown(1)

# Ensure configured user is valid and environment is properly set
# before initializating rest of the stack.
self.verify_user()

# TODO: AIO core is separate from transport
# Late import so logging works correctly
import salt.minion
Expand Down Expand Up @@ -618,10 +595,6 @@ def prepare(self):

self.action_log_info('Setting up "{}"'.format(self.config["id"]))

# Ensure configured user is valid and environment is properly set
# before initializating rest of the stack.
self.verify_user()

# Late import so logging works correctly
import salt.minion

Expand Down
8 changes: 0 additions & 8 deletions salt/cli/ssh.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import sys

import salt.client.ssh
import salt.defaults.exitcodes
import salt.utils.parsers
from salt.utils.verify import check_user


class SaltSSH(salt.utils.parsers.SaltSSHOptionParser):
Expand All @@ -17,12 +15,6 @@ def run(self):
# that won't be used anyways with -H or --hosts
self.parse_args()

if not check_user(self.config["user"]):
self.exit(
salt.defaults.exitcodes.EX_NOUSER,
"Cannot switch to configured user for Salt. Exiting",
)

ssh = salt.client.ssh.SSH(self.config)
try:
ssh.run()
Expand Down
4 changes: 2 additions & 2 deletions salt/utils/verify.py
Original file line number Diff line number Diff line change
Expand Up @@ -346,8 +346,8 @@ def check_user(user):

# We could just reset the whole environment but let's just override
# the variables we can get from pwuser
# We ensure HOME is always present and set according to pwuser
os.environ["HOME"] = pwuser.pw_dir
if "HOME" in os.environ:
os.environ["HOME"] = pwuser.pw_dir

if "SHELL" in os.environ:
os.environ["SHELL"] = pwuser.pw_shell
Expand Down
2 changes: 1 addition & 1 deletion tests/pytests/integration/cli/test_salt_minion.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def test_exit_status_unknown_user(salt_master, minion_id):
),
},
)
factory.start(start_timeout=30, max_start_attempts=1)
factory.start(start_timeout=10, max_start_attempts=1)

assert exc.value.process_result.returncode == salt.defaults.exitcodes.EX_NOUSER
assert "The user is not available." in exc.value.process_result.stderr
Expand Down

0 comments on commit 6b44ea7

Please sign in to comment.