Merge pull request #2001 from safing/fix/1999-SPN-intel-data-is-not-applied-in-some-cases

fix: SPN intel data is not applied in some cases

spn/captain/module.go

@@ -135,8 +135,9 @@ func start() error {
 		crew.EnableConnecting(publicIdentity.Hub)
 	}
 
-	// Initialize intel.
-	module.mgr.Go("start", func(wc *mgr.WorkerCtx) error {
+	// Initialize SPN intel.
+	// Do this synchronously to ensure everything is up to date before
+	err = module.mgr.Do("start", func(wc *mgr.WorkerCtx) error {
 		if err := registerIntelUpdateHook(); err != nil {
 			return err
 		}
@@ -145,6 +146,9 @@ func start() error {
 		}
 		return nil
 	})
+	if err != nil {
+		return err
+	}
 
 	// Subscribe to updates of cranes.
 	startDockHooks()

spn/navigator/intel.go

@@ -67,14 +67,18 @@ func (m *Map) GetIntel() *hub.Intel {
 }
 
 func (m *Map) updateIntelStatuses(pin *Pin, trustNodes []string) {
-	// Reset all related states.
-	pin.removeStates(StateTrusted | StateUsageDiscouraged | StateUsageAsHomeDiscouraged | StateUsageAsDestinationDiscouraged)
+	// Reset all related states (StateSummaryStatusesAppliedFromIntel).
+	pin.stateIntelApplied.UnSet()
+	pin.removeStates(StateTrusted | StateUsageDiscouraged | StateUsageAsHomeDiscouraged | StateUsageAsDestinationDiscouraged) // same as: StateSummaryStatusesAppliedFromIntel
 
 	// Check if Intel data is loaded.
 	if m.intel == nil {
 		return
 	}
 
+	// Indicate that intel statuses have been applied to the pin
+	defer pin.stateIntelApplied.Set()
+
 	// Check Hub Intel
 	hubIntel, ok := m.intel.Hubs[pin.Hub.ID]
 	if ok {

spn/navigator/options.go

@@ -246,6 +246,14 @@ func (o *HubOptions) Matcher(hubType HubType, hubIntel *hub.Intel) PinMatcher {
 			return false
 		}
 
+		// Check if all required states from intel were applied.
+		if regard.HasAnyOf(StateSummaryStatusesAppliedFromIntel) || disregard.HasAnyOf(StateSummaryStatusesAppliedFromIntel) {
+			if pin.stateIntelApplied.IsNotSet() {
+				log.Warningf("spn/navigator: pin %s skipped as intel statuses were not applied", pin.Hub.ID)
+				return false
+			}
+		}
+
 		// Check verified owners.
 		if len(o.RequireVerifiedOwners) > 0 {
 			// Check if Pin has a verified owner at all.

spn/navigator/pin.go

@@ -26,6 +26,10 @@ type Pin struct { //nolint:maligned
 
 	// Hub Status
 	State PinState
+
+	// stateIntelApplied signifies that states from intel file were applied to the pin.
+	stateIntelApplied *abool.AtomicBool
+
 	// VerifiedOwner holds the name of the verified owner / operator of the Hub.
 	VerifiedOwner string
 	// HopDistance signifies the needed hops to reach this Hub.

spn/navigator/state.go

@@ -91,6 +91,12 @@ const (
 		StateOffline |
 		StateUsageDiscouraged |
 		StateIsHomeHub
+
+	// StateSummaryStatusesAppliedFromIntel summarizes all states that are applied from the intel file.
+	StateSummaryStatusesAppliedFromIntel = StateTrusted |
+		StateUsageDiscouraged |
+		StateUsageAsHomeDiscouraged |
+		StateUsageAsDestinationDiscouraged
 )
 
 var allStates = []PinState{

spn/navigator/update.go

@@ -168,9 +168,10 @@ func (m *Map) updateHub(h *hub.Hub, lockMap, lockHub bool) {
 		pin.Hub = h
 	} else {
 		pin = &Pin{
-			Hub:         h,
-			ConnectedTo: make(map[string]*Lane),
-			pushChanges: abool.New(),
+			Hub:               h,
+			ConnectedTo:       make(map[string]*Lane),
+			stateIntelApplied: abool.New(),
+			pushChanges:       abool.New(),
 		}
 		m.all[h.ID] = pin
 	}