Merge lp:~sergiusens/snappy/YouShallNotPassBeforeEither into lp:~snappy-dev/snappy/15.04-deprecated

[Sergio Schvezov]

Don't allow installation of packages with unsupported architectures (backported from trunk with bzr merge -c 484 from trunk)

[lp:~sergiusens/snappy/YouShallNotPassBeforeEither]

450. By Sergio Schvezov on 2015-06-04

Don't allow installation of packages with unsupported architectures (backported from trunk with bzr merge -c 484 from trunk)

[John Lenton (chipaca)]

review: Approve

=== modified file 'helpers/helpers.go'
--- helpers/helpers.go	2015-06-03 19:34:38 +0000
+++ helpers/helpers.go	2015-06-04 15:01:05 +0000
@@ -177,6 +177,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
+}
+
 // EnsureDir ensures that the given directory exists and if
 // not creates it with the given permissions.
 func EnsureDir(dir string, perm os.FileMode) (err error) {

=== modified file 'helpers/helpers_test.go'
--- helpers/helpers_test.go	2015-05-29 13:52:33 +0000
+++ helpers/helpers_test.go	2015-06-04 15:01:05 +0000
@@ -96,6 +96,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/click.go'
--- snappy/click.go	2015-06-03 19:34:38 +0000
+++ snappy/click.go	2015-06-04 15:01:05 +0000
@@ -904,6 +904,11 @@
 		return "", err
 	}
 
+	// verify we have a valid architecture
+	if !helpers.IsSupportedArchitecture(m.Architectures) {
+		return "", &ErrArchitectureNotSupported{m.Architectures}
+	}
+
 	if err := m.checkForNameClashes(); err != nil {
 		return "", err
 	}

=== modified file 'snappy/errors.go'
--- snappy/errors.go	2015-05-26 09:21:05 +0000
+++ snappy/errors.go	2015-06-04 15:01:05 +0000
@@ -21,6 +21,8 @@
 	"errors"
 	"fmt"
 	"strings"
+
+	"launchpad.net/snappy/helpers"
 )
 
 var (
@@ -143,6 +145,16 @@
 	ErrInvalidPart = errors.New("invalid package on system")
 )
 
+// 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_test.go'
--- snappy/snapp_test.go	2015-04-22 09:06:36 +0000
+++ snappy/snapp_test.go	2015-06-04 15:01:05 +0000
@@ -18,6 +18,7 @@
 package snappy
 
 import (
+	"fmt"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -698,6 +699,22 @@
 	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)
+	_, err := installClick(snapPkg, 0, nil, testNamespace)
+	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{}