mirror of
https://github.com/moby/moby.git
synced 2026-01-11 02:31:44 +00:00
9bcb12aa48
This change changes the default for noOverwriteDirNonDir to be true internally, with the intent to change the default at the API to follow accordingly. The `AllowOverwriteDirWithFile` option in the Client was added when reimplementing the CLI using the API Client lib in [moby@1b2b91b]. Before that refactor, the `noOverwriteDirNonDir` query argument [would be set unconditionally][1] by the CLI, with no options to control the behavior. The `noOverwriteDirNonDir` query parameter was added in [moby@db9cc91] to set the `NoOverwriteDirNonDir` option that was implemented in pkg/archive in [moby@a74799b]. It was added in [PR13171-comment2], following a discussion on the risk of replacing a directory with a file and vice-versa in [PR13171-comment]. > In my latest changes from yesterday: > > - Removed the `GET stat-path` endpoint and added a `HEAD` handler to > the `archive-path` endpoint. Updated the api docs to reflect this. > Also moved api docs changes from `v1.19` to `v1.20`. > - Added a `NoOverwriteDirNonDir` flag to `archive.TarOptions` to indicate > that we do not want to overwrite a directory with a non-directory (and > vice versa) when unpacking an archive. > - Added a corresponding but optional `noOverwriteDirNonDir` parameter > to the `PUT extract-to-dir` endpoint to specify desired behavior. > > These changes combine to keep the behavior we want It's unclear why these were added as an *option* and why it was implemented as opt-in (not opt-out), as overwriting a file with a directory (or vice-versa) would generally be unexpected behavior. [1]:8c9ad7b818/api/client/cp.go (L345-L346)[moby@1b2b91b]:1b2b91ba43[moby@a74799b]:a74799b701[moby@db9cc91]:db9cc91a9e[PR13171-comment]: https://github.com/moby/moby/pull/13171#issuecomment-106559765 [PR13171-comment2]: https://github.com/moby/moby/pull/13171#issuecomment-108538643 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
15 lines
388 B
Go
15 lines
388 B
Go
package daemon
|
|
|
|
import (
|
|
"github.com/moby/go-archive"
|
|
)
|
|
|
|
// defaultTarCopyOptions is the setting that is used when unpacking an archive
|
|
// for a copy API event.
|
|
func (daemon *Daemon) defaultTarCopyOptions(allowOverwriteDirWithFile bool) *archive.TarOptions {
|
|
return &archive.TarOptions{
|
|
NoOverwriteDirNonDir: !allowOverwriteDirWithFile,
|
|
IDMap: daemon.idMapping,
|
|
}
|
|
}
|