systemd-cryptenroll: added test cases to integration test #27007

1awesomeJ · 2023-03-27T11:10:34Z

No description provided.

1awesomeJ · 2023-03-27T12:06:54Z

Tests to improve coverage on cryptenroll.c. Most of the uncovered portions are currently in the Parse_argv() function. About 300 lines. These cover the first 100, I'll be adding more tests to cover the rest.

bluca · 2023-03-27T12:09:35Z

test/units/testsuite-70.sh

 systemd-run -p PrivateDevices=yes -p SetCredentialEncrypted=testdata.encrypted:"$(cat /tmp/testdata.encrypted)" --pipe --wait systemd-creds cat testdata.encrypted | cmp - /tmp/testdata
 rm /tmp/testdata

+#some failure tests for cryptenroll


leave a space after a # for readability

bluca · 2023-03-27T12:09:54Z

src/test/test-compare-operator.c

        const char *str_e = "!=!="; /* parse_compare_operator() moves the pointer */
        assert_se(parse_compare_operator(&str_e, COMPARE_EQUAL_BY_STRING) == COMPARE_STRING_UNEQUAL);
        assert_se(parse_compare_operator(&str_e, 0) == COMPARE_UNEQUAL);
+        assert_se(parse_compare_operator(&str_e, 0) == _COMPARE_OPERATOR_INVALID);


this is unrelated to the other change, split it in a separate commit with its own commit message

bluca · 2023-03-27T12:13:10Z

test/units/testsuite-70.sh


+#some failure tests for cryptenroll
+
+set +e


by doing this, this doesn't really test much, it doesn't check for results - please see other tests how they do negative testing, eg:

res="$(! portablectl attach --extension /tmp/emptyext /tmp/emptyroot 2> >(grep "Remote peer disconnected"))" test -z "${res}"

by doing this, this doesn't really test much, it doesn't check for results - please see other tests how they do negative testing, eg:

res="$(! portablectl attach --extension /tmp/emptyext /tmp/emptyroot 2> >(grep "Remote peer disconnected"))" test -z "${res}"

Thank you so much for the guidelines sir.

1awesomeJ · 2023-03-27T12:25:46Z

this is unrelated to the other change, split it in a separate commit with its own commit message
Ohh...okay sir.

mrc0mmand · 2023-03-27T12:52:00Z

Good job, I'd say, since it already managed to find a memory leak:

[   63.223568] testsuite-70.sh[683]: ==683==ERROR: LeakSanitizer: detected memory leaks
[   63.223568] testsuite-70.sh[683]: Direct leak of 64 byte(s) in 1 object(s) allocated from:
[   63.226229] testsuite-70.sh[683]:     #0 0x7f1995d0ea0a  (/usr/lib/clang/15.0.7/lib/linux/libclang_rt.asan-x86_64.so+0x10ea0a) (BuildId: faf0f22f6ed3e575962cd50bcfba6f2e17878558)
[   63.226229] testsuite-70.sh[683]:     #1 0x7f19951bae47 in greedy_realloc /systemd-meson-build/../build/src/basic/alloc-util.c:70:13
[   63.226229] testsuite-70.sh[683]:     #2 0x56167ee55f55 in list_enrolled /systemd-meson-build/../build/src/cryptenroll/cryptenroll-list.c:30:22
[   63.226229] testsuite-70.sh[683]:     #3 0x56167ee5fb36 in run /systemd-meson-build/../build/src/cryptenroll/cryptenroll.c:673:32
[   63.226229] testsuite-70.sh[683]:     #4 0x56167ee5fb36 in main /systemd-meson-build/../build/src/cryptenroll/cryptenroll.c:692:1
[   63.226229] testsuite-70.sh[683]:     #5 0x7f199423c78f  (/usr/lib/libc.so.6+0x2378f) (BuildId: 4a4bec3d95a1804443e852958fe59ed461135ce9)
[   63.226229] testsuite-70.sh[683]: SUMMARY: AddressSanitizer: 64 byte(s) leaked in 1 allocation(s).

https://jenkins-systemd.apps.ocp.cloud.ci.centos.org/job/upstream-vagrant-archlinux-sanitizers/816/artifact//systemd-centos-ci/artifacts_all/artifacts_hwvz5viz/vagrant-logs.UQm/vagrant-arch-sanitizers-clang-testsuite.YlW/TEST-70-TPM2_2_sanitizer_errors_FAIL.log

1awesomeJ · 2023-03-27T12:54:05Z

