beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libn/d/overlay: support encryption on any port

Browse source 
While the VXLAN interface and the iptables rules to mark outgoing VXLAN
packets for encryption are configured to use the Swarm data path port,
the XFRM policies for actually applying the encryption are hardcoded to
match packets with destination port 4789/udp. Consequently, encrypted
overlay networks do not pass traffic when the Swarm is configured with
any other data path port: encryption is not applied to the outgoing
VXLAN packets and the destination host drops the received cleartext
packets. Use the configured data path port instead of hardcoding port
4789 in the XFRM policies.

Signed-off-by: Cory Snider <csnider@mirantis.com>
(cherry picked from commit 9a692a3802)
Signed-off-by: Cory Snider <csnider@mirantis.com>
This commit is contained in:
Cory Snider 2023-05-26 14:36:34 -04:00
parent 91cc8ad679
commit f6ff82666d
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libnetwork/drivers/overlay/encryption.go
View file

@ -400,8 +400,8 @@ func programSP(fSA *netlink.XfrmState, rSA *netlink.XfrmState, add bool) error {
Src: &net.IPNet{IP: s, Mask: fullMask}, Src: &net.IPNet{IP: s, Mask: fullMask},
Dst: &net.IPNet{IP: d, Mask: fullMask}, Dst: &net.IPNet{IP: d, Mask: fullMask},
Dir: netlink.XFRM_DIR_OUT, Dir: netlink.XFRM_DIR_OUT,
Proto: 17, Proto: syscall.IPPROTO_UDP,
DstPort: 4789, DstPort: int(overlayutils.VXLANUDPPort()),
Mark: &spMark, Mark: &spMark,
Tmpls: []netlink.XfrmPolicyTmpl{ Tmpls: []netlink.XfrmPolicyTmpl{
{ {
@ -614,8 +614,8 @@ func updateNodeKey(lIP, aIP, rIP net.IP, idxs []*spi, curKeys []*key, newIdx, pr
Src: &net.IPNet{IP: s, Mask: fullMask}, Src: &net.IPNet{IP: s, Mask: fullMask},
Dst: &net.IPNet{IP: d, Mask: fullMask}, Dst: &net.IPNet{IP: d, Mask: fullMask},
Dir: netlink.XFRM_DIR_OUT, Dir: netlink.XFRM_DIR_OUT,
Proto: 17, Proto: syscall.IPPROTO_UDP,
DstPort: 4789, DstPort: int(overlayutils.VXLANUDPPort()),
Mark: &spMark, Mark: &spMark,
Tmpls: []netlink.XfrmPolicyTmpl{ Tmpls: []netlink.XfrmPolicyTmpl{
{ {