Moves test to proper file and tries to make CodeQL happy let's hope

Author: ForestEckhardt

vacation/vacation.go

@@ -411,8 +411,12 @@ func (z ZipArchive) Decompress(destination string) error {
 // This function checks to see that the given path is within the destination
 // directory or it is the destination directory itself i.e. ./
 func checkExtractPath(filePath string, destination string) error {
+	if filePath == "."+string(os.PathSeparator) {
+		return nil
+	}
+
 	destpath := filepath.Join(destination, filePath)
-	if !strings.HasPrefix(destpath, filepath.Clean(destination)+string(os.PathSeparator)) && destpath != filepath.Clean(destination) {
+	if !strings.HasPrefix(destpath, filepath.Clean(destination)+string(os.PathSeparator)) {
 		return fmt.Errorf("illegal file path %q: the file path does not occur within the destination directory", filePath)
 	}
 	return nil

vacation/vacation_tar_gzip_test.go

@@ -35,12 +35,6 @@ func testVacationTarGzip(t *testing.T, context spec.G, it spec.S) {
 			gw := gzip.NewWriter(buffer)
 			tw := tar.NewWriter(gw)
 
-			// Some archive files will make a relative top level path directory these
-			// should still successfully decompress.
-			Expect(tw.WriteHeader(&tar.Header{Name: "./", Mode: 0755, Typeflag: tar.TypeDir})).To(Succeed())
-			_, err = tw.Write(nil)
-			Expect(err).NotTo(HaveOccurred())
-
 			Expect(tw.WriteHeader(&tar.Header{Name: "some-dir", Mode: 0755, Typeflag: tar.TypeDir})).To(Succeed())
 			_, err = tw.Write(nil)
 			Expect(err).NotTo(HaveOccurred())

vacation/vacation_tar_test.go

@@ -33,6 +33,12 @@ func testVacationTar(t *testing.T, context spec.G, it spec.S) {
 			buffer := bytes.NewBuffer(nil)
 			tw := tar.NewWriter(buffer)
 
+			// Some archive files will make a relative top level path directory these
+			// should still successfully decompress.
+			Expect(tw.WriteHeader(&tar.Header{Name: "./", Mode: 0755, Typeflag: tar.TypeDir})).To(Succeed())
+			_, err = tw.Write(nil)
+			Expect(err).NotTo(HaveOccurred())
+
 			Expect(tw.WriteHeader(&tar.Header{Name: "some-dir", Mode: 0755, Typeflag: tar.TypeDir})).To(Succeed())
 			_, err = tw.Write(nil)
 			Expect(err).NotTo(HaveOccurred())