this is unrelated to the other change, split it in a separate commit with its own commit message
Ohh...okay sir.

$ dd if=/dev/zero of=luks.img bs=1M count=64 $ echo 1231dfsd234d | cryptsetup luksFormat luks.img $ build-san/systemd-cryptenroll luks.img SLOT TYPE 0 password ================================================================= ==640364==ERROR: LeakSanitizer: detected memory leaks Direct leak of 64 byte(s) in 1 object(s) allocated from: #0 0x7f43ffeb95b5 in __interceptor_realloc.part.0 (/lib64/libasan.so.8+0xb95b5) #1 0x7f43ff0a4f2f in greedy_realloc ../src/basic/alloc-util.c:70 #2 0x404d9f in list_enrolled ../src/cryptenroll/cryptenroll-list.c:30 #3 0x40f149 in run ../src/cryptenroll/cryptenroll.c:673 #4 0x40f149 in main ../src/cryptenroll/cryptenroll.c:692 #5 0x7f43fd64a50f in __libc_start_call_main (/lib64/libc.so.6+0x2750f) SUMMARY: AddressSanitizer: 64 byte(s) leaked in 1 allocation(s). Aborted (core dumped) Reported in systemd#27007.

1awesomeJ · 2023-03-27T15:28:13Z

lots of gits issue on this PR. I'm closing it.
I've re-opened here:
#27020

1awesomeJ · 2023-03-27T16:28:17Z

Good job, I'd say, since it already managed to find a memory leak:

[   63.223568] testsuite-70.sh[683]: ==683==ERROR: LeakSanitizer: detected memory leaks
[   63.223568] testsuite-70.sh[683]: Direct leak of 64 byte(s) in 1 object(s) allocated from:
[   63.226229] testsuite-70.sh[683]:     #0 0x7f1995d0ea0a  (/usr/lib/clang/15.0.7/lib/linux/libclang_rt.asan-x86_64.so+0x10ea0a) (BuildId: faf0f22f6ed3e575962cd50bcfba6f2e17878558)
[   63.226229] testsuite-70.sh[683]:     #1 0x7f19951bae47 in greedy_realloc /systemd-meson-build/../build/src/basic/alloc-util.c:70:13
[   63.226229] testsuite-70.sh[683]:     #2 0x56167ee55f55 in list_enrolled /systemd-meson-build/../build/src/cryptenroll/cryptenroll-list.c:30:22
[   63.226229] testsuite-70.sh[683]:     #3 0x56167ee5fb36 in run /systemd-meson-build/../build/src/cryptenroll/cryptenroll.c:673:32
[   63.226229] testsuite-70.sh[683]:     #4 0x56167ee5fb36 in main /systemd-meson-build/../build/src/cryptenroll/cryptenroll.c:692:1
[   63.226229] testsuite-70.sh[683]:     #5 0x7f199423c78f  (/usr/lib/libc.so.6+0x2378f) (BuildId: 4a4bec3d95a1804443e852958fe59ed461135ce9)
[   63.226229] testsuite-70.sh[683]: SUMMARY: AddressSanitizer: 64 byte(s) leaked in 1 allocation(s).

https://jenkins-systemd.apps.ocp.cloud.ci.centos.org/job/upstream-vagrant-archlinux-sanitizers/816/artifact//systemd-centos-ci/artifacts_all/artifacts_hwvz5viz/vagrant-logs.UQm/vagrant-arch-sanitizers-clang-testsuite.YlW/TEST-70-TPM2_2_sanitizer_errors_FAIL.log

Thank you sir.
I was having a hard time posting comments before.

$ dd if=/dev/zero of=luks.img bs=1M count=64 $ echo 1231dfsd234d | cryptsetup luksFormat luks.img $ build-san/systemd-cryptenroll luks.img SLOT TYPE 0 password ================================================================= ==640364==ERROR: LeakSanitizer: detected memory leaks Direct leak of 64 byte(s) in 1 object(s) allocated from: #0 0x7f43ffeb95b5 in __interceptor_realloc.part.0 (/lib64/libasan.so.8+0xb95b5) #1 0x7f43ff0a4f2f in greedy_realloc ../src/basic/alloc-util.c:70 #2 0x404d9f in list_enrolled ../src/cryptenroll/cryptenroll-list.c:30 #3 0x40f149 in run ../src/cryptenroll/cryptenroll.c:673 #4 0x40f149 in main ../src/cryptenroll/cryptenroll.c:692 #5 0x7f43fd64a50f in __libc_start_call_main (/lib64/libc.so.6+0x2750f) SUMMARY: AddressSanitizer: 64 byte(s) leaked in 1 allocation(s). Aborted (core dumped) Reported in #27007.

