Merge lp:~chipaca/snappy/exec-self into lp:~snappy-dev/snappy/snappy-moved-to-github

[John Lenton]

Exec self instead of looking for 'snappy' in the path when unpacking via drop privs.

[lp:~chipaca/snappy/exec-self]

381. By John Lenton on 2015-04-16

spurious println

[Sergio Schvezov (sergiusens)]

This breaks u-d-f or webdm

review: Disapprove

Unmerged revisions

381. By John Lenton on 2015-04-16

spurious println

380. By John Lenton on 2015-04-16

exec self for unpack helper

=== modified file 'snappy/click.go'
--- snappy/click.go	2015-04-16 19:59:43 +0000
+++ snappy/click.go	2015-04-16 19:59:43 +0000
@@ -630,21 +630,6 @@
 	return nil
 }
 
-// takes a name and PATH (colon separated) and returns the full qualified path
-func findBinaryInPath(name, path string) string {
-	for _, entry := range strings.Split(path, ":") {
-		fname := filepath.Join(entry, name)
-		if st, err := os.Stat(fname); err == nil {
-			// check for any x bit
-			if st.Mode()&0111 != 0 {
-				return fname
-			}
-		}
-	}
-
-	return ""
-}
-
 // unpackWithDropPrivs is a helper that will unapck the ClickDeb content
 // into the target dir and drop privs when doing this.
 //
@@ -656,19 +641,7 @@
 		return d.Unpack(instDir)
 	}
 
-	// find priv helper executable
-	privHelper := ""
-	for _, path := range []string{"PATH", "GOPATH"} {
-		privHelper = findBinaryInPath("snappy", os.Getenv(path))
-		if privHelper != "" {
-			break
-		}
-	}
-	if privHelper == "" {
-		return ErrUnpackHelperNotFound
-	}
-
-	cmd := exec.Command(privHelper, "internal-unpack", d.Name(), instDir, globalRootDir)
+	cmd := exec.Command(os.Args[0], "internal-unpack", d.Name(), instDir, globalRootDir)
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	if err := cmd.Run(); err != nil {

=== modified file 'snappy/click_test.go'
--- snappy/click_test.go	2015-04-16 19:59:43 +0000
+++ snappy/click_test.go	2015-04-16 19:59:43 +0000
@@ -739,22 +739,6 @@
 
 }
 
-func (s *SnapTestSuite) TestFindBinaryInPath(c *C) {
-	fakeBinDir := c.MkDir()
-	runMePath := filepath.Join(fakeBinDir, "runme")
-	err := ioutil.WriteFile(runMePath, []byte(""), 0755)
-	c.Assert(err, IsNil)
-
-	p := filepath.Join(fakeBinDir, "not-executable")
-	err = ioutil.WriteFile(p, []byte(""), 0644)
-	c.Assert(err, IsNil)
-
-	fakePATH := fmt.Sprintf("/some/dir:%s", fakeBinDir)
-	c.Assert(findBinaryInPath("runme", fakePATH), Equals, runMePath)
-	c.Assert(findBinaryInPath("no-such-binary-nowhere", fakePATH), Equals, "")
-	c.Assert(findBinaryInPath("not-executable", fakePATH), Equals, "")
-}
-
 func (s *SnapTestSuite) TestLocalSnapInstallRunHooks(c *C) {
 	// we can not strip the global rootdir for the hook tests
 	stripGlobalRootDir = func(s string) string { return s }