starlingx/integ
Code Issues Proposed changes

debian: Fix openrc sourcing

Browse Source 
This work is part of Debian integration effort.
This work only affects Debian.

Cannot obtain password from keyring when doing 'source
/etc/platform/openrc' from sysadmin user.
Due to a comparison with a wrong octal permissions string, code that
requires elevation is run. The code shouldn't run in the first place
using sysadmin user.

Fix the comparison string.

Debian Bullseye tests:
- PASS: build-pkgs and build-image
- PASS: bootstrap
- PASS: after bootstrap can source /etc/platform/openrc from sysadmin

Story: 2009221
Task: 43438
Signed-off-by: Dan Voiculeasa <dan.voiculeasa@windriver.com>
Change-Id: I0c1f53c216f1a126280e0e27748fd50b2759f3c3
This commit is contained in:
Dan Voiculeasa 2022-01-28 13:59:16 +02:00
parent 8dbdc40fe1
commit ccdfc3b716
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
security/keyrings.alt/debian/patches/chmod_keyringlock2.patch
View File

@ -31,7 +31,7 @@ Index: keyring-5.3/keyrings/alt/file_base.py
+ if os.path.isfile(lockdir + "/" + lockfile): + if os.path.isfile(lockdir + "/" + lockfile):
+ import stat + import stat
+ import grp + import grp
+ if oct(stat.S_IMODE(os.stat(lockdir + "/" + lockfile).st_mode)) != '0770': + if oct(stat.S_IMODE(os.stat(lockdir + "/" + lockfile).st_mode)) != '0o770':
+ # Must have the lock file with the correct group and permissisions g+rw + # Must have the lock file with the correct group and permissisions g+rw
+ os.chmod(lockdir + "/" + lockfile, stat.S_IRWXG | stat.S_IRWXU) + os.chmod(lockdir + "/" + lockfile, stat.S_IRWXG | stat.S_IRWXU)
+ groupinfo = grp.getgrnam('sys_protected') + groupinfo = grp.getgrnam('sys_protected')