diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-08-14 20:13:31 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-08-14 20:13:31 +0200 |
| commit | a74e67a778a6c698e44cbc6c5d184d03c9c12396 (patch) | |
| tree | 8a1962d22cb6dc09fc1a48749740552bf9e74919 /python/vyos/util.py | |
| parent | 1229665d353a070e14ee9cceafbfdb107d669745 (diff) | |
| download | vyos-1x-a74e67a778a6c698e44cbc6c5d184d03c9c12396.tar.gz vyos-1x-a74e67a778a6c698e44cbc6c5d184d03c9c12396.zip | |
vyos.util: T1503: use build in methods to determine current user for commit_in_progress()
Diffstat (limited to 'python/vyos/util.py')
| -rw-r--r-- | python/vyos/util.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/python/vyos/util.py b/python/vyos/util.py index 60171746a..8af46a6ee 100644 --- a/python/vyos/util.py +++ b/python/vyos/util.py @@ -562,12 +562,13 @@ def commit_in_progress(): # Since this will be used in scripts that modify the config outside of the CLI # framework, those knowingly have root permissions. # For everything else, we add a safeguard. - from psutil import process_iter, NoSuchProcess + from psutil import process_iter + from psutil import NoSuchProcess + from getpass import getuser from vyos.defaults import commit_lock - idu = cmd('/usr/bin/id -u') - if idu != '0': - raise OSError("This functions needs root permissions to return correct results") + if getuser() != 'root': + raise OSError('This functions needs to be run as root to return correct results!') for proc in process_iter(): try: |