validation: Use non-empty files in masked/readonly tests

Previously we were only looking at directories.  But the spec does not
say these are directory-only options, so test files too.  Put some
content in the files, because runtimetest currently has no way to
check the readability of empty files.

Signed-off-by: W. Trevor King <[email protected]>

Author: wking

cmd/runtimetest/main.go

@@ -426,6 +426,9 @@ func testFileReadAccess(path string) (readable bool, err error) {
 	if err == nil {
 		return true, nil
 	} else if err == io.EOF {
+		// Our validation/ tests only use non-empty files for read-access
+		// tests. So if we get an EOF on the first read, the runtime did
+		// successfully block readability.
 		return false, nil
 	}
 	return false, err

validation/linux_masked_paths.go

@@ -9,10 +9,23 @@ import (
 
 func main() {
 	g := util.GetDefaultGenerator()
-	g.AddLinuxMaskedPaths("/masktest")
+	g.AddLinuxMaskedPaths("/masked-dir")
+	g.AddLinuxMaskedPaths("/masked-file")
 	err := util.RuntimeInsideValidate(g, func(path string) error {
-		pathName := filepath.Join(path, "masktest")
-		return os.MkdirAll(pathName, 0700)
+		testDir := filepath.Join(path, "masked-dir")
+		err := os.MkdirAll(testDir, 0777)
+		if err != nil {
+			return err
+		}
+
+		testFile := filepath.Join(path, "masked-file")
+
+		// runtimetest cannot check the readability of empty files, so
+		// write something.
+		err := ioutil.WriteFile(testFile, []byte("secrets"), 0777)
+		if err != nil {
+			return err
+		}
 	})
 	if err != nil {
 		util.Fatal(err)

validation/linux_readonly_paths.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -9,10 +10,23 @@ import (
 
 func main() {
 	g := util.GetDefaultGenerator()
-	g.AddLinuxReadonlyPaths("readonlytest")
+	g.AddLinuxReadonlyPaths("/readonly-dir")
+	g.AddLinuxReadonlyPaths("/readonly-file")
 	err := util.RuntimeInsideValidate(g, func(path string) error {
-		pathName := filepath.Join(path, "readonlytest")
-		return os.MkdirAll(pathName, 0700)
+		testDir := filepath.Join(path, "readonly-dir")
+		err := os.MkdirAll(testDir, 0777)
+		if err != nil {
+			return err
+		}
+
+		testFile := filepath.Join(path, "readonly-file")
+
+		// runtimetest cannot check the readability of empty files, so
+		// write something.
+		err := ioutil.WriteFile(testFile, []byte("immutable"), 0777)
+		if err != nil {
+			return err
+		}
 	})
 	if err != nil {
 		util.Fatal(err)