X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/72dd37f1abb2b550aaaac48eac677403d5664797..8fc43f8e53a60144f49b92a0c28b0c939a69d1c9:/hotline/file_path_test.go?ds=sidebyside

diff --git a/hotline/file_path_test.go b/hotline/file_path_test.go
index a5f5b60..c2fa666 100644
--- a/hotline/file_path_test.go
+++ b/hotline/file_path_test.go
@@ -5,11 +5,7 @@ import (
 	"testing"
 )
 
-func TestFilePath_UnmarshalBinary(t *testing.T) {
-	type fields struct {
-		ItemCount []byte
-		Items     []FilePathItem
-	}
+func TestFilePath_Write(t *testing.T) {
 	type args struct {
 		b []byte
 	}
@@ -31,7 +27,7 @@ func TestFilePath_UnmarshalBinary(t *testing.T) {
 				0x41, 0x20, 0x53, 0x75, 0x62, 0x44, 0x69, 0x72,
 			}},
 			want: FilePath{
-				ItemCount: []byte{0x00, 0x02},
+				ItemCount: [2]byte{0x00, 0x02},
 				Items: []FilePathItem{
 					{
 						Len:  0x0f,
@@ -45,12 +41,23 @@ func TestFilePath_UnmarshalBinary(t *testing.T) {
 			},
 			wantErr: false,
 		},
+		{
+			name: "handles empty data payload",
+			args: args{b: []byte{
+				0x00, 0x00,
+			}},
+			want: FilePath{
+				ItemCount: [2]byte{0x00, 0x00},
+				Items:     []FilePathItem(nil),
+			},
+			wantErr: false,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			var fp FilePath
-			if err := fp.UnmarshalBinary(tt.args.b); (err != nil) != tt.wantErr {
-				t.Errorf("UnmarshalBinary() error = %v, wantErr %v", err, tt.wantErr)
+			if _, err := fp.Write(tt.args.b); (err != nil) != tt.wantErr {
+				t.Errorf("Write() error = %v, wantErr %v", err, tt.wantErr)
 			}
 			if !assert.Equal(t, tt.want, fp) {
 				t.Errorf("Read() got = %v, want %v", fp, tt.want)
@@ -58,3 +65,102 @@ func TestFilePath_UnmarshalBinary(t *testing.T) {
 		})
 	}
 }
+
+func Test_readPath(t *testing.T) {
+	type args struct {
+		fileRoot string
+		filePath []byte
+		fileName []byte
+	}
+	tests := []struct {
+		name    string
+		args    args
+		want    string
+		wantErr bool
+	}{
+		{
+			name: "when filePath is invalid",
+			args: args{
+				fileRoot: "/usr/local/var/mobius/Files",
+				filePath: []byte{
+					0x61,
+				},
+				fileName: []byte{
+					0x61, 0x61, 0x61,
+				},
+			},
+			want:    "",
+			wantErr: true,
+		},
+		{
+			name: "when filePath is nil",
+			args: args{
+				fileRoot: "/usr/local/var/mobius/Files",
+				filePath: nil,
+				fileName: []byte("foo"),
+			},
+			want: "/usr/local/var/mobius/Files/foo",
+		},
+		{
+			name: "when fileName contains .. ",
+			args: args{
+				fileRoot: "/usr/local/var/mobius/Files",
+				filePath: nil,
+				fileName: []byte("../../../foo"),
+			},
+			want: "/usr/local/var/mobius/Files/foo",
+		},
+		{
+			name: "when filePath contains .. ",
+			args: args{
+				fileRoot: "/usr/local/var/mobius/Files",
+				filePath: []byte{
+					0x00, 0x02,
+					0x00, 0x00,
+					0x03,
+					0x2e, 0x2e, 0x2f,
+					0x00, 0x00,
+					0x08,
+					0x41, 0x20, 0x53, 0x75, 0x62, 0x44, 0x69, 0x72,
+				},
+				fileName: []byte("foo"),
+			},
+			want: "/usr/local/var/mobius/Files/A SubDir/foo",
+		},
+		{
+			name: "when a filePath entry contains .. ",
+			args: args{
+				fileRoot: "/usr/local/var/mobius/Files",
+				filePath: []byte{
+					0x00, 0x01,
+					0x00, 0x00,
+					0x0b,
+					0x2e, 0x2e, 0x2f, 0x41, 0x20, 0x53, 0x75, 0x62, 0x44, 0x69, 0x72,
+				},
+				fileName: []byte("foo"),
+			},
+			want: "/usr/local/var/mobius/Files/A SubDir/foo",
+		},
+		{
+			name: "when filePath and fileName are nil",
+			args: args{
+				fileRoot: "/usr/local/var/mobius/Files",
+				filePath: nil,
+				fileName: nil,
+			},
+			want: "/usr/local/var/mobius/Files",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := readPath(tt.args.fileRoot, tt.args.filePath, tt.args.fileName)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("readPath() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if got != tt.want {
+				t.Errorf("readPath() got = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}