feat: add irr-accept-child-prefixes (#144)

Author: natesales

pkg/config/config.go

@@ -13,41 +13,42 @@ type Peer struct {
 	Disabled    *bool   `yaml:"disabled" description:"Should the sessions be disabled?" default:"false"`
 
 	// BGP Attributes
-	ASN                  *int      `yaml:"asn" description:"Local ASN" validate:"required" default:"0"`
-	NeighborIPs          *[]string `yaml:"neighbors" description:"List of neighbor IPs" validate:"required,ip" default:"-"`
-	Prepends             *int      `yaml:"prepends" description:"Number of times to prepend local AS on export" default:"0"`
-	PrependPath          *[]uint32 `yaml:"prepend-path" description:"List of ASNs to prepend" default:"-"`
-	ClearPath            *bool     `yaml:"clear-path" description:"Remove all ASNs from path (before prepends and prepend-path)" default:"false"`
-	LocalPref            *int      `yaml:"local-pref" description:"BGP local preference" default:"100"`
-	SetLocalPref         *bool     `yaml:"set-local-pref" description:"Should an explicit local pref be set?" default:"true"`
-	Multihop             *bool     `yaml:"multihop" description:"Should BGP multihop be enabled? (255 max hops)" default:"false"`
-	Listen4              *string   `yaml:"listen4" description:"IPv4 BGP listen address" default:"-"`
-	Listen6              *string   `yaml:"listen6" description:"IPv6 BGP listen address" default:"-"`
-	LocalASN             *int      `yaml:"local-asn" description:"Local ASN as defined in the global ASN field" default:"-"`
-	LocalPort            *int      `yaml:"local-port" description:"Local TCP port" default:"179"`
-	NeighborPort         *int      `yaml:"neighbor-port" description:"Neighbor TCP port" default:"179"`
-	Passive              *bool     `yaml:"passive" description:"Should we listen passively?" default:"false"`
-	Direct               *bool     `yaml:"direct" description:"Specify that the neighbor is directly connected" default:"false"`
-	NextHopSelf          *bool     `yaml:"next-hop-self" description:"Should BGP next-hop-self be enabled?" default:"false"`
-	BFD                  *bool     `yaml:"bfd" description:"Should BFD be enabled?" default:"false"`
-	Password             *string   `yaml:"password" description:"BGP MD5 password" default:"-"`
-	RSClient             *bool     `yaml:"rs-client" description:"Should this peer be a route server client?" default:"false"`
-	RRClient             *bool     `yaml:"rr-client" description:"Should this peer be a route reflector client?" default:"false"`
-	RemovePrivateASNs    *bool     `yaml:"remove-private-asns" description:"Should private ASNs be removed from path before exporting?" default:"true"`
-	MPUnicast46          *bool     `yaml:"mp-unicast-46" description:"Should this peer be configured with multiprotocol IPv4 and IPv6 unicast?" default:"false"`
-	AllowLocalAS         *bool     `yaml:"allow-local-as" description:"Should routes originated by the local ASN be accepted?" default:"false"`
-	AddPathTx            *bool     `yaml:"add-path-tx" description:"Enable BGP additional paths on export?" default:"false"`
-	AddPathRx            *bool     `yaml:"add-path-rx" description:"Enable BGP additional paths on import?" default:"false"`
-	ImportNextHop        *string   `yaml:"import-next-hop" description:"Rewrite the BGP next hop before importing routes learned from this peer" default:"-"`
-	ExportNextHop        *string   `yaml:"export-next-hop" description:"Rewrite the BGP next hop before announcing routes to this peer" default:"-"`
-	Confederation        *int      `yaml:"confederation" description:"BGP confederation (RFC 5065)" default:"-"`
-	ConfederationMember  *bool     `yaml:"confederation-member" description:"Should this peer be a member of the local confederation?" default:"false"`
-	TTLSecurity          *bool     `yaml:"ttl-security" description:"RFC 5082 Generalized TTL Security Mechanism" default:"false"`
-	InterpretCommunities *bool     `yaml:"interpret-communities" description:"Should well-known BGP communities be interpreted by their intended action?" default:"true"`
-	DefaultLocalPref     *int      `yaml:"default-local-pref" description:"Default value for local preference" default:"-"`
-	AdvertiseHostname    *bool     `yaml:"advertise-hostname" description:"Advertise hostname capability" default:"false"`
-	DisableAfterError    *bool     `yaml:"disable-after-error" description:"Disable peer after error" default:"false"`
-	PreferOlderRoutes    *bool     `yaml:"prefer-older-routes" description:"Prefer older routes instead of comparing router IDs (RFC 5004)" default:"false"`
+	ASN                    *int      `yaml:"asn" description:"Local ASN" validate:"required" default:"0"`
+	NeighborIPs            *[]string `yaml:"neighbors" description:"List of neighbor IPs" validate:"required,ip" default:"-"`
+	Prepends               *int      `yaml:"prepends" description:"Number of times to prepend local AS on export" default:"0"`
+	PrependPath            *[]uint32 `yaml:"prepend-path" description:"List of ASNs to prepend" default:"-"`
+	ClearPath              *bool     `yaml:"clear-path" description:"Remove all ASNs from path (before prepends and prepend-path)" default:"false"`
+	LocalPref              *int      `yaml:"local-pref" description:"BGP local preference" default:"100"`
+	SetLocalPref           *bool     `yaml:"set-local-pref" description:"Should an explicit local pref be set?" default:"true"`
+	Multihop               *bool     `yaml:"multihop" description:"Should BGP multihop be enabled? (255 max hops)" default:"false"`
+	Listen4                *string   `yaml:"listen4" description:"IPv4 BGP listen address" default:"-"`
+	Listen6                *string   `yaml:"listen6" description:"IPv6 BGP listen address" default:"-"`
+	LocalASN               *int      `yaml:"local-asn" description:"Local ASN as defined in the global ASN field" default:"-"`
+	LocalPort              *int      `yaml:"local-port" description:"Local TCP port" default:"179"`
+	NeighborPort           *int      `yaml:"neighbor-port" description:"Neighbor TCP port" default:"179"`
+	Passive                *bool     `yaml:"passive" description:"Should we listen passively?" default:"false"`
+	Direct                 *bool     `yaml:"direct" description:"Specify that the neighbor is directly connected" default:"false"`
+	NextHopSelf            *bool     `yaml:"next-hop-self" description:"Should BGP next-hop-self be enabled?" default:"false"`
+	BFD                    *bool     `yaml:"bfd" description:"Should BFD be enabled?" default:"false"`
+	Password               *string   `yaml:"password" description:"BGP MD5 password" default:"-"`
+	RSClient               *bool     `yaml:"rs-client" description:"Should this peer be a route server client?" default:"false"`
+	RRClient               *bool     `yaml:"rr-client" description:"Should this peer be a route reflector client?" default:"false"`
+	RemovePrivateASNs      *bool     `yaml:"remove-private-asns" description:"Should private ASNs be removed from path before exporting?" default:"true"`
+	MPUnicast46            *bool     `yaml:"mp-unicast-46" description:"Should this peer be configured with multiprotocol IPv4 and IPv6 unicast?" default:"false"`
+	AllowLocalAS           *bool     `yaml:"allow-local-as" description:"Should routes originated by the local ASN be accepted?" default:"false"`
+	AddPathTx              *bool     `yaml:"add-path-tx" description:"Enable BGP additional paths on export?" default:"false"`
+	AddPathRx              *bool     `yaml:"add-path-rx" description:"Enable BGP additional paths on import?" default:"false"`
+	ImportNextHop          *string   `yaml:"import-next-hop" description:"Rewrite the BGP next hop before importing routes learned from this peer" default:"-"`
+	ExportNextHop          *string   `yaml:"export-next-hop" description:"Rewrite the BGP next hop before announcing routes to this peer" default:"-"`
+	Confederation          *int      `yaml:"confederation" description:"BGP confederation (RFC 5065)" default:"-"`
+	ConfederationMember    *bool     `yaml:"confederation-member" description:"Should this peer be a member of the local confederation?" default:"false"`
+	TTLSecurity            *bool     `yaml:"ttl-security" description:"RFC 5082 Generalized TTL Security Mechanism" default:"false"`
+	InterpretCommunities   *bool     `yaml:"interpret-communities" description:"Should well-known BGP communities be interpreted by their intended action?" default:"true"`
+	DefaultLocalPref       *int      `yaml:"default-local-pref" description:"Default value for local preference" default:"-"`
+	AdvertiseHostname      *bool     `yaml:"advertise-hostname" description:"Advertise hostname capability" default:"false"`
+	DisableAfterError      *bool     `yaml:"disable-after-error" description:"Disable peer after error" default:"false"`
+	PreferOlderRoutes      *bool     `yaml:"prefer-older-routes" description:"Prefer older routes instead of comparing router IDs (RFC 5004)" default:"false"`
+	IRRAcceptChildPrefixes *bool     `yaml:"irr-accept-child-prefixes" description:"Accept prefixes up to /24 and /48 from covering parent IRR objects" default:"false"`
 
 	ImportCommunities    *[]string `yaml:"add-on-import" description:"List of communities to add to all imported routes" default:"-"`
 	ExportCommunities    *[]string `yaml:"add-on-export" description:"List of communities to add to all exported routes" default:"-"`

pkg/irr/irr.go

@@ -85,11 +85,28 @@ func Update(peerData *config.Peer, irrServer string, queryTimeout uint, bgpqArgs
 				hasNeighbor4 = true
 			} else if strings.Contains(n, ":") {
 				hasNeighbor6 = true
+			} else {
+				log.Fatalf("Invalid neighbor IP %s", n)
 			}
 		}
 	}
 
