Skip to content

Ensure the initial version check succeeds, to ensure we don't legacy sessions on ha or oidc-enabled controllers. Fixes #847 #848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
plorenz merged 1 commit into from
Dec 22, 2025
+204 −151
Merged

Ensure the initial version check succeeds, to ensure we don't legacy sessions on ha or oidc-enabled controllers. Fixes #847 #848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,42 @@
# Release notes 1.3.2

## Issues Fixed and Dependency Updates

* github.com/openziti/sdk-golang: [v1.3.1 -> v1.3.2](https://github.com/openziti/sdk-golang/compare/v1.3.1...v1.3.2)
* [Issue #847](https://github.com/openziti/sdk-golang/issues/847) - Ensure the initial version check succeeds, to ensure we don't legacy sessions on ha or oidc-enabled controllers

* github.com/go-openapi/runtime: v0.29.0 -> v0.29.2
* github.com/go-openapi/strfmt: v0.24.0 -> v0.25.0
* github.com/go-resty/resty/v2: v2.16.5 -> v2.17.1
* github.com/openziti/channel/v4: [v4.2.41 -> v4.2.43](https://github.com/openziti/channel/compare/v4.2.41...v4.2.43)
* github.com/openziti/edge-api: [v0.26.51 -> v0.26.52](https://github.com/openziti/edge-api/compare/v0.26.51...v0.26.52)
* [Issue #164](https://github.com/openziti/edge-api/issues/164) - Add permissions list to identity

* github.com/openziti/foundation/v2: [v2.0.79 -> v2.0.81](https://github.com/openziti/foundation/compare/v2.0.79...v2.0.81)
* [Issue #464](https://github.com/openziti/foundation/issues/464) - Add support for -pre in versions

* github.com/openziti/identity: [v1.0.118 -> v1.0.120](https://github.com/openziti/identity/compare/v1.0.118...v1.0.120)
* github.com/openziti/metrics: [v1.4.2 -> v1.4.3](https://github.com/openziti/metrics/compare/v1.4.2...v1.4.3)
* [Issue #56](https://github.com/openziti/metrics/issues/56) - underlying resources of reference counted meters are not cleaned up when reference count hits zero

* github.com/openziti/transport/v2: [v2.0.198 -> v2.0.200](https://github.com/openziti/transport/compare/v2.0.198...v2.0.200)
* github.com/zitadel/oidc/v3: v3.45.0 -> v3.45.1
* golang.org/x/oauth2: v0.31.0 -> v0.33.0
* golang.org/x/sys: v0.37.0 -> v0.38.0
* google.golang.org/protobuf: v1.36.10 -> v1.36.11
* github.com/go-openapi/analysis: v0.24.0 -> v0.24.1
* github.com/go-openapi/errors: v0.22.3 -> v0.22.4
* github.com/go-openapi/jsonreference: v0.21.2 -> v0.21.3
* github.com/go-openapi/loads: v0.23.1 -> v0.23.2
* github.com/go-openapi/spec: v0.22.0 -> v0.22.1
* github.com/go-openapi/validate: v0.25.0 -> v0.25.1
* go.mongodb.org/mongo-driver: v1.17.4 -> v1.17.6
* golang.org/x/crypto: v0.43.0 -> v0.45.0
* golang.org/x/net: v0.45.0 -> v0.47.0
* golang.org/x/sync: v0.17.0 -> v0.18.0
* golang.org/x/term: v0.36.0 -> v0.37.0
* golang.org/x/text: v0.30.0 -> v0.31.0

# Release notes 1.3.0

## What's New
Expand Down
26 changes: 19 additions & 7 deletions edge-apis/client_edge_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ import (
"net/http"
"net/url"
"sync"
"time"

"github.com/michaelquigley/pfxlog"
"github.com/openziti/edge-api/rest_client_api_client"
clientAuth "github.com/openziti/edge-api/rest_client_api_client/authentication"
clientControllers "github.com/openziti/edge-api/rest_client_api_client/controllers"
Expand Down Expand Up @@ -65,6 +67,10 @@ func NewClientApiClientWithConfig(config *ApiClientConfig) *ClientApiClient {
transportPool.Add(apiUrl, newRuntime)
}

if len(config.ApiUrls) > 1 {
ret.SetUseOidc(true)
}

newApi := rest_client_api_client.New(transportPool, nil)
api := ZitiEdgeClient{
ZitiEdgeClient: newApi,
Expand All @@ -74,7 +80,7 @@ func NewClientApiClientWithConfig(config *ApiClientConfig) *ClientApiClient {
ret.API = &api
ret.AuthEnabledApi = &api

api.doOnceCacheVersionInfo()
go api.doOnceCacheVersionInfo()

return ret
}
Expand Down Expand Up @@ -262,12 +268,18 @@ func (self *ZitiEdgeClient) ControllerSupportsOidc() bool {
// Subsequent calls are no-ops due to sync.Once synchronization.
func (self *ZitiEdgeClient) doOnceCacheVersionInfo() {
self.versionOnce.Do(func() {
versionParams := clientInfo.NewListVersionParams()

versionResp, _ := self.Informational.ListVersion(versionParams)

if versionResp != nil {
self.versionInfo = versionResp.Payload.Data
for {
versionParams := clientInfo.NewListVersionParams()

versionResp, err := self.Informational.ListVersion(versionParams)
if versionResp != nil && err == nil {
self.versionInfo = versionResp.Payload.Data
return
}
if err != nil {
pfxlog.Logger().WithError(err).Error("failed to load controller information, trying again in 5s")
}
time.Sleep(5 * time.Second)
}
})
}
39 changes: 19 additions & 20 deletions example/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ require (
github.com/google/uuid v1.6.0
github.com/gorilla/mux v1.8.1
github.com/michaelquigley/pfxlog v0.6.10
github.com/openziti/edge-api v0.26.51
github.com/openziti/foundation/v2 v2.0.79
github.com/openziti/edge-api v0.26.52
github.com/openziti/foundation/v2 v2.0.81
github.com/openziti/runzmd v1.0.83
github.com/openziti/sdk-golang v1.2.6
github.com/openziti/transport/v2 v2.0.198
github.com/openziti/transport/v2 v2.0.200
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.10.1
Expand All @@ -31,7 +31,6 @@ require (
github.com/Jeffail/gabs/v2 v2.7.0 // indirect
github.com/MichaelMure/go-term-text v0.3.1 // indirect
github.com/alecthomas/chroma v0.10.0 // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/clipperhouse/uax29/v2 v2.2.0 // indirect
github.com/dlclark/regexp2 v1.11.5 // indirect
Expand All @@ -43,14 +42,14 @@ require (
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.3.0 // indirect
github.com/go-openapi/analysis v0.24.0 // indirect
github.com/go-openapi/errors v0.22.3 // indirect
github.com/go-openapi/analysis v0.24.1 // indirect
github.com/go-openapi/errors v0.22.4 // indirect
github.com/go-openapi/jsonpointer v0.22.1 // indirect
github.com/go-openapi/jsonreference v0.21.2 // indirect
github.com/go-openapi/loads v0.23.1 // indirect
github.com/go-openapi/runtime v0.29.0 // indirect
github.com/go-openapi/spec v0.22.0 // indirect
github.com/go-openapi/strfmt v0.24.0 // indirect
github.com/go-openapi/jsonreference v0.21.3 // indirect
github.com/go-openapi/loads v0.23.2 // indirect
github.com/go-openapi/runtime v0.29.2 // indirect
github.com/go-openapi/spec v0.22.1 // indirect
github.com/go-openapi/strfmt v0.25.0 // indirect
github.com/go-openapi/swag v0.25.1 // indirect
github.com/go-openapi/swag/cmdutils v0.25.1 // indirect
github.com/go-openapi/swag/conv v0.25.1 // indirect
Expand All @@ -63,8 +62,8 @@ require (
github.com/go-openapi/swag/stringutils v0.25.1 // indirect
github.com/go-openapi/swag/typeutils v0.25.1 // indirect
github.com/go-openapi/swag/yamlutils v0.25.1 // indirect
github.com/go-openapi/validate v0.25.0 // indirect
github.com/go-resty/resty/v2 v2.16.5 // indirect
github.com/go-openapi/validate v0.25.1 // indirect
github.com/go-resty/resty/v2 v2.17.1 // indirect
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
github.com/golang/protobuf v1.5.4 // indirect
Expand All @@ -87,10 +86,10 @@ require (
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/muhlemmer/gu v0.3.1 // indirect
github.com/oklog/ulid v1.3.1 // indirect
github.com/openziti/channel/v4 v4.2.41 // indirect
github.com/openziti/channel/v4 v4.2.43 // indirect
github.com/openziti/go-term-markdown v1.0.1 // indirect
github.com/openziti/identity v1.0.118 // indirect
github.com/openziti/metrics v1.4.2 // indirect
github.com/openziti/identity v1.0.120 // indirect
github.com/openziti/metrics v1.4.3 // indirect
github.com/openziti/secretstream v0.1.42 // indirect
github.com/orcaman/concurrent-map/v2 v2.0.1 // indirect
github.com/parallaxsecond/parsec-client-go v0.0.0-20221025095442-f0a77d263cf9 // indirect
Expand All @@ -114,9 +113,9 @@ require (
github.com/valyala/fasttemplate v1.2.2 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
github.com/zitadel/logging v0.6.2 // indirect
github.com/zitadel/oidc/v3 v3.45.0 // indirect
github.com/zitadel/oidc/v3 v3.45.1 // indirect
github.com/zitadel/schema v1.3.1 // indirect
go.mongodb.org/mongo-driver v1.17.4 // indirect
go.mongodb.org/mongo-driver v1.17.6 // indirect
go.mozilla.org/pkcs7 v0.9.0 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/otel v1.38.0 // indirect
Expand All @@ -127,12 +126,12 @@ require (
golang.org/x/crypto v0.45.0 // indirect
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
golang.org/x/net v0.47.0 // indirect
golang.org/x/oauth2 v0.31.0 // indirect
golang.org/x/oauth2 v0.33.0 // indirect
golang.org/x/sync v0.18.0 // indirect
golang.org/x/sys v0.38.0 // indirect
golang.org/x/term v0.37.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
google.golang.org/protobuf v1.36.10 // indirect
google.golang.org/protobuf v1.36.11 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
nhooyr.io/websocket v1.8.17 // indirect
Expand Down
Loading
Loading