X-Git-Url: https://ruderich.org/simon/gitweb/?p=safcm%2Fsafcm.git;a=blobdiff_plain;f=remote%2Fsync%2Ffiles_test.go;h=3d19e7f9a3b950e180326f7930efd7d019d57369;hp=39714594382445369936666719d625d4351cd820;hb=2804606f9f8dc5078c38580bac363b47eb638620;hpb=a950980d2e302547743fb567d0636b766f4e9704

diff --git a/remote/sync/files_test.go b/remote/sync/files_test.go
index 3971459..3d19e7f 100644
--- a/remote/sync/files_test.go
+++ b/remote/sync/files_test.go
@@ -963,7 +963,7 @@ func TestSyncFile(t *testing.T) {
 				`4: files: "file" (group): will create`,
 				`3: files: "file" (group): creating`,
 				`4: files: "file" (group): creating temporary file ".file*"`,
-				`4: files: "file" (group): renaming "./.fileRND"`,
+				`4: files: "file" (group): renaming ".fileRND"`,
 			},
 			nil,
 		},
@@ -1116,7 +1116,7 @@ func TestSyncFile(t *testing.T) {
 				`4: files: "file" (group): permission differs -rwxr-xr-x -> urwxr-xr-x`,
 				`3: files: "file" (group): updating`,
 				`4: files: "file" (group): creating temporary file ".file*"`,
-				`4: files: "file" (group): renaming "./.fileRND"`,
+				`4: files: "file" (group): renaming ".fileRND"`,
 			},
 			nil,
 		},
@@ -1174,7 +1174,7 @@ func TestSyncFile(t *testing.T) {
 				`4: files: "file" (group): content differs`,
 				`3: files: "file" (group): updating`,
 				`4: files: "file" (group): creating temporary file ".file*"`,
-				`4: files: "file" (group): renaming "./.fileRND"`,
+				`4: files: "file" (group): renaming ".fileRND"`,
 			},
 			nil,
 		},
@@ -1734,7 +1734,7 @@ func TestSyncFile(t *testing.T) {
 				`4: files: "path" (group): type differs L--------- -> ----------`,
 				`3: files: "path" (group): updating`,
 				`4: files: "path" (group): creating temporary file ".path*"`,
-				`4: files: "path" (group): renaming "./.pathRND"`,
+				`4: files: "path" (group): renaming ".pathRND"`,
 			},
 			nil,
 		},
@@ -1845,10 +1845,66 @@ func TestSyncFile(t *testing.T) {
 				`3: files: "path" (group): updating`,
 				`4: files: "path" (group): removing (due to type change)`,
 				`4: files: "path" (group): creating temporary file ".path*"`,
-				`4: files: "path" (group): renaming "./.pathRND"`,
+				`4: files: "path" (group): renaming ".pathRND"`,
 			},
 			nil,
 		},
+		{
+			"change: directory to file (non-empty)",
+			safcm.MsgSyncReq{},
+			&safcm.File{
+				Path:      "path",
+				Mode:      0666,
+				Uid:       -1,
+				Gid:       -1,
+				OrigGroup: "group",
+				Data:      []byte("content\n"),
+			},
+			func() {
+				ft.CreateDirectory("path", 0777)
+				ft.CreateFile("path/file", "content\n", 0644)
+			},
+			true,
+			[]ft.File{
+				root,
+				{
+					Path: "path",
+					Mode: fs.ModeDir | 0777,
+				},
+				{
+					Path: "path/file",
+					Mode: 0644,
+					Data: []byte("content\n"),
+				},
+			},
+			safcm.MsgSyncResp{
+				FileChanges: []safcm.FileChange{
+					{
+						Path: "path",
+						Old: safcm.FileChangeInfo{
+							Mode:  fs.ModeDir | 0777,
+							User:  user,
+							Uid:   uid,
+							Group: group,
+							Gid:   gid,
+						},
+						New: safcm.FileChangeInfo{
+							Mode:  0666,
+							User:  user,
+							Uid:   uid,
+							Group: group,
+							Gid:   gid,
+						},
+					},
+				},
+			},
+			[]string{
+				`4: files: "path" (group): type differs d--------- -> ----------`,
+				`3: files: "path" (group): updating`,
+				`4: files: "path" (group): removing (due to type change)`,
+			},
+			fmt.Errorf("will not replace non-empty directory, please remove manually"),
+		},
 
 		{
 			"change: directory to symlink",
@@ -1952,7 +2008,7 @@ func TestSyncFile(t *testing.T) {
 				`4: files: "path" (group): type differs p--------- -> ----------`,
 				`3: files: "path" (group): updating`,
 				`4: files: "path" (group): creating temporary file ".path*"`,
-				`4: files: "path" (group): renaming "./.pathRND"`,
+				`4: files: "path" (group): renaming ".pathRND"`,
 			},
 			nil,
 		},
@@ -2116,6 +2172,41 @@ func TestSyncFile(t *testing.T) {
 			nil,
 		},
 
+		// Symlink "attacks"
+
+		{
+			"symlink in earlier path component",
+			safcm.MsgSyncReq{},
+			&safcm.File{
+				Path:      "dir/file",
+				Mode:      0644,
+				Uid:       -1,
+				Gid:       -1,
+				OrigGroup: "group",
+				Data:      []byte("content"),
+			},
+			func() {
+				ft.CreateDirectory("tmp", 0755)
+				ft.CreateSymlink("dir", "tmp")
+			},
+			false,
+			[]ft.File{
+				root,
+				{
+					Path: "dir",
+					Mode: fs.ModeSymlink | 0777,
+					Data: []byte("tmp"),
+				},
+				{
+					Path: "tmp",
+					Mode: fs.ModeDir | 0755,
+				},
+			},
+			safcm.MsgSyncResp{},
+			nil,
+			fmt.Errorf("symlink not permitted in path: \"dir\""),
+		},
+
 		// Diffs
 
 		{