From 91f5b1669ef2861cf42884b43ce7ec4e3d638534 Mon Sep 17 00:00:00 2001 From: Alessandro Boch Date: Fri, 17 Feb 2017 11:28:36 -0800 Subject: [PATCH] Once a network is encrypted, do not accept clear packets from it Signed-off-by: Alessandro Boch --- libnetwork/drivers/overlay/encryption.go | 34 ++++++++++++++++++++++++ libnetwork/drivers/overlay/ov_network.go | 2 ++ 2 files changed, 36 insertions(+) diff --git a/libnetwork/drivers/overlay/encryption.go b/libnetwork/drivers/overlay/encryption.go index 2bf07b066d..b4c3aade49 100644 --- a/libnetwork/drivers/overlay/encryption.go +++ b/libnetwork/drivers/overlay/encryption.go @@ -138,6 +138,11 @@ func setupEncryption(localIP, advIP, remoteIP net.IP, vni uint32, em *encrMap, k logrus.Warn(err) } + err = programInput(vni, true) + if err != nil { + logrus.Warn(err) + } + for i, k := range keys { spis := &spi{buildSPI(advIP, remoteIP, k.tag), buildSPI(remoteIP, advIP, k.tag)} dir := reverse @@ -219,6 +224,35 @@ func programMangle(vni uint32, add bool) (err error) { return } +func programInput(vni uint32, add bool) (err error) { + var ( + port = strconv.FormatUint(uint64(vxlanPort), 10) + vniMatch = fmt.Sprintf("0>>22&0x3C@12&0xFFFFFF00=%d", int(vni)<<8) + plainVxlan = []string{"-p", "udp", "--dport", port, "-m", "u32", "--u32", vniMatch, "-j"} + ipsecVxlan = append([]string{"-m", "policy", "--dir", "in", "--pol", "ipsec"}, plainVxlan...) + block = append(plainVxlan, "DROP") + accept = append(ipsecVxlan, "ACCEPT") + chain = "INPUT" + action = iptables.Append + msg = "add" + ) + + if !add { + action = iptables.Delete + msg = "remove" + } + + if err := iptables.ProgramRule(iptables.Filter, chain, action, accept); err != nil { + logrus.Errorf("could not %s input rule: %v. Please do it manually.", msg, err) + } + + if err := iptables.ProgramRule(iptables.Filter, chain, action, block); err != nil { + logrus.Errorf("could not %s input rule: %v. Please do it manually.", msg, err) + } + + return +} + func programSA(localIP, remoteIP net.IP, spi *spi, k *key, dir int, add bool) (fSA *netlink.XfrmState, rSA *netlink.XfrmState, err error) { var ( action = "Removing" diff --git a/libnetwork/drivers/overlay/ov_network.go b/libnetwork/drivers/overlay/ov_network.go index d9edeccf88..173cd606d1 100644 --- a/libnetwork/drivers/overlay/ov_network.go +++ b/libnetwork/drivers/overlay/ov_network.go @@ -154,6 +154,7 @@ func (d *driver) CreateNetwork(id string, option map[string]interface{}, nInfo d if !n.secure { for _, vni := range vnis { programMangle(vni, false) + programInput(vni, false) } } @@ -204,6 +205,7 @@ func (d *driver) DeleteNetwork(nid string) error { if n.secure { for _, vni := range vnis { programMangle(vni, false) + programInput(vni, false) } }