| Message ID | 20200430095249.782597-12-thomas.petazzoni@bootlin.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | Overwritten file detection, improvements to file listing logic | expand |
Thomas, All, On 2020-04-30 11:52 +0200, Thomas Petazzoni spake thusly: > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> > --- [--SNIP--] > diff --git a/support/testing/tests/core/test_file_overwrite.py b/support/testing/tests/core/test_file_overwrite.py > new file mode 100644 > index 0000000000..526ed55e43 > --- /dev/null > +++ b/support/testing/tests/core/test_file_overwrite.py > @@ -0,0 +1,47 @@ > +import infra > +import infra.basetest > +import subprocess > + > + > +class DetectTargetFileOverwriteTest(infra.basetest.BRConfigTest): > + config = \ > + infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ > + infra.basetest.MINIMAL_CONFIG + \ > + """ > + BR2_PER_PACKAGE_DIRECTORIES=y > + BR2_PACKAGE_DETECT_OVERWRITE=y > + """ > + br2_external = [infra.filepath("tests/core/br2-external/detect-overwrite")] > + > + def test_run(self): > + with self.assertRaises(SystemError): > + self.b.build() > + logf_path = infra.log_file_path(self.b.builddir, "build", > + infra.basetest.BRConfigTest.logtofile) > + if logf_path: > + s = './etc/passwd: FAILED' > + logf = open(logf_path, "r") > + ret = subprocess.call(["grep", "-q", s], stdin=logf) > + self.assertEqual(ret, 0) This does not need a subprocess, and can be done efficiently in python, like suggested in my review of patch 10. Note thatif the search pattern does not occur at the beginning of the line, we can do: s = 'blabla' for open(log_path, "r") as f: lines = [l for l in f.readlines() if s in l] Ditto for the other test, of course. ;-) Regards, Yann E. MORIN. > + > +class DetectHostFileOverwriteTest(infra.basetest.BRConfigTest): > + config = \ > + infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ > + infra.basetest.MINIMAL_CONFIG + \ > + """ > + BR2_PER_PACKAGE_DIRECTORIES=y > + BR2_PACKAGE_HOST_DETECT_OVERWRITE=y > + """ > + br2_external = [infra.filepath("tests/core/br2-external/detect-overwrite")] > + > + def test_run(self): > + with self.assertRaises(SystemError): > + self.b.build() > + logf_path = infra.log_file_path(self.b.builddir, "build", > + infra.basetest.BRConfigTest.logtofile) > + if logf_path: > + s = './lib/pkgconfig/libpkgconf.pc: FAILED' > + logf = open(logf_path, "r") > + ret = subprocess.call(["grep", "-q", s], stdin=logf) > + self.assertEqual(ret, 0) > -- > 2.25.4 >
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dd69fb9d50..64266d8783 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -356,6 +356,8 @@ tests.boot.test_syslinux.TestSysLinuxX86_64EFI: { extends: .runtime_test } tests.boot.test_syslinux.TestSysLinuxX86_64LegacyBios: { extends: .runtime_test } tests.core.test_bad_arch.DetectBadArchTest: { extends: .runtime_test } tests.core.test_file_capabilities.TestFileCapabilities: { extends: .runtime_test } +tests.core.test_file_overwrite.DetectHostFileOverwriteTest: { extends: .runtime_test } +tests.core.test_file_overwrite.DetectTargetFileOverwriteTest: { extends: .runtime_test } tests.core.test_hardening.TestFortifyConserv: { extends: .runtime_test } tests.core.test_hardening.TestFortifyNone: { extends: .runtime_test } tests.core.test_hardening.TestRelro: { extends: .runtime_test } diff --git a/support/testing/tests/core/br2-external/detect-overwrite/Config.in b/support/testing/tests/core/br2-external/detect-overwrite/Config.in new file mode 100644 index 0000000000..b5514510bd --- /dev/null +++ b/support/testing/tests/core/br2-external/detect-overwrite/Config.in @@ -0,0 +1 @@ +source "$BR2_EXTERNAL_DETECT_OVERWRITE_PATH/package/detect-overwrite/Config.in" diff --git a/support/testing/tests/core/br2-external/detect-overwrite/external.desc b/support/testing/tests/core/br2-external/detect-overwrite/external.desc new file mode 100644 index 0000000000..6fedc276e8 --- /dev/null +++ b/support/testing/tests/core/br2-external/detect-overwrite/external.desc @@ -0,0 +1 @@ +name: DETECT_OVERWRITE diff --git a/support/testing/tests/core/br2-external/detect-overwrite/external.mk b/support/testing/tests/core/br2-external/detect-overwrite/external.mk new file mode 100644 index 0000000000..90927b33ef --- /dev/null +++ b/support/testing/tests/core/br2-external/detect-overwrite/external.mk @@ -0,0 +1 @@ +include $(sort $(wildcard $(BR2_EXTERNAL_DETECT_OVERWRITE_PATH)/package/*/*.mk)) diff --git a/support/testing/tests/core/br2-external/detect-overwrite/package/detect-overwrite/Config.in b/support/testing/tests/core/br2-external/detect-overwrite/package/detect-overwrite/Config.in new file mode 100644 index 0000000000..fff8b0320f --- /dev/null +++ b/support/testing/tests/core/br2-external/detect-overwrite/package/detect-overwrite/Config.in @@ -0,0 +1,5 @@ +config BR2_PACKAGE_DETECT_OVERWRITE + bool "detect-overwrite" + +config BR2_PACKAGE_HOST_DETECT_OVERWRITE + bool "host-detect-overwrite" diff --git a/support/testing/tests/core/br2-external/detect-overwrite/package/detect-overwrite/detect-overwrite.mk b/support/testing/tests/core/br2-external/detect-overwrite/package/detect-overwrite/detect-overwrite.mk new file mode 100644 index 0000000000..c6df2a339d --- /dev/null +++ b/support/testing/tests/core/br2-external/detect-overwrite/package/detect-overwrite/detect-overwrite.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# detect-overwrite +# +################################################################################ + +define DETECT_OVERWRITE_INSTALL_TARGET_CMDS + grep -q "^foo" $(TARGET_DIR)/etc/passwd || \ + echo "foo" >> $(TARGET_DIR)/etc/passwd +endef + +HOST_DETECT_OVERWRITE_DEPENDENCIES = host-pkgconf + +define HOST_DETECT_OVERWRITE_INSTALL_CMDS + $(SED) 's/manipulating/tweaking/' $(HOST_DIR)/lib/pkgconfig/libpkgconf.pc +endef + +$(eval $(generic-package)) +$(eval $(host-generic-package)) diff --git a/support/testing/tests/core/test_file_overwrite.py b/support/testing/tests/core/test_file_overwrite.py new file mode 100644 index 0000000000..526ed55e43 --- /dev/null +++ b/support/testing/tests/core/test_file_overwrite.py @@ -0,0 +1,47 @@ +import infra +import infra.basetest +import subprocess + + +class DetectTargetFileOverwriteTest(infra.basetest.BRConfigTest): + config = \ + infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + infra.basetest.MINIMAL_CONFIG + \ + """ + BR2_PER_PACKAGE_DIRECTORIES=y + BR2_PACKAGE_DETECT_OVERWRITE=y + """ + br2_external = [infra.filepath("tests/core/br2-external/detect-overwrite")] + + def test_run(self): + with self.assertRaises(SystemError): + self.b.build() + logf_path = infra.log_file_path(self.b.builddir, "build", + infra.basetest.BRConfigTest.logtofile) + if logf_path: + s = './etc/passwd: FAILED' + logf = open(logf_path, "r") + ret = subprocess.call(["grep", "-q", s], stdin=logf) + self.assertEqual(ret, 0) + + +class DetectHostFileOverwriteTest(infra.basetest.BRConfigTest): + config = \ + infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + infra.basetest.MINIMAL_CONFIG + \ + """ + BR2_PER_PACKAGE_DIRECTORIES=y + BR2_PACKAGE_HOST_DETECT_OVERWRITE=y + """ + br2_external = [infra.filepath("tests/core/br2-external/detect-overwrite")] + + def test_run(self): + with self.assertRaises(SystemError): + self.b.build() + logf_path = infra.log_file_path(self.b.builddir, "build", + infra.basetest.BRConfigTest.logtofile) + if logf_path: + s = './lib/pkgconfig/libpkgconf.pc: FAILED' + logf = open(logf_path, "r") + ret = subprocess.call(["grep", "-q", s], stdin=logf) + self.assertEqual(ret, 0)
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> --- .gitlab-ci.yml | 2 + .../br2-external/detect-overwrite/Config.in | 1 + .../detect-overwrite/external.desc | 1 + .../br2-external/detect-overwrite/external.mk | 1 + .../package/detect-overwrite/Config.in | 5 ++ .../detect-overwrite/detect-overwrite.mk | 19 ++++++++ .../testing/tests/core/test_file_overwrite.py | 47 +++++++++++++++++++ 7 files changed, 76 insertions(+) create mode 100644 support/testing/tests/core/br2-external/detect-overwrite/Config.in create mode 100644 support/testing/tests/core/br2-external/detect-overwrite/external.desc create mode 100644 support/testing/tests/core/br2-external/detect-overwrite/external.mk create mode 100644 support/testing/tests/core/br2-external/detect-overwrite/package/detect-overwrite/Config.in create mode 100644 support/testing/tests/core/br2-external/detect-overwrite/package/detect-overwrite/detect-overwrite.mk create mode 100644 support/testing/tests/core/test_file_overwrite.py