Skip to content

addresses openziti/ziti#3008 UPDB enrolls panic on older controllers #719

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
merged 1 commit into from
Apr 23, 2025
Merged

addresses openziti/ziti#3008 UPDB enrolls panic on older controllers #719

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
7 changes: 6 additions & 1 deletion ziti/enroll/enroll.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,11 @@ func Enroll(enFlags EnrollmentFlags) (*ziti.Config, error) {
enrollErr = enrollCAAuto(enFlags, cfg, caPool)
case "updb":
resultUsername, enrollErr = enrollUpdb(enFlags.Username, enFlags.Password, enFlags.Token, caPool)

//v1.5.0 and earlier controllers do not confirm the username in their response (e.g. if set by admin and an override isn't provided)
if resultUsername == "" {
resultUsername = enFlags.Username
}
default:
enrollErr = errors.Errorf("enrollment method '%s' is not supported", enFlags.Token.EnrollmentMethod)
}
Expand Down Expand Up @@ -325,7 +330,7 @@ func enrollUpdb(username, password string, token *ziti.EnrollmentClaims, caPool
if resp.StatusCode == http.StatusOK {
respBody, _ := io.ReadAll(resp.Body)
if respContainer, err := gabs.ParseJSON(respBody); err == nil {
username = respContainer.Path("data.username").Data().(string)
username, _ = respContainer.Path("data.username").Data().(string)
}
return username, nil
}
Expand Down
Loading