Merge lp:~mvo/snappy/snappy-hashes-yaml-for-devices into lp:~snappy-dev/snappy/snappy-moved-to-github

[Michael Vogt]

Add support for char/block devices in hashes.yaml

This branch adds support for char/block devices for the hashes.yaml. This is prep work for an eventual move of the OS part as a snap.

[John Lenton (chipaca)]

review: Approve

=== modified file 'snappy/build.go'
--- snappy/build.go	2015-05-05 23:22:01 +0000
+++ snappy/build.go	2015-05-06 12:14:38 +0000
@@ -27,6 +27,7 @@
 	"path/filepath"
 	"regexp"
 	"strings"
+	"syscall"
 	"text/template"
 
 	"launchpad.net/snappy/clickdeb"
@@ -216,6 +217,47 @@
 	return strings.Fields(string(output))[0], nil
 }
 
+func hashForFile(buildDir, path string, info os.FileInfo) (h *fileHash, err error) {
+	sha512sum := ""
+	// pointer so that omitempty works (we don't want size for
+	// directories or symlinks)
+	var size *int64
+	if info.Mode().IsRegular() {
+		sha512sum, err = helpers.Sha512sum(path)
+		if err != nil {
+			return nil, err
+		}
+		fsize := info.Size()
+		size = &fsize
+	}
+
+	// major/minor handling
+	device := ""
+	if (info.Mode()&os.ModeDevice) != 0 || (info.Mode()&os.ModeCharDevice) != 0 {
+		unixStat, ok := info.Sys().(*syscall.Stat_t)
+		if ok {
+			// see  /usr/include/linux/kdev_t.h
+			major := int64(unixStat.Rdev >> 8)
+			minor := int64(unixStat.Rdev & 0xff)
+			device = fmt.Sprintf("%v,%v", major, minor)
+		}
+	}
+
+	if buildDir != "" {
+		path = path[len(buildDir)+1:]
+	}
+
+	return &fileHash{
+		Name:   path,
+		Size:   size,
+		Sha512: sha512sum,
+		Device: device,
+		// FIXME: not portable, this output is different on
+		//        windows, macos
+		Mode: newYamlFileMode(info.Mode()),
+	}, nil
+}
+
 func writeHashes(buildDir, dataTar string) error {
 
 	debianDir := filepath.Join(buildDir, "DEBIAN")
@@ -236,27 +278,11 @@
 			return nil
 		}
 
-		sha512sum := ""
-		// pointer so that omitempty works (we don't want size for
-		// directories or symlinks)
-		var size *int64
-		if info.Mode().IsRegular() {
-			sha512sum, err = helpers.Sha512sum(path)
-			if err != nil {
-				return err
-			}
-			fsize := info.Size()
-			size = &fsize
+		hash, err := hashForFile(buildDir, path, info)
+		if err != nil {
+			return err
 		}
-
-		hashes.Files = append(hashes.Files, fileHash{
-			Name:   path[len(buildDir)+1:],
-			Size:   size,
-			Sha512: sha512sum,
-			// FIXME: not portable, this output is different on
-			//        windows, macos
-			Mode: newYamlFileMode(info.Mode()),
-		})
+		hashes.Files = append(hashes.Files, hash)
 
 		return nil
 	})

=== modified file 'snappy/build_test.go'
--- snappy/build_test.go	2015-05-02 22:52:02 +0000
+++ snappy/build_test.go	2015-05-06 12:14:38 +0000
@@ -24,6 +24,8 @@
 	"path/filepath"
 	"strings"
 
+	"launchpad.net/snappy/helpers"
+
 	. "launchpad.net/gocheck"
 )
 
@@ -409,3 +411,18 @@
 	c.Check(debArchitecture(&packageYaml{Architectures: []string{"foo", "bar"}}), Equals, "multi")
 	c.Check(debArchitecture(&packageYaml{Architectures: nil}), Equals, "unknown")
 }
+
+func (s *SnapTestSuite) TestHashForFileForDevice(c *C) {
+	// skip test
+	if !helpers.FileExists("/dev/kmsg") {
+		c.Skip("no /dev/kmsg")
+	}
+
+	stat, err := os.Stat("/dev/kmsg")
+	c.Assert(err, IsNil)
+	h, err := hashForFile("", "/dev/kmsg", stat)
+	c.Assert(err, IsNil)
+	c.Assert(h.Name, Equals, "/dev/kmsg")
+	c.Assert(h.Device, Equals, "1,11")
+	c.Assert(h.Sha512, Equals, "")
+}

