diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..3550a30 --- /dev/null +++ b/.envrc @@ -0,0 +1 @@ +use flake diff --git a/CHANGELOG.md b/CHANGELOG.md index 471dabb..1b932b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## v1.11.11 +### Fixed +* Backups missing content when a `.pteroignore` file is used +* Archives originating from a subdirectory not containing any files ([#5030](https://github.com/pterodactyl/panel/issues/5030)) + ## v1.11.10 ### Fixed * Archives randomly ignoring files and directories ([#5027](https://github.com/pterodactyl/panel/issues/5027)) diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..e25bd2f --- /dev/null +++ b/flake.lock @@ -0,0 +1,85 @@ +{ + "nodes": { + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1706830856, + "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1707956935, + "narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a4d4fe8c5002202493e87ec8dbc91335ff55552c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib": { + "locked": { + "dir": "lib", + "lastModified": 1706550542, + "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs", + "treefmt-nix": "treefmt-nix" + } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1707300477, + "narHash": "sha256-qQF0fEkHlnxHcrKIMRzOETnRBksUK048MXkX0SOmxvA=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "ac599dab59a66304eb511af07b3883114f061b9d", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..a984da8 --- /dev/null +++ b/flake.nix @@ -0,0 +1,54 @@ +{ + description = "Wings"; + + inputs = { + flake-parts.url = "github:hercules-ci/flake-parts"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + + treefmt-nix = { + url = "github:numtide/treefmt-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + }; + + outputs = {...} @ inputs: + inputs.flake-parts.lib.mkFlake {inherit inputs;} { + systems = ["aarch64-darwin" "aarch64-linux" "x86_64-darwin" "x86_64-linux"]; + + imports = [ + inputs.treefmt-nix.flakeModule + ]; + + perSystem = {system, ...}: let + pkgs = import inputs.nixpkgs {inherit system;}; + in { + devShells.default = pkgs.mkShell { + buildInputs = with pkgs; [ + go_1_22 + gofumpt + golangci-lint + gotools + ]; + }; + + treefmt = { + projectRootFile = "flake.nix"; + + programs = { + alejandra.enable = true; + deadnix.enable = true; + gofumpt = { + enable = true; + extra = true; + }; + shellcheck.enable = true; + shfmt = { + enable = true; + indent_size = 0; # 0 causes shfmt to use tabs + }; + yamlfmt.enable = true; + }; + }; + }; + }; +} diff --git a/internal/ufs/walk_unix.go b/internal/ufs/walk_unix.go index e3945b1..8472edf 100644 --- a/internal/ufs/walk_unix.go +++ b/internal/ufs/walk_unix.go @@ -66,6 +66,13 @@ func (fs *UnixFS) walkDir(b []byte, parentfd int, name, relative string, d DirEn } for _, d1 := range dirs { + // TODO: the path.Join on this line may actually be partially incorrect. + // If we are not walking starting at the root, relative will contain the + // name of the directory we are starting the walk from, which will be + // relative to the root of the filesystem instead of from where the walk + // was initiated from. + // + // ref; https://github.com/pterodactyl/panel/issues/5030 if err := fs.walkDir(b, dirfd, d1.Name(), path.Join(relative, d1.Name()), d1, walkDirFn); err != nil { if err == SkipDir { break diff --git a/server/filesystem/archive.go b/server/filesystem/archive.go index d7d6446..16ae7f9 100644 --- a/server/filesystem/archive.go +++ b/server/filesystem/archive.go @@ -113,6 +113,10 @@ func (a *Archive) Stream(ctx context.Context, w io.Writer) error { return errors.New("filesystem: archive.Filesystem is unset") } + // The base directory may come with a prefixed `/`, strip it to prevent + // problems. + a.BaseDirectory = strings.TrimPrefix(a.BaseDirectory, "/") + if filesLen := len(a.Files); filesLen > 0 { files := make([]string, filesLen) for i, f := range a.Files { @@ -157,7 +161,7 @@ func (a *Archive) Stream(ctx context.Context, w io.Writer) error { i := ignore.CompileIgnoreLines(strings.Split(a.Ignore, "\n")...) callback = a.callback(func(_ int, _, relative string, _ ufs.DirEntry) error { if i.MatchesPath(relative) { - return ufs.SkipDir + return SkipThis } return nil }) @@ -167,11 +171,14 @@ func (a *Archive) Stream(ctx context.Context, w io.Writer) error { callback = a.callback() } + // Open the base directory we were provided. dirfd, name, closeFd, err := fs.SafePath(a.BaseDirectory) defer closeFd() if err != nil { return err } + + // Recursively walk the base directory. return fs.WalkDirat(dirfd, name, func(dirfd int, name, relative string, d ufs.DirEntry, err error) error { if err != nil { return err @@ -188,12 +195,28 @@ func (a *Archive) Stream(ctx context.Context, w io.Writer) error { // Callback function used to determine if a given file should be included in the archive // being generated. func (a *Archive) callback(opts ...walkFunc) walkFunc { + // Get the base directory we need to strip when walking. + // + // This is important as when we are walking, the last part of the base directory + // is present on all the paths we walk. + var base string + if a.BaseDirectory != "" { + base = filepath.Base(a.BaseDirectory) + "/" + } return func(dirfd int, name, relative string, d ufs.DirEntry) error { // Skip directories because we are walking them recursively. if d.IsDir() { return nil } + // If base isn't empty, strip it from the relative path. This fixes an + // issue when creating an archive starting from a nested directory. + // + // See https://github.com/pterodactyl/panel/issues/5030 for more details. + if base != "" { + relative = strings.TrimPrefix(relative, base) + } + // Call the additional options passed to this callback function. If any of them return // a non-nil error we will exit immediately. for _, opt := range opts {