rf, _ := os.Create(t.realTemp + "/2/realfile")
rf.Write([]byte("foo"))
rf.Close()
+
+ os.Mkdir(t.realTemp+"/2/realdir", 0700)
+ rf, _ = os.Create(t.realTemp + "/2/realdir/subfile")
+ rf.Write([]byte("bar"))
+ rf.Close()
+
os.Symlink("/tmp/realfile", t.realTemp+"/2/file1")
os.Symlink("realfile", t.realTemp+"/2/file2")
os.Symlink("/tmp/file1", t.realTemp+"/2/file3")
os.Symlink("file2", t.realTemp+"/2/file4")
+ os.Symlink("realdir", t.realTemp+"/2/dir1")
+ os.Symlink("/tmp/realdir", t.realTemp+"/2/dir2")
t.logWriter.Close()
})
collection := v["collection"].(arvadosclient.Dict)
if strings.Index(collection["name"].(string), "output") == 0 {
manifest := collection["manifest_text"].(string)
- c.Check(manifest, Equals, ". 7a2c86e102dcc231bd232aad99686dfa+15 0:3:file1 3:3:file2 6:3:file3 9:3:file4 12:3:realfile\n")
+ c.Check(manifest, Equals,
+ `. 7a2c86e102dcc231bd232aad99686dfa+15 0:3:file1 3:3:file2 6:3:file3 9:3:file4 12:3:realfile
+./dir1 37b51d194a7513e45b56f6524f2d51f2+3 0:3:subfile
+./dir2 37b51d194a7513e45b56f6524f2d51f2+3 0:3:subfile
+./realdir 37b51d194a7513e45b56f6524f2d51f2+3 0:3:subfile
+`)
}
}
}
c.Check(err, IsNil)
c.Check(string(jsondata), Equals, `{"number":123456789123456789}`)
}
+
+func (s *TestSuite) TestEvalSymlinks(c *C) {
+ cr := NewContainerRunner(&ArvTestClient{callraw: true}, &KeepTestClient{}, nil, "zzzzz-zzzzz-zzzzzzzzzzzzzzz")
+
+ realTemp, err := ioutil.TempDir("", "crunchrun_test-")
+ c.Assert(err, IsNil)
+ defer os.RemoveAll(realTemp)
+
+ cr.HostOutputDir = realTemp
+
+ // Absolute path outside output dir
+ os.Symlink("/etc/passwd", realTemp+"/p1")
+
+ // Relative outside output dir
+ os.Symlink("..", realTemp+"/p2")
+
+ // Circular references
+ os.Symlink("p4", realTemp+"/p3")
+ os.Symlink("p5", realTemp+"/p4")
+ os.Symlink("p3", realTemp+"/p5")
+
+ // Target doesn't exist
+ os.Symlink("p99", realTemp+"/p6")
+
+ for _, v := range []string{"p1", "p2", "p3", "p4", "p5"} {
+ info, err := os.Lstat(realTemp + "/" + v)
+ _, err = cr.UploadOutputFile(realTemp+"/"+v, info, err, []string{}, nil, "", "")
+ c.Assert(err, NotNil)
+ }
+}