interfaces: add common support for udev #3658
Merged
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
Many interfaces will need to support udev-based device tagging. To counter the explosion of custom interface types the common interface can be grown to support per-app udev tags. There's also some helper for testing, placed in export_test.go, since common_test is not using builtin_test package. I'll clean that up separately. Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
zyga
force-pushed
the
feature/common-interface-udev-support
branch
from
736194b
to
a370824
Compare
Codecov Report
@@ Coverage Diff @@
## master #3658 +/- ##
==========================================
+ Coverage 75.16% 75.18% +0.01%
==========================================
Files 388 388
Lines 33628 33637 +9
==========================================
+ Hits 25278 25289 +11
+ Misses 6534 6532 -2
Partials 1816 1816
Continue to review full report at Codecov.
|
adglkh
reviewed
Aug 4, 2017
| @@ -142,3 +145,15 @@ func (iface *commonInterface) SecCompConnectedPlug(spec *seccomp.Specification, | |||
| } | |||
| return nil | |||
| } | |||
|
|
|||
| func (iface *commonInterface) UDevConnectedPlug(spec *udev.Specification, plug *interfaces.Plug, plugAttrs map[string]interface{}, slot *interfaces.Slot, slotAttrs map[string]interface{}) error { | |||
| old := "###SLOT_SECURITY_TAGS###" | |||
There was a problem hiding this comment.
I prefer to use the following code for a few reasons here, instead of introducing tags and doing the string.Replace here.
- less code for consistency with other functions in commonInterface
- In favor of "format" here rather than "replace" for performance consideration (nitpicking, we have a large code snippet udev rules for udisk2, modemManager, maybe more in the future)
if iface.connectedPlugUdev != "" {
for appName := range plug.Apps {
tag := udevSnapSecurityName(plug.Snap.Name(), appName)
spec.AddSnippet(fmt.Sprintf(iface.connectedPlugUdev, tag))
}
}
People could use %[1]s if there're multiple udev entries there or simply use "%s" if only one entry exists.
I'll leave the decision to you though.
There was a problem hiding this comment.
I used format first but then changed this so that it is consistent with ###replaceme### markers we use elsewhere in the interface code. We can revisit that but then we should do it consistently in the whole stack (all of builtin/*.go)
adglkh
approved these changes
Aug 4, 2017
| @@ -142,3 +145,15 @@ func (iface *commonInterface) SecCompConnectedPlug(spec *seccomp.Specification, | |||
| } | |||
| return nil | |||
| } | |||
|
|
|||
| func (iface *commonInterface) UDevConnectedPlug(spec *udev.Specification, plug *interfaces.Plug, plugAttrs map[string]interface{}, slot *interfaces.Slot, slotAttrs map[string]interface{}) error { | |||
| old := "###SLOT_SECURITY_TAGS###" | |||
chipaca
approved these changes
Aug 4, 2017
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.
Many interfaces will need to support udev-based device tagging. To
counter the explosion of custom interface types the common interface can
be grown to support per-app udev tags.
There's also some helper for testing, placed in export_test.go, since
common_test is not using builtin_test package. I'll clean that up
separately.
Signed-off-by: Zygmunt Krynicki zygmunt.krynicki@canonical.com