2020-07-15 04:34:07 +08:00
package copier
import (
"archive/tar"
"bytes"
"encoding/json"
2022-07-06 17:14:06 +08:00
"errors"
2020-07-15 04:34:07 +08:00
"fmt"
"io"
2022-03-26 19:48:51 +08:00
"io/fs"
2020-07-15 04:34:07 +08:00
"io/ioutil"
2020-11-04 05:52:33 +08:00
"net"
2020-07-15 04:34:07 +08:00
"os"
2020-11-04 05:52:33 +08:00
"os/user"
2020-12-15 06:21:16 +08:00
"path"
2020-07-15 04:34:07 +08:00
"path/filepath"
"strconv"
"strings"
"sync"
"syscall"
"time"
"github.com/containers/buildah/util"
"github.com/containers/image/v5/pkg/compression"
"github.com/containers/storage/pkg/fileutils"
"github.com/containers/storage/pkg/idtools"
"github.com/containers/storage/pkg/reexec"
"github.com/sirupsen/logrus"
)
const (
copierCommand = "buildah-copier"
maxLoopsFollowed = 64
// See http://pubs.opengroup.org/onlinepubs/9699919799/utilities/pax.html#tag_20_92_13_06, from archive/tar
cISUID = 04000 // Set uid, from archive/tar
cISGID = 02000 // Set gid, from archive/tar
cISVTX = 01000 // Save text (sticky bit), from archive/tar
)
func init ( ) {
reexec . Register ( copierCommand , copierMain )
}
// isArchivePath returns true if the specified path can be read like a (possibly
// compressed) tarball.
func isArchivePath ( path string ) bool {
f , err := os . Open ( path )
if err != nil {
return false
}
defer f . Close ( )
rc , _ , err := compression . AutoDecompress ( f )
if err != nil {
return false
}
defer rc . Close ( )
tr := tar . NewReader ( rc )
_ , err = tr . Next ( )
return err == nil
}
2020-08-12 22:11:35 +08:00
// requestType encodes exactly what kind of request this is.
type requestType string
2020-07-15 04:34:07 +08:00
const (
2021-04-20 06:01:13 +08:00
requestEval requestType = "EVAL"
requestStat requestType = "STAT"
requestGet requestType = "GET"
requestPut requestType = "PUT"
requestMkdir requestType = "MKDIR"
requestRemove requestType = "REMOVE"
requestQuit requestType = "QUIT"
2020-07-15 04:34:07 +08:00
)
2020-08-12 22:11:35 +08:00
// Request encodes a single request.
type request struct {
Request requestType
Root string // used by all requests
2020-07-15 04:34:07 +08:00
preservedRoot string
rootPrefix string // used to reconstruct paths being handed back to the caller
Directory string // used by all requests
preservedDirectory string
Globs [ ] string ` json:",omitempty" ` // used by stat, get
preservedGlobs [ ] string
2021-04-20 06:01:13 +08:00
StatOptions StatOptions ` json:",omitempty" `
GetOptions GetOptions ` json:",omitempty" `
PutOptions PutOptions ` json:",omitempty" `
MkdirOptions MkdirOptions ` json:",omitempty" `
RemoveOptions RemoveOptions ` json:",omitempty" `
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
}
2020-08-12 22:11:35 +08:00
func ( req * request ) Excludes ( ) [ ] string {
switch req . Request {
2021-03-03 05:06:27 +08:00
case requestEval :
return nil
2020-08-12 22:11:35 +08:00
case requestStat :
return req . StatOptions . Excludes
case requestGet :
return req . GetOptions . Excludes
case requestPut :
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
return nil
2020-08-12 22:11:35 +08:00
case requestMkdir :
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
return nil
2021-04-20 06:01:13 +08:00
case requestRemove :
return nil
2020-08-12 22:11:35 +08:00
case requestQuit :
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
return nil
default :
2020-08-12 22:11:35 +08:00
panic ( fmt . Sprintf ( "not an implemented request type: %q" , req . Request ) )
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
}
}
2020-08-12 22:11:35 +08:00
func ( req * request ) UIDMap ( ) [ ] idtools . IDMap {
switch req . Request {
2021-03-03 05:06:27 +08:00
case requestEval :
return nil
2020-08-12 22:11:35 +08:00
case requestStat :
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
return nil
2020-08-12 22:11:35 +08:00
case requestGet :
return req . GetOptions . UIDMap
case requestPut :
return req . PutOptions . UIDMap
case requestMkdir :
return req . MkdirOptions . UIDMap
2021-04-20 06:01:13 +08:00
case requestRemove :
return nil
2020-08-12 22:11:35 +08:00
case requestQuit :
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
return nil
default :
2020-08-12 22:11:35 +08:00
panic ( fmt . Sprintf ( "not an implemented request type: %q" , req . Request ) )
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
}
}
2020-08-12 22:11:35 +08:00
func ( req * request ) GIDMap ( ) [ ] idtools . IDMap {
switch req . Request {
2021-03-03 05:06:27 +08:00
case requestEval :
return nil
2020-08-12 22:11:35 +08:00
case requestStat :
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
return nil
2020-08-12 22:11:35 +08:00
case requestGet :
return req . GetOptions . GIDMap
case requestPut :
return req . PutOptions . GIDMap
case requestMkdir :
return req . MkdirOptions . GIDMap
2021-04-20 06:01:13 +08:00
case requestRemove :
return nil
2020-08-12 22:11:35 +08:00
case requestQuit :
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
return nil
default :
2020-08-12 22:11:35 +08:00
panic ( fmt . Sprintf ( "not an implemented request type: %q" , req . Request ) )
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
}
2020-07-15 04:34:07 +08:00
}
2020-08-12 22:11:35 +08:00
// Response encodes a single response.
type response struct {
2021-04-20 06:01:13 +08:00
Error string ` json:",omitempty" `
Stat statResponse ` json:",omitempty" `
Eval evalResponse ` json:",omitempty" `
Get getResponse ` json:",omitempty" `
Put putResponse ` json:",omitempty" `
Mkdir mkdirResponse ` json:",omitempty" `
Remove removeResponse ` json:",omitempty" `
2020-07-15 04:34:07 +08:00
}
2020-08-12 22:11:35 +08:00
// statResponse encodes a response for a single Stat request.
type statResponse struct {
2020-07-15 04:34:07 +08:00
Globs [ ] * StatsForGlob
}
2021-03-03 05:06:27 +08:00
// evalResponse encodes a response for a single Eval request.
type evalResponse struct {
Evaluated string
}
2020-07-15 04:34:07 +08:00
// StatsForGlob encode results for a single glob pattern passed to Stat().
type StatsForGlob struct {
Error string ` json:",omitempty" ` // error if the Glob pattern was malformed
Glob string // input pattern to which this result corresponds
Globbed [ ] string // a slice of zero or more names that match the glob
Results map [ string ] * StatForItem // one for each Globbed value if there are any, or for Glob
}
// StatForItem encode results for a single filesystem item, as returned by Stat().
type StatForItem struct {
Error string ` json:",omitempty" `
Name string
Size int64 // dereferenced value for symlinks
Mode os . FileMode // dereferenced value for symlinks
ModTime time . Time // dereferenced value for symlinks
IsSymlink bool
IsDir bool // dereferenced value for symlinks
IsRegular bool // dereferenced value for symlinks
IsArchive bool // dereferenced value for symlinks
ImmediateTarget string ` json:",omitempty" ` // raw link content
}
2020-08-12 22:11:35 +08:00
// getResponse encodes a response for a single Get request.
type getResponse struct {
2020-07-15 04:34:07 +08:00
}
2020-08-12 22:11:35 +08:00
// putResponse encodes a response for a single Put request.
type putResponse struct {
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
}
2020-08-12 22:11:35 +08:00
// mkdirResponse encodes a response for a single Mkdir request.
type mkdirResponse struct {
2020-07-15 04:34:07 +08:00
}
2021-04-20 06:01:13 +08:00
// removeResponse encodes a response for a single Remove request.
type removeResponse struct {
}
2021-03-03 05:06:27 +08:00
// EvalOptions controls parts of Eval()'s behavior.
type EvalOptions struct {
}
// Eval evaluates the directory's path, including any intermediate symbolic
// links.
// If root is specified and the current OS supports it, and the calling process
// has the necessary privileges, evaluation is performed in a chrooted context.
// If the directory is specified as an absolute path, it should either be the
// root directory or a subdirectory of the root directory. Otherwise, the
// directory is treated as a path relative to the root directory.
func Eval ( root string , directory string , options EvalOptions ) ( string , error ) {
req := request {
Request : requestEval ,
Root : root ,
Directory : directory ,
}
resp , err := copier ( nil , nil , req )
if err != nil {
return "" , err
}
if resp . Error != "" {
return "" , errors . New ( resp . Error )
}
return resp . Eval . Evaluated , nil
}
2020-07-15 04:34:07 +08:00
// StatOptions controls parts of Stat()'s behavior.
type StatOptions struct {
CheckForArchives bool // check for and populate the IsArchive bit in returned values
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
Excludes [ ] string // contents to pretend don't exist, using the OS-specific path separator
2020-07-15 04:34:07 +08:00
}
// Stat globs the specified pattern in the specified directory and returns its
// results.
// If root and directory are both not specified, the current root directory is
// used, and relative names in the globs list are treated as being relative to
// the current working directory.
2020-12-16 23:26:59 +08:00
// If root is specified and the current OS supports it, and the calling process
// has the necessary privileges, the stat() is performed in a chrooted context.
// If the directory is specified as an absolute path, it should either be the
// root directory or a subdirectory of the root directory. Otherwise, the
// directory is treated as a path relative to the root directory.
2020-07-15 04:34:07 +08:00
// Relative names in the glob list are treated as being relative to the
// directory.
func Stat ( root string , directory string , options StatOptions , globs [ ] string ) ( [ ] * StatsForGlob , error ) {
2020-08-12 22:11:35 +08:00
req := request {
Request : requestStat ,
2020-07-15 04:34:07 +08:00
Root : root ,
Directory : directory ,
Globs : append ( [ ] string { } , globs ... ) ,
StatOptions : options ,
}
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
resp , err := copier ( nil , nil , req )
2020-07-15 04:34:07 +08:00
if err != nil {
return nil , err
}
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
if resp . Error != "" {
return nil , errors . New ( resp . Error )
2020-07-15 04:34:07 +08:00
}
return resp . Stat . Globs , nil
}
// GetOptions controls parts of Get()'s behavior.
type GetOptions struct {
2020-12-15 06:21:16 +08:00
UIDMap , GIDMap [ ] idtools . IDMap // map from hostIDs to containerIDs in the output archive
Excludes [ ] string // contents to pretend don't exist, using the OS-specific path separator
ExpandArchives bool // extract the contents of named items that are archives
ChownDirs * idtools . IDPair // set ownership on directories. no effect on archives being extracted
ChmodDirs * os . FileMode // set permissions on directories. no effect on archives being extracted
ChownFiles * idtools . IDPair // set ownership of files. no effect on archives being extracted
ChmodFiles * os . FileMode // set permissions on files. no effect on archives being extracted
StripSetuidBit bool // strip the setuid bit off of items being copied. no effect on archives being extracted
StripSetgidBit bool // strip the setgid bit off of items being copied. no effect on archives being extracted
StripStickyBit bool // strip the sticky bit off of items being copied. no effect on archives being extracted
StripXattrs bool // don't record extended attributes of items being copied. no effect on archives being extracted
KeepDirectoryNames bool // don't strip the top directory's basename from the paths of items in subdirectories
Rename map [ string ] string // rename items with the specified names, or under the specified names
2021-02-18 02:44:40 +08:00
NoDerefSymlinks bool // don't follow symlinks when globs match them
2021-03-04 05:45:43 +08:00
IgnoreUnreadable bool // ignore errors reading items, instead of returning an error
2021-04-14 02:09:21 +08:00
NoCrossDevice bool // if a subdirectory is a mountpoint with a different device number, include it but skip its contents
2020-07-15 04:34:07 +08:00
}
// Get produces an archive containing items that match the specified glob
// patterns and writes it to bulkWriter.
// If root and directory are both not specified, the current root directory is
// used, and relative names in the globs list are treated as being relative to
// the current working directory.
2020-12-16 23:26:59 +08:00
// If root is specified and the current OS supports it, and the calling process
// has the necessary privileges, the contents are read in a chrooted context.
// If the directory is specified as an absolute path, it should either be the
// root directory or a subdirectory of the root directory. Otherwise, the
// directory is treated as a path relative to the root directory.
2020-07-15 04:34:07 +08:00
// Relative names in the glob list are treated as being relative to the
// directory.
func Get ( root string , directory string , options GetOptions , globs [ ] string , bulkWriter io . Writer ) error {
2020-08-12 22:11:35 +08:00
req := request {
Request : requestGet ,
2020-07-15 04:34:07 +08:00
Root : root ,
Directory : directory ,
Globs : append ( [ ] string { } , globs ... ) ,
StatOptions : StatOptions {
CheckForArchives : options . ExpandArchives ,
} ,
GetOptions : options ,
}
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
resp , err := copier ( nil , bulkWriter , req )
2020-07-15 04:34:07 +08:00
if err != nil {
return err
}
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
if resp . Error != "" {
return errors . New ( resp . Error )
2020-07-15 04:34:07 +08:00
}
return nil
}
// PutOptions controls parts of Put()'s behavior.
type PutOptions struct {
2020-12-15 06:21:16 +08:00
UIDMap , GIDMap [ ] idtools . IDMap // map from containerIDs to hostIDs when writing contents to disk
DefaultDirOwner * idtools . IDPair // set ownership of implicitly-created directories, default is ChownDirs, or 0:0 if ChownDirs not set
DefaultDirMode * os . FileMode // set permissions on implicitly-created directories, default is ChmodDirs, or 0755 if ChmodDirs not set
ChownDirs * idtools . IDPair // set ownership of newly-created directories
ChmodDirs * os . FileMode // set permissions on newly-created directories
ChownFiles * idtools . IDPair // set ownership of newly-created files
ChmodFiles * os . FileMode // set permissions on newly-created files
2022-04-28 04:56:14 +08:00
StripSetuidBit bool // strip the setuid bit off of items being written
StripSetgidBit bool // strip the setgid bit off of items being written
StripStickyBit bool // strip the sticky bit off of items being written
2020-12-15 06:21:16 +08:00
StripXattrs bool // don't bother trying to set extended attributes of items being copied
IgnoreXattrErrors bool // ignore any errors encountered when attempting to set extended attributes
2021-01-05 05:44:30 +08:00
IgnoreDevices bool // ignore items which are character or block devices
2020-12-15 06:21:16 +08:00
NoOverwriteDirNonDir bool // instead of quietly overwriting directories with non-directories, return an error
2022-06-07 18:54:07 +08:00
NoOverwriteNonDirDir bool // instead of quietly overwriting non-directories with directories, return an error
2020-12-15 06:21:16 +08:00
Rename map [ string ] string // rename items with the specified names, or under the specified names
2020-07-15 04:34:07 +08:00
}
// Put extracts an archive from the bulkReader at the specified directory.
// If root and directory are both not specified, the current root directory is
// used.
2020-12-16 23:26:59 +08:00
// If root is specified and the current OS supports it, and the calling process
// has the necessary privileges, the contents are written in a chrooted
// context. If the directory is specified as an absolute path, it should
// either be the root directory or a subdirectory of the root directory.
// Otherwise, the directory is treated as a path relative to the root
// directory.
2020-07-15 04:34:07 +08:00
func Put ( root string , directory string , options PutOptions , bulkReader io . Reader ) error {
2020-08-12 22:11:35 +08:00
req := request {
Request : requestPut ,
2020-07-15 04:34:07 +08:00
Root : root ,
Directory : directory ,
PutOptions : options ,
}
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
resp , err := copier ( bulkReader , nil , req )
2020-07-15 04:34:07 +08:00
if err != nil {
return err
}
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
if resp . Error != "" {
return errors . New ( resp . Error )
2020-07-15 04:34:07 +08:00
}
return nil
}
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
// MkdirOptions controls parts of Mkdir()'s behavior.
type MkdirOptions struct {
UIDMap , GIDMap [ ] idtools . IDMap // map from containerIDs to hostIDs when creating directories
ChownNew * idtools . IDPair // set ownership of newly-created directories
ChmodNew * os . FileMode // set permissions on newly-created directories
}
// Mkdir ensures that the specified directory exists. Any directories which
// need to be created will be given the specified ownership and permissions.
// If root and directory are both not specified, the current root directory is
// used.
2020-12-16 23:26:59 +08:00
// If root is specified and the current OS supports it, and the calling process
// has the necessary privileges, the directory is created in a chrooted
// context. If the directory is specified as an absolute path, it should
// either be the root directory or a subdirectory of the root directory.
// Otherwise, the directory is treated as a path relative to the root
// directory.
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
func Mkdir ( root string , directory string , options MkdirOptions ) error {
2020-08-12 22:11:35 +08:00
req := request {
Request : requestMkdir ,
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
Root : root ,
Directory : directory ,
MkdirOptions : options ,
}
resp , err := copier ( nil , nil , req )
if err != nil {
return err
}
if resp . Error != "" {
return errors . New ( resp . Error )
}
return nil
}
2021-04-20 06:01:13 +08:00
// RemoveOptions controls parts of Remove()'s behavior.
type RemoveOptions struct {
All bool // if Directory is a directory, remove its contents as well
}
// Remove removes the specified directory or item, traversing any intermediate
// symbolic links.
// If the root directory is not specified, the current root directory is used.
// If root is specified and the current OS supports it, and the calling process
// has the necessary privileges, the remove() is performed in a chrooted context.
// If the item to remove is specified as an absolute path, it should either be
// in the root directory or in a subdirectory of the root directory. Otherwise,
// the directory is treated as a path relative to the root directory.
func Remove ( root string , item string , options RemoveOptions ) error {
req := request {
Request : requestRemove ,
Root : root ,
Directory : item ,
RemoveOptions : options ,
}
resp , err := copier ( nil , nil , req )
if err != nil {
return err
}
if resp . Error != "" {
return errors . New ( resp . Error )
}
return nil
}
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
// cleanerReldirectory resolves relative path candidate lexically, attempting
// to ensure that when joined as a subdirectory of another directory, it does
// not reference anything outside of that other directory.
func cleanerReldirectory ( candidate string ) string {
cleaned := strings . TrimPrefix ( filepath . Clean ( string ( os . PathSeparator ) + candidate ) , string ( os . PathSeparator ) )
if cleaned == "" {
return "."
}
return cleaned
}
2020-12-22 00:19:56 +08:00
// convertToRelSubdirectory returns the path of directory, bound and relative to
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
// root, as a relative path, or an error if that path can't be computed or if
// the two directories are on different volumes
func convertToRelSubdirectory ( root , directory string ) ( relative string , err error ) {
if root == "" || ! filepath . IsAbs ( root ) {
2022-07-06 17:14:06 +08:00
return "" , fmt . Errorf ( "expected root directory to be an absolute path, got %q" , root )
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
}
if directory == "" || ! filepath . IsAbs ( directory ) {
2022-07-06 17:14:06 +08:00
return "" , fmt . Errorf ( "expected directory to be an absolute path, got %q" , root )
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
}
if filepath . VolumeName ( root ) != filepath . VolumeName ( directory ) {
2022-07-06 17:14:06 +08:00
return "" , fmt . Errorf ( "%q and %q are on different volumes" , root , directory )
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
}
rel , err := filepath . Rel ( root , directory )
if err != nil {
2022-07-06 17:14:06 +08:00
return "" , fmt . Errorf ( "error computing path of %q relative to %q: %w" , directory , root , err )
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
}
return cleanerReldirectory ( rel ) , nil
}
func currentVolumeRoot ( ) ( string , error ) {
cwd , err := os . Getwd ( )
if err != nil {
2022-07-06 17:14:06 +08:00
return "" , fmt . Errorf ( "error getting current working directory: %w" , err )
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
}
return filepath . VolumeName ( cwd ) + string ( os . PathSeparator ) , nil
}
func isVolumeRoot ( candidate string ) ( bool , error ) {
abs , err := filepath . Abs ( candidate )
if err != nil {
2022-07-06 17:14:06 +08:00
return false , fmt . Errorf ( "error converting %q to an absolute path: %w" , candidate , err )
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
}
return abs == filepath . VolumeName ( abs ) + string ( os . PathSeparator ) , nil
}
func looksLikeAbs ( candidate string ) bool {
return candidate [ 0 ] == os . PathSeparator && ( len ( candidate ) == 1 || candidate [ 1 ] != os . PathSeparator )
}
2020-08-12 22:11:35 +08:00
func copier ( bulkReader io . Reader , bulkWriter io . Writer , req request ) ( * response , error ) {
if req . Directory == "" {
if req . Root == "" {
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
wd , err := os . Getwd ( )
2020-07-15 04:34:07 +08:00
if err != nil {
2022-07-06 17:14:06 +08:00
return nil , fmt . Errorf ( "error getting current working directory: %w" , err )
2020-07-15 04:34:07 +08:00
}
2020-08-12 22:11:35 +08:00
req . Directory = wd
2020-07-15 04:34:07 +08:00
} else {
2020-08-12 22:11:35 +08:00
req . Directory = req . Root
2020-07-15 04:34:07 +08:00
}
}
2020-08-12 22:11:35 +08:00
if req . Root == "" {
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
root , err := currentVolumeRoot ( )
if err != nil {
2022-07-06 17:14:06 +08:00
return nil , fmt . Errorf ( "error determining root of current volume: %w" , err )
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
}
2020-08-12 22:11:35 +08:00
req . Root = root
2020-07-15 04:34:07 +08:00
}
2020-08-12 22:11:35 +08:00
if filepath . IsAbs ( req . Directory ) {
_ , err := convertToRelSubdirectory ( req . Root , req . Directory )
2020-07-15 04:34:07 +08:00
if err != nil {
2022-07-06 17:14:06 +08:00
return nil , fmt . Errorf ( "error rewriting %q to be relative to %q: %w" , req . Directory , req . Root , err )
2020-07-15 04:34:07 +08:00
}
}
2020-08-12 22:11:35 +08:00
isAlreadyRoot , err := isVolumeRoot ( req . Root )
2020-07-15 04:34:07 +08:00
if err != nil {
2022-07-06 17:14:06 +08:00
return nil , fmt . Errorf ( "error checking if %q is a root directory: %w" , req . Root , err )
2020-07-15 04:34:07 +08:00
}
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
if ! isAlreadyRoot && canChroot {
2020-08-12 22:11:35 +08:00
return copierWithSubprocess ( bulkReader , bulkWriter , req )
2020-07-15 04:34:07 +08:00
}
2020-08-12 22:11:35 +08:00
return copierWithoutSubprocess ( bulkReader , bulkWriter , req )
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
}
2020-07-15 04:34:07 +08:00
2020-08-12 22:11:35 +08:00
func copierWithoutSubprocess ( bulkReader io . Reader , bulkWriter io . Writer , req request ) ( * response , error ) {
req . preservedRoot = req . Root
req . rootPrefix = string ( os . PathSeparator )
req . preservedDirectory = req . Directory
req . preservedGlobs = append ( [ ] string { } , req . Globs ... )
if ! filepath . IsAbs ( req . Directory ) {
req . Directory = filepath . Join ( req . Root , cleanerReldirectory ( req . Directory ) )
}
absoluteGlobs := make ( [ ] string , 0 , len ( req . Globs ) )
for _ , glob := range req . preservedGlobs {
2020-07-15 04:34:07 +08:00
if filepath . IsAbs ( glob ) {
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
relativeGlob , err := convertToRelSubdirectory ( req . preservedRoot , glob )
if err != nil {
fmt . Fprintf ( os . Stderr , "error rewriting %q to be relative to %q: %v" , glob , req . preservedRoot , err )
os . Exit ( 1 )
}
absoluteGlobs = append ( absoluteGlobs , filepath . Join ( req . Root , string ( os . PathSeparator ) + relativeGlob ) )
2020-07-15 04:34:07 +08:00
} else {
2020-08-12 22:11:35 +08:00
absoluteGlobs = append ( absoluteGlobs , filepath . Join ( req . Directory , cleanerReldirectory ( glob ) ) )
2020-07-15 04:34:07 +08:00
}
}
2020-08-12 22:11:35 +08:00
req . Globs = absoluteGlobs
resp , cb , err := copierHandler ( bulkReader , bulkWriter , req )
2020-07-15 04:34:07 +08:00
if err != nil {
return nil , err
}
if cb != nil {
if err = cb ( ) ; err != nil {
return nil , err
}
}
2020-08-12 22:11:35 +08:00
return resp , nil
2020-07-15 04:34:07 +08:00
}
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
func closeIfNotNilYet ( f * * os . File , what string ) {
2019-07-25 22:10:03 +08:00
if f != nil && * f != nil {
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
err := ( * f ) . Close ( )
* f = nil
if err != nil {
logrus . Debugf ( "error closing %s: %v" , what , err )
}
2020-07-15 04:34:07 +08:00
}
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
}
2020-08-12 22:11:35 +08:00
func copierWithSubprocess ( bulkReader io . Reader , bulkWriter io . Writer , req request ) ( resp * response , err error ) {
2020-07-15 04:34:07 +08:00
if bulkReader == nil {
bulkReader = bytes . NewReader ( [ ] byte { } )
}
if bulkWriter == nil {
bulkWriter = ioutil . Discard
}
cmd := reexec . Command ( copierCommand )
stdinRead , stdinWrite , err := os . Pipe ( )
if err != nil {
2022-07-06 17:14:06 +08:00
return nil , fmt . Errorf ( "pipe: %w" , err )
2020-07-15 04:34:07 +08:00
}
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
defer closeIfNotNilYet ( & stdinRead , "stdin pipe reader" )
defer closeIfNotNilYet ( & stdinWrite , "stdin pipe writer" )
2020-07-15 04:34:07 +08:00
encoder := json . NewEncoder ( stdinWrite )
stdoutRead , stdoutWrite , err := os . Pipe ( )
if err != nil {
2022-07-06 17:14:06 +08:00
return nil , fmt . Errorf ( "pipe: %w" , err )
2020-07-15 04:34:07 +08:00
}
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
defer closeIfNotNilYet ( & stdoutRead , "stdout pipe reader" )
defer closeIfNotNilYet ( & stdoutWrite , "stdout pipe writer" )
2020-07-15 04:34:07 +08:00
decoder := json . NewDecoder ( stdoutRead )
bulkReaderRead , bulkReaderWrite , err := os . Pipe ( )
if err != nil {
2022-07-06 17:14:06 +08:00
return nil , fmt . Errorf ( "pipe: %w" , err )
2020-07-15 04:34:07 +08:00
}
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
defer closeIfNotNilYet ( & bulkReaderRead , "child bulk content reader pipe, read end" )
defer closeIfNotNilYet ( & bulkReaderWrite , "child bulk content reader pipe, write end" )
2020-07-15 04:34:07 +08:00
bulkWriterRead , bulkWriterWrite , err := os . Pipe ( )
if err != nil {
2022-07-06 17:14:06 +08:00
return nil , fmt . Errorf ( "pipe: %w" , err )
2020-07-15 04:34:07 +08:00
}
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
defer closeIfNotNilYet ( & bulkWriterRead , "child bulk content writer pipe, read end" )
defer closeIfNotNilYet ( & bulkWriterWrite , "child bulk content writer pipe, write end" )
2020-07-15 04:34:07 +08:00
cmd . Dir = "/"
cmd . Env = append ( [ ] string { fmt . Sprintf ( "LOGLEVEL=%d" , logrus . GetLevel ( ) ) } , os . Environ ( ) ... )
errorBuffer := bytes . Buffer { }
cmd . Stdin = stdinRead
cmd . Stdout = stdoutWrite
cmd . Stderr = & errorBuffer
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
cmd . ExtraFiles = [ ] * os . File { bulkReaderRead , bulkWriterWrite }
2020-07-15 04:34:07 +08:00
if err = cmd . Start ( ) ; err != nil {
2022-07-06 17:14:06 +08:00
return nil , fmt . Errorf ( "error starting subprocess: %w" , err )
2020-07-15 04:34:07 +08:00
}
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
cmdToWaitFor := cmd
defer func ( ) {
if cmdToWaitFor != nil {
if err := cmdToWaitFor . Wait ( ) ; err != nil {
if errorBuffer . String ( ) != "" {
logrus . Debug ( errorBuffer . String ( ) )
}
}
}
} ( )
2020-07-15 04:34:07 +08:00
stdinRead . Close ( )
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
stdinRead = nil
2020-07-15 04:34:07 +08:00
stdoutWrite . Close ( )
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
stdoutWrite = nil
2020-07-15 04:34:07 +08:00
bulkReaderRead . Close ( )
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
bulkReaderRead = nil
2020-07-15 04:34:07 +08:00
bulkWriterWrite . Close ( )
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
bulkWriterWrite = nil
2020-08-12 22:11:35 +08:00
killAndReturn := func ( err error , step string ) ( * response , error ) { // nolint: unparam
2020-07-15 04:34:07 +08:00
if err2 := cmd . Process . Kill ( ) ; err2 != nil {
2022-07-06 17:14:06 +08:00
return nil , fmt . Errorf ( "error killing subprocess: %v; %s: %w" , err2 , step , err )
2020-07-15 04:34:07 +08:00
}
2022-07-06 17:14:06 +08:00
return nil , fmt . Errorf ( "%v: %w" , step , err )
2020-07-15 04:34:07 +08:00
}
2020-08-12 22:11:35 +08:00
if err = encoder . Encode ( req ) ; err != nil {
2020-12-16 23:26:59 +08:00
return killAndReturn ( err , "error encoding request for copier subprocess" )
2020-07-15 04:34:07 +08:00
}
2020-08-12 22:11:35 +08:00
if err = decoder . Decode ( & resp ) ; err != nil {
2021-02-17 02:41:17 +08:00
if errors . Is ( err , io . EOF ) && errorBuffer . Len ( ) > 0 {
return killAndReturn ( errors . New ( errorBuffer . String ( ) ) , "error in copier subprocess" )
}
2020-12-16 23:26:59 +08:00
return killAndReturn ( err , "error decoding response from copier subprocess" )
2020-07-15 04:34:07 +08:00
}
2020-08-12 22:11:35 +08:00
if err = encoder . Encode ( & request { Request : requestQuit } ) ; err != nil {
2020-12-16 23:26:59 +08:00
return killAndReturn ( err , "error encoding request for copier subprocess" )
2020-07-15 04:34:07 +08:00
}
stdinWrite . Close ( )
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
stdinWrite = nil
2020-07-15 04:34:07 +08:00
stdoutRead . Close ( )
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
stdoutRead = nil
2020-07-15 04:34:07 +08:00
var wg sync . WaitGroup
var readError , writeError error
wg . Add ( 1 )
go func ( ) {
_ , writeError = io . Copy ( bulkWriter , bulkWriterRead )
bulkWriterRead . Close ( )
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
bulkWriterRead = nil
2020-07-15 04:34:07 +08:00
wg . Done ( )
} ( )
wg . Add ( 1 )
go func ( ) {
_ , readError = io . Copy ( bulkReaderWrite , bulkReader )
bulkReaderWrite . Close ( )
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
bulkReaderWrite = nil
2020-07-15 04:34:07 +08:00
wg . Done ( )
} ( )
wg . Wait ( )
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
cmdToWaitFor = nil
2020-07-15 04:34:07 +08:00
if err = cmd . Wait ( ) ; err != nil {
if errorBuffer . String ( ) != "" {
err = fmt . Errorf ( "%s" , errorBuffer . String ( ) )
}
return nil , err
}
if cmd . ProcessState . Exited ( ) && ! cmd . ProcessState . Success ( ) {
err = fmt . Errorf ( "subprocess exited with error" )
if errorBuffer . String ( ) != "" {
err = fmt . Errorf ( "%s" , errorBuffer . String ( ) )
}
return nil , err
}
2020-10-09 22:09:05 +08:00
loggedOutput := strings . TrimSuffix ( errorBuffer . String ( ) , "\n" )
if len ( loggedOutput ) > 0 {
for _ , output := range strings . Split ( loggedOutput , "\n" ) {
logrus . Debug ( output )
}
}
2020-07-15 04:34:07 +08:00
if readError != nil {
2022-07-06 17:14:06 +08:00
return nil , fmt . Errorf ( "error passing bulk input to subprocess: %w" , readError )
2020-07-15 04:34:07 +08:00
}
if writeError != nil {
2022-07-06 17:14:06 +08:00
return nil , fmt . Errorf ( "error passing bulk output from subprocess: %w" , writeError )
2020-07-15 04:34:07 +08:00
}
2020-08-12 22:11:35 +08:00
return resp , nil
2020-07-15 04:34:07 +08:00
}
func copierMain ( ) {
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
var chrooted bool
decoder := json . NewDecoder ( os . Stdin )
encoder := json . NewEncoder ( os . Stdout )
previousRequestRoot := ""
2020-07-15 04:34:07 +08:00
2022-05-05 17:11:52 +08:00
// Attempt a user and host lookup to force libc (glibc, and possibly others that use dynamic
// modules to handle looking up user and host information) to load modules that match the libc
// our binary is currently using. Hopefully they're loaded on first use, so that they won't
// need to be loaded after we've chrooted into the rootfs, which could include modules that
// don't match our libc and which can't be loaded, or modules which we don't want to execute
// because we don't trust their code.
_ , _ = user . Lookup ( "buildah" )
_ , _ = net . LookupHost ( "localhost" )
2020-07-15 04:34:07 +08:00
// Set logging.
if level := os . Getenv ( "LOGLEVEL" ) ; level != "" {
if ll , err := strconv . Atoi ( level ) ; err == nil {
logrus . SetLevel ( logrus . Level ( ll ) )
}
}
// Set up descriptors for receiving and sending tarstreams.
bulkReader := os . NewFile ( 3 , "bulk-reader" )
bulkWriter := os . NewFile ( 4 , "bulk-writer" )
for {
// Read a request.
2020-08-12 22:11:35 +08:00
req := new ( request )
if err := decoder . Decode ( req ) ; err != nil {
2020-12-16 23:26:59 +08:00
fmt . Fprintf ( os . Stderr , "error decoding request from copier parent process: %v" , err )
2020-07-15 04:34:07 +08:00
os . Exit ( 1 )
}
2020-08-12 22:11:35 +08:00
if req . Request == requestQuit {
2020-07-15 04:34:07 +08:00
// Making Quit a specific request means that we could
// run Stat() at a caller's behest before using the
// same process for Get() or Put(). Maybe later.
break
}
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
2020-07-15 04:34:07 +08:00
// Multiple requests should list the same root, because we
// can't un-chroot to chroot to some other location.
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
if previousRequestRoot != "" {
// Check that we got the same input value for
// where-to-chroot-to.
2020-08-12 22:11:35 +08:00
if req . Root != previousRequestRoot {
fmt . Fprintf ( os . Stderr , "error: can't change location of chroot from %q to %q" , previousRequestRoot , req . Root )
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
os . Exit ( 1 )
}
2020-08-12 22:11:35 +08:00
previousRequestRoot = req . Root
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
} else {
// Figure out where to chroot to, if we weren't told.
2020-08-12 22:11:35 +08:00
if req . Root == "" {
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
root , err := currentVolumeRoot ( )
if err != nil {
fmt . Fprintf ( os . Stderr , "error determining root of current volume: %v" , err )
os . Exit ( 1 )
}
2020-08-12 22:11:35 +08:00
req . Root = root
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
}
// Change to the specified root directory.
var err error
2020-08-12 22:11:35 +08:00
chrooted , err = chroot ( req . Root )
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
if err != nil {
2021-02-17 02:40:23 +08:00
fmt . Fprintf ( os . Stderr , "%v" , err )
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
os . Exit ( 1 )
}
2020-07-15 04:34:07 +08:00
}
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
2020-08-12 22:11:35 +08:00
req . preservedRoot = req . Root
req . rootPrefix = string ( os . PathSeparator )
req . preservedDirectory = req . Directory
req . preservedGlobs = append ( [ ] string { } , req . Globs ... )
2020-07-15 04:34:07 +08:00
if chrooted {
// We'll need to adjust some things now that the root
// directory isn't what it was. Make the directory and
// globs absolute paths for simplicity's sake.
2020-08-12 22:11:35 +08:00
absoluteDirectory := req . Directory
if ! filepath . IsAbs ( req . Directory ) {
absoluteDirectory = filepath . Join ( req . Root , cleanerReldirectory ( req . Directory ) )
2020-07-15 04:34:07 +08:00
}
2020-08-12 22:11:35 +08:00
relativeDirectory , err := convertToRelSubdirectory ( req . preservedRoot , absoluteDirectory )
2020-07-15 04:34:07 +08:00
if err != nil {
2020-08-12 22:11:35 +08:00
fmt . Fprintf ( os . Stderr , "error rewriting %q to be relative to %q: %v" , absoluteDirectory , req . preservedRoot , err )
2020-07-15 04:34:07 +08:00
os . Exit ( 1 )
}
2020-08-12 22:11:35 +08:00
req . Directory = filepath . Clean ( string ( os . PathSeparator ) + relativeDirectory )
absoluteGlobs := make ( [ ] string , 0 , len ( req . Globs ) )
for i , glob := range req . preservedGlobs {
2020-07-15 04:34:07 +08:00
if filepath . IsAbs ( glob ) {
2020-08-12 22:11:35 +08:00
relativeGlob , err := convertToRelSubdirectory ( req . preservedRoot , glob )
2020-07-15 04:34:07 +08:00
if err != nil {
2020-08-12 22:11:35 +08:00
fmt . Fprintf ( os . Stderr , "error rewriting %q to be relative to %q: %v" , glob , req . preservedRoot , err )
2020-07-15 04:34:07 +08:00
os . Exit ( 1 )
}
absoluteGlobs = append ( absoluteGlobs , filepath . Clean ( string ( os . PathSeparator ) + relativeGlob ) )
} else {
2020-08-12 22:11:35 +08:00
absoluteGlobs = append ( absoluteGlobs , filepath . Join ( req . Directory , cleanerReldirectory ( req . Globs [ i ] ) ) )
2020-07-15 04:34:07 +08:00
}
}
2020-08-12 22:11:35 +08:00
req . Globs = absoluteGlobs
req . rootPrefix = req . Root
req . Root = string ( os . PathSeparator )
2020-07-15 04:34:07 +08:00
} else {
// Make the directory and globs absolute paths for
// simplicity's sake.
2020-08-12 22:11:35 +08:00
if ! filepath . IsAbs ( req . Directory ) {
req . Directory = filepath . Join ( req . Root , cleanerReldirectory ( req . Directory ) )
2020-07-15 04:34:07 +08:00
}
2020-08-12 22:11:35 +08:00
absoluteGlobs := make ( [ ] string , 0 , len ( req . Globs ) )
for i , glob := range req . preservedGlobs {
2020-07-15 04:34:07 +08:00
if filepath . IsAbs ( glob ) {
2020-08-12 22:11:35 +08:00
absoluteGlobs = append ( absoluteGlobs , req . Globs [ i ] )
2020-07-15 04:34:07 +08:00
} else {
2020-08-12 22:11:35 +08:00
absoluteGlobs = append ( absoluteGlobs , filepath . Join ( req . Directory , cleanerReldirectory ( req . Globs [ i ] ) ) )
2020-07-15 04:34:07 +08:00
}
}
2020-08-12 22:11:35 +08:00
req . Globs = absoluteGlobs
2020-07-15 04:34:07 +08:00
}
2020-08-12 22:11:35 +08:00
resp , cb , err := copierHandler ( bulkReader , bulkWriter , * req )
2020-07-15 04:34:07 +08:00
if err != nil {
2020-12-16 23:26:59 +08:00
fmt . Fprintf ( os . Stderr , "error handling request %#v from copier parent process: %v" , * req , err )
2020-07-15 04:34:07 +08:00
os . Exit ( 1 )
}
// Encode the response.
2020-08-12 22:11:35 +08:00
if err := encoder . Encode ( resp ) ; err != nil {
2020-12-16 23:26:59 +08:00
fmt . Fprintf ( os . Stderr , "error encoding response %#v for copier parent process: %v" , * req , err )
2020-07-15 04:34:07 +08:00
os . Exit ( 1 )
}
// If there's bulk data to transfer, run the callback to either
// read or write it.
if cb != nil {
if err = cb ( ) ; err != nil {
2020-08-12 22:11:35 +08:00
fmt . Fprintf ( os . Stderr , "error during bulk transfer for %#v: %v" , * req , err )
2020-07-15 04:34:07 +08:00
os . Exit ( 1 )
}
}
}
}
2020-08-12 22:11:35 +08:00
func copierHandler ( bulkReader io . Reader , bulkWriter io . Writer , req request ) ( * response , func ( ) error , error ) {
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
// NewPatternMatcher splits patterns into components using
// os.PathSeparator, implying that it expects OS-specific naming
// conventions.
2020-08-12 22:11:35 +08:00
excludes := req . Excludes ( )
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
pm , err := fileutils . NewPatternMatcher ( excludes )
if err != nil {
2022-07-06 17:14:06 +08:00
return nil , nil , fmt . Errorf ( "error processing excludes list %v: %w" , excludes , err )
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
}
var idMappings * idtools . IDMappings
2020-08-12 22:11:35 +08:00
uidMap , gidMap := req . UIDMap ( ) , req . GIDMap ( )
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
if len ( uidMap ) > 0 && len ( gidMap ) > 0 {
idMappings = idtools . NewIDMappingsFromMaps ( uidMap , gidMap )
}
2020-08-12 22:11:35 +08:00
switch req . Request {
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
default :
2022-07-06 17:14:06 +08:00
return nil , nil , fmt . Errorf ( "not an implemented request type: %q" , req . Request )
2021-03-03 05:06:27 +08:00
case requestEval :
resp := copierHandlerEval ( req )
return resp , nil , nil
2020-08-12 22:11:35 +08:00
case requestStat :
resp := copierHandlerStat ( req , pm )
2020-07-15 04:34:07 +08:00
return resp , nil , nil
2020-08-12 22:11:35 +08:00
case requestGet :
return copierHandlerGet ( bulkWriter , req , pm , idMappings )
case requestPut :
return copierHandlerPut ( bulkReader , req , idMappings )
case requestMkdir :
return copierHandlerMkdir ( req , idMappings )
2021-04-20 06:01:13 +08:00
case requestRemove :
resp := copierHandlerRemove ( req )
return resp , nil , nil
2020-08-12 22:11:35 +08:00
case requestQuit :
2020-07-15 04:34:07 +08:00
return nil , nil , nil
}
}
// pathIsExcluded computes path relative to root, then asks the pattern matcher
// if the result is excluded. Returns the relative path and the matcher's
// results.
func pathIsExcluded ( root , path string , pm * fileutils . PatternMatcher ) ( string , bool , error ) {
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
rel , err := convertToRelSubdirectory ( root , path )
2020-07-15 04:34:07 +08:00
if err != nil {
2022-07-06 17:14:06 +08:00
return "" , false , fmt . Errorf ( "copier: error computing path of %q relative to root %q: %w" , path , root , err )
2020-07-15 04:34:07 +08:00
}
if pm == nil {
return rel , false , nil
}
if rel == "." {
// special case
return rel , false , nil
}
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
// Matches uses filepath.FromSlash() to convert candidates before
// checking if they match the patterns it's been given, implying that
// it expects Unix-style paths.
matches , err := pm . Matches ( filepath . ToSlash ( rel ) ) // nolint:staticcheck
2020-07-15 04:34:07 +08:00
if err != nil {
2022-07-06 17:14:06 +08:00
return rel , false , fmt . Errorf ( "copier: error checking if %q is excluded: %w" , rel , err )
2020-07-15 04:34:07 +08:00
}
if matches {
return rel , true , nil
}
return rel , false , nil
}
// resolvePath resolves symbolic links in paths, treating the specified
// directory as the root.
// Resolving the path this way, and using the result, is in no way secure
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
// against another process manipulating the content that we're looking at, and
// it is not expected to be.
2020-07-15 04:34:07 +08:00
// This helps us approximate chrooted behavior on systems and in test cases
// where chroot isn't available.
2021-04-20 06:01:13 +08:00
func resolvePath ( root , path string , evaluateFinalComponent bool , pm * fileutils . PatternMatcher ) ( string , error ) {
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
rel , err := convertToRelSubdirectory ( root , path )
2020-07-15 04:34:07 +08:00
if err != nil {
2022-07-06 17:14:06 +08:00
return "" , fmt . Errorf ( "error making path %q relative to %q" , path , root )
2020-07-15 04:34:07 +08:00
}
workingPath := root
followed := 0
components := strings . Split ( rel , string ( os . PathSeparator ) )
excluded := false
for len ( components ) > 0 {
// if anything we try to examine is excluded, then resolution has to "break"
_ , thisExcluded , err := pathIsExcluded ( root , filepath . Join ( workingPath , components [ 0 ] ) , pm )
if err != nil {
return "" , err
}
excluded = excluded || thisExcluded
if ! excluded {
2021-04-20 06:01:13 +08:00
if target , err := os . Readlink ( filepath . Join ( workingPath , components [ 0 ] ) ) ; err == nil && ! ( len ( components ) == 1 && ! evaluateFinalComponent ) {
2020-07-15 04:34:07 +08:00
followed ++
if followed > maxLoopsFollowed {
return "" , & os . PathError {
Op : "open" ,
Path : path ,
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
Err : syscall . ELOOP ,
2020-07-15 04:34:07 +08:00
}
}
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
if filepath . IsAbs ( target ) || looksLikeAbs ( target ) {
2020-07-15 04:34:07 +08:00
// symlink to an absolute path - prepend the
// root directory to that absolute path to
// replace the current location, and resolve
// the remaining components
workingPath = root
components = append ( strings . Split ( target , string ( os . PathSeparator ) ) , components [ 1 : ] ... )
continue
}
// symlink to a relative path - add the link target to
// the current location to get the next location, and
// resolve the remaining components
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
rel , err := convertToRelSubdirectory ( root , filepath . Join ( workingPath , target ) )
2020-07-15 04:34:07 +08:00
if err != nil {
2022-07-06 17:14:06 +08:00
return "" , fmt . Errorf ( "error making path %q relative to %q" , filepath . Join ( workingPath , target ) , root )
2020-07-15 04:34:07 +08:00
}
workingPath = root
components = append ( strings . Split ( filepath . Clean ( string ( os . PathSeparator ) + rel ) , string ( os . PathSeparator ) ) , components [ 1 : ] ... )
continue
}
}
// append the current component's name to get the next location
workingPath = filepath . Join ( workingPath , components [ 0 ] )
if workingPath == filepath . Join ( root , ".." ) {
// attempted to go above the root using a relative path .., scope it
workingPath = root
}
// ready to handle the next component
components = components [ 1 : ]
}
return workingPath , nil
}
2021-03-03 05:06:27 +08:00
func copierHandlerEval ( req request ) * response {
errorResponse := func ( fmtspec string , args ... interface { } ) * response {
return & response { Error : fmt . Sprintf ( fmtspec , args ... ) , Eval : evalResponse { } }
}
2021-04-20 06:01:13 +08:00
resolvedTarget , err := resolvePath ( req . Root , req . Directory , true , nil )
2021-03-03 05:06:27 +08:00
if err != nil {
return errorResponse ( "copier: eval: error resolving %q: %v" , req . Directory , err )
}
return & response { Eval : evalResponse { Evaluated : filepath . Join ( req . rootPrefix , resolvedTarget ) } }
}
2020-08-12 22:11:35 +08:00
func copierHandlerStat ( req request , pm * fileutils . PatternMatcher ) * response {
errorResponse := func ( fmtspec string , args ... interface { } ) * response {
return & response { Error : fmt . Sprintf ( fmtspec , args ... ) , Stat : statResponse { } }
2020-07-15 04:34:07 +08:00
}
2020-08-12 22:11:35 +08:00
if len ( req . Globs ) == 0 {
2020-07-15 04:34:07 +08:00
return errorResponse ( "copier: stat: expected at least one glob pattern, got none" )
}
var stats [ ] * StatsForGlob
2020-08-12 22:11:35 +08:00
for i , glob := range req . Globs {
2020-07-15 04:34:07 +08:00
s := StatsForGlob {
2020-08-12 22:11:35 +08:00
Glob : req . preservedGlobs [ i ] ,
2020-07-15 04:34:07 +08:00
}
// glob this pattern
globMatched , err := filepath . Glob ( glob )
if err != nil {
s . Error = fmt . Sprintf ( "copier: stat: %q while matching glob pattern %q" , err . Error ( ) , glob )
2021-04-19 18:22:41 +08:00
}
if len ( globMatched ) == 0 && strings . ContainsAny ( glob , "*?[" ) {
2020-07-15 04:34:07 +08:00
continue
}
// collect the matches
s . Globbed = make ( [ ] string , 0 , len ( globMatched ) )
s . Results = make ( map [ string ] * StatForItem )
for _ , globbed := range globMatched {
2020-08-12 22:11:35 +08:00
rel , excluded , err := pathIsExcluded ( req . Root , globbed , pm )
2020-07-15 04:34:07 +08:00
if err != nil {
return errorResponse ( "copier: stat: %v" , err )
}
if excluded {
continue
}
// if the glob was an absolute path, reconstruct the
// path that we should hand back for the match
var resultName string
2020-08-12 22:11:35 +08:00
if filepath . IsAbs ( req . preservedGlobs [ i ] ) {
resultName = filepath . Join ( req . rootPrefix , globbed )
2020-07-15 04:34:07 +08:00
} else {
relResult := rel
2020-08-12 22:11:35 +08:00
if req . Directory != req . Root {
relResult , err = convertToRelSubdirectory ( req . Directory , globbed )
2020-07-15 04:34:07 +08:00
if err != nil {
2020-08-12 22:11:35 +08:00
return errorResponse ( "copier: stat: error making %q relative to %q: %v" , globbed , req . Directory , err )
2020-07-15 04:34:07 +08:00
}
}
resultName = relResult
}
result := StatForItem { Name : resultName }
s . Globbed = append ( s . Globbed , resultName )
s . Results [ resultName ] = & result
// lstat the matched value
linfo , err := os . Lstat ( globbed )
if err != nil {
result . Error = err . Error ( )
continue
}
result . Size = linfo . Size ( )
result . Mode = linfo . Mode ( )
result . ModTime = linfo . ModTime ( )
result . IsDir = linfo . IsDir ( )
result . IsRegular = result . Mode . IsRegular ( )
result . IsSymlink = ( linfo . Mode ( ) & os . ModeType ) == os . ModeSymlink
2020-08-12 22:11:35 +08:00
checkForArchive := req . StatOptions . CheckForArchives
2020-07-15 04:34:07 +08:00
if result . IsSymlink {
// if the match was a symbolic link, read it
immediateTarget , err := os . Readlink ( globbed )
if err != nil {
result . Error = err . Error ( )
continue
}
// record where it points, both by itself (it
// could be a relative link) and in the context
// of the chroot
result . ImmediateTarget = immediateTarget
2021-04-20 06:01:13 +08:00
resolvedTarget , err := resolvePath ( req . Root , globbed , true , pm )
2020-07-15 04:34:07 +08:00
if err != nil {
return errorResponse ( "copier: stat: error resolving %q: %v" , globbed , err )
}
// lstat the thing that we point to
info , err := os . Lstat ( resolvedTarget )
if err != nil {
result . Error = err . Error ( )
continue
}
// replace IsArchive/IsDir/IsRegular with info about the target
2020-08-12 22:11:35 +08:00
if info . Mode ( ) . IsRegular ( ) && req . StatOptions . CheckForArchives {
2020-07-15 04:34:07 +08:00
result . IsArchive = isArchivePath ( resolvedTarget )
checkForArchive = false
}
result . IsDir = info . IsDir ( )
result . IsRegular = info . Mode ( ) . IsRegular ( )
}
if result . IsRegular && checkForArchive {
// we were asked to check on this, and it
// wasn't a symlink, in which case we'd have
// already checked what the link points to
result . IsArchive = isArchivePath ( globbed )
}
}
// no unskipped matches -> error
if len ( s . Globbed ) == 0 {
s . Globbed = nil
s . Results = nil
s . Error = fmt . Sprintf ( "copier: stat: %q: %v" , glob , syscall . ENOENT )
}
2021-04-19 18:22:41 +08:00
stats = append ( stats , & s )
}
// no matches -> error
if len ( stats ) == 0 {
s := StatsForGlob {
Error : fmt . Sprintf ( "copier: stat: %q: %v" , req . Globs , syscall . ENOENT ) ,
}
stats = append ( stats , & s )
2020-07-15 04:34:07 +08:00
}
2020-08-12 22:11:35 +08:00
return & response { Stat : statResponse { Globs : stats } }
2020-07-15 04:34:07 +08:00
}
2021-03-04 05:45:43 +08:00
func errorIsPermission ( err error ) bool {
if err == nil {
return false
}
2022-07-06 17:14:06 +08:00
return errors . Is ( err , os . ErrPermission ) || strings . Contains ( err . Error ( ) , "permission denied" )
2021-03-04 05:45:43 +08:00
}
2020-08-12 22:11:35 +08:00
func copierHandlerGet ( bulkWriter io . Writer , req request , pm * fileutils . PatternMatcher , idMappings * idtools . IDMappings ) ( * response , func ( ) error , error ) {
statRequest := req
statRequest . Request = requestStat
statResponse := copierHandlerStat ( req , pm )
errorResponse := func ( fmtspec string , args ... interface { } ) ( * response , func ( ) error , error ) {
return & response { Error : fmt . Sprintf ( fmtspec , args ... ) , Stat : statResponse . Stat , Get : getResponse { } } , nil , nil
2020-07-15 04:34:07 +08:00
}
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
if statResponse . Error != "" {
return errorResponse ( "%s" , statResponse . Error )
2020-07-15 04:34:07 +08:00
}
2020-08-12 22:11:35 +08:00
if len ( req . Globs ) == 0 {
2020-07-15 04:34:07 +08:00
return errorResponse ( "copier: get: expected at least one glob pattern, got 0" )
}
// build a queue of items by globbing
var queue [ ] string
globMatchedCount := 0
2020-08-12 22:11:35 +08:00
for _ , glob := range req . Globs {
2020-07-15 04:34:07 +08:00
globMatched , err := filepath . Glob ( glob )
if err != nil {
return errorResponse ( "copier: get: glob %q: %v" , glob , err )
}
globMatchedCount += len ( globMatched )
2020-10-06 05:43:49 +08:00
queue = append ( queue , globMatched ... )
2020-07-15 04:34:07 +08:00
}
// no matches -> error
if len ( queue ) == 0 {
2020-08-12 22:11:35 +08:00
return errorResponse ( "copier: get: globs %v matched nothing (%d filtered out): %v" , req . Globs , globMatchedCount , syscall . ENOENT )
2020-07-15 04:34:07 +08:00
}
2021-04-14 02:09:21 +08:00
topInfo , err := os . Stat ( req . Directory )
if err != nil {
return errorResponse ( "copier: get: error reading info about directory %q: %v" , req . Directory , err )
}
2020-07-15 04:34:07 +08:00
cb := func ( ) error {
tw := tar . NewWriter ( bulkWriter )
defer tw . Close ( )
hardlinkChecker := new ( util . HardlinkChecker )
itemsCopied := 0
for i , item := range queue {
// if we're not discarding the names of individual directories, keep track of this one
relNamePrefix := ""
2020-08-12 22:11:35 +08:00
if req . GetOptions . KeepDirectoryNames {
2020-07-15 04:34:07 +08:00
relNamePrefix = filepath . Base ( item )
}
// if the named thing-to-read is a symlink, dereference it
info , err := os . Lstat ( item )
if err != nil {
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "copier: get: lstat %q: %w" , item , err )
2020-07-15 04:34:07 +08:00
}
// chase links. if we hit a dead end, we should just fail
followedLinks := 0
const maxFollowedLinks = 16
2021-02-18 02:44:40 +08:00
for ! req . GetOptions . NoDerefSymlinks && info . Mode ( ) & os . ModeType == os . ModeSymlink && followedLinks < maxFollowedLinks {
2020-07-15 04:34:07 +08:00
path , err := os . Readlink ( item )
if err != nil {
continue
}
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
if filepath . IsAbs ( path ) || looksLikeAbs ( path ) {
2020-08-12 22:11:35 +08:00
path = filepath . Join ( req . Root , path )
2020-07-15 04:34:07 +08:00
} else {
path = filepath . Join ( filepath . Dir ( item ) , path )
}
item = path
2020-08-12 22:11:35 +08:00
if _ , err = convertToRelSubdirectory ( req . Root , item ) ; err != nil {
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "copier: get: computing path of %q(%q) relative to %q: %w" , queue [ i ] , item , req . Root , err )
2020-07-15 04:34:07 +08:00
}
if info , err = os . Lstat ( item ) ; err != nil {
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "copier: get: lstat %q(%q): %w" , queue [ i ] , item , err )
2020-07-15 04:34:07 +08:00
}
followedLinks ++
}
if followedLinks >= maxFollowedLinks {
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "copier: get: resolving symlink %q(%q): %w" , queue [ i ] , item , syscall . ELOOP )
2020-07-15 04:34:07 +08:00
}
// evaluate excludes relative to the root directory
if info . Mode ( ) . IsDir ( ) {
2020-10-02 01:39:33 +08:00
// we don't expand any of the contents that are archives
options := req . GetOptions
options . ExpandArchives = false
2022-03-26 19:48:51 +08:00
walkfn := func ( path string , d fs . DirEntry , err error ) error {
2020-10-09 22:23:38 +08:00
if err != nil {
2021-03-04 05:45:43 +08:00
if options . IgnoreUnreadable && errorIsPermission ( err ) {
2022-03-26 19:48:51 +08:00
if info != nil && d . IsDir ( ) {
2021-03-04 05:45:43 +08:00
return filepath . SkipDir
}
return nil
2022-07-06 17:14:06 +08:00
} else if errors . Is ( err , os . ErrNotExist ) {
Fix copy race while walking paths
During a copy operation which descends through a directory tree,
It's possible for a referenced file to become inaccessible (by unlink
or permission change or whatever). During the walk of paths to copy,
an `Lstat()` is run on each item, and any error passed into the handler
function to deal with. Subsequently, if there is no error, the file
is examined for inclusion/exclusion by the handler.
Unfortunately, this introduces a TOCTOU race condition for files which
become inaccessible even if they would otherwise be excluded. For
example a file or directory under /proc or /sys (which frequently and
unpredictably change). This was the original cause encountered during
podman integration testing.
It's impractical to actually fix this race at the file-level, without
introducing negative effects to any source-container operations. It's
also questionably useful to offer a command-line option to offload the
choice to the user. Instead, follow the behavior of the `tar` command
for this situation: Issue a warning to the user, and ignore the
problematic item (don't copy it).
Also add a test resembling the podman test which originally caught this
race. While not reliable, it does introduce a non-zero chance of
hitting the race condition - and handling the new warning properly.
Signed-off-by: Chris Evich <cevich@redhat.com>
2021-05-07 22:37:52 +08:00
logrus . Warningf ( "copier: file disappeared while reading: %q" , path )
return nil
2021-03-04 05:45:43 +08:00
}
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "copier: get: error reading %q: %w" , path , err )
2020-10-09 22:23:38 +08:00
}
2022-03-26 19:48:51 +08:00
if d . Type ( ) == os . ModeSocket {
logrus . Warningf ( "copier: skipping socket %q" , d . Name ( ) )
2021-03-12 16:20:33 +08:00
return nil
}
2020-07-15 04:34:07 +08:00
// compute the path of this item
// relative to the top-level directory,
// for the tar header
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
rel , relErr := convertToRelSubdirectory ( item , path )
2020-07-15 04:34:07 +08:00
if relErr != nil {
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "copier: get: error computing path of %q relative to top directory %q: %w" , path , item , relErr )
2020-07-15 04:34:07 +08:00
}
// prefix the original item's name if we're keeping it
if relNamePrefix != "" {
rel = filepath . Join ( relNamePrefix , rel )
}
if rel == "" || rel == "." {
// skip the "." entry
return nil
}
2021-08-24 22:41:16 +08:00
skippedPath , skip , err := pathIsExcluded ( req . Root , path , pm )
2020-07-15 04:34:07 +08:00
if err != nil {
return err
}
if skip {
2022-03-26 19:48:51 +08:00
if d . IsDir ( ) {
2021-08-24 22:41:16 +08:00
// if there are no "include
// this anyway" patterns at
// all, we don't need to
// descend into this particular
// directory if it's a directory
if ! pm . Exclusions ( ) {
return filepath . SkipDir
}
// if there are exclusion
// patterns for which this
// path is a prefix, we
// need to keep descending
for _ , pattern := range pm . Patterns ( ) {
if ! pattern . Exclusion ( ) {
continue
}
spec := strings . Trim ( pattern . String ( ) , string ( os . PathSeparator ) )
trimmedPath := strings . Trim ( skippedPath , string ( os . PathSeparator ) )
if strings . HasPrefix ( spec + string ( os . PathSeparator ) , trimmedPath ) {
// we can't just skip over
// this directory
return nil
}
}
// there are exclusions, but
// none of them apply here
return filepath . SkipDir
}
// skip this item, but if we're
// a directory, a more specific
2020-07-15 04:34:07 +08:00
// but-include-this for
// something under it might
// also be in the excludes list
return nil
}
// if it's a symlink, read its target
symlinkTarget := ""
2022-03-26 19:48:51 +08:00
if d . Type ( ) == os . ModeSymlink {
2020-07-15 04:34:07 +08:00
target , err := os . Readlink ( path )
if err != nil {
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "copier: get: readlink(%q(%q)): %w" , rel , path , err )
2020-07-15 04:34:07 +08:00
}
symlinkTarget = target
}
2022-03-26 19:48:51 +08:00
info , err := d . Info ( )
if err != nil {
return err
}
2021-04-14 02:09:21 +08:00
// if it's a directory and we're staying on one device, and it's on a
// different device than the one we started from, skip its contents
var ok error
2022-03-26 19:48:51 +08:00
if d . IsDir ( ) && req . GetOptions . NoCrossDevice {
2021-04-14 02:09:21 +08:00
if ! sameDevice ( topInfo , info ) {
ok = filepath . SkipDir
}
}
2020-07-15 04:34:07 +08:00
// add the item to the outgoing tar stream
2021-03-04 05:45:43 +08:00
if err := copierHandlerGetOne ( info , symlinkTarget , rel , path , options , tw , hardlinkChecker , idMappings ) ; err != nil {
if req . GetOptions . IgnoreUnreadable && errorIsPermission ( err ) {
2021-04-14 02:09:21 +08:00
return ok
2022-07-06 17:14:06 +08:00
} else if errors . Is ( err , os . ErrNotExist ) {
Fix copy race while walking paths
During a copy operation which descends through a directory tree,
It's possible for a referenced file to become inaccessible (by unlink
or permission change or whatever). During the walk of paths to copy,
an `Lstat()` is run on each item, and any error passed into the handler
function to deal with. Subsequently, if there is no error, the file
is examined for inclusion/exclusion by the handler.
Unfortunately, this introduces a TOCTOU race condition for files which
become inaccessible even if they would otherwise be excluded. For
example a file or directory under /proc or /sys (which frequently and
unpredictably change). This was the original cause encountered during
podman integration testing.
It's impractical to actually fix this race at the file-level, without
introducing negative effects to any source-container operations. It's
also questionably useful to offer a command-line option to offload the
choice to the user. Instead, follow the behavior of the `tar` command
for this situation: Issue a warning to the user, and ignore the
problematic item (don't copy it).
Also add a test resembling the podman test which originally caught this
race. While not reliable, it does introduce a non-zero chance of
hitting the race condition - and handling the new warning properly.
Signed-off-by: Chris Evich <cevich@redhat.com>
2021-05-07 22:37:52 +08:00
logrus . Warningf ( "copier: file disappeared while reading: %q" , path )
return nil
2021-03-04 05:45:43 +08:00
}
return err
}
2021-04-14 02:09:21 +08:00
return ok
2020-07-15 04:34:07 +08:00
}
// walk the directory tree, checking/adding items individually
2022-03-26 19:48:51 +08:00
if err := filepath . WalkDir ( item , walkfn ) ; err != nil {
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "copier: get: %q(%q): %w" , queue [ i ] , item , err )
2020-07-15 04:34:07 +08:00
}
itemsCopied ++
} else {
2020-08-12 22:11:35 +08:00
_ , skip , err := pathIsExcluded ( req . Root , item , pm )
2020-07-15 04:34:07 +08:00
if err != nil {
return err
}
if skip {
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
continue
2020-07-15 04:34:07 +08:00
}
// add the item to the outgoing tar stream. in
// cases where this was a symlink that we
// dereferenced, be sure to use the name of the
// link.
2020-08-12 22:11:35 +08:00
if err := copierHandlerGetOne ( info , "" , filepath . Base ( queue [ i ] ) , item , req . GetOptions , tw , hardlinkChecker , idMappings ) ; err != nil {
2021-03-04 05:45:43 +08:00
if req . GetOptions . IgnoreUnreadable && errorIsPermission ( err ) {
continue
}
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "copier: get: %q: %w" , queue [ i ] , err )
2020-07-15 04:34:07 +08:00
}
itemsCopied ++
}
}
if itemsCopied == 0 {
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "copier: get: copied no items: %w" , syscall . ENOENT )
2020-07-15 04:34:07 +08:00
}
return nil
}
2020-08-12 22:11:35 +08:00
return & response { Stat : statResponse . Stat , Get : getResponse { } } , cb , nil
2020-07-15 04:34:07 +08:00
}
2020-12-15 06:21:16 +08:00
func handleRename ( rename map [ string ] string , name string ) string {
if rename == nil {
return name
}
// header names always use '/', so use path instead of filepath to manipulate it
if directMapping , ok := rename [ name ] ; ok {
return directMapping
}
prefix , remainder := path . Split ( name )
for prefix != "" {
if mappedPrefix , ok := rename [ prefix ] ; ok {
return path . Join ( mappedPrefix , remainder )
}
if prefix [ len ( prefix ) - 1 ] == '/' {
2021-02-18 04:05:32 +08:00
prefix = prefix [ : len ( prefix ) - 1 ]
if mappedPrefix , ok := rename [ prefix ] ; ok {
2020-12-15 06:21:16 +08:00
return path . Join ( mappedPrefix , remainder )
}
}
newPrefix , middlePart := path . Split ( prefix )
if newPrefix == prefix {
return name
}
prefix = newPrefix
remainder = path . Join ( middlePart , remainder )
}
return name
}
2020-07-15 04:34:07 +08:00
func copierHandlerGetOne ( srcfi os . FileInfo , symlinkTarget , name , contentPath string , options GetOptions , tw * tar . Writer , hardlinkChecker * util . HardlinkChecker , idMappings * idtools . IDMappings ) error {
// build the header using the name provided
hdr , err := tar . FileInfoHeader ( srcfi , symlinkTarget )
if err != nil {
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "error generating tar header for %s (%s): %w" , contentPath , symlinkTarget , err )
2020-07-15 04:34:07 +08:00
}
if name != "" {
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
hdr . Name = filepath . ToSlash ( name )
2020-07-15 04:34:07 +08:00
}
2020-12-15 06:21:16 +08:00
if options . Rename != nil {
hdr . Name = handleRename ( options . Rename , hdr . Name )
}
2020-07-29 04:36:39 +08:00
if options . StripSetuidBit {
hdr . Mode &^= cISUID
}
if options . StripSetgidBit {
hdr . Mode &^= cISGID
}
if options . StripStickyBit {
hdr . Mode &^= cISVTX
2020-07-15 04:34:07 +08:00
}
// read extended attributes
var xattrs map [ string ] string
if ! options . StripXattrs {
xattrs , err = Lgetxattrs ( contentPath )
if err != nil {
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "error getting extended attributes for %q: %w" , contentPath , err )
2020-07-15 04:34:07 +08:00
}
}
hdr . Xattrs = xattrs // nolint:staticcheck
if hdr . Typeflag == tar . TypeReg {
// if it's an archive and we're extracting archives, read the
// file and spool out its contents in-line. (if we just
// inlined the whole file, we'd also be inlining the EOF marker
// it contains)
if options . ExpandArchives && isArchivePath ( contentPath ) {
f , err := os . Open ( contentPath )
if err != nil {
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "error opening file for reading archive contents: %w" , err )
2020-07-15 04:34:07 +08:00
}
defer f . Close ( )
rc , _ , err := compression . AutoDecompress ( f )
if err != nil {
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "error decompressing %s: %w" , contentPath , err )
2020-07-15 04:34:07 +08:00
}
defer rc . Close ( )
tr := tar . NewReader ( rc )
hdr , err := tr . Next ( )
for err == nil {
2020-12-15 06:21:16 +08:00
if options . Rename != nil {
hdr . Name = handleRename ( options . Rename , hdr . Name )
}
2020-07-15 04:34:07 +08:00
if err = tw . WriteHeader ( hdr ) ; err != nil {
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "error writing tar header from %q to pipe: %w" , contentPath , err )
2020-07-15 04:34:07 +08:00
}
if hdr . Size != 0 {
n , err := io . Copy ( tw , tr )
if err != nil {
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "error extracting content from archive %s: %s: %w" , contentPath , hdr . Name , err )
2020-07-15 04:34:07 +08:00
}
if n != hdr . Size {
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "error extracting contents of archive %s: incorrect length for %q" , contentPath , hdr . Name )
2020-07-15 04:34:07 +08:00
}
tw . Flush ( )
}
hdr , err = tr . Next ( )
}
if err != io . EOF {
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "error extracting contents of archive %s: %w" , contentPath , err )
2020-07-15 04:34:07 +08:00
}
return nil
}
// if this regular file is hard linked to something else we've
// already added, set up to output a TypeLink entry instead of
// a TypeReg entry
target := hardlinkChecker . Check ( srcfi )
if target != "" {
hdr . Typeflag = tar . TypeLink
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
hdr . Linkname = filepath . ToSlash ( target )
2020-07-15 04:34:07 +08:00
hdr . Size = 0
} else {
// note the device/inode pair for this file
2020-09-09 05:55:07 +08:00
hardlinkChecker . Add ( srcfi , name )
2020-07-15 04:34:07 +08:00
}
}
// map the ownership for the archive
if idMappings != nil && ! idMappings . Empty ( ) {
hostPair := idtools . IDPair { UID : hdr . Uid , GID : hdr . Gid }
hdr . Uid , hdr . Gid , err = idMappings . ToContainer ( hostPair )
if err != nil {
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "error mapping host filesystem owners %#v to container filesystem owners: %w" , hostPair , err )
2020-07-15 04:34:07 +08:00
}
}
2020-09-30 03:01:27 +08:00
// force ownership and/or permissions, if requested
if hdr . Typeflag == tar . TypeDir {
if options . ChownDirs != nil {
hdr . Uid , hdr . Gid = options . ChownDirs . UID , options . ChownDirs . GID
}
if options . ChmodDirs != nil {
hdr . Mode = int64 ( * options . ChmodDirs )
}
} else {
if options . ChownFiles != nil {
hdr . Uid , hdr . Gid = options . ChownFiles . UID , options . ChownFiles . GID
}
if options . ChmodFiles != nil {
hdr . Mode = int64 ( * options . ChmodFiles )
}
}
2021-03-04 05:45:43 +08:00
var f * os . File
if hdr . Typeflag == tar . TypeReg {
// open the file first so that we don't write a header for it if we can't actually read it
f , err = os . Open ( contentPath )
if err != nil {
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "error opening file for adding its contents to archive: %w" , err )
2021-03-04 05:45:43 +08:00
}
defer f . Close ( )
2022-03-30 20:49:42 +08:00
} else if hdr . Typeflag == tar . TypeDir {
// open the directory file first to make sure we can access it.
f , err = os . Open ( contentPath )
if err != nil {
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "error opening directory for adding its contents to archive: %w" , err )
2022-03-30 20:49:42 +08:00
}
defer f . Close ( )
2021-03-04 05:45:43 +08:00
}
2020-07-15 04:34:07 +08:00
// output the header
if err = tw . WriteHeader ( hdr ) ; err != nil {
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "error writing header for %s (%s): %w" , contentPath , hdr . Name , err )
2020-07-15 04:34:07 +08:00
}
if hdr . Typeflag == tar . TypeReg {
// output the content
n , err := io . Copy ( tw , f )
if err != nil {
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "error copying %s: %w" , contentPath , err )
2020-07-15 04:34:07 +08:00
}
if n != hdr . Size {
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "error copying %s: incorrect size (expected %d bytes, read %d bytes)" , contentPath , n , hdr . Size )
2020-07-15 04:34:07 +08:00
}
tw . Flush ( )
}
return nil
}
2020-08-12 22:11:35 +08:00
func copierHandlerPut ( bulkReader io . Reader , req request , idMappings * idtools . IDMappings ) ( * response , func ( ) error , error ) {
errorResponse := func ( fmtspec string , args ... interface { } ) ( * response , func ( ) error , error ) {
return & response { Error : fmt . Sprintf ( fmtspec , args ... ) , Put : putResponse { } } , nil , nil
2020-07-15 04:34:07 +08:00
}
2020-09-30 03:01:27 +08:00
dirUID , dirGID , defaultDirUID , defaultDirGID := 0 , 0 , 0 , 0
2020-08-12 22:11:35 +08:00
if req . PutOptions . ChownDirs != nil {
dirUID , dirGID = req . PutOptions . ChownDirs . UID , req . PutOptions . ChownDirs . GID
2020-09-30 03:01:27 +08:00
defaultDirUID , defaultDirGID = dirUID , dirGID
2020-07-15 04:34:07 +08:00
}
2020-09-30 03:01:27 +08:00
defaultDirMode := os . FileMode ( 0755 )
2020-08-12 22:11:35 +08:00
if req . PutOptions . ChmodDirs != nil {
2020-09-30 03:01:27 +08:00
defaultDirMode = * req . PutOptions . ChmodDirs
}
if req . PutOptions . DefaultDirOwner != nil {
defaultDirUID , defaultDirGID = req . PutOptions . DefaultDirOwner . UID , req . PutOptions . DefaultDirOwner . GID
}
if req . PutOptions . DefaultDirMode != nil {
defaultDirMode = * req . PutOptions . DefaultDirMode
2020-07-15 04:34:07 +08:00
}
var fileUID , fileGID * int
2020-08-12 22:11:35 +08:00
if req . PutOptions . ChownFiles != nil {
fileUID , fileGID = & req . PutOptions . ChownFiles . UID , & req . PutOptions . ChownFiles . GID
2020-07-15 04:34:07 +08:00
}
if idMappings != nil && ! idMappings . Empty ( ) {
containerDirPair := idtools . IDPair { UID : dirUID , GID : dirGID }
hostDirPair , err := idMappings . ToHost ( containerDirPair )
if err != nil {
return errorResponse ( "copier: put: error mapping container filesystem owner %d:%d to host filesystem owners: %v" , dirUID , dirGID , err )
}
dirUID , dirGID = hostDirPair . UID , hostDirPair . GID
2020-10-06 13:13:09 +08:00
defaultDirUID , defaultDirGID = hostDirPair . UID , hostDirPair . GID
2020-08-12 22:11:35 +08:00
if req . PutOptions . ChownFiles != nil {
2020-07-15 04:34:07 +08:00
containerFilePair := idtools . IDPair { UID : * fileUID , GID : * fileGID }
hostFilePair , err := idMappings . ToHost ( containerFilePair )
if err != nil {
return errorResponse ( "copier: put: error mapping container filesystem owner %d:%d to host filesystem owners: %v" , fileUID , fileGID , err )
}
fileUID , fileGID = & hostFilePair . UID , & hostFilePair . GID
}
}
2022-04-27 05:33:10 +08:00
directoryModes := make ( map [ string ] os . FileMode )
2020-07-15 04:34:07 +08:00
ensureDirectoryUnderRoot := func ( directory string ) error {
2020-08-12 22:11:35 +08:00
rel , err := convertToRelSubdirectory ( req . Root , directory )
2020-07-15 04:34:07 +08:00
if err != nil {
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "%q is not a subdirectory of %q: %w" , directory , req . Root , err )
2020-07-15 04:34:07 +08:00
}
subdir := ""
for _ , component := range strings . Split ( rel , string ( os . PathSeparator ) ) {
subdir = filepath . Join ( subdir , component )
2020-08-12 22:11:35 +08:00
path := filepath . Join ( req . Root , subdir )
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
if err := os . Mkdir ( path , 0700 ) ; err == nil {
2020-09-30 03:01:27 +08:00
if err = lchown ( path , defaultDirUID , defaultDirGID ) ; err != nil {
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "copier: put: error setting owner of %q to %d:%d: %w" , path , defaultDirUID , defaultDirGID , err )
2020-07-15 04:34:07 +08:00
}
2022-04-27 05:33:10 +08:00
// make a conditional note to set this directory's permissions
// later, but not if we already had an explictly-provided mode
if _ , ok := directoryModes [ path ] ; ! ok {
directoryModes [ path ] = defaultDirMode
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
}
2020-07-15 04:34:07 +08:00
} else {
2022-05-06 22:39:54 +08:00
// FreeBSD can return EISDIR for "mkdir /":
// https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=59739.
2022-07-27 03:27:30 +08:00
if ! errors . Is ( err , os . ErrExist ) && ! errors . Is ( err , syscall . EISDIR ) {
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "copier: put: error checking directory %q: %w" , path , err )
2020-07-15 04:34:07 +08:00
}
}
}
return nil
}
2022-04-27 05:33:10 +08:00
makeDirectoryWriteable := func ( directory string ) error {
st , err := os . Lstat ( directory )
if err != nil {
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "copier: put: error reading permissions of directory %q: %w" , directory , err )
2022-04-27 05:33:10 +08:00
}
mode := st . Mode ( ) & os . ModePerm
if _ , ok := directoryModes [ directory ] ; ! ok {
directoryModes [ directory ] = mode
}
if err = os . Chmod ( directory , 0 o700 ) ; err != nil {
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "copier: put: error making directory %q writable: %w" , directory , err )
2022-04-27 05:33:10 +08:00
}
return nil
}
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
createFile := func ( path string , tr * tar . Reader ) ( int64 , error ) {
f , err := os . OpenFile ( path , os . O_CREATE | os . O_WRONLY | os . O_TRUNC | os . O_EXCL , 0600 )
2022-07-27 03:27:30 +08:00
if err != nil && errors . Is ( err , os . ErrExist ) {
2020-12-15 06:21:16 +08:00
if req . PutOptions . NoOverwriteDirNonDir {
if st , err2 := os . Lstat ( path ) ; err2 == nil && st . IsDir ( ) {
2022-07-06 17:14:06 +08:00
return 0 , fmt . Errorf ( "copier: put: error creating file at %q: %w" , path , err )
2020-12-15 06:21:16 +08:00
}
}
2020-12-12 02:22:39 +08:00
if err = os . RemoveAll ( path ) ; err != nil {
2022-04-27 05:33:10 +08:00
if os . IsPermission ( err ) {
if err := makeDirectoryWriteable ( filepath . Dir ( path ) ) ; err != nil {
return 0 , err
}
err = os . RemoveAll ( path )
}
if err != nil {
2022-07-06 17:14:06 +08:00
return 0 , fmt . Errorf ( "copier: put: error removing item to be overwritten %q: %w" , path , err )
2022-04-27 05:33:10 +08:00
}
}
f , err = os . OpenFile ( path , os . O_CREATE | os . O_WRONLY | os . O_TRUNC | os . O_EXCL , 0600 )
}
if err != nil && os . IsPermission ( err ) {
if err = makeDirectoryWriteable ( filepath . Dir ( path ) ) ; err != nil {
return 0 , err
2020-07-15 04:34:07 +08:00
}
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
f , err = os . OpenFile ( path , os . O_CREATE | os . O_WRONLY | os . O_TRUNC | os . O_EXCL , 0600 )
2020-07-15 04:34:07 +08:00
}
if err != nil {
2022-07-06 17:14:06 +08:00
return 0 , fmt . Errorf ( "copier: put: error opening file %q for writing: %w" , path , err )
2020-07-15 04:34:07 +08:00
}
defer f . Close ( )
n , err := io . Copy ( f , tr )
if err != nil {
2022-07-06 17:14:06 +08:00
return n , fmt . Errorf ( "copier: put: error writing file %q: %w" , path , err )
2020-07-15 04:34:07 +08:00
}
return n , nil
}
2021-04-20 06:01:13 +08:00
targetDirectory , err := resolvePath ( req . Root , req . Directory , true , nil )
2020-07-15 04:34:07 +08:00
if err != nil {
2020-08-12 22:11:35 +08:00
return errorResponse ( "copier: put: error resolving %q: %v" , req . Directory , err )
2020-07-15 04:34:07 +08:00
}
info , err := os . Lstat ( targetDirectory )
if err == nil {
if ! info . IsDir ( ) {
2020-08-12 22:11:35 +08:00
return errorResponse ( "copier: put: %s (%s): exists but is not a directory" , req . Directory , targetDirectory )
2020-07-15 04:34:07 +08:00
}
} else {
2022-07-27 03:27:30 +08:00
if ! errors . Is ( err , os . ErrNotExist ) {
2020-08-12 22:11:35 +08:00
return errorResponse ( "copier: put: %s: %v" , req . Directory , err )
2020-07-15 04:34:07 +08:00
}
2020-08-12 22:11:35 +08:00
if err := ensureDirectoryUnderRoot ( req . Directory ) ; err != nil {
2020-07-15 04:34:07 +08:00
return errorResponse ( "copier: put: %v" , err )
}
}
cb := func ( ) error {
type directoryAndTimes struct {
directory string
atime , mtime time . Time
}
var directoriesAndTimes [ ] directoryAndTimes
defer func ( ) {
for i := range directoriesAndTimes {
directoryAndTimes := directoriesAndTimes [ len ( directoriesAndTimes ) - i - 1 ]
if err := lutimes ( false , directoryAndTimes . directory , directoryAndTimes . atime , directoryAndTimes . mtime ) ; err != nil {
logrus . Debugf ( "error setting access and modify timestamps on %q to %s and %s: %v" , directoryAndTimes . directory , directoryAndTimes . atime , directoryAndTimes . mtime , err )
}
}
2022-04-27 05:33:10 +08:00
for directory , mode := range directoryModes {
if err := os . Chmod ( directory , mode ) ; err != nil {
logrus . Debugf ( "error setting permissions of %q to 0%o: %v" , directory , uint32 ( mode ) , err )
}
}
2020-07-15 04:34:07 +08:00
} ( )
2021-01-05 05:44:30 +08:00
ignoredItems := make ( map [ string ] struct { } )
2020-07-15 04:34:07 +08:00
tr := tar . NewReader ( bulkReader )
hdr , err := tr . Next ( )
for err == nil {
2021-01-05 05:44:30 +08:00
nameBeforeRenaming := hdr . Name
2020-12-12 02:24:04 +08:00
if len ( hdr . Name ) == 0 {
// no name -> ignore the entry
2021-01-05 05:44:30 +08:00
ignoredItems [ nameBeforeRenaming ] = struct { } { }
2020-12-12 02:24:04 +08:00
hdr , err = tr . Next ( )
continue
}
2020-12-15 06:21:16 +08:00
if req . PutOptions . Rename != nil {
hdr . Name = handleRename ( req . PutOptions . Rename , hdr . Name )
}
2020-07-15 04:34:07 +08:00
// figure out who should own this new item
if idMappings != nil && ! idMappings . Empty ( ) {
containerPair := idtools . IDPair { UID : hdr . Uid , GID : hdr . Gid }
hostPair , err := idMappings . ToHost ( containerPair )
if err != nil {
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "error mapping container filesystem owner 0,0 to host filesystem owners: %w" , err )
2020-07-15 04:34:07 +08:00
}
hdr . Uid , hdr . Gid = hostPair . UID , hostPair . GID
}
if hdr . Typeflag == tar . TypeDir {
2020-08-12 22:11:35 +08:00
if req . PutOptions . ChownDirs != nil {
2020-07-15 04:34:07 +08:00
hdr . Uid , hdr . Gid = dirUID , dirGID
}
} else {
2020-08-12 22:11:35 +08:00
if req . PutOptions . ChownFiles != nil {
2020-07-15 04:34:07 +08:00
hdr . Uid , hdr . Gid = * fileUID , * fileGID
}
}
2020-10-23 23:51:55 +08:00
// make sure the parent directory exists, including for tar.TypeXGlobalHeader entries
// that we otherwise ignore, because that's what docker build does with them
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
path := filepath . Join ( targetDirectory , cleanerReldirectory ( filepath . FromSlash ( hdr . Name ) ) )
2020-07-15 04:34:07 +08:00
if err := ensureDirectoryUnderRoot ( filepath . Dir ( path ) ) ; err != nil {
return err
}
// figure out what the permissions should be
2022-04-28 04:56:14 +08:00
if req . PutOptions . StripSetuidBit && hdr . Mode & cISUID == cISUID {
hdr . Mode &^= cISUID
}
if req . PutOptions . StripSetgidBit && hdr . Mode & cISGID == cISGID {
hdr . Mode &^= cISGID
}
if req . PutOptions . StripStickyBit && hdr . Mode & cISVTX == cISVTX {
hdr . Mode &^= cISVTX
}
2020-07-15 04:34:07 +08:00
if hdr . Typeflag == tar . TypeDir {
2020-08-12 22:11:35 +08:00
if req . PutOptions . ChmodDirs != nil {
hdr . Mode = int64 ( * req . PutOptions . ChmodDirs )
2020-07-15 04:34:07 +08:00
}
} else {
2020-08-12 22:11:35 +08:00
if req . PutOptions . ChmodFiles != nil {
hdr . Mode = int64 ( * req . PutOptions . ChmodFiles )
2020-07-15 04:34:07 +08:00
}
}
// create the new item
devMajor := uint32 ( hdr . Devmajor )
devMinor := uint32 ( hdr . Devminor )
2020-10-23 23:51:55 +08:00
mode := os . FileMode ( hdr . Mode ) & os . ModePerm
2020-07-15 04:34:07 +08:00
switch hdr . Typeflag {
// no type flag for sockets
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
default :
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "unrecognized Typeflag %c" , hdr . Typeflag )
2020-07-15 04:34:07 +08:00
case tar . TypeReg , tar . TypeRegA :
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
var written int64
written , err = createFile ( path , tr )
2020-10-20 00:53:15 +08:00
// only check the length if there wasn't an error, which we'll
// check along with errors for other types of entries
if err == nil && written != hdr . Size {
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "copier: put: error creating regular file %q: incorrect length (%d != %d)" , path , written , hdr . Size )
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
}
2020-07-15 04:34:07 +08:00
case tar . TypeLink :
var linkTarget string
2021-01-05 05:44:30 +08:00
if _ , ignoredTarget := ignoredItems [ hdr . Linkname ] ; ignoredTarget {
// hard link to an ignored item: skip this, too
ignoredItems [ nameBeforeRenaming ] = struct { } { }
goto nextHeader
}
2020-12-15 06:21:16 +08:00
if req . PutOptions . Rename != nil {
hdr . Linkname = handleRename ( req . PutOptions . Rename , hdr . Linkname )
}
2021-04-20 06:01:13 +08:00
if linkTarget , err = resolvePath ( targetDirectory , filepath . Join ( req . Root , filepath . FromSlash ( hdr . Linkname ) ) , true , nil ) ; err != nil {
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "error resolving hardlink target path %q under root %q" , hdr . Linkname , req . Root )
2020-07-15 04:34:07 +08:00
}
2022-07-27 03:27:30 +08:00
if err = os . Link ( linkTarget , path ) ; err != nil && errors . Is ( err , os . ErrExist ) {
2020-12-15 06:21:16 +08:00
if req . PutOptions . NoOverwriteDirNonDir {
if st , err := os . Lstat ( path ) ; err == nil && st . IsDir ( ) {
break
}
}
2021-11-30 01:51:16 +08:00
if err = os . RemoveAll ( path ) ; err == nil {
2020-07-15 04:34:07 +08:00
err = os . Link ( linkTarget , path )
}
}
case tar . TypeSymlink :
2020-12-15 06:21:16 +08:00
// if req.PutOptions.Rename != nil {
// todo: the general solution requires resolving to an absolute path, handling
// renaming, and then possibly converting back to a relative symlink
// }
2022-07-27 03:27:30 +08:00
if err = os . Symlink ( filepath . FromSlash ( hdr . Linkname ) , filepath . FromSlash ( path ) ) ; err != nil && errors . Is ( err , os . ErrExist ) {
2020-12-15 06:21:16 +08:00
if req . PutOptions . NoOverwriteDirNonDir {
if st , err := os . Lstat ( path ) ; err == nil && st . IsDir ( ) {
break
}
}
2021-11-30 01:51:16 +08:00
if err = os . RemoveAll ( path ) ; err == nil {
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
err = os . Symlink ( filepath . FromSlash ( hdr . Linkname ) , filepath . FromSlash ( path ) )
2020-07-15 04:34:07 +08:00
}
}
case tar . TypeChar :
2021-01-05 05:44:30 +08:00
if req . PutOptions . IgnoreDevices {
ignoredItems [ nameBeforeRenaming ] = struct { } { }
goto nextHeader
}
2022-07-27 03:27:30 +08:00
if err = mknod ( path , chrMode ( 0600 ) , int ( mkdev ( devMajor , devMinor ) ) ) ; err != nil && errors . Is ( err , os . ErrExist ) {
2020-12-15 06:21:16 +08:00
if req . PutOptions . NoOverwriteDirNonDir {
if st , err := os . Lstat ( path ) ; err == nil && st . IsDir ( ) {
break
}
}
2021-11-30 01:51:16 +08:00
if err = os . RemoveAll ( path ) ; err == nil {
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
err = mknod ( path , chrMode ( 0600 ) , int ( mkdev ( devMajor , devMinor ) ) )
2020-07-15 04:34:07 +08:00
}
}
case tar . TypeBlock :
2021-01-05 05:44:30 +08:00
if req . PutOptions . IgnoreDevices {
ignoredItems [ nameBeforeRenaming ] = struct { } { }
goto nextHeader
}
2022-07-27 03:27:30 +08:00
if err = mknod ( path , blkMode ( 0600 ) , int ( mkdev ( devMajor , devMinor ) ) ) ; err != nil && errors . Is ( err , os . ErrExist ) {
2020-12-15 06:21:16 +08:00
if req . PutOptions . NoOverwriteDirNonDir {
if st , err := os . Lstat ( path ) ; err == nil && st . IsDir ( ) {
break
}
}
2021-11-30 01:51:16 +08:00
if err = os . RemoveAll ( path ) ; err == nil {
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
err = mknod ( path , blkMode ( 0600 ) , int ( mkdev ( devMajor , devMinor ) ) )
2020-07-15 04:34:07 +08:00
}
}
case tar . TypeDir :
2022-07-27 03:27:30 +08:00
if err = os . Mkdir ( path , 0700 ) ; err != nil && errors . Is ( err , os . ErrExist ) {
2022-06-07 18:54:07 +08:00
if st , stErr := os . Lstat ( path ) ; stErr == nil && ! st . IsDir ( ) {
if req . PutOptions . NoOverwriteNonDirDir {
break
}
2020-12-12 02:22:39 +08:00
if err = os . Remove ( path ) ; err == nil {
err = os . Mkdir ( path , 0700 )
}
2022-06-07 18:54:07 +08:00
} else {
err = stErr
2020-12-12 02:22:39 +08:00
}
// either we removed it and retried, or it was a directory,
// in which case we want to just add the new stuff under it
2020-07-15 04:34:07 +08:00
}
// make a note of the directory's times. we
// might create items under it, which will
// cause the mtime to change after we correct
// it, so we'll need to correct it again later
directoriesAndTimes = append ( directoriesAndTimes , directoryAndTimes {
directory : path ,
atime : hdr . AccessTime ,
mtime : hdr . ModTime ,
} )
2022-04-27 05:33:10 +08:00
// set the mode here unconditionally, in case the directory is in
// the archive more than once for whatever reason
directoryModes [ path ] = mode
2020-07-15 04:34:07 +08:00
case tar . TypeFifo :
2022-07-27 03:27:30 +08:00
if err = mkfifo ( path , 0600 ) ; err != nil && errors . Is ( err , os . ErrExist ) {
2020-12-15 06:21:16 +08:00
if req . PutOptions . NoOverwriteDirNonDir {
if st , err := os . Lstat ( path ) ; err == nil && st . IsDir ( ) {
break
}
}
2021-11-30 01:51:16 +08:00
if err = os . RemoveAll ( path ) ; err == nil {
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
err = mkfifo ( path , 0600 )
2020-07-15 04:34:07 +08:00
}
}
2020-10-23 23:51:55 +08:00
case tar . TypeXGlobalHeader :
// Per archive/tar, PAX uses these to specify key=value information
// applies to all subsequent entries. The one in reported in #2717,
// https://www.openssl.org/source/openssl-1.1.1g.tar.gz, includes a
// comment=(40 byte hex string) at the start, possibly a digest.
// Don't try to create whatever path was used for the header.
goto nextHeader
2020-07-15 04:34:07 +08:00
}
// check for errors
if err != nil {
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "copier: put: error creating %q: %w" , path , err )
2020-07-15 04:34:07 +08:00
}
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
// set ownership
if err = lchown ( path , hdr . Uid , hdr . Gid ) ; err != nil {
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "copier: put: error setting ownership of %q to %d:%d: %w" , path , hdr . Uid , hdr . Gid , err )
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
}
2022-04-27 05:33:10 +08:00
// set permissions, except for symlinks, since we don't
// have an lchmod, and directories, which we'll fix up
// on our way out so that we don't get tripped up by
// directories which we're not supposed to be able to
// write to, but which we'll need to create content in
if hdr . Typeflag != tar . TypeSymlink && hdr . Typeflag != tar . TypeDir {
2020-07-15 04:34:07 +08:00
if err = os . Chmod ( path , mode ) ; err != nil {
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "copier: put: error setting permissions on %q to 0%o: %w" , path , mode , err )
2020-07-15 04:34:07 +08:00
}
}
// set other bits that might have been reset by chown()
if hdr . Typeflag != tar . TypeSymlink {
if hdr . Mode & cISUID == cISUID {
mode |= syscall . S_ISUID
}
if hdr . Mode & cISGID == cISGID {
mode |= syscall . S_ISGID
}
if hdr . Mode & cISVTX == cISVTX {
mode |= syscall . S_ISVTX
}
if err = syscall . Chmod ( path , uint32 ( mode ) ) ; err != nil {
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "error setting additional permissions on %q to 0%o: %w" , path , mode , err )
2020-07-15 04:34:07 +08:00
}
}
2021-06-19 02:56:09 +08:00
// set xattrs, including some that might have been reset by chown()
if ! req . PutOptions . StripXattrs {
if err = Lsetxattrs ( path , hdr . Xattrs ) ; err != nil { // nolint:staticcheck
if ! req . PutOptions . IgnoreXattrErrors {
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "copier: put: error setting extended attributes on %q: %w" , path , err )
2021-06-19 02:56:09 +08:00
}
}
}
2020-07-15 04:34:07 +08:00
// set time
if hdr . AccessTime . IsZero ( ) || hdr . AccessTime . Before ( hdr . ModTime ) {
hdr . AccessTime = hdr . ModTime
}
if err = lutimes ( hdr . Typeflag == tar . TypeSymlink , path , hdr . AccessTime , hdr . ModTime ) ; err != nil {
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "error setting access and modify timestamps on %q to %s and %s: %w" , path , hdr . AccessTime , hdr . ModTime , err )
2020-07-15 04:34:07 +08:00
}
2020-10-23 23:51:55 +08:00
nextHeader :
2020-07-15 04:34:07 +08:00
hdr , err = tr . Next ( )
}
if err != io . EOF {
2022-07-06 17:14:06 +08:00
return fmt . Errorf ( "error reading tar stream: expected EOF: %w" , err )
2020-07-15 04:34:07 +08:00
}
return nil
}
2020-08-12 22:11:35 +08:00
return & response { Error : "" , Put : putResponse { } } , cb , nil
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
}
2020-08-12 22:11:35 +08:00
func copierHandlerMkdir ( req request , idMappings * idtools . IDMappings ) ( * response , func ( ) error , error ) {
errorResponse := func ( fmtspec string , args ... interface { } ) ( * response , func ( ) error , error ) {
return & response { Error : fmt . Sprintf ( fmtspec , args ... ) , Mkdir : mkdirResponse { } } , nil , nil
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
}
dirUID , dirGID := 0 , 0
2020-08-12 22:11:35 +08:00
if req . MkdirOptions . ChownNew != nil {
dirUID , dirGID = req . MkdirOptions . ChownNew . UID , req . MkdirOptions . ChownNew . GID
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
}
dirMode := os . FileMode ( 0755 )
2020-08-12 22:11:35 +08:00
if req . MkdirOptions . ChmodNew != nil {
dirMode = * req . MkdirOptions . ChmodNew
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
}
if idMappings != nil && ! idMappings . Empty ( ) {
containerDirPair := idtools . IDPair { UID : dirUID , GID : dirGID }
hostDirPair , err := idMappings . ToHost ( containerDirPair )
if err != nil {
return errorResponse ( "copier: mkdir: error mapping container filesystem owner %d:%d to host filesystem owners: %v" , dirUID , dirGID , err )
}
dirUID , dirGID = hostDirPair . UID , hostDirPair . GID
}
2021-04-20 06:01:13 +08:00
directory , err := resolvePath ( req . Root , req . Directory , true , nil )
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
if err != nil {
2020-08-12 22:11:35 +08:00
return errorResponse ( "copier: mkdir: error resolving %q: %v" , req . Directory , err )
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
}
2020-08-12 22:11:35 +08:00
rel , err := convertToRelSubdirectory ( req . Root , directory )
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
if err != nil {
2020-08-12 22:11:35 +08:00
return errorResponse ( "copier: mkdir: error computing path of %q relative to %q: %v" , directory , req . Root , err )
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
}
subdir := ""
for _ , component := range strings . Split ( rel , string ( os . PathSeparator ) ) {
subdir = filepath . Join ( subdir , component )
2020-08-12 22:11:35 +08:00
path := filepath . Join ( req . Root , subdir )
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
if err := os . Mkdir ( path , 0700 ) ; err == nil {
if err = chown ( path , dirUID , dirGID ) ; err != nil {
return errorResponse ( "copier: mkdir: error setting owner of %q to %d:%d: %v" , path , dirUID , dirGID , err )
}
if err = chmod ( path , dirMode ) ; err != nil {
return errorResponse ( "copier: mkdir: error setting permissions on %q to 0%o: %v" , path , dirMode )
}
} else {
2022-05-06 22:39:54 +08:00
// FreeBSD can return EISDIR for "mkdir /":
// https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=59739.
2022-07-27 03:27:30 +08:00
if ! errors . Is ( err , os . ErrExist ) && ! errors . Is ( err , syscall . EISDIR ) {
copier: add Mkdir()
Add a function for doing Mkdir-possibly-in-a-chroot, for ensuring that a
directory exists without having to possibly create it directly from
outside of a chroot.
Make use of filepath.ToSlash() and filepath.FromSlash() where it's
appropriate.
Add more unit tests.
Address some review comments:
* Check for ERANGE instead of E2BIG errors from llistxattr() and
lgetxattr() as indicators that the buffer we passed to them is too
small.
* Factor an `isRelevantXattr` helper out of Lgetxattrs() and
Lsetxattrs().
* Drop our getcwd() function in favor of using os.Getwd().
* Adjust the comment describing the GetOptions.KeepDirectoryNames field.
* Clean hdr.Name before attempting to compute where an item being
extracted should go.
* When writing items to the filesystem, create with 0?00 permissions,
set ownership, then set the correct permissions.
* Merge StatResponse.Error, GetResponse.Error, and PutResponse.Error
into Response.Error.
* When reading items from the filesystem, if a glob matches multiple
items, and one of the items is excluded, continue checking the other
items.
* Make sure we always Wait() on a child process if we spawned one.
* Clean up the cleanup logic for pipes that we use to communicate with a
child process.
* Clean up the kill-the-child-process logic we call when we encounter an
error communicating with the child process.
* Drop the separate Options structure, use helper methods to simplify
pulling out the right ID maps and exclusions list for the request.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-07-31 02:00:25 +08:00
return errorResponse ( "copier: mkdir: error checking directory %q: %v" , path , err )
}
}
}
2020-08-12 22:11:35 +08:00
return & response { Error : "" , Mkdir : mkdirResponse { } } , nil , nil
2020-07-15 04:34:07 +08:00
}
2021-04-20 06:01:13 +08:00
func copierHandlerRemove ( req request ) * response {
errorResponse := func ( fmtspec string , args ... interface { } ) * response {
return & response { Error : fmt . Sprintf ( fmtspec , args ... ) , Remove : removeResponse { } }
}
resolvedTarget , err := resolvePath ( req . Root , req . Directory , false , nil )
if err != nil {
return errorResponse ( "copier: remove: %v" , err )
}
if req . RemoveOptions . All {
err = os . RemoveAll ( resolvedTarget )
} else {
err = os . Remove ( resolvedTarget )
}
if err != nil {
return errorResponse ( "copier: remove %q: %v" , req . Directory , err )
}
return & response { Error : "" , Remove : removeResponse { } }
}