$ dd if=/dev/zero of=luks.img bs=1M count=64 $ echo 1231dfsd234d | cryptsetup luksFormat luks.img $ build-san/systemd-cryptenroll luks.img SLOT TYPE 0 password ================================================================= ==640364==ERROR: LeakSanitizer: detected memory leaks Direct leak of 64 byte(s) in 1 object(s) allocated from: #0 0x7f43ffeb95b5 in __interceptor_realloc.part.0 (/lib64/libasan.so.8+0xb95b5) systemd#1 0x7f43ff0a4f2f in greedy_realloc ../src/basic/alloc-util.c:70 systemd#2 0x404d9f in list_enrolled ../src/cryptenroll/cryptenroll-list.c:30 systemd#3 0x40f149 in run ../src/cryptenroll/cryptenroll.c:673 systemd#4 0x40f149 in main ../src/cryptenroll/cryptenroll.c:692 systemd#5 0x7f43fd64a50f in __libc_start_call_main (/lib64/libc.so.6+0x2750f) SUMMARY: AddressSanitizer: 64 byte(s) leaked in 1 allocation(s). Aborted (core dumped) Reported in systemd/systemd#27007. (cherry picked from commit 30dbadf)

$ dd if=/dev/zero of=luks.img bs=1M count=64 $ echo 1231dfsd234d | cryptsetup luksFormat luks.img $ build-san/systemd-cryptenroll luks.img SLOT TYPE 0 password ================================================================= ==640364==ERROR: LeakSanitizer: detected memory leaks Direct leak of 64 byte(s) in 1 object(s) allocated from: #0 0x7f43ffeb95b5 in __interceptor_realloc.part.0 (/lib64/libasan.so.8+0xb95b5) #1 0x7f43ff0a4f2f in greedy_realloc ../src/basic/alloc-util.c:70 #2 0x404d9f in list_enrolled ../src/cryptenroll/cryptenroll-list.c:30 #3 0x40f149 in run ../src/cryptenroll/cryptenroll.c:673 #4 0x40f149 in main ../src/cryptenroll/cryptenroll.c:692 #5 0x7f43fd64a50f in __libc_start_call_main (/lib64/libc.so.6+0x2750f) SUMMARY: AddressSanitizer: 64 byte(s) leaked in 1 allocation(s). Aborted (core dumped) Reported in systemd/systemd#27007. (cherry picked from commit 30dbadf)

$ dd if=/dev/zero of=luks.img bs=1M count=64 $ echo 1231dfsd234d | cryptsetup luksFormat luks.img $ build-san/systemd-cryptenroll luks.img SLOT TYPE 0 password ================================================================= ==640364==ERROR: LeakSanitizer: detected memory leaks Direct leak of 64 byte(s) in 1 object(s) allocated from: #0 0x7f43ffeb95b5 in __interceptor_realloc.part.0 (/lib64/libasan.so.8+0xb95b5) systemd#1 0x7f43ff0a4f2f in greedy_realloc ../src/basic/alloc-util.c:70 systemd#2 0x404d9f in list_enrolled ../src/cryptenroll/cryptenroll-list.c:30 systemd#3 0x40f149 in run ../src/cryptenroll/cryptenroll.c:673 systemd#4 0x40f149 in main ../src/cryptenroll/cryptenroll.c:692 systemd#5 0x7f43fd64a50f in __libc_start_call_main (/lib64/libc.so.6+0x2750f) SUMMARY: AddressSanitizer: 64 byte(s) leaked in 1 allocation(s). Aborted (core dumped) Reported in systemd/systemd#27007. (cherry picked from commit 30dbadf) (cherry picked from commit a19396c)

