fix #250: is_elevated doesn't ask for pass when not needed

F1bonacc1 · Sep 26, 2024 · 64430a6 · 64430a6
1 parent 3f53128
commit 64430a6
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/src/app/process.go b/src/app/process.go
@@ -590,9 +590,16 @@ func (p *Process) handleOutput(pipe io.ReadCloser, output string, handler func(m
 			p.procState.Health = types.ProcessHealthReady
 			p.readyLogCancelFn(nil)
 		}
-		if p.procConf.IsElevated &&
-			!p.passProvided &&
-			p.waitForPassCancelFn != nil {
+		p.checkElevatedProcOutput(line)
+		handler(strings.TrimSuffix(line, "\n"))
+	}
+	close(done)
+}
+
+func (p *Process) checkElevatedProcOutput(line string) {
+	if p.procConf.IsElevated &&
+		!p.passProvided {
+		if p.waitForPassCancelFn != nil {
 			if isWrongPasswordEntered(line) {
 				log.Warn().
 					Str("process", p.getName()).
@@ -605,10 +612,10 @@ func (p *Process) handleOutput(pipe io.ReadCloser, output string, handler func(m
 			}
 			p.waitForPassCancelFn()
 			p.waitForPassCancelFn = nil
+		} else {
+			p.passProvided = true
 		}
-		handler(strings.TrimSuffix(line, "\n"))
 	}
-	close(done)
 }
 
 func (p *Process) handleInfo(message string) {