Full re-auth should not clear services list, as that breaks the on-change logic. Fixes #818

plorenz · plorenz · commit 09b519f6e529 · 2025-10-07T11:38:59.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# Release notes 1.2.9
+
+## Issues Fixed and Dependency Updates
+
+* github.com/openziti/sdk-golang: [v1.2.8 -> v1.2.9](https://github.com/openziti/sdk-golang/compare/v1.2.8...v1.2.9)
+    * [Issue #818](https://github.com/openziti/sdk-golang/issues/818) - Full re-auth should not clear services list, as that breaks the on-change logic
+    * [Issue #817](https://github.com/openziti/sdk-golang/issues/817) - goroutines can get stuck when iterating over randomized HA controller list
+
 # Release notes 1.2.8
 
 ## Issues Fixed and Dependency Updates
diff --git a/ziti/contexts.go b/ziti/contexts.go
@@ -92,6 +92,9 @@ func NewContextWithOpts(cfg *Config, options *Options) (Context, error) {
 		routerProxy:           cfg.RouterProxy,
 		maxDefaultConnections: int(cfg.MaxDefaultConnections),
 		maxControlConnections: int(cfg.MaxControlConnections),
+		services:              cmap.New[*rest_model.ServiceDetail](),
+		sessions:              cmap.New[*rest_model.SessionDetail](),
+		intercepts:            cmap.New[*edge.InterceptV1Config](),
 	}
 
 	if newContext.maxDefaultConnections < 1 {
diff --git a/ziti/sdkinfo/build_info.go b/ziti/sdkinfo/build_info.go
diff --git a/ziti/ziti.go b/ziti/ziti.go
@@ -545,7 +545,6 @@ func (context *ContextImpl) processServiceUpdates(services []*rest_model.Service
 			context.Emit(EventServiceRemoved, svc)
 
 			context.deleteServiceSessions(*svc.ID)
-
 		}
 	})
 
@@ -603,7 +602,9 @@ func (context *ContextImpl) processServiceAddOrUpdated(s *rest_model.ServiceDeta
 	})
 
 	if isChange {
-		context.Emit(EventServiceChanged, s)
+		if valuesDiffer {
+			context.Emit(EventServiceChanged, s)
+		}
 	} else {
 		context.Emit(EventServiceAdded, s)
 	}
@@ -614,7 +615,6 @@ func (context *ContextImpl) processServiceAddOrUpdated(s *rest_model.ServiceDeta
 				context.options.OnServiceUpdate(ServiceChanged, s)
 			}
 		} else {
-			context.services.Set(*s.Name, s)
 			context.options.OnServiceUpdate(ServiceAdded, s)
 		}
 	}
@@ -740,17 +740,16 @@ func (context *ContextImpl) refreshServices(forceRefresh, refreshAfterAuth bool)
 			}
 
 			target := &service.ListServicesUnauthorized{}
-			if errors.As(err, &target) {
-				log.Info("attempting to re-authenticate")
-				if authErr := context.Authenticate(); authErr != nil {
-					log.WithError(authErr).Error("unable to re-authenticate during services refresh")
-					return err
-				}
-				if services, err = context.CtrlClt.GetServices(); err != nil {
-					return err
-				}
+			if !errors.As(err, &target) {
+				return err
+			}
 
-			} else {
+			log.Info("attempting to re-authenticate")
+			if authErr := context.Authenticate(); authErr != nil {
+				log.WithError(authErr).Error("unable to re-authenticate during services refresh")
+				return err
+			}
+			if services, err = context.CtrlClt.GetServices(); err != nil {
 				return err
 			}
 		}
@@ -955,9 +954,7 @@ func (context *ContextImpl) setUnauthenticated() {
 
 func (context *ContextImpl) authenticate() error {
 	logrus.Debug("attempting to authenticate")
-	context.services = cmap.New[*rest_model.ServiceDetail]()
-	context.sessions = cmap.New[*rest_model.SessionDetail]()
-	context.intercepts = cmap.New[*edge.InterceptV1Config]()
+	context.sessions.Clear()
 
 	context.setUnauthenticated()
 

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,9 @@ func NewContextWithOpts(cfg Config, options Options) (Context, error) {`
`92`	`92`	`routerProxy: cfg.RouterProxy,`
`93`	`93`	`maxDefaultConnections: int(cfg.MaxDefaultConnections),`
`94`	`94`	`maxControlConnections: int(cfg.MaxControlConnections),`
	`95`	`+ services: cmap.New[*rest_model.ServiceDetail](),`
	`96`	`+ sessions: cmap.New[*rest_model.SessionDetail](),`
	`97`	`+ intercepts: cmap.New[*edge.InterceptV1Config](),`
`95`	`98`	`}`
`96`	`99`
`97`	`100`	`if newContext.maxDefaultConnections < 1 {`