Update reserved policy to accept multiple hosts

store/policies.go

@@ -117,21 +117,23 @@ func (p *BlockPolicy) Accept(id, address string) bool {
 type ReservedPolicy struct {
 	basePolicy
 	SourceID string `json:"reserved_source_id"`
-	Address  string `json:"address"`
 }
 
-func NewReservedPolicy(issuer, sourceID, address string) *ReservedPolicy {
-	address = TrimPort(address)
+func NewReservedPolicy(issuer, sourceID string, hosts ...string) *ReservedPolicy {
+	addrs := []string{}
+	for _, v := range hosts {
+		address := TrimPort(v)
+		addrs = append(addrs, LookupAddress(address)...)
+	}
 	return &ReservedPolicy{
 		basePolicy: basePolicy{
-			Name:   fmt.Sprintf("reserve_%s_for_%s", sourceID, address),
+			Name:   fmt.Sprintf("reserve_%s", sourceID),
 			Issuer: issuer,
 			Code:   PolicyCodeReserve,
-			Desc:   fmt.Sprintf("source %v will only be used for connections to %s", sourceID, address),
-			Addrs:  LookupAddress(address),
+			Desc:   fmt.Sprintf("source %v will only be used for connections to %v", sourceID, addrs),
+			Addrs:  addrs,
 		},
 		SourceID: sourceID,
-		Address:  address,
 	}
 }
 

store/policies_test.go

@@ -76,6 +76,7 @@ func TestReservedPolicy(t *testing.T) {
 	s1 := &mock{id: "bar"}
 	t0 := "host0"
 	t1 := "host1"
+	t2 := "host2"
 
 	p := store.NewReservedPolicy("T", s0.ID(), t0)
 	if ok := p.Accept(s0.ID(), t0); !ok {
@@ -90,6 +91,15 @@ func TestReservedPolicy(t *testing.T) {
 	if ok := p.Accept(s1.ID(), t1); !ok {
 		t.Fatalf("Policy %s did not accept source %v for address %s", p.ID(), s1.ID(), t1)
 	}
+
+	// reserved policy with multiple addresses
+	p = store.NewReservedPolicy("T", s0.ID(), t0, t1)
+	if ok := p.Accept(s0.ID(), t0); !ok {
+		t.Fatalf("Policy %s did not accept source %v for address %s", p.ID(), s0.ID(), t0)
+	}
+	if ok := p.Accept(s0.ID(), t2); ok {
+		t.Fatalf("Policy %s accepted source %v for address %s", p.ID(), s0.ID(), t2)
+	}
 }
 
 func TestAvoidPolicy(t *testing.T) {