MCorange/wings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #46 from pterodactyl/feature/docker-repo-auth

Browse Source 
Add Docker registry authentication
This commit is contained in:
Dane Everitt
2020-07-31 20:27:35 -07:00
committed by GitHub
parent da26b4c5c7 8f1ebdd39f
commit cecc72110c
3 changed files with 60 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/filesystem.go
View File

@@ -114,10 +114,10 @@ func (fs *Filesystem) SafePath(p string) (string, error) {
}
// Generate a path to the file by cleaning it up and appending the root server path to it. This
// DOES NOT gaurantee that the file resolves within the server data directory. You'll want to use
// DOES NOT guarantee that the file resolves within the server data directory. You'll want to use
// the fs.unsafeIsInDataDirectory(p) function to confirm.
func (fs *Filesystem) unsafeFilePath(p string) string {
// Calling filpath.Clean on the joined directory will resolve it to the absolute path,
// Calling filepath.Clean on the joined directory will resolve it to the absolute path,
// removing any ../ type of resolution arguments, and leaving us with a direct path link.
//
// This will also trim the existing root path off the beginning of the path passed to