$ dd if=/dev/zero of=luks.img bs=1M count=64 $ echo 1231dfsd234d | cryptsetup luksFormat luks.img $ build-san/systemd-cryptenroll luks.img SLOT TYPE 0 password ================================================================= ==640364==ERROR: LeakSanitizer: detected memory leaks Direct leak of 64 byte(s) in 1 object(s) allocated from: #0 0x7f43ffeb95b5 in __interceptor_realloc.part.0 (/lib64/libasan.so.8+0xb95b5) #1 0x7f43ff0a4f2f in greedy_realloc ../src/basic/alloc-util.c:70 #2 0x404d9f in list_enrolled ../src/cryptenroll/cryptenroll-list.c:30 #3 0x40f149 in run ../src/cryptenroll/cryptenroll.c:673 #4 0x40f149 in main ../src/cryptenroll/cryptenroll.c:692 #5 0x7f43fd64a50f in __libc_start_call_main (/lib64/libc.so.6+0x2750f) SUMMARY: AddressSanitizer: 64 byte(s) leaked in 1 allocation(s). Aborted (core dumped) Reported in systemd/systemd#27007. (cherry picked from commit 30dbadf) (cherry picked from commit a19396c)

$ dd if=/dev/zero of=luks.img bs=1M count=64 $ echo 1231dfsd234d | cryptsetup luksFormat luks.img $ build-san/systemd-cryptenroll luks.img SLOT TYPE 0 password ================================================================= ==640364==ERROR: LeakSanitizer: detected memory leaks Direct leak of 64 byte(s) in 1 object(s) allocated from: #0 0x7f43ffeb95b5 in __interceptor_realloc.part.0 (/lib64/libasan.so.8+0xb95b5) systemd#1 0x7f43ff0a4f2f in greedy_realloc ../src/basic/alloc-util.c:70 systemd#2 0x404d9f in list_enrolled ../src/cryptenroll/cryptenroll-list.c:30 systemd#3 0x40f149 in run ../src/cryptenroll/cryptenroll.c:673 systemd#4 0x40f149 in main ../src/cryptenroll/cryptenroll.c:692 systemd#5 0x7f43fd64a50f in __libc_start_call_main (/lib64/libc.so.6+0x2750f) SUMMARY: AddressSanitizer: 64 byte(s) leaked in 1 allocation(s). Aborted (core dumped) Reported in systemd/systemd#27007. (cherry picked from commit 30dbadf) (cherry picked from commit a19396c) (cherry picked from commit 33a69cf)

$ dd if=/dev/zero of=luks.img bs=1M count=64 $ echo 1231dfsd234d | cryptsetup luksFormat luks.img $ build-san/systemd-cryptenroll luks.img SLOT TYPE 0 password ================================================================= ==640364==ERROR: LeakSanitizer: detected memory leaks Direct leak of 64 byte(s) in 1 object(s) allocated from: #0 0x7f43ffeb95b5 in __interceptor_realloc.part.0 (/lib64/libasan.so.8+0xb95b5) #1 0x7f43ff0a4f2f in greedy_realloc ../src/basic/alloc-util.c:70 #2 0x404d9f in list_enrolled ../src/cryptenroll/cryptenroll-list.c:30 #3 0x40f149 in run ../src/cryptenroll/cryptenroll.c:673 #4 0x40f149 in main ../src/cryptenroll/cryptenroll.c:692 #5 0x7f43fd64a50f in __libc_start_call_main (/lib64/libc.so.6+0x2750f) SUMMARY: AddressSanitizer: 64 byte(s) leaked in 1 allocation(s). Aborted (core dumped) Reported in systemd/systemd#27007. (cherry picked from commit 30dbadf) (cherry picked from commit a19396c) (cherry picked from commit 33a69cf)

$ dd if=/dev/zero of=luks.img bs=1M count=64 $ echo 1231dfsd234d | cryptsetup luksFormat luks.img $ build-san/systemd-cryptenroll luks.img SLOT TYPE 0 password ================================================================= ==640364==ERROR: LeakSanitizer: detected memory leaks Direct leak of 64 byte(s) in 1 object(s) allocated from: #0 0x7f43ffeb95b5 in __interceptor_realloc.part.0 (/lib64/libasan.so.8+0xb95b5) redhat-plumbers#1 0x7f43ff0a4f2f in greedy_realloc ../src/basic/alloc-util.c:70 redhat-plumbers#2 0x404d9f in list_enrolled ../src/cryptenroll/cryptenroll-list.c:30 redhat-plumbers#3 0x40f149 in run ../src/cryptenroll/cryptenroll.c:673 redhat-plumbers#4 0x40f149 in main ../src/cryptenroll/cryptenroll.c:692 redhat-plumbers#5 0x7f43fd64a50f in __libc_start_call_main (/lib64/libc.so.6+0x2750f) SUMMARY: AddressSanitizer: 64 byte(s) leaked in 1 allocation(s). Aborted (core dumped) Reported in systemd/systemd#27007. (cherry picked from commit 30dbadf) Related: RHEL-16182