=== modified file 'snappy/hashes.go'
--- snappy/hashes.go	2015-03-31 14:12:52 +0000
+++ snappy/hashes.go	2015-05-06 12:14:38 +0000
@@ -38,6 +38,10 @@
 		buf[0] = 'd'
 	case (v.mode & os.ModeSymlink) != 0:
 		buf[0] = 'l'
+	case (v.mode & os.ModeDevice) != 0:
+		buf[0] = 'b'
+	case (v.mode & os.ModeCharDevice) != 0:
+		buf[0] = 'c'
 	case (v.mode & os.ModeType) == 0:
 		buf[0] = 'f'
 	default:
@@ -67,11 +71,15 @@
 	switch modeAsStr[0] {
 	case 'd':
 		m |= os.ModeDir
+	case 'l':
+		m |= os.ModeSymlink
+	case 'c':
+		m |= os.ModeCharDevice
+	case 'b':
+		m |= os.ModeDevice
 	case 'f':
 		// default
 		m |= 0
-	case 'l':
-		m |= os.ModeSymlink
 	default:
 		return fmt.Errorf("Unknown file mode %s", modeAsStr)
 	}
@@ -93,6 +101,7 @@
 type fileHash struct {
 	Name   string        `yaml:"name"`
 	Size   *int64        `yaml:"size,omitempty"`
+	Device string        `yaml:"device,omitempty"`
 	Sha512 string        `yaml:"sha512,omitempty"`
 	Mode   *yamlFileMode `yaml:"mode"`
 	// FIXME: not used yet, our tar implementation does not
@@ -106,5 +115,5 @@
 	ArchiveSha512 string `yaml:"archive-sha512"`
 
 	// the hashes for the files in the archive
-	Files []fileHash
+	Files []*fileHash
 }

=== modified file 'snappy/hashes_test.go'
--- snappy/hashes_test.go	2015-03-31 14:12:52 +0000
+++ snappy/hashes_test.go	2015-05-06 12:14:38 +0000
@@ -47,6 +47,30 @@
 	c.Assert(h, DeepEquals, fileHashStruct)
 }
 
+func (s *SnapTestSuite) TestHashesYamlUnmarshalChar(c *C) {
+	var h fileHash
+	err := yaml.Unmarshal([]byte(`name: device
+mode: crw-r--r--`), &h)
+	c.Assert(err, IsNil)
+
+	c.Assert(h, DeepEquals, fileHash{
+		Name: "device",
+		Mode: newYamlFileMode(0644 | os.ModeCharDevice),
+	})
+}
+
+func (s *SnapTestSuite) TestHashesYamlUnmarshalBlock(c *C) {
+	var h fileHash
+	err := yaml.Unmarshal([]byte(`name: device
+mode: brw-r--r--`), &h)
+	c.Assert(err, IsNil)
+
+	c.Assert(h, DeepEquals, fileHash{
+		Name: "device",
+		Mode: newYamlFileMode(0644 | os.ModeDevice),
+	})
+}
+
 func (s *SnapTestSuite) TestHashesYamlMarshal(c *C) {
 	y, err := yaml.Marshal(&fileHashStruct)
 	c.Assert(err, IsNil)
@@ -54,6 +78,30 @@
 	c.Assert(string(y), Equals, fileHashYaml)
 }
 
+func (s *SnapTestSuite) TestHashesYamlMarshalBlockDevice(c *C) {
+	y, err := yaml.Marshal(fileHash{
+		Name: "device",
+		Mode: newYamlFileMode(0644 | os.ModeDevice),
+	})
+	c.Assert(err, IsNil)
+
+	c.Assert(string(y), Equals, `name: device
+mode: brw-r--r--
+`)
+}
+
+func (s *SnapTestSuite) TestHashesYamlMarshalCharDevice(c *C) {
+	y, err := yaml.Marshal(fileHash{
+		Name: "device",
+		Mode: newYamlFileMode(0644 | os.ModeCharDevice),
+	})
+	c.Assert(err, IsNil)
+
+	c.Assert(string(y), Equals, `name: device
+mode: crw-r--r--
+`)
+}
+
 func (s *SnapTestSuite) TestBuildCreateDebianHashesSimple(c *C) {
 	tempdir := c.MkDir()