-	prefixesFromIRR4, err := PrefixSet(*peerData.ASSet, 4, irrServer, queryTimeout, bgpqArgs)
+	// Handle acceptChildPrefixes
+	bgpqArgs4 := bgpqArgs
+	bgpqArgs6 := bgpqArgs
+	if peerData.IRRAcceptChildPrefixes != nil && *peerData.IRRAcceptChildPrefixes {
+		if bgpqArgs4 != "" {
+			bgpqArgs4 += " "
+		}
+		bgpqArgs4 += "-R 24"
+
+		if bgpqArgs6 != "" {
+			bgpqArgs6 += " "
+		}
+		bgpqArgs6 += "-R 48"
+	}
+
+	prefixesFromIRR4, err := PrefixSet(*peerData.ASSet, 4, irrServer, queryTimeout, bgpqArgs4)
 	if err != nil {
 		return fmt.Errorf("unable to get IPv4 IRR prefix list from %s: %s", *peerData.ASSet, err)
 	}
@@ -102,7 +119,7 @@ func Update(peerData *config.Peer, irrServer string, queryTimeout uint, bgpqArgs
 		log.Warnf("peer has IPv4 session(s) but no IPv4 prefixes")
 	}
 
-	prefixesFromIRR6, err := PrefixSet(*peerData.ASSet, 6, irrServer, queryTimeout, bgpqArgs)
+	prefixesFromIRR6, err := PrefixSet(*peerData.ASSet, 6, irrServer, queryTimeout, bgpqArgs6)
 	if err != nil {
 		return fmt.Errorf("unable to get IPv6 IRR prefix list from %s: %s", *peerData.ASSet, err)
 	}