Adding "mutable log paths" feature #665

galmasi · 2023-10-02T01:41:08Z

As discussed in Issue #657 -- initial commit for implementing configurable logging paths

galmasi · 2023-10-02T01:42:17Z

As mentioned above, please do not merge yet -- this is a trial balloon to see how many testing features I run afoul in one try. Also, the implementation is incomplete: the feature discussed in Issue #657 , info logging nonstandard log paths, is not yet implemented.

codecov · 2023-10-02T18:57:38Z

Codecov Report

Attention: 13 lines in your changes are missing coverage. Please review.

Comparison is base (63bb12d) 65.21% compared to head (f56bd27) 65.28%.

Additional details and impacted files

Flag	Coverage Δ
e2e-testsuite	`59.15% <77.55%> (+0.13%)`	⬆️
upstream-unit-tests	`52.30% <83.33%> (+0.22%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files	Coverage Δ
keylime-agent/src/common.rs	`67.70% <ø> (+1.03%)`	⬆️
keylime-agent/src/crypto.rs	`77.93% <ø> (ø)`
keylime-agent/src/main.rs	`62.99% <42.85%> (-0.36%)`	⬇️
keylime-agent/src/config.rs	`78.40% <79.54%> (-0.34%)`	⬇️

galmasi · 2023-10-09T19:19:32Z

@ansasaki @kkaarreell I do not believe I can improve the rust agent code in this PR anymore. I have been laboring under a misunderstanding of how rust agent testing is performed. I have created this one-line [PR] (RedHat-SP-Security/keylime-tests#498) in keylime-tests to help pass this PR.

Note that the testing feature in the keylime agent is not actually used for measured boot in the test framework; instead, the test framework directly seds the source code. This raises the issue that either

(a) the testing harness should be updated to compile the rust agent correctly by using cargo with the --feature testing parameters; -- or --
(b) let the SED command stay in the test code and remove the unused testing feature of the keylime agent.

ansasaki · 2023-10-10T09:46:50Z

@ansasaki @kkaarreell I do not believe I can improve the rust agent code in this PR anymore. I have been laboring under a misunderstanding of how rust agent testing is performed. I have created this one-line [PR] (RedHat-SP-Security/keylime-tests#498) in keylime-tests to help pass this PR.

Note that the testing feature in the keylime agent is not actually used for measured boot in the test framework; instead, the test framework directly seds the source code. This raises the issue that either

(a) the testing harness should be updated to compile the rust agent correctly by using cargo with the --feature testing parameters; -- or -- (b) let the SED command stay in the test code and remove the unused testing feature of the keylime agent.

This looks like a leftover. It should use the approach a and avoid changing the code. I'll try to get rid of that sed.

EDIT: BTW, the testing feature is used when the rust agent is installed from the RPM in Copr (which is always build with the testing feature enabled). Only in the cases it is build and installed during the tests (for code coverage measurement) it was not being used and the sed approach was applied.

galmasi · 2023-10-10T17:09:43Z

I closed RedHat-SP-Security/keylime-tests#498 in the expectation that RedHat-SP-Security/keylime-tests#499 will solve this problem. Will force a re-test as soon as 499 is merged.

GNUmakefile

keylime-agent/src/config.rs

keylime-agent/src/main.rs

ansasaki · 2024-01-11T13:49:49Z

@galmasi Hi, is there anything blocking you here that I can help you with?

galmasi · 2024-01-17T14:31:50Z

I'll take another look at all the changes I have made and try to reconcile. I have rebased to the current master, but there are a number of thinking errors that I need to address: chief among them, config_file_get_path(). I need to build a test case that shows it used wrong, then fix it.

aplanas · 2024-01-29T12:17:50Z

keylime-agent/src/config.rs

@@ -515,6 +532,14 @@ impl Source for KeylimeConfig {
            "agent_data_path".to_string(),
            self.agent.agent_data_path.to_string().into(),
        );
+        _ = m.insert(


So many _ seems a bit ugly. I wonder if this can help: rust-lang/rfcs#3092

Thanks for the pointer, but unfortunately we cannot use this (yet). It is still available only on nightly:
https://doc.rust-lang.org/std/collections/struct.HashMap.html#method.try_insert

ansasaki · 2024-01-29T13:03:48Z

Hi @galmasi, I took the liberty to make the formatting changes and rebase. I'd like to ask if I can also add the configuration change required (in the case, include the new configuration options and bump the version)

EDIT: we will also need to update the templates in the python side and bump the version there. If possible, we should do both before @maugustosilva creates the new tag for the monthly release.

…ylime configuration. Signed-off-by: George Almasi <[email protected]> Signed-off-by: Anderson Toshiyuki Sasaki <[email protected]>

This introduces the 'ima_ml_path' and 'measuredboot_ml_path' options to set the IMA measurement log and Measured Boot event log, respectively. This also bumps the configuration version to 2.2 as new options were added. Signed-off-by: Anderson Toshiyuki Sasaki <[email protected]>

ansasaki · 2024-01-30T13:33:19Z

I'll squash some commits and rebase. Note that I added a commit to add the new configuration options.

keylime-bot requested review from sergio-correia, ansasaki and lukehinds October 2, 2023 01:41

keylime-bot assigned ansasaki, sergio-correia and lukehinds Oct 2, 2023

galmasi force-pushed the settable-logpaths branch from 012c66b to 5e73835 Compare October 4, 2023 16:47

galmasi changed the title ~~[DO NOT MERGE] Adding "mutable log paths" feature~~ Adding "mutable log paths" feature Oct 4, 2023

galmasi mentioned this pull request Oct 9, 2023

Rust agent test fix: RedHat-SP-Security/keylime-tests#498

Closed

galmasi mentioned this pull request Oct 10, 2023

install_upstream_rust_keylime: allow setting measurements location RedHat-SP-Security/keylime-tests#499

Merged

ansasaki requested changes Oct 16, 2023

View reviewed changes

GNUmakefile Show resolved Hide resolved

keylime-agent/src/config.rs Outdated Show resolved Hide resolved

keylime-agent/src/main.rs Show resolved Hide resolved

keylime-bot assigned galmasi and unassigned lukehinds, ansasaki and sergio-correia Oct 16, 2023

THS-on mentioned this pull request Oct 26, 2023

Meeting 25/10/23 keylime/meetings#70

Closed

24 tasks

galmasi force-pushed the settable-logpaths branch from 911ef9b to 048f6c0 Compare January 17, 2024 14:13

ansasaki force-pushed the settable-logpaths branch from 5a05030 to 899cdf8 Compare January 29, 2024 10:35

ansasaki approved these changes Jan 29, 2024

View reviewed changes

aplanas approved these changes Jan 29, 2024

View reviewed changes

ansasaki added the configuration Involves changes to configuration file format label Jan 29, 2024

keylime-bot assigned sergio-correia and unassigned galmasi Jan 29, 2024

keylime-bot assigned lukehinds Jan 29, 2024

George Almasi and others added 2 commits January 30, 2024 14:31

Mutable log paths: allow IMA and MBA log paths to be overridden by ke…

6342cec

…ylime configuration. Signed-off-by: George Almasi <[email protected]> Signed-off-by: Anderson Toshiyuki Sasaki <[email protected]>

ansasaki force-pushed the settable-logpaths branch from b36af2a to f56bd27 Compare January 30, 2024 13:34

ansasaki merged commit 6c9db8b into keylime:master Jan 30, 2024
10 checks passed

ansasaki mentioned this pull request Jan 30, 2024

Proposal: remove "testing only" limitation from agent: allow configurable locations for boot and IMA logs. #657

Closed

galmasi mentioned this pull request Feb 14, 2024

typo fix for default path to measured boot log file #743

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adding "mutable log paths" feature #665

Adding "mutable log paths" feature #665

galmasi commented Oct 2, 2023

galmasi commented Oct 2, 2023

codecov bot commented Oct 2, 2023 •

edited

Loading

galmasi commented Oct 9, 2023

ansasaki commented Oct 10, 2023 •

edited

Loading

galmasi commented Oct 10, 2023

ansasaki commented Jan 11, 2024

galmasi commented Jan 17, 2024

aplanas Jan 29, 2024

ansasaki Jan 29, 2024

ansasaki commented Jan 29, 2024 •

edited

Loading

ansasaki commented Jan 30, 2024

Adding "mutable log paths" feature #665

Adding "mutable log paths" feature #665

Conversation

galmasi commented Oct 2, 2023

galmasi commented Oct 2, 2023

codecov bot commented Oct 2, 2023 • edited Loading

Codecov Report

galmasi commented Oct 9, 2023

ansasaki commented Oct 10, 2023 • edited Loading

galmasi commented Oct 10, 2023

ansasaki commented Jan 11, 2024

galmasi commented Jan 17, 2024

aplanas Jan 29, 2024

Choose a reason for hiding this comment

ansasaki Jan 29, 2024

Choose a reason for hiding this comment

ansasaki commented Jan 29, 2024 • edited Loading

ansasaki commented Jan 30, 2024

codecov bot commented Oct 2, 2023 •

edited

Loading

ansasaki commented Oct 10, 2023 •

edited

Loading

ansasaki commented Jan 29, 2024 •

edited

Loading