`4926f2b`

Classify helper diagnostic lines

Authored by mfwolffe <wolffemf@dukes.jmu.edu> 2 months ago

SHA: 4926f2b32e159fd29611d2a44d2ee71bfda5ace7
Parents: 75e5223
Tree: 786f8f2

1 changed file

Status	File	+	-
M	`garcard/src/polkit_helper.rs`	38	0

garcard/src/polkit_helper.rsmodified

          return Ok(HelperEvent::Info(message.to_string()));
+     }
 +    // Some helper builds emit plain-text diagnostics instead of PAM_* protocol
 +    // lines. Classify known auth failures so callers can present proper retry UX
 +    // without treating successful paths as generic errors.
 +    let lower = line.to_ascii_lowercase();
 +    if lower.contains("pam_authenticate failed")
 +        || lower.contains("authentication failure")
 +        || lower.contains("no session for cookie")
 +    {
 +        return Ok(HelperEvent::Failure);
 +    }
 +    if line.starts_with("polkit-agent-helper-1:") {
 +        return Ok(HelperEvent::Info(line.to_string()));
 +    }
++
      anyhow::bail!("unsupported helper protocol line: {}", line);
+ }
          assert!(err.to_string().contains("unsupported helper protocol line"));
+     }
 +    #[test]
 +    fn parse_helper_line_maps_plaintext_failure_diagnostics() {
 +        assert_eq!(
 +            parse_helper_line(
 +                "polkit-agent-helper-1: pam_authenticate failed: Authentication failure"
 +            )
 +            .expect("maps failure"),
 +            HelperEvent::Failure
 +        );
 +        assert_eq!(
 +            parse_helper_line("polkit-agent-helper-1: error response to PolicyKit daemon: GDBus.Error:org.freedesktop.PolicyKit1.Error.Failed: No session for cookie")
 +                .expect("maps cookie failure"),
 +            HelperEvent::Failure
 +        );
 +    }
++
 +    #[test]
 +    fn parse_helper_line_maps_plaintext_info() {
 +        assert_eq!(
 +            parse_helper_line("polkit-agent-helper-1: informational message").expect("maps info"),
 +            HelperEvent::Info("polkit-agent-helper-1: informational message".to_string())
 +        );
 +    }
++
      #[test]
      fn helper_client_drives_prompt_round_trip() {
          let socket_path = temp_socket_path();