pam/nativemodel: Add more debug info to check stage changes

It may help debugging ubuntu#719
3v1n0 · Feb 27, 2025 · 12565bd · 12565bd
1 parent 0fadf0f
commit 12565bd
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/pam/internal/adapter/nativemodel.go b/pam/internal/adapter/nativemodel.go
@@ -139,6 +139,15 @@ func (m nativeModel) changeStage(stage proto.Stage) tea.Cmd {
 	return sendEvent(nativeChangeStage{stage})
 }
 
+func (m nativeModel) checkStage(expected proto.Stage) bool {
+	if m.currentStage != expected {
+		log.Debugf(context.Background(),
+			"Current stage %q is not matching expected %q", m.currentStage, expected)
+		return false
+	}
+	return true
+}
+
 func (m nativeModel) requestStageChange(stage proto.Stage) tea.Cmd {
 	return sendEvent(nativeStageChangeRequest{stage})
 }
@@ -179,7 +188,7 @@ func (m nativeModel) Update(msg tea.Msg) (nativeModel, tea.Cmd) {
 		return m, m.requestStageChange(pam_proto.Stage_userSelection)
 
 	case nativeUserSelection:
-		if m.currentStage != proto.Stage_userSelection {
+		if !m.checkStage(proto.Stage_userSelection) {
 			return m, nil
 		}
 		if m.busy {
@@ -227,7 +236,7 @@ func (m nativeModel) Update(msg tea.Msg) (nativeModel, tea.Cmd) {
 		})
 
 	case nativeBrokerSelection:
-		if m.currentStage != proto.Stage_brokerSelection {
+		if !m.checkStage(proto.Stage_brokerSelection) {
 			return m, nil
 		}
 		if m.busy {
@@ -251,7 +260,7 @@ func (m nativeModel) Update(msg tea.Msg) (nativeModel, tea.Cmd) {
 		return m.startAsyncOp(m.brokerSelection)
 
 	case nativeAuthSelection:
-		if m.currentStage != proto.Stage_authModeSelection {
+		if !m.checkStage(proto.Stage_authModeSelection) {
 			return m, nil
 		}
 		if m.busy {
@@ -286,7 +295,7 @@ func (m nativeModel) Update(msg tea.Msg) (nativeModel, tea.Cmd) {
 		return m, m.requestStageChange(pam_proto.Stage_challenge)
 
 	case nativeChallengeRequested:
-		if m.currentStage != pam_proto.Stage_challenge {
+		if !m.checkStage(pam_proto.Stage_challenge) {
 			return m, nil
 		}
 		return m, m.startChallenge()