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

[Sergio Schvezov]

Don't allow installation of packages with unsupported architectures

I hope but don't think this will be able to be directly backported :-)

[John Lenton (chipaca)]

Nice! One minuscule nit.

review: Approve

[lp:~sergiusens/snappy/YouShallNotPass]

485. By Sergio Schvezov on 2015-06-04

comma space, always comma space

486. By Sergio Schvezov on 2015-06-04

Adding a test to test the error

[Sergio Schvezov (sergiusens)]

On Thu, Jun 04, 2015 at 09:26:57PM -0000, Michael Vogt wrote:
>
>
> Diff comments:
>
> > === modified file 'helpers/helpers.go'
> > --- helpers/helpers.go 2015-06-03 14:01:51 +0000
> > +++ helpers/helpers.go 2015-06-04 13:35:20 +0000
> > @@ -197,6 +197,20 @@
> > }
> > }
> >
> > +// IsSupportedArchitecture returns true if the system architecture is in the
> > +// list of architectures.
> > +func IsSupportedArchitecture(architectures []string) bool {
>
> I am a bit late to the party I guess so I shouldn't complain ;) I'm a bit uncertainy if helpers/ is the best place for this. Helpers a bit of a catch-all-bag but so far mostly for stuff that is pretty generic and could be re-used in very different projects than snappy. Not sure how well this fits. But then UbuntuArchitecture() is also in helpers so I guess its fine and I stop to jabber :)

The only reason I put this code in helpers is because UbuntuArchitecture
was already here; it also made backporting easier as there ir a major
refactor in clickInstall and SnapParts going on.

=== modified file 'helpers/helpers.go'
--- helpers/helpers.go	2015-06-03 14:01:51 +0000
+++ helpers/helpers.go	2015-06-04 13:35:20 +0000
@@ -197,6 +197,20 @@
 	}
 }
 
+// IsSupportedArchitecture returns true if the system architecture is in the
+// list of architectures.
+func IsSupportedArchitecture(architectures []string) bool {
+	systemArch := UbuntuArchitecture()
+
+	for _, arch := range architectures {
+		if arch == "all" || arch == systemArch {
+			return true
+		}
+	}
+
+	return false
+}
+
 // Sha512sum returns the sha512 of the given file as a hexdigest
 func Sha512sum(infile string) (hexdigest string, err error) {
 	r, err := os.Open(infile)

=== modified file 'helpers/helpers_test.go'
--- helpers/helpers_test.go	2015-06-02 20:46:07 +0000
+++ helpers/helpers_test.go	2015-06-04 13:35:20 +0000
@@ -97,6 +97,18 @@
 	c.Check(UbuntuArchitecture(), Equals, "i386")
 }
 
+func (ts *HTestSuite) TestSupportedArchitectures(c *C) {
+	goarch = "arm"
+	c.Check(IsSupportedArchitecture([]string{"all"}), Equals, true)
+	c.Check(IsSupportedArchitecture([]string{"amd64", "armhf", "powerpc"}), Equals, true)
+	c.Check(IsSupportedArchitecture([]string{"armhf"}), Equals, true)
+	c.Check(IsSupportedArchitecture([]string{"amd64", "powerpc"}), Equals, false)
+
+	goarch = "amd64"
+	c.Check(IsSupportedArchitecture([]string{"amd64", "armhf", "powerpc"}), Equals, true)
+	c.Check(IsSupportedArchitecture([]string{"powerpc"}), Equals, false)
+}
+
 func (ts *HTestSuite) TestChdir(c *C) {
 	tmpdir := c.MkDir()
 

=== modified file 'snappy/errors.go'
--- snappy/errors.go	2015-05-28 11:58:30 +0000
+++ snappy/errors.go	2015-06-04 13:35:20 +0000
@@ -23,6 +23,8 @@
 	"errors"
 	"fmt"
 	"strings"
+
+	"launchpad.net/snappy/helpers"
 )
 
 var (
@@ -140,6 +142,16 @@
 	ErrInvalidSeccompPolicy = errors.New("policy-version and policy-vendor must be specified together")
 )
 
+// ErrArchitectureNotSupported is returned when trying to install a snappy package that
+// is not supported on the system
+type ErrArchitectureNotSupported struct {
+	architectures []string
+}
+
+func (e *ErrArchitectureNotSupported) Error() string {
+	return fmt.Sprintf("package's supported architectures (%s) is incompatible with this system (%s)", strings.Join(e.architectures, ", "), helpers.UbuntuArchitecture())
+}
+
 // ErrInstallFailed is an error type for installation errors for snaps
 type ErrInstallFailed struct {
 	snap    string

=== modified file 'snappy/snapp.go'
--- snappy/snapp.go	2015-05-29 13:22:14 +0000
+++ snappy/snapp.go	2015-06-04 13:35:20 +0000
@@ -941,6 +941,11 @@
 		return err
 	}
 
+	// verify we have a valid architecture
+	if !helpers.IsSupportedArchitecture(s.m.Architectures) {
+		return &ErrArchitectureNotSupported{s.m.Architectures}
+	}
+
 	if err := s.m.checkForNameClashes(); err != nil {
 		return err
 	}

=== modified file 'snappy/snapp_test.go'
--- snappy/snapp_test.go	2015-06-02 20:46:07 +0000
+++ snappy/snapp_test.go	2015-06-04 13:35:20 +0000
@@ -20,6 +20,7 @@
 package snappy
 
 import (
+	"fmt"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -708,6 +709,25 @@
 	c.Check(p.notified[0], Matches, "Waiting for .* stop.")
 }
 
+func (s *SnapTestSuite) TestErrorOnUnsupportedArchitecture(c *C) {
+	const packageHello = `name: hello-app
+version: 1.10
+vendor: Somebody
+icon: meta/hello.svg
+architectures:
+    - yadayada
+    - blahblah
+`
+
+	snapPkg := makeTestSnapPackage(c, packageHello)
+	part, err := NewSnapPartFromSnapFile(snapPkg, "original", true)
+	c.Assert(err, IsNil)
+
+	_, err = part.Install(&MockProgressMeter{}, 0)
+	errorMsg := fmt.Sprintf("package's supported architectures (yadayada, blahblah) is incompatible with this system (%s)", helpers.UbuntuArchitecture())
+	c.Assert(err.Error(), Equals, errorMsg)
+}
+
 func (s *SnapTestSuite) TestRemoteSnapErrors(c *C) {
 	snap := RemoteSnapPart{}