Merge lp:~sergiusens/snappy/policyRoot into lp:~snappy-dev/snappy/snappy-moved-to-github

[Sergio Schvezov]

Consider the root directory when installing and removing policies

[Michael Vogt (mvo)]

Good catch!

review: Approve

=== modified file 'policy/policy.go'
--- policy/policy.go	2015-05-15 13:33:27 +0000
+++ policy/policy.go	2015-06-12 03:58:44 +0000
@@ -60,7 +60,7 @@
 // Directories are created as needed. Errors out with any of the things that
 // could go wrong with this, including a file found by glob not being a
 // regular file.
-func iterOp(op policyOp, glob string, targetDir string, prefix string) (err error) {
+func iterOp(op policyOp, glob, targetDir, prefix string) (err error) {
 	if err = os.MkdirAll(targetDir, 0755); err != nil {
 		return fmt.Errorf("unable to make %v directory: %v", targetDir, err)
 	}
@@ -104,11 +104,11 @@
 
 // frameworkOp perform the given operation (either Install or Remove) on the
 // given package that's installed in the given path.
-func frameworkOp(op policyOp, pkgName string, instPath string) error {
+func frameworkOp(op policyOp, pkgName, instPath, rootDir string) error {
 	pol := filepath.Join(instPath, "meta", "framework-policy")
 	for _, i := range []string{"apparmor", "seccomp"} {
 		for _, j := range []string{"policygroups", "templates"} {
-			if err := iterOp(op, filepath.Join(pol, i, j, "*"), filepath.Join(SecBase, i, j), pkgName+"_"); err != nil {
+			if err := iterOp(op, filepath.Join(pol, i, j, "*"), filepath.Join(rootDir, SecBase, i, j), pkgName+"_"); err != nil {
 				return err
 			}
 		}
@@ -119,14 +119,14 @@
 
 // Install sets up the framework's policy from the given snap that's
 // installed in the given path.
-func Install(pkgName string, instPath string) error {
-	return frameworkOp(install, pkgName, instPath)
+func Install(pkgName, instPath, rootDir string) error {
+	return frameworkOp(install, pkgName, instPath, rootDir)
 }
 
 // Remove cleans up the framework's policy from the given snap that's
 // installed in the given path.
-func Remove(pkgName string, instPath string) error {
-	return frameworkOp(remove, pkgName, instPath)
+func Remove(pkgName, instPath, rootDir string) error {
+	return frameworkOp(remove, pkgName, instPath, rootDir)
 }
 
 func aaUp(old, new, dir, pfx string) map[string]bool {

=== modified file 'policy/policy_test.go'
--- policy/policy_test.go	2015-06-02 20:53:10 +0000
+++ policy/policy_test.go	2015-06-12 03:58:44 +0000
@@ -26,8 +26,9 @@
 	"path/filepath"
 	"testing"
 
+	"sort"
+
 	. "gopkg.in/check.v1"
-	"sort"
 )
 
 // Hook up check.v1 into the "go test" runner.
@@ -140,13 +141,14 @@
 }
 
 func (s *policySuite) TestFrameworkRoundtrip(c *C) {
+	rootDir := c.MkDir()
 	SecBase = s.dest
-	c.Check(Install("foo", s.orig), IsNil)
+	c.Check(Install("foo", s.orig, rootDir), IsNil)
 	// check the files were copied, with the packagename prepended properly
-	g, err := filepath.Glob(filepath.Join(SecBase, "*", "*", "foo_*"))
+	g, err := filepath.Glob(filepath.Join(rootDir, SecBase, "*", "*", "foo_*"))
 	c.Check(err, IsNil)
 	c.Check(g, HasLen, 4*3)
-	c.Check(Remove("foo", s.orig), IsNil)
+	c.Check(Remove("foo", s.orig, rootDir), IsNil)
 	g, err = filepath.Glob(filepath.Join(SecBase, "*", "*", "*"))
 	c.Check(err, IsNil)
 	c.Check(g, HasLen, 0)
@@ -155,7 +157,7 @@
 func (s *policySuite) TestFrameworkError(c *C) {
 	// check we get errors from the iterOp, is all
 	SecBase = s.dest
-	c.Check(frameworkOp(42, "foo", s.orig), ErrorMatches, ".*unknown operation.*")
+	c.Check(frameworkOp(42, "foo", s.orig, ""), ErrorMatches, ".*unknown operation.*")
 }
 
 func (s *policySuite) TestOpString(c *C) {

=== modified file 'snappy/snapp.go'
--- snappy/snapp.go	2015-06-09 19:11:54 +0000
+++ snappy/snapp.go	2015-06-12 03:58:44 +0000
@@ -939,7 +939,7 @@
 	}
 
 	if s.Type() == pkg.TypeFramework {
-		if err := policy.Install(s.Name(), s.basedir); err != nil {
+		if err := policy.Install(s.Name(), s.basedir, globalRootDir); err != nil {
 			return err
 		}
 	}
@@ -1001,7 +1001,7 @@
 	}
 
 	if s.Type() == pkg.TypeFramework {
-		if err := policy.Remove(s.Name(), s.basedir); err != nil {
+		if err := policy.Remove(s.Name(), s.basedir, globalRootDir); err != nil {
 			return err
 		}
 	}