interfaecs/apparmor: remove all traces of old-security from apparmor backend #955

Merged
merged 7 commits into from Apr 14, 2016

Conversation

Projects
None yet
3 participants
Contributor

zyga commented Apr 14, 2016

This branch streamlines the apparmor policy code that no longer needs to support old-security

zyga added some commits Apr 14, 2016

interfaces/apparmor: remove support for loading custom templates
Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
interfaces/apparmor: add SNAP_REVISION to modern variables
Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
interfaces/apparmor: remove APP_SECURITY_TAG
Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
interfaces/apparmor: switch to modern variables
Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
interfaces/apparmor: remove legacy variables
Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
interfaces/apparmor: rename modernVariables to templateVariables
Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
interfaces/apparmor/template.go
# Allow apps from the same package to communicate with each other via an
# abstract or anonymous socket
- unix peer=(label=@{APP_PKGNAME}_*),
+ unix peer=(label=@{SNAP_NAME}_*),
@jdstrand

jdstrand Apr 14, 2016

Contributor

This needs to be:
+ unix peer=(label=snap.@{SNAP_NAME}.*),

@zyga

zyga Apr 14, 2016

Contributor

Ah, I remember your comment the other day now. Thanks fixing

interfaces/apparmor/template.go
# Allow apps from the same package to signal each other via signals
- signal peer=@{APP_PKGNAME}_*,
+ signal peer=@{SNAP_NAME}_*,
@jdstrand

jdstrand Apr 14, 2016

Contributor

This needs to be:
+ signal peer=snap.@{SNAP_NAME}.*,

@zyga

zyga Apr 14, 2016

Contributor

@jdstrand fixed in a481e20 (same as above)

Contributor

jdstrand commented Apr 14, 2016

I'll let someone else comment on the code changes. The apparmor variable changes look fine assuming you make the suggested changes.

interfaces/apparmor: correct template issues
Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
Contributor

niemeyer commented Apr 14, 2016

Why do we not have integration test results anymore? :(

@niemeyer niemeyer merged commit 1de3003 into snapcore:master Apr 14, 2016

3 checks passed

Integration tests Success
Details
autopkgtest Success
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@zyga zyga deleted the zyga:ifaces-kill-old-security branch Dec 12, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment