opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-01 08:07:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22262 from Luap99/rootlesskit-v2

Browse Source 
update github.com/rootless-containers/rootlesskit to v2
This commit is contained in:
openshift-merge-bot[bot]
2024-04-05 15:43:28 +00:00
committed by GitHub
parent 41a710b0ca 10995192f8
commit 8ac7d9d492
20 changed files with 68 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/rootlessport/main.go
View File

@ -17,9 +17,9 @@ import (
"github.com/containernetworking/plugins/pkg/ns"
"github.com/containers/common/libnetwork/types"
"github.com/containers/common/pkg/rootlessport"
rkport "github.com/rootless-containers/rootlesskit/pkg/port"
rkbuiltin "github.com/rootless-containers/rootlesskit/pkg/port/builtin"
rkportutil "github.com/rootless-containers/rootlesskit/pkg/port/portutil"
rkport "github.com/rootless-containers/rootlesskit/v2/pkg/port"
rkbuiltin "github.com/rootless-containers/rootlesskit/v2/pkg/port/builtin"
rkportutil "github.com/rootless-containers/rootlesskit/v2/pkg/port/portutil"
"github.com/sirupsen/logrus"
"golang.org/x/sys/unix"
)
@ -343,7 +343,7 @@ func child() error {
errCh := make(chan error)
go func() {
d := rkbuiltin.NewChildDriver(os.Stderr)
dErr := d.RunChildDriver(opaque, quit)
dErr := d.RunChildDriver(opaque, quit, "")
errCh <- dErr
}()
defer func() {

2
cmd/rootlessport/wsl.go
View File

@ -5,7 +5,7 @@ import (
"strings"
"github.com/containers/common/pkg/machine"
rkport "github.com/rootless-containers/rootlesskit/pkg/port"
rkport "github.com/rootless-containers/rootlesskit/v2/pkg/port"
)
// WSL machines do not relay ipv4 traffic to dual-stack ports, simulate instead

2
cmd/rootlessport/wsl_test.go
View File

@ -4,7 +4,7 @@ import (
"testing"
"github.com/containers/common/pkg/machine"
"github.com/rootless-containers/rootlesskit/pkg/port"
"github.com/rootless-containers/rootlesskit/v2/pkg/port"
"github.com/stretchr/testify/assert"
)

2
go.mod
View File

@ -73,7 +73,7 @@ require (
github.com/opencontainers/runtime-tools v0.9.1-0.20230914150019-408c51e934dc
github.com/opencontainers/selinux v1.11.0
github.com/openshift/imagebuilder v1.2.7
github.com/rootless-containers/rootlesskit v1.1.1
github.com/rootless-containers/rootlesskit/v2 v2.0.2
github.com/shirou/gopsutil/v3 v3.24.3
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.8.0

4
go.sum
View File

@ -499,8 +499,8 @@ github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
github.com/rootless-containers/rootlesskit v1.1.1 h1:F5psKWoWY9/VjZ3ifVcaosjvFZJOagX85U22M0/EQZE=
github.com/rootless-containers/rootlesskit v1.1.1/go.mod h1:UD5GoA3dqKCJrnvnhVgQQnweMF2qZnf9KLw8EewcMZI=
github.com/rootless-containers/rootlesskit/v2 v2.0.2 h1:wztWcDYFlk+EVAUuPJwlNMFXZIk1G14T45lv47WWGuA=
github.com/rootless-containers/rootlesskit/v2 v2.0.2/go.mod h1:hE+ztevrQxNi+tdZyPKumzDk7VKDAf0E4seOzlOyBsY=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/sebdah/goldie/v2 v2.5.3 h1:9ES/mNN+HNUbNWpVAlrzuZ7jE+Nrczbj8uFRjM7624Y=
github.com/seccomp/libseccomp-golang v0.10.0 h1:aA4bp+/Zzi0BnWZ2F1wgNBs5gTpm+na2rWM6M9YjLpY=

0
vendor/github.com/rootless-containers/rootlesskit/LICENSE → vendor/github.com/rootless-containers/rootlesskit/v2/LICENSE generated vendored
View File

5
vendor/github.com/rootless-containers/rootlesskit/pkg/api/api.go → vendor/github.com/rootless-containers/rootlesskit/v2/pkg/api/api.go generated vendored
View File

@ -8,11 +8,6 @@ const (
Version = "1.1.1"
)
// ErrorJSON is returned with "application/json" content type and non-2XX status code
type ErrorJSON struct {
Message string `json:"message"`
}
// Info is the structure returned by `GET /info`
type Info struct {
APIVersion string `json:"apiVersion"` // REST API version

0
vendor/github.com/rootless-containers/rootlesskit/pkg/api/openapi.yaml → vendor/github.com/rootless-containers/rootlesskit/v2/pkg/api/openapi.yaml generated vendored
View File

4
vendor/github.com/rootless-containers/rootlesskit/pkg/msgutil/msgutil.go → vendor/github.com/rootless-containers/rootlesskit/v2/pkg/lowlevelmsgutil/lowlevelmsgutil.go generated vendored
View File

@ -1,5 +1,5 @@
// Package msgutil provides utility for JSON message with uint32le header
package msgutil
// Package lowlevelmsgutil provides utility for JSON message with uint32le header
package lowlevelmsgutil
import (
"bytes"

6
vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/builtin.go → vendor/github.com/rootless-containers/rootlesskit/v2/pkg/port/builtin/builtin.go generated vendored
View File

@ -3,9 +3,9 @@ package builtin
import (
"io"
"github.com/rootless-containers/rootlesskit/pkg/port"
"github.com/rootless-containers/rootlesskit/pkg/port/builtin/child"
"github.com/rootless-containers/rootlesskit/pkg/port/builtin/parent"
"github.com/rootless-containers/rootlesskit/v2/pkg/port"
"github.com/rootless-containers/rootlesskit/v2/pkg/port/builtin/child"
"github.com/rootless-containers/rootlesskit/v2/pkg/port/builtin/parent"
)
var (

29
vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/child/child.go → vendor/github.com/rootless-containers/rootlesskit/v2/pkg/port/builtin/child/child.go generated vendored
View File

@ -11,10 +11,11 @@ import (
"golang.org/x/sys/unix"
"github.com/rootless-containers/rootlesskit/pkg/msgutil"
"github.com/rootless-containers/rootlesskit/pkg/port"
"github.com/rootless-containers/rootlesskit/pkg/port/builtin/msg"
opaquepkg "github.com/rootless-containers/rootlesskit/pkg/port/builtin/opaque"
"github.com/containernetworking/plugins/pkg/ns"
"github.com/rootless-containers/rootlesskit/v2/pkg/lowlevelmsgutil"
"github.com/rootless-containers/rootlesskit/v2/pkg/port"
"github.com/rootless-containers/rootlesskit/v2/pkg/port/builtin/msg"
opaquepkg "github.com/rootless-containers/rootlesskit/v2/pkg/port/builtin/opaque"
)
func NewDriver(logWriter io.Writer) port.ChildDriver {
@ -27,7 +28,7 @@ type childDriver struct {
logWriter io.Writer
}
func (d *childDriver) RunChildDriver(opaque map[string]string, quit <-chan struct{}) error {
func (d *childDriver) RunChildDriver(opaque map[string]string, quit <-chan struct{}, detachedNetNSPath string) error {
socketPath := opaque[opaquepkg.SocketPath]
if socketPath == "" {
return errors.New("socket path not set")
@ -68,34 +69,40 @@ func (d *childDriver) RunChildDriver(opaque map[string]string, quit <-chan struc
return err
}
go func() {
if rerr := d.routine(c); rerr != nil {
if rerr := d.routine(c, detachedNetNSPath); rerr != nil {
rep := msg.Reply{
Error: rerr.Error(),
}
msgutil.MarshalToWriter(c, &rep)
lowlevelmsgutil.MarshalToWriter(c, &rep)
}
c.Close()
}()
}
}
func (d *childDriver) routine(c *net.UnixConn) error {
func (d *childDriver) routine(c *net.UnixConn, detachedNetNSPath string) error {
var req msg.Request
if _, err := msgutil.UnmarshalFromReader(c, &req); err != nil {
if _, err := lowlevelmsgutil.UnmarshalFromReader(c, &req); err != nil {
return err
}
switch req.Type {
case msg.RequestTypeInit:
return d.handleConnectInit(c, &req)
case msg.RequestTypeConnect:
return d.handleConnectRequest(c, &req)
if detachedNetNSPath == "" {
return d.handleConnectRequest(c, &req)
} else {
return ns.WithNetNSPath(detachedNetNSPath, func(_ ns.NetNS) error {
return d.handleConnectRequest(c, &req)
})
}
default:
return fmt.Errorf("unknown request type %q", req.Type)
}
}
func (d *childDriver) handleConnectInit(c *net.UnixConn, req *msg.Request) error {
_, err := msgutil.MarshalToWriter(c, nil)
_, err := lowlevelmsgutil.MarshalToWriter(c, nil)
return err
}

10
vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/msg/msg.go → vendor/github.com/rootless-containers/rootlesskit/v2/pkg/port/builtin/msg/msg.go generated vendored
View File

@ -8,8 +8,8 @@ import (
"golang.org/x/sys/unix"
"github.com/rootless-containers/rootlesskit/pkg/msgutil"
"github.com/rootless-containers/rootlesskit/pkg/port"
"github.com/rootless-containers/rootlesskit/v2/pkg/lowlevelmsgutil"
"github.com/rootless-containers/rootlesskit/v2/pkg/port"
)
const (
@ -35,14 +35,14 @@ func Initiate(c *net.UnixConn) error {
req := Request{
Type: RequestTypeInit,
}
if _, err := msgutil.MarshalToWriter(c, &req); err != nil {
if _, err := lowlevelmsgutil.MarshalToWriter(c, &req); err != nil {
return err
}
if err := c.CloseWrite(); err != nil {
return err
}
var rep Reply
if _, err := msgutil.UnmarshalFromReader(c, &rep); err != nil {
if _, err := lowlevelmsgutil.UnmarshalFromReader(c, &rep); err != nil {
return err
}
return c.CloseRead()
@ -57,7 +57,7 @@ func ConnectToChild(c *net.UnixConn, spec port.Spec) (int, error) {
Port: spec.ChildPort,
IP: spec.ChildIP,
}
if _, err := msgutil.MarshalToWriter(c, &req); err != nil {
if _, err := lowlevelmsgutil.MarshalToWriter(c, &req); err != nil {
return 0, err
}
if err := c.CloseWrite(); err != nil {

0
vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/opaque/opaque.go → vendor/github.com/rootless-containers/rootlesskit/v2/pkg/port/builtin/opaque/opaque.go generated vendored
View File

14
vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/parent/parent.go → vendor/github.com/rootless-containers/rootlesskit/v2/pkg/port/builtin/parent/parent.go generated vendored
View File

@ -14,13 +14,13 @@ import (
"syscall"
"time"
"github.com/rootless-containers/rootlesskit/pkg/api"
"github.com/rootless-containers/rootlesskit/pkg/port"
"github.com/rootless-containers/rootlesskit/pkg/port/builtin/msg"
"github.com/rootless-containers/rootlesskit/pkg/port/builtin/opaque"
"github.com/rootless-containers/rootlesskit/pkg/port/builtin/parent/tcp"
"github.com/rootless-containers/rootlesskit/pkg/port/builtin/parent/udp"
"github.com/rootless-containers/rootlesskit/pkg/port/portutil"
"github.com/rootless-containers/rootlesskit/v2/pkg/api"
"github.com/rootless-containers/rootlesskit/v2/pkg/port"
"github.com/rootless-containers/rootlesskit/v2/pkg/port/builtin/msg"
"github.com/rootless-containers/rootlesskit/v2/pkg/port/builtin/opaque"
"github.com/rootless-containers/rootlesskit/v2/pkg/port/builtin/parent/tcp"
"github.com/rootless-containers/rootlesskit/v2/pkg/port/builtin/parent/udp"
"github.com/rootless-containers/rootlesskit/v2/pkg/port/portutil"
)
// NewDriver for builtin driver.

4
vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/parent/tcp/tcp.go → vendor/github.com/rootless-containers/rootlesskit/v2/pkg/port/builtin/parent/tcp/tcp.go generated vendored
View File

@ -8,8 +8,8 @@ import (
"strconv"
"sync"
"github.com/rootless-containers/rootlesskit/pkg/port"
"github.com/rootless-containers/rootlesskit/pkg/port/builtin/msg"
"github.com/rootless-containers/rootlesskit/v2/pkg/port"
"github.com/rootless-containers/rootlesskit/v2/pkg/port/builtin/msg"
)
func Run(socketPath string, spec port.Spec, stopCh <-chan struct{}, stoppedCh chan error, logWriter io.Writer) error {

6
vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/parent/udp/udp.go → vendor/github.com/rootless-containers/rootlesskit/v2/pkg/port/builtin/parent/udp/udp.go generated vendored
View File

@ -7,9 +7,9 @@ import (
"os"
"strconv"
"github.com/rootless-containers/rootlesskit/pkg/port"
"github.com/rootless-containers/rootlesskit/pkg/port/builtin/msg"
"github.com/rootless-containers/rootlesskit/pkg/port/builtin/parent/udp/udpproxy"
"github.com/rootless-containers/rootlesskit/v2/pkg/port"
"github.com/rootless-containers/rootlesskit/v2/pkg/port/builtin/msg"
"github.com/rootless-containers/rootlesskit/v2/pkg/port/builtin/parent/udp/udpproxy"
)
func Run(socketPath string, spec port.Spec, stopCh <-chan struct{}, stoppedCh chan error, logWriter io.Writer) error {

0
vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/parent/udp/udpproxy/udp_proxy.go → vendor/github.com/rootless-containers/rootlesskit/v2/pkg/port/builtin/parent/udp/udpproxy/udp_proxy.go generated vendored
View File

7
vendor/github.com/rootless-containers/rootlesskit/pkg/port/port.go → vendor/github.com/rootless-containers/rootlesskit/v2/pkg/port/port.go generated vendored
View File

@ -4,7 +4,7 @@ import (
"context"
"net"
"github.com/rootless-containers/rootlesskit/pkg/api"
"github.com/rootless-containers/rootlesskit/v2/pkg/api"
)
type Spec struct {
@ -35,8 +35,6 @@ type Manager interface {
// ChildContext is used for RunParentDriver
type ChildContext struct {
// PID of the child, can be used for ns-entering to the child namespaces.
PID int
// IP of the tap device
IP net.IP
}
@ -57,5 +55,6 @@ type ParentDriver interface {
}
type ChildDriver interface {
RunChildDriver(opaque map[string]string, quit <-chan struct{}) error
// RunChildDriver is executed in the child's namespaces, excluding detached-netns.
RunChildDriver(opaque map[string]string, quit <-chan struct{}, detachedNetNSPath string) error
}

6
vendor/github.com/rootless-containers/rootlesskit/pkg/port/portutil/portutil.go → vendor/github.com/rootless-containers/rootlesskit/v2/pkg/port/portutil/portutil.go generated vendored
View File

@ -7,7 +7,7 @@ import (
"strings"
"text/scanner"
"github.com/rootless-containers/rootlesskit/pkg/port"
"github.com/rootless-containers/rootlesskit/v2/pkg/port"
)
// ParsePortSpec parses a Docker-like representation of PortSpec, but with
@ -16,13 +16,13 @@ import (
//
// Format is as follows:
//
// <parent IP>:<parent port>[:<child IP>]:<child port>/<proto>
// <parent IP>:<parent port>[:<child IP>]:<child port>/<proto>
//
// Note that (child IP being optional) the format can either contain 5 or 4
// components. When using IPv6 IP addresses, addresses must use square brackets
// to prevent the colons being mistaken for delimiters. For example:
//
// [::1]:8080:[::2]:80/udp
// [::1]:8080:[::2]:80/udp
func ParsePortSpec(portSpec string) (*port.Spec, error) {
const (
parentIP = iota

26
vendor/modules.txt vendored
View File

@ -949,20 +949,20 @@ github.com/proglottis/gpgme
# github.com/rivo/uniseg v0.4.7
## explicit; go 1.18
github.com/rivo/uniseg
# github.com/rootless-containers/rootlesskit v1.1.1
# github.com/rootless-containers/rootlesskit/v2 v2.0.2
## explicit; go 1.19
github.com/rootless-containers/rootlesskit/pkg/api
github.com/rootless-containers/rootlesskit/pkg/msgutil
github.com/rootless-containers/rootlesskit/pkg/port
github.com/rootless-containers/rootlesskit/pkg/port/builtin
github.com/rootless-containers/rootlesskit/pkg/port/builtin/child
github.com/rootless-containers/rootlesskit/pkg/port/builtin/msg
github.com/rootless-containers/rootlesskit/pkg/port/builtin/opaque
github.com/rootless-containers/rootlesskit/pkg/port/builtin/parent
github.com/rootless-containers/rootlesskit/pkg/port/builtin/parent/tcp
github.com/rootless-containers/rootlesskit/pkg/port/builtin/parent/udp
github.com/rootless-containers/rootlesskit/pkg/port/builtin/parent/udp/udpproxy
github.com/rootless-containers/rootlesskit/pkg/port/portutil
github.com/rootless-containers/rootlesskit/v2/pkg/api
github.com/rootless-containers/rootlesskit/v2/pkg/lowlevelmsgutil
github.com/rootless-containers/rootlesskit/v2/pkg/port
github.com/rootless-containers/rootlesskit/v2/pkg/port/builtin
github.com/rootless-containers/rootlesskit/v2/pkg/port/builtin/child
github.com/rootless-containers/rootlesskit/v2/pkg/port/builtin/msg
github.com/rootless-containers/rootlesskit/v2/pkg/port/builtin/opaque
github.com/rootless-containers/rootlesskit/v2/pkg/port/builtin/parent
github.com/rootless-containers/rootlesskit/v2/pkg/port/builtin/parent/tcp
github.com/rootless-containers/rootlesskit/v2/pkg/port/builtin/parent/udp
github.com/rootless-containers/rootlesskit/v2/pkg/port/builtin/parent/udp/udpproxy
github.com/rootless-containers/rootlesskit/v2/pkg/port/portutil
# github.com/seccomp/libseccomp-golang v0.10.0
## explicit; go 1.14
github.com/seccomp/libseccomp-golang