mirror of
https://github.com/podman-container-tools/podman.git
synced 2026-09-10 09:37:52 +00:00
be7b956790
Align codebase with v4.4.1-rhel PodmanConfig structure and API signatures to resolve compilation errors. - Update all cfg.Engine.* references to cfg.ContainersConf.Engine.* or cfg.ContainersConfDefaultsRO.Engine.* - Update all cfg.Network.* references to cfg.ContainersConf.Network.* - Update all cfg.Containers.* references to cfg.ContainersConf.Containers.* or cfg.ContainersConfDefaultsRO.Containers.* - Update cfg.Machine.* references to cfg.ContainersConfDefaultsRO.Machine.* - Fix PodmanConfig initialization in config.go to use ContainersConf and ContainersConfDefaultsRO fields - Add createOptions parameter to NetworkCreate method across all implementations (abi, tunnel, handlers) - Update ContainerEngine interface to match new NetworkCreate signature - Fix manager.Store call in secrets.go to use StoreOptions struct - Update DiskUsage to handle 3 return values - Fix NewConnectionWithIdentity call signature - Remove duplicate setupRemoteConnection function - Remove duplicate readRemoteCliFlags function - Remove duplicate function declarations in container_path_resolution.go, oci_conmon_linux.go - Comment out duplicate SpecGenToOCI and helper functions in oci.go/oci_linux.go - Remove unused imports across multiple files - Fix SSHMode flag handling (field doesn't exist in current PodmanConfig) - Fix ns.NetNS type handling in container_internal_linux.go - Add missing Terminal() method to Container struct - Add missing SdNotifySocket field to ContainerConfig - Fix DefaultCapabilities to use .Get() method - Fix cgroups.AvailableControllers reference - Fix ConmonPath type conversion (attributedstring.Slice) - Add missing ErrNetworkConnected error definition - Fix NetworkCreateOptions handling in secrets.go - Update networking code to use getNetNSPathCommon helper - Fix teardownNetwork method signature - Fix makeInspectPorts to makeInspectPortBindings - Remove hardcoded IsPasta() checks - Fix runtime_libpod.go field access patterns All changes align with the v4.4.1-rhel worktree structure to ensure compatibility with upcoming cherry-picks. Substantially Assisted-by AI: Cursor <auto> Signed-off-by: Chris Evich <cevich@redhat.com>
88 lines
2.1 KiB
Go
88 lines
2.1 KiB
Go
package sftp
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"os"
|
|
"os/user"
|
|
"strconv"
|
|
"time"
|
|
|
|
sshfx "github.com/pkg/sftp/internal/encoding/ssh/filexfer"
|
|
)
|
|
|
|
func lsFormatID(id uint32) string {
|
|
return strconv.FormatUint(uint64(id), 10)
|
|
}
|
|
|
|
type osIDLookup struct{}
|
|
|
|
func (osIDLookup) Filelist(*Request) (ListerAt, error) {
|
|
return nil, errors.New("unimplemented stub")
|
|
}
|
|
|
|
func (osIDLookup) LookupUserName(uid string) string {
|
|
u, err := user.LookupId(uid)
|
|
if err != nil {
|
|
return uid
|
|
}
|
|
|
|
return u.Username
|
|
}
|
|
|
|
func (osIDLookup) LookupGroupName(gid string) string {
|
|
g, err := user.LookupGroupId(gid)
|
|
if err != nil {
|
|
return gid
|
|
}
|
|
|
|
return g.Name
|
|
}
|
|
|
|
// runLs formats the FileInfo as per `ls -l` style, which is in the 'longname' field of a SSH_FXP_NAME entry.
|
|
// This is a fairly simple implementation, just enough to look close to openssh in simple cases.
|
|
func runLs(idLookup NameLookupFileLister, dirent os.FileInfo) string {
|
|
// example from openssh sftp server:
|
|
// crw-rw-rw- 1 root wheel 0 Jul 31 20:52 ttyvd
|
|
// format:
|
|
// {directory / char device / etc}{rwxrwxrwx} {number of links} owner group size month day [time (this year) | year (otherwise)] name
|
|
|
|
symPerms := sshfx.FileMode(fromFileMode(dirent.Mode())).String()
|
|
|
|
var numLinks uint64 = 1
|
|
uid, gid := "0", "0"
|
|
|
|
switch sys := dirent.Sys().(type) {
|
|
case *sshfx.Attributes:
|
|
uid = lsFormatID(sys.UID)
|
|
gid = lsFormatID(sys.GID)
|
|
case *FileStat:
|
|
uid = lsFormatID(sys.UID)
|
|
gid = lsFormatID(sys.GID)
|
|
default:
|
|
if fiExt, ok := dirent.(FileInfoUidGid); ok {
|
|
uid = lsFormatID(fiExt.Uid())
|
|
gid = lsFormatID(fiExt.Gid())
|
|
|
|
break
|
|
}
|
|
|
|
numLinks, uid, gid = lsLinksUIDGID(dirent)
|
|
}
|
|
|
|
if idLookup != nil {
|
|
uid, gid = idLookup.LookupUserName(uid), idLookup.LookupGroupName(gid)
|
|
}
|
|
|
|
mtime := dirent.ModTime()
|
|
date := mtime.Format("Jan 2")
|
|
|
|
var yearOrTime string
|
|
if mtime.Before(time.Now().AddDate(0, -6, 0)) {
|
|
yearOrTime = mtime.Format("2006")
|
|
} else {
|
|
yearOrTime = mtime.Format("15:04")
|
|
}
|
|
|
|
return fmt.Sprintf("%s %4d %-8s %-8s %8d %s %5s %s", symPerms, numLinks, uid, gid, dirent.Size(), date, yearOrTime, dirent.Name())
|
|
}
|