Don't include files and folders with identical name prefixes when archiving; closes pterodactyl/panel#3946

This commit is contained in:
DaneEveritt
2022-05-12 18:00:55 -04:00
parent 7ededdb9a2
commit 37e4d57cdf
2 changed files with 2 additions and 1 deletions

View File

@@ -130,7 +130,7 @@ func (a *Archive) withFilesCallback(tw *tar.Writer) func(path string, de *godirw
for _, f := range a.Files {
// If the given doesn't match, or doesn't have the same prefix continue
// to the next item in the loop.
if p != f && !strings.HasPrefix(p, f) {
if p != f && !strings.HasPrefix(strings.TrimSuffix(p, "/")+"/", f) {
continue
}