$ dd if=/dev/zero of=luks.img bs=1M count=64 $ echo 1231dfsd234d | cryptsetup luksFormat luks.img $ build-san/systemd-cryptenroll luks.img SLOT TYPE 0 password ================================================================= ==640364==ERROR: LeakSanitizer: detected memory leaks Direct leak of 64 byte(s) in 1 object(s) allocated from: #0 0x7f43ffeb95b5 in __interceptor_realloc.part.0 (/lib64/libasan.so.8+0xb95b5) #1 0x7f43ff0a4f2f in greedy_realloc ../src/basic/alloc-util.c:70 #2 0x404d9f in list_enrolled ../src/cryptenroll/cryptenroll-list.c:30 #3 0x40f149 in run ../src/cryptenroll/cryptenroll.c:673 #4 0x40f149 in main ../src/cryptenroll/cryptenroll.c:692 #5 0x7f43fd64a50f in __libc_start_call_main (/lib64/libc.so.6+0x2750f) SUMMARY: AddressSanitizer: 64 byte(s) leaked in 1 allocation(s). Aborted (core dumped) Reported in systemd/systemd#27007. (cherry picked from commit 30dbadf) Related: RHEL-16182

github-actions bot added tests please-review PR is ready for (re-)review by a maintainer labels Mar 27, 2023

1awesomeJ mentioned this pull request Mar 27, 2023

[Outreachy 2023] Applicants tasks/contributions #26585

Closed

bluca reviewed Mar 27, 2023

View reviewed changes

bluca added reviewed/needs-rework 🔨 PR has been reviewed and needs another round of reworks and removed please-review PR is ready for (re-)review by a maintainer labels Mar 27, 2023

github-actions bot added please-review PR is ready for (re-)review by a maintainer and removed reviewed/needs-rework 🔨 PR has been reviewed and needs another round of reworks labels Mar 27, 2023

1awesomeJ force-pushed the new_integration_test branch from 6d1225f to d473370 Compare March 27, 2023 13:42

systemd-cryptenroll: added test cases to integration test

2fd0f45

1awesomeJ force-pushed the new_integration_test branch from d473370 to 2fd0f45 Compare March 27, 2023 13:46

github-actions bot added the util-lib label Mar 27, 2023

mrc0mmand mentioned this pull request Mar 27, 2023

cryptenroll: fix a memory leak #27018

Merged

1awesomeJ closed this Mar 27, 2023

github-actions bot removed the please-review PR is ready for (re-)review by a maintainer label Mar 27, 2023

1awesomeJ deleted the new_integration_test branch March 29, 2023 14:12

bluca added the 🙋🏽‍♀️ outreachy 🙋 label Apr 3, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

systemd-cryptenroll: added test cases to integration test #27007

systemd-cryptenroll: added test cases to integration test #27007

Uh oh!

1awesomeJ commented Mar 27, 2023

Uh oh!

1awesomeJ commented Mar 27, 2023

Uh oh!

bluca Mar 27, 2023

Uh oh!

bluca Mar 27, 2023

Uh oh!

bluca Mar 27, 2023

Uh oh!

1awesomeJ Mar 27, 2023

Uh oh!

1awesomeJ commented Mar 27, 2023

Uh oh!

mrc0mmand commented Mar 27, 2023

Uh oh!

1awesomeJ commented Mar 27, 2023

Uh oh!

1awesomeJ commented Mar 27, 2023

Uh oh!

1awesomeJ commented Mar 27, 2023

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

4 participants

Uh oh!

systemd-cryptenroll: added test cases to integration test #27007

systemd-cryptenroll: added test cases to integration test #27007

Uh oh!

Conversation

1awesomeJ commented Mar 27, 2023

Uh oh!

1awesomeJ commented Mar 27, 2023

Uh oh!

bluca Mar 27, 2023

Choose a reason for hiding this comment

Uh oh!

bluca Mar 27, 2023

Choose a reason for hiding this comment

Uh oh!

bluca Mar 27, 2023

Choose a reason for hiding this comment

Uh oh!

1awesomeJ Mar 27, 2023

Choose a reason for hiding this comment

Uh oh!

1awesomeJ commented Mar 27, 2023

Uh oh!

mrc0mmand commented Mar 27, 2023

Uh oh!

1awesomeJ commented Mar 27, 2023

Uh oh!

1awesomeJ commented Mar 27, 2023

Uh oh!

1awesomeJ commented Mar 27, 2023

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

4 participants