fix test

Velocidex · Apr 4, 2022 · cb613d6 · cb613d6
1 parent 06e5fd0
commit cb613d6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/artifacts/testdata/server/testcases/mft.in.yaml b/artifacts/testdata/server/testcases/mft.in.yaml
@@ -34,12 +34,14 @@ Parameters:
 Queries:
   - LET _ <= remap(config=format(format=RemappingTemplate,
        args=[
-          srcDir+'/artifacts/testdata/files/test.ntfs.dd'
+          srcDir+'/artifacts/testdata/files/test.ntfs.dd',
+          srcDir+'/artifacts/testdata/files/test.ntfs.dd',
         ]), clear=TRUE)
 
   # Test MFT output
-  - SELECT * FROM Artifact.Windows.NTFS.MFT(FileRegex='just_a_file\.txt')
+  - SELECT * FROM Artifact.Windows.NTFS.MFT(FileRegex='just_a_file\\.txt')
+
   # Test time contraints
-  - SELECT * FROM Artifact.Windows.NTFS.MFT(FileRegex='\.txt',DateBefore='2018-12-31')
-  - SELECT * FROM Artifact.Windows.NTFS.MFT(FileRegex='\.txt',DateAfter='2021-07-01')
-  - SELECT * FROM Artifact.Windows.NTFS.MFT(FileRegex='\.txt',DateAfter='2021-07-01',DateBefore='2022-02-01')
+  - SELECT * FROM Artifact.Windows.NTFS.MFT(FileRegex='\\.txt',DateBefore='2018-12-31')
+  - SELECT * FROM Artifact.Windows.NTFS.MFT(FileRegex='\\.txt',DateAfter='2021-07-01')
+  - SELECT * FROM Artifact.Windows.NTFS.MFT(FileRegex='\\.txt',DateAfter='2021-07-01',DateBefore='2022-02-01')
diff --git a/artifacts/testdata/server/testcases/mft.out.yaml b/artifacts/testdata/server/testcases/mft.out.yaml
@@ -1,4 +1,4 @@
-LET _ <= remap(config=format(format=RemappingTemplate, args=[ srcDir+'/artifacts/testdata/files/test.ntfs.dd' ]), clear=TRUE)[]SELECT * FROM Artifact.Windows.NTFS.MFT(FileRegex='just_a_file\.txt')[
+LET _ <= remap(config=format(format=RemappingTemplate, args=[ srcDir+'/artifacts/testdata/files/test.ntfs.dd', srcDir+'/artifacts/testdata/files/test.ntfs.dd', ]), clear=TRUE)[]SELECT * FROM Artifact.Windows.NTFS.MFT(FileRegex='just_a_file\\.txt')[
  {
   "EntryNumber": 49,
   "InUse": true,
@@ -25,7 +25,7 @@ LET _ <= remap(config=format(format=RemappingTemplate, args=[ srcDir+'/artifacts
   "FileNameTypes": "POSIX",
   "_Source": "Windows.NTFS.MFT"
  }
-]SELECT * FROM Artifact.Windows.NTFS.MFT(FileRegex='\.txt',DateBefore='2018-12-31')[
+]SELECT * FROM Artifact.Windows.NTFS.MFT(FileRegex='\\.txt',DateBefore='2018-12-31')[
  {
   "EntryNumber": 46,
   "InUse": true,
@@ -78,7 +78,7 @@ LET _ <= remap(config=format(format=RemappingTemplate, args=[ srcDir+'/artifacts
   "FileNameTypes": "POSIX",
   "_Source": "Windows.NTFS.MFT"
  }
-]SELECT * FROM Artifact.Windows.NTFS.MFT(FileRegex='\.txt',DateAfter='2021-07-01')[
+]SELECT * FROM Artifact.Windows.NTFS.MFT(FileRegex='\\.txt',DateAfter='2021-07-01')[
  {
   "EntryNumber": 37,
   "InUse": true,
@@ -131,7 +131,7 @@ LET _ <= remap(config=format(format=RemappingTemplate, args=[ srcDir+'/artifacts
   "FileNameTypes": "POSIX",
   "_Source": "Windows.NTFS.MFT"
  }
-]SELECT * FROM Artifact.Windows.NTFS.MFT(FileRegex='\.txt',DateAfter='2021-07-01',DateBefore='2022-02-01')[
+]SELECT * FROM Artifact.Windows.NTFS.MFT(FileRegex='\\.txt',DateAfter='2021-07-01',DateBefore='2022-02-01')[
  {
   "EntryNumber": 49,
   "InUse": true,

diff --git a/reporting/container.go b/reporting/container.go
@@ -219,7 +219,7 @@ func (self *Container) Upload(
 	reader io.Reader) (*uploads.UploadResponse, error) {
 
 	if store_as_name == "" {
-		store_as_name = accessor + "/" + strings.TrimPrefix(filename.String(), "/")
+		store_as_name = accessors.MustNewGenericOSPath(accessor).Append(filename.Components...).String()
 	}
 
 	sanitized_name := sanitize_upload_name(store_as_name)