|
|
|
|
@ -92,34 +92,104 @@ func (d *linuxDriver) firewalldReadiness(ctx context.Context, current map[string
|
|
|
|
|
if err != nil || !active {
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
if err := d.preflightFirewalld(ctx, current, current); err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
if len(current) == 0 {
|
|
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
|
desiredGuest, desiredTransport := firewalldInterfaces(current)
|
|
|
|
|
for _, scope := range []firewalldScope{{permanent: true}, {permanent: false}} {
|
|
|
|
|
complete, err := d.firewalldDefinitionsComplete(ctx, scope)
|
|
|
|
|
err := d.firewalldReadinessScope(
|
|
|
|
|
ctx, scope, desiredGuest, desiredTransport, len(current) != 0,
|
|
|
|
|
)
|
|
|
|
|
if err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
if !complete {
|
|
|
|
|
return unavailable("vpc_firewalld_apply_unconfirmed", "committed firewalld VPC definitions are incomplete", nil)
|
|
|
|
|
}
|
|
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// firewalldReadinessScope inspects each reserved object once. Capability
|
|
|
|
|
// reporting used to run the general mutation preflight, a complete definition
|
|
|
|
|
// check, and a final interface check in sequence. On real hosts that meant more
|
|
|
|
|
// than fifty firewall-cmd subprocesses under one five-second deadline, so a
|
|
|
|
|
// healthy committed projection could be reported unavailable. Keep the same
|
|
|
|
|
// fail-closed checks while projecting one immutable snapshot per scope.
|
|
|
|
|
func (d *linuxDriver) firewalldReadinessScope(
|
|
|
|
|
ctx context.Context,
|
|
|
|
|
scope firewalldScope,
|
|
|
|
|
desiredGuest, desiredTransport map[string]struct{},
|
|
|
|
|
requireComplete bool,
|
|
|
|
|
) error {
|
|
|
|
|
zones, err := d.firewalldNames(ctx, scope, "--get-zones")
|
|
|
|
|
if err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
policies, err := d.firewalldNames(ctx, scope, "--get-policies")
|
|
|
|
|
if err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for _, zone := range []struct {
|
|
|
|
|
name string
|
|
|
|
|
forward bool
|
|
|
|
|
interfaces map[string]struct{}
|
|
|
|
|
}{
|
|
|
|
|
{name: firewalldGuestZone, forward: true, interfaces: desiredGuest},
|
|
|
|
|
{name: firewalldTransportZone, interfaces: desiredTransport},
|
|
|
|
|
} {
|
|
|
|
|
if _, exists := zones[zone.name]; !exists {
|
|
|
|
|
if requireComplete {
|
|
|
|
|
return unavailable("vpc_firewalld_apply_unconfirmed", "committed firewalld VPC definitions are incomplete", nil)
|
|
|
|
|
}
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
guest, err := d.inspectFirewalldZone(ctx, scope, firewalldGuestZone)
|
|
|
|
|
state, err := d.inspectFirewalldZone(ctx, scope, zone.name)
|
|
|
|
|
if err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
transport, err := d.inspectFirewalldZone(ctx, scope, firewalldTransportZone)
|
|
|
|
|
if err != nil {
|
|
|
|
|
if err := validateFirewalldZoneState(scope, zone.name, zone.forward, state); err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
if !equalStringSets(guest.interfaces, desiredGuest) ||
|
|
|
|
|
!equalStringSets(transport.interfaces, desiredTransport) {
|
|
|
|
|
for name := range state.interfaces {
|
|
|
|
|
if _, owned := zone.interfaces[name]; !owned {
|
|
|
|
|
return firewalldConflict(scope, "zone "+zone.name+" contains an unmanaged interface")
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
for _, name := range sortedStringSet(zone.interfaces) {
|
|
|
|
|
bound, err := d.firewalldInterfaceZone(ctx, scope, name)
|
|
|
|
|
if err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
if bound != "" && bound != zone.name {
|
|
|
|
|
return firewalldConflict(scope, "interface "+name+" is already bound to zone "+bound)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if requireComplete && (state.forward != zone.forward || !equalStringSets(state.interfaces, zone.interfaces)) {
|
|
|
|
|
return unavailable("vpc_firewalld_apply_unconfirmed", "committed firewalld VPC interface ownership is incomplete", nil)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for _, policy := range []struct {
|
|
|
|
|
name string
|
|
|
|
|
ingress string
|
|
|
|
|
egress string
|
|
|
|
|
}{
|
|
|
|
|
{name: firewalldGuestToTransportPolicy, ingress: firewalldGuestZone, egress: firewalldTransportZone},
|
|
|
|
|
{name: firewalldTransportToGuestPolicy, ingress: firewalldTransportZone, egress: firewalldGuestZone},
|
|
|
|
|
} {
|
|
|
|
|
if _, exists := policies[policy.name]; !exists {
|
|
|
|
|
if requireComplete {
|
|
|
|
|
return unavailable("vpc_firewalld_apply_unconfirmed", "committed firewalld VPC definitions are incomplete", nil)
|
|
|
|
|
}
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
state, err := d.inspectFirewalldPolicy(ctx, scope, policy.name)
|
|
|
|
|
if err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
if err := validateFirewalldPolicyState(scope, policy.name, policy.ingress, policy.egress, state); err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
if requireComplete && (!containsExactStrings(state.ingress, policy.ingress) || !containsExactStrings(state.egress, policy.egress)) {
|
|
|
|
|
return unavailable("vpc_firewalld_apply_unconfirmed", "committed firewalld VPC definitions are incomplete", nil)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|