particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

stages/users: support a dot inside a username

Browse source 
From IEEE Std 1003.1-2017:

 3.437 User Name:
A string that is used to identify a user; see also User Database. To be
portable across systems conforming to POSIX.1-2017, the value is composed
of characters from the portable filename character set. The <hyphen-minus>
character should not be used as the first character of a portable user name.

 3.282 Portable Filename Character Set
The set of characters from which portable filenames are constructed.

A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
a b c d e f g h i j k l m n o p q r s t u v w x y z
0 1 2 3 4 5 6 7 8 9 . _ -

The last three characters are the <period>, <underscore>, and <hyphen-minus>
characters, respectively.

---

The regex checking the username in org.osbuild.users stage omitted the
<period> character before. This commit adds it and modifies the stage
test in order to cover this change.

Fixes: rhbz#2104464
This commit is contained in:
Ondřej Budai 2022-07-20 10:20:39 +02:00 • committed by Ondřej Budai
parent 7dcc7d4499
commit 092f886904
4 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
test/data/stages/users/b.json
View file

@ -317,6 +317,9 @@
"users": {
"test": {
"password": "$6$s06sY2/bZbmuyE4a$JTn/Ki2jbNG.wGeCvt6mcjaIZ2HV.H8VjLzIMZs7f2G48NMFlcB2/OhbHZ6HhZAOcb.CmUb2qywSW2DkKe6gn0"
},
"test.user_42-OSBUILD": {
"password": "$6$TZ9oR8s21Srjvamo$PRHaXMA6pcZc7M2yKGEDLVir/GjCUgV0gW8ZIrab3cY4fKth/MBGm/wndn2MxSU31dCmCnb.3uEODgyaAkaRh0"
}
}
}

3
test/data/stages/users/b.mpp.json
View file

@ -35,6 +35,9 @@
"users": {
"test": {
"password": "$6$s06sY2/bZbmuyE4a$JTn/Ki2jbNG.wGeCvt6mcjaIZ2HV.H8VjLzIMZs7f2G48NMFlcB2/OhbHZ6HhZAOcb.CmUb2qywSW2DkKe6gn0"
},
"test.user_42-OSBUILD": {
"password": "$6$TZ9oR8s21Srjvamo$PRHaXMA6pcZc7M2yKGEDLVir/GjCUgV0gW8ZIrab3cY4fKth/MBGm/wndn2MxSU31dCmCnb.3uEODgyaAkaRh0"
}
}
}

15
test/data/stages/users/diff.json
View file

@ -11,14 +11,19 @@
"/home/test/.bash_logout",
"/home/test/.bashrc",
"/home/test/.bash_profile",
"/var/spool/mail/test"
"/home/test.user_42-OSBUILD",
"/home/test.user_42-OSBUILD/.bash_logout",
"/home/test.user_42-OSBUILD/.bashrc",
"/home/test.user_42-OSBUILD/.bash_profile",
"/var/spool/mail/test",
"/var/spool/mail/test.user_42-OSBUILD"
],
"deleted_files": [],
"differences": {
"/etc/group": {
"content": [
"sha256:5be46faf83078411c18ce0f3cb5e5fc5b56b8cb214a7f5a65dbbef6cb8249e16",
"sha256:c84391d03143617e308b8a7800704ffb58ee20d88fdfa07ada57a0e84fc44dc8"
"sha256:b75a8542437c8c0265e36f719b0bb2176ab14bc843af12bb009180b53aeb51f6"
]
},
"/etc/gshadow": {
@ -30,7 +35,7 @@
"/etc/passwd": {
"content": [
"sha256:d137fa8bf6ca9020c35a5bf992f32d4c803497e856e0254618f5abcb2f2425c6",
"sha256:f6d28352e02b3ed1971d8d0d2e9e556f9dfaa9300fbafa6828f69f758570839c"
"sha256:cb2abbc72a76ead35817e76050f6fbb85255a53e09ecfcd6966389dc2e563565"
]
},
"/etc/shadow": {
@ -42,13 +47,13 @@
"/etc/subgid": {
"content": [
"sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
"sha256:26d48e295489c012dd33c13df566059d0f97215e1990d80192026e5a162dc3a0"
"sha256:601e9cc755cb80e34e21999e732e25869f554f92a42e760533da8d5c701957ea"
]
},
"/etc/subuid": {
"content": [
"sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
"sha256:26d48e295489c012dd33c13df566059d0f97215e1990d80192026e5a162dc3a0"
"sha256:601e9cc755cb80e34e21999e732e25869f554f92a42e760533da8d5c701957ea"
]
}
}