dirs,interfaces/apparmor: remove unused apparmor cache entries #770
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
This patch just makes access to apparmor cache directory follow standard directory variables so that upcoming support to apparmor cache removal can be easily tested. Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
This patch ensures that we remove the apparmor cache file when removing the profile text. The cache is written by apparmor_parser but is never removed. Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
| @@ -70,6 +73,22 @@ apparmor_parser output: | |||
| "--replace --write-cache -O no-expr-simplify --cache-loc=/var/cache/apparmor /path/to/snap.samba.smbd"}) | |||
There was a problem hiding this comment.
This context for the diff shows a hard-coded --cache-loc. Please adjust it and any other uses of --cache-loc. With those changes, LGTM.
There was a problem hiding this comment.
This is okay (in this case) because we don't divert the root directory. I can add the diversion to ensure we are indeed using the variable name.
|
LGTM, but it feels like the logic might be simplified a bit in some cases, per inline comments. |
This patch merges the two function so that LoadProfile is completely undone by UnloadProfile. In addition, it is no longer an error for UnloadProfile to not remove a missing cache entry (for whatever reason, the cache might be missing and this should not be a problem). Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
| err = os.MkdirAll(dirs.AppArmorCacheDir, 0700) | ||
| c.Assert(err, IsNil) | ||
| // Mock away any real apparmor interaction | ||
| s.mockCmd = testutil.MockCommand(c, "apparmor_parser", fakeAppArmorParser) |
There was a problem hiding this comment.
Which mock command? This should probably be s.parserCmd.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This branch ensures we remove entries from
/var/cache/apparmorcorresponding to removed apparmor profiles. We have to do this becauseapparmor_parserwrites the cache but never removes it.