From de33539c9752dc0fe7ae052da256e97f768365a8 Mon Sep 17 00:00:00 2001 From: Kimmo Lehto Date: Tue, 9 Sep 2025 10:36:27 +0300 Subject: [PATCH 1/8] Bump v0.x dependencies Signed-off-by: Kimmo Lehto --- go.mod | 20 ++++++++++---------- go.sum | 32 ++++++++++++++++---------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/go.mod b/go.mod index c828f073..e3f4c33c 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/k0sproject/rig -go 1.24.0 +go 1.25.0 -toolchain go1.24.2 +toolchain go1.25.1 require ( al.essio.dev/pkg/shellescape v1.6.0 @@ -10,13 +10,13 @@ require ( github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d github.com/creasty/defaults v1.8.0 github.com/davidmz/go-pageant v1.0.2 - github.com/kevinburke/ssh_config v1.2.0 - github.com/masterzen/winrm v0.0.0-20240702205601-3fad6e106085 + github.com/kevinburke/ssh_config v1.4.0 + github.com/masterzen/winrm v0.0.0-20250819055755-20c0798bc988 github.com/mattn/go-shellwords v1.0.12 github.com/mitchellh/go-homedir v1.1.0 github.com/stretchr/testify v1.9.0 - golang.org/x/crypto v0.38.0 - golang.org/x/term v0.32.0 + golang.org/x/crypto v0.42.0 + golang.org/x/term v0.35.0 ) require ( @@ -25,7 +25,7 @@ require ( github.com/bodgit/ntlmssp v0.0.0-20240506230425-31973bb52d9b // indirect github.com/bodgit/windows v1.0.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.2 // indirect + github.com/go-logr/logr v1.4.3 // indirect github.com/gofrs/uuid v4.4.0+incompatible // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-uuid v1.0.3 // indirect @@ -38,8 +38,8 @@ require ( github.com/masterzen/simplexml v0.0.0-20190410153822-31eea3082786 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/tidwall/transform v0.0.0-20201103190739-32f242e2dbde // indirect - golang.org/x/net v0.40.0 // indirect - golang.org/x/sys v0.33.0 // indirect - golang.org/x/text v0.25.0 // indirect + golang.org/x/net v0.43.0 // indirect + golang.org/x/sys v0.36.0 // indirect + golang.org/x/text v0.29.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 23bab0ea..de409df4 100644 --- a/go.sum +++ b/go.sum @@ -19,8 +19,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davidmz/go-pageant v1.0.2 h1:bPblRCh5jGU+Uptpz6LgMZGD5hJoOt7otgT454WvHn0= github.com/davidmz/go-pageant v1.0.2/go.mod h1:P2EDDnMqIwG5Rrp05dTRITj9z2zpGcD9efWSkTNKLIE= -github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= -github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= +github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA= github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= @@ -48,16 +48,16 @@ github.com/jcmturner/gokrb5/v8 v8.4.4 h1:x1Sv4HaTpepFkXbt2IkL29DXRf8sOfZXo8eRKh6 github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs= github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY= github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= -github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= -github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= +github.com/kevinburke/ssh_config v1.4.0 h1:6xxtP5bZ2E4NF5tuQulISpTO2z8XbtH8cg1PWkxoFkQ= +github.com/kevinburke/ssh_config v1.4.0/go.mod h1:q2RIzfka+BXARoNexmF9gkxEX7DmvbW9P4hIVx2Kg4M= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/masterzen/simplexml v0.0.0-20190410153822-31eea3082786 h1:2ZKn+w/BJeL43sCxI2jhPLRv73oVVOjEKZjKkflyqxg= github.com/masterzen/simplexml v0.0.0-20190410153822-31eea3082786/go.mod h1:kCEbxUJlNDEBNbdQMkPSp6yaKcRXVI6f4ddk8Riv4bc= -github.com/masterzen/winrm v0.0.0-20240702205601-3fad6e106085 h1:PiQLLKX4vMYlJImDzJYtQScF2BbQ0GAjPIHCDqzHHHs= -github.com/masterzen/winrm v0.0.0-20240702205601-3fad6e106085/go.mod h1:JajVhkiG2bYSNYYPYuWG7WZHr42CTjMTcCjfInRNCqc= +github.com/masterzen/winrm v0.0.0-20250819055755-20c0798bc988 h1:opRNRg5Ugt4DVedR1dAAlbkByHUjhlkKKcUi3L+/46Y= +github.com/masterzen/winrm v0.0.0-20250819055755-20c0798bc988/go.mod h1:JajVhkiG2bYSNYYPYuWG7WZHr42CTjMTcCjfInRNCqc= github.com/mattn/go-shellwords v1.0.12 h1:M2zGm7EW6UQJvDeQxo4T51eKPurbeFbe8WtebGE2xrk= github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= @@ -80,8 +80,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= -golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8= -golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw= +golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI= +golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -89,8 +89,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY= -golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds= +golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE= +golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -99,19 +99,19 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw= -golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k= +golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg= -golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ= +golang.org/x/term v0.35.0 h1:bZBVKBudEyhRcajGcNc3jIfWPqV4y/Kt2XcoigOWtDQ= +golang.org/x/term v0.35.0/go.mod h1:TPGtkTLesOwf2DE8CgVYiZinHAOuy5AYUYT1lENIZnA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4= -golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA= +golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk= +golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= From 3b9b81bcc4782f15416c4b7d2bef82436123ac01 Mon Sep 17 00:00:00 2001 From: Kimmo Lehto Date: Tue, 9 Sep 2025 10:49:13 +0300 Subject: [PATCH 2/8] Update smoke-test images Signed-off-by: Kimmo Lehto --- .github/workflows/go.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 125c065a..9fa71eb8 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -24,9 +24,9 @@ jobs: fail-fast: false matrix: image: - - quay.io/k0sproject/bootloose-ubuntu20.04 + - quay.io/k0sproject/bootloose-ubuntu24.04 - quay.io/k0sproject/bootloose-debian12 - - quay.io/k0sproject/bootloose-alpine3.18 + - quay.io/k0sproject/bootloose-alpine3.22 needs: unit-linux runs-on: ubuntu-latest steps: From 22338d02de10fc1e520ded25aa58fe2a0fe2c889 Mon Sep 17 00:00:00 2001 From: Kimmo Lehto Date: Tue, 9 Sep 2025 11:16:35 +0300 Subject: [PATCH 3/8] Make integration tests work with busybox groupadd/useradd Signed-off-by: Kimmo Lehto --- test/test.sh | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/test/test.sh b/test/test.sh index a9af799b..4e70f525 100755 --- a/test/test.sh +++ b/test/test.sh @@ -234,11 +234,23 @@ rig_test_regular_user() { } ssh "$@" root@127.0.0.1 sh -euxC - </dev/null 2>&1; then + # shadow tools (Debian/Ubuntu/CentOS, or Alpine with shadow installed) + groupadd -r rig-wheel || true + else + # BusyBox + addgroup -S rig-wheel || true + fi + + if command -v useradd >/dev/null 2>&1; then + id -u rigtest-user >/dev/null 2>&1 || useradd -d /var/lib/rigtest-user -G rig-wheel -g rig-wheel -p '*' -s /bin/sh rigtest-user + else + id -u rigtest-user >/dev/null 2>&1 || adduser -D -H -h /var/lib/rigtest-user -G rig-wheel -s /bin/sh rigtest-user + fi + mkdir -p /var/lib/rigtest-user/ cp -r /root/.ssh /var/lib/rigtest-user/. - chown -R rigtest-user:rigtest-user /var/lib/rigtest-user/ + chown -R rigtest-user:rig-wheel /var/lib/rigtest-user/ [ ! -d /etc/sudoers.d/ ] || { echo '%rig-wheel ALL=(ALL)NOPASSWD:ALL' >/etc/sudoers.d/rig-wheel chmod 0440 /etc/sudoers.d/rig-wheel From 898ad5f17b181cbc09527d97f516342e12a83778 Mon Sep 17 00:00:00 2001 From: Kimmo Lehto Date: Tue, 9 Sep 2025 14:29:42 +0300 Subject: [PATCH 4/8] Ensure the user gets username group Signed-off-by: Kimmo Lehto --- test/test.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/test.sh b/test/test.sh index 4e70f525..91037ad8 100755 --- a/test/test.sh +++ b/test/test.sh @@ -233,7 +233,7 @@ rig_test_regular_user() { return 0 } - ssh "$@" root@127.0.0.1 sh -euxC - </dev/null 2>&1; then # shadow tools (Debian/Ubuntu/CentOS, or Alpine with shadow installed) groupadd -r rig-wheel || true @@ -243,14 +243,14 @@ rig_test_regular_user() { fi if command -v useradd >/dev/null 2>&1; then - id -u rigtest-user >/dev/null 2>&1 || useradd -d /var/lib/rigtest-user -G rig-wheel -g rig-wheel -p '*' -s /bin/sh rigtest-user + id -u rigtest-user >/dev/null 2>&1 || useradd -d /var/lib/rigtest-user -G rig-wheel -p '*' -s /bin/sh rigtest-user else - id -u rigtest-user >/dev/null 2>&1 || adduser -D -H -h /var/lib/rigtest-user -G rig-wheel -s /bin/sh rigtest-user + id -u rigtest-user >/dev/null 2>&1 || adduser -D -H -h /var/lib/rigtest-user -G rigtest-user,rig-wheel -s /bin/sh rigtest-user fi mkdir -p /var/lib/rigtest-user/ - cp -r /root/.ssh /var/lib/rigtest-user/. - chown -R rigtest-user:rig-wheel /var/lib/rigtest-user/ + cp -r /root/.ssh /var/lib/rigtest-user/ + chown -R rigtest-user:rigtest-user /var/lib/rigtest-user/. [ ! -d /etc/sudoers.d/ ] || { echo '%rig-wheel ALL=(ALL)NOPASSWD:ALL' >/etc/sudoers.d/rig-wheel chmod 0440 /etc/sudoers.d/rig-wheel From 77ad33f51ca00071aee2d8590ba525997eae8402 Mon Sep 17 00:00:00 2001 From: Kimmo Lehto Date: Tue, 9 Sep 2025 14:53:10 +0300 Subject: [PATCH 5/8] Fix busybox usage Signed-off-by: Kimmo Lehto --- test/test.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/test.sh b/test/test.sh index 91037ad8..97484019 100755 --- a/test/test.sh +++ b/test/test.sh @@ -233,19 +233,20 @@ rig_test_regular_user() { return 0 } - ssh "$@" root@127.0.0.1 sh -euxC - <<"EOF" + ssh "$@" root@127.0.0.1 sh -euxC - </dev/null 2>&1; then # shadow tools (Debian/Ubuntu/CentOS, or Alpine with shadow installed) groupadd -r rig-wheel || true else # BusyBox addgroup -S rig-wheel || true + addgroup rigtest-user || true fi if command -v useradd >/dev/null 2>&1; then id -u rigtest-user >/dev/null 2>&1 || useradd -d /var/lib/rigtest-user -G rig-wheel -p '*' -s /bin/sh rigtest-user else - id -u rigtest-user >/dev/null 2>&1 || adduser -D -H -h /var/lib/rigtest-user -G rigtest-user,rig-wheel -s /bin/sh rigtest-user + id -u rigtest-user >/dev/null 2>&1 || adduser -D -H -h /var/lib/rigtest-user -G rig-wheel -s /bin/sh rigtest-user rigtest-user fi mkdir -p /var/lib/rigtest-user/ From ca943eef3a05d02d947b1aa2d4ad51e184091ff2 Mon Sep 17 00:00:00 2001 From: Kimmo Lehto Date: Tue, 9 Sep 2025 15:32:17 +0300 Subject: [PATCH 6/8] Homedir modes Signed-off-by: Kimmo Lehto --- test/test.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/test/test.sh b/test/test.sh index 97484019..7f98515f 100755 --- a/test/test.sh +++ b/test/test.sh @@ -249,9 +249,11 @@ rig_test_regular_user() { id -u rigtest-user >/dev/null 2>&1 || adduser -D -H -h /var/lib/rigtest-user -G rig-wheel -s /bin/sh rigtest-user rigtest-user fi - mkdir -p /var/lib/rigtest-user/ - cp -r /root/.ssh /var/lib/rigtest-user/ - chown -R rigtest-user:rigtest-user /var/lib/rigtest-user/. + mkdir -p /var/lib/rigtest-user/.ssh + cp /root/.ssh/* /var/lib/rigtest-user/.ssh/ + chmod 700 /var/lib/rigtest-user/.ssh + chmod 600 /var/lib/rigtest-user/.ssh/* + chown -R rigtest-user:rigtest-user /var/lib/rigtest-user [ ! -d /etc/sudoers.d/ ] || { echo '%rig-wheel ALL=(ALL)NOPASSWD:ALL' >/etc/sudoers.d/rig-wheel chmod 0440 /etc/sudoers.d/rig-wheel From 244b14d64d8e5e3b74a37237ba6a003a39b75ba7 Mon Sep 17 00:00:00 2001 From: Kimmo Lehto Date: Tue, 9 Sep 2025 15:55:27 +0300 Subject: [PATCH 7/8] Inspect Signed-off-by: Kimmo Lehto --- test/test.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/test.sh b/test/test.sh index 7f98515f..626810a5 100755 --- a/test/test.sh +++ b/test/test.sh @@ -251,9 +251,13 @@ rig_test_regular_user() { mkdir -p /var/lib/rigtest-user/.ssh cp /root/.ssh/* /var/lib/rigtest-user/.ssh/ + chmod 755 /var/lib/rigtest-user chmod 700 /var/lib/rigtest-user/.ssh chmod 600 /var/lib/rigtest-user/.ssh/* chown -R rigtest-user:rigtest-user /var/lib/rigtest-user + ls -al /var/lib/rigtest-user + ls -al /var/lib/rigtest-user/.ssh + [ ! -d /etc/sudoers.d/ ] || { echo '%rig-wheel ALL=(ALL)NOPASSWD:ALL' >/etc/sudoers.d/rig-wheel chmod 0440 /etc/sudoers.d/rig-wheel From d27d9e83a5529aca53f954380c848a8478cffa0e Mon Sep 17 00:00:00 2001 From: Kimmo Lehto Date: Tue, 9 Sep 2025 16:14:27 +0300 Subject: [PATCH 8/8] What the Signed-off-by: Kimmo Lehto --- test/test.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/test/test.sh b/test/test.sh index 626810a5..a6535c52 100755 --- a/test/test.sh +++ b/test/test.sh @@ -257,6 +257,7 @@ rig_test_regular_user() { chown -R rigtest-user:rigtest-user /var/lib/rigtest-user ls -al /var/lib/rigtest-user ls -al /var/lib/rigtest-user/.ssh + cat /var/lib/rigtest-user/.ssh/authorized_keys [ ! -d /etc/sudoers.d/ ] || { echo '%rig-wheel ALL=(ALL)NOPASSWD:ALL' >/etc/sudoers.d/rig-wheel