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

allow exposed sctp ports

Browse Source 
There is no reason to disallow exposed sctp ports at all. As root we can
publish them find and as rootless it should error later anyway.

And for the case mentioned in the issue it doesn't make sense as the
port is not even published thus it is just part of the metadata which is
totally in all cases.

Fixes #23911

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2024-09-18 14:18:30 +02:00
parent 62c101651f
commit d7335855d7
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/specgen/generate/ports.go
View File

@ -158,7 +158,7 @@ func ParsePortMapping(portMappings []types.PortMapping, exposePorts map[uint16][
// First, we need to validate the ports passed in the specgen // First, we need to validate the ports passed in the specgen
for _, port := range portMappings { for _, port := range portMappings {
// First, check proto // First, check proto
protocols, err := checkProtocol(port.Protocol, true) protocols, err := checkProtocol(port.Protocol)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -355,7 +355,7 @@ func createPortMappings(s *specgen.SpecGenerator, imageData *libimage.ImageData)
if port == 0 { if port == 0 {
return nil, nil, fmt.Errorf("cannot expose 0 as it is not a valid port number") return nil, nil, fmt.Errorf("cannot expose 0 as it is not a valid port number")
} }
protocols, err := checkProtocol(proto, false) protocols, err := checkProtocol(proto)
if err != nil { if err != nil {
return nil, nil, fmt.Errorf("validating protocols for exposed port %d: %w", port, err) return nil, nil, fmt.Errorf("validating protocols for exposed port %d: %w", port, err)
} }
@ -376,7 +376,7 @@ func createPortMappings(s *specgen.SpecGenerator, imageData *libimage.ImageData)
} }
// Check a string to ensure it is a comma-separated set of valid protocols // Check a string to ensure it is a comma-separated set of valid protocols
func checkProtocol(protocol string, allowSCTP bool) ([]string, error) { func checkProtocol(protocol string) ([]string, error) {
protocols := make(map[string]struct{}) protocols := make(map[string]struct{})
splitProto := strings.Split(protocol, ",") splitProto := strings.Split(protocol, ",")
// Don't error on duplicates - just deduplicate // Don't error on duplicates - just deduplicate
@ -388,9 +388,6 @@ func checkProtocol(protocol string, allowSCTP bool) ([]string, error) {
case protoUDP: case protoUDP:
protocols[protoUDP] = struct{}{} protocols[protoUDP] = struct{}{}
case protoSCTP: case protoSCTP:
if !allowSCTP {
return nil, fmt.Errorf("protocol SCTP is not allowed for exposed ports")
}
protocols[protoSCTP] = struct{}{} protocols[protoSCTP] = struct{}{}
default: default:
return nil, fmt.Errorf("unrecognized protocol %q in port mapping", p) return nil, fmt.Errorf("unrecognized protocol %q in port mapping", p)

6
test/e2e/container_inspect_test.go
View File

@ -29,19 +29,19 @@ var _ = Describe("Podman container inspect", func() {
It("podman inspect shows exposed ports", func() { It("podman inspect shows exposed ports", func() {
name := "testcon" name := "testcon"
session := podmanTest.Podman([]string{"run", "-d", "--stop-timeout", "0", "--expose", "8787/udp", "--name", name, ALPINE, "sleep", "100"}) session := podmanTest.Podman([]string{"run", "-d", "--stop-timeout", "0", "--expose", "8787/udp", "--expose", "99/sctp", "--name", name, ALPINE, "sleep", "100"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session).Should(ExitCleanly()) Expect(session).Should(ExitCleanly())
data := podmanTest.InspectContainer(name) data := podmanTest.InspectContainer(name)
Expect(data).To(HaveLen(1)) Expect(data).To(HaveLen(1))
Expect(data[0].NetworkSettings.Ports). Expect(data[0].NetworkSettings.Ports).
To(Equal(map[string][]define.InspectHostPort{"8787/udp": nil})) To(Equal(map[string][]define.InspectHostPort{"8787/udp": nil, "99/sctp": nil}))
session = podmanTest.Podman([]string{"ps", "--format", "{{.Ports}}"}) session = podmanTest.Podman([]string{"ps", "--format", "{{.Ports}}"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session).Should(ExitCleanly()) Expect(session).Should(ExitCleanly())
Expect(session.OutputToString()).To(Equal("8787/udp")) Expect(session.OutputToString()).To(Equal("99/sctp, 8787/udp"))
}) })
It("podman inspect shows exposed ports on image", func() { It("podman inspect shows exposed ports on image", func() {