mirror of
https://github.com/containers/podman.git
synced 2025-12-03 03:39:44 +08:00
vendor of containers/(common, storage, image)
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
4
vendor/github.com/containers/common/pkg/ssh/connection_golang.go
generated
vendored
4
vendor/github.com/containers/common/pkg/ssh/connection_golang.go
generated
vendored
@@ -28,7 +28,7 @@ import (
|
||||
func golangConnectionCreate(options ConnectionCreateOptions) error {
|
||||
var match bool
|
||||
var err error
|
||||
if match, err = regexp.Match("^[A-Za-z][A-Za-z0-9+.-]*://", []byte(options.Path)); err != nil {
|
||||
if match, err = regexp.MatchString("^[A-Za-z][A-Za-z0-9+.-]*://", options.Path); err != nil {
|
||||
return fmt.Errorf("invalid destination: %w", err)
|
||||
}
|
||||
|
||||
@@ -229,7 +229,7 @@ func GetUserInfo(uri *url.URL) (*url.Userinfo, error) {
|
||||
}
|
||||
|
||||
// ValidateAndConfigure will take a ssh url and an identity key (rsa and the like) and ensure the information given is valid
|
||||
// iden iden can be blank to mean no identity key
|
||||
// iden can be blank to mean no identity key
|
||||
// once the function validates the information it creates and returns an ssh.ClientConfig.
|
||||
func ValidateAndConfigure(uri *url.URL, iden string, insecureIsMachineConnection bool) (*ssh.ClientConfig, error) {
|
||||
var signers []ssh.Signer
|
||||
|
||||
2
vendor/github.com/containers/common/pkg/ssh/connection_native.go
generated
vendored
2
vendor/github.com/containers/common/pkg/ssh/connection_native.go
generated
vendored
@@ -14,7 +14,7 @@ import (
|
||||
func nativeConnectionCreate(options ConnectionCreateOptions) error {
|
||||
var match bool
|
||||
var err error
|
||||
if match, err = regexp.Match("^[A-Za-z][A-Za-z0-9+.-]*://", []byte(options.Path)); err != nil {
|
||||
if match, err = regexp.MatchString("^[A-Za-z][A-Za-z0-9+.-]*://", options.Path); err != nil {
|
||||
return fmt.Errorf("invalid destination: %w", err)
|
||||
}
|
||||
|
||||
|
||||
2
vendor/github.com/containers/common/pkg/ssh/utils.go
generated
vendored
2
vendor/github.com/containers/common/pkg/ssh/utils.go
generated
vendored
@@ -145,7 +145,7 @@ func ParseScpArgs(options ConnectionScpOptions) (string, string, string, bool, e
|
||||
if strings.Contains(localPath, "ssh://") {
|
||||
localPath = strings.Split(localPath, "ssh://")[1]
|
||||
}
|
||||
remotePath := ""
|
||||
var remotePath string
|
||||
swap := false
|
||||
if split := strings.Split(localPath, ":"); len(split) == 2 {
|
||||
// save to remote, load to local
|
||||
|
||||
Reference in New Issue
Block a user