`2138e2e`

Send username and cookie to helper socket

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

SHA: 2138e2e45bc0121f2a69c12a4b547517da0536eb
Parents: b81c372
Tree: 582ff05

1 changed file

Status	File	+	-
M	`garcard/src/polkit_helper.rs`	14	8

garcard/src/polkit_helper.rsmodified

          cookie: &str,
          prompts: &mut P,
      ) -> Result<HelperOutcome> {
 -        let username_label = sanitize_control_line(username);
 +        let username_line = sanitize_control_line(username);
          let cookie_line = sanitize_control_line(cookie);
          let mut stream = UnixStream::connect(&self.socket_path).with_context(|| {
              format!(
          })?;
          let cookie_preview: String = cookie_line.chars().take(16).collect();
          tracing::debug!(
 -            username = %username_label,
 +            username = %username_line,
              cookie_len = cookie_line.len(),
              cookie_preview = %cookie_preview,
              socket = %self.socket_path.display(),
 -            protocol = "socket-activated-cookie-only",
 +            protocol = "socket-activated-username-cookie",
              "Connected to polkit helper socket"
          );
 -        if username_label.len() != username.len() || cookie_line.len() != cookie.len() {
 +        if username_line.len() != username.len() || cookie_line.len() != cookie.len() {
              tracing::debug!(
                  original_username_len = username.len(),
 -                normalized_username_len = username_label.len(),
 +                normalized_username_len = username_line.len(),
                  original_cookie_len = cookie.len(),
                  normalized_cookie_len = cookie_line.len(),
                  "Normalized helper auth control lines before send"
              .context("failed to clone helper socket stream")?;
          let mut reader = BufReader::new(read_stream);
 -        // socket-activated polkit helper resolves identity from peer credentials.
 -        // It expects only the cookie line from the agent protocol stream.
 +        // polkit 127 socket-activated helper reads two control lines:
 +        // username first, then cookie.
 +        write_line(&mut stream, &username_line).context("failed to send helper username")?;
          write_line(&mut stream, &cookie_line).context("failed to send helper cookie")?;
          loop {
              let read_stream = stream.try_clone().expect("clone");
              let mut reader = BufReader::new(read_stream);
 +            let mut username = String::new();
 +            reader.read_line(&mut username).expect("read username");
              let mut cookie = String::new();
              reader.read_line(&mut cookie).expect("read cookie");
+             {
                  let mut lines = transcript_for_thread.lock().expect("lock transcript");
 +                lines.push(username.trim().to_string());
                  lines.push(cookie.trim().to_string());
                  lines.push(secret.trim().to_string());
+             }
          server.join().expect("server join");
          let lines = transcript.lock().expect("lock transcript");
 -        assert_eq!(lines.as_slice(), ["cookie-123", "correct horse"]);
 +        assert_eq!(lines.as_slice(), ["alice", "cookie-123", "correct horse"]);
          let _ = std::fs::remove_file(&socket_path);
+     }
              let read_stream = stream.try_clone().expect("clone");
              let mut reader = BufReader::new(read_stream);
 +            let mut username = String::new();
 +            reader.read_line(&mut username).expect("read username");
              let mut cookie = String::new();
              reader.read_line(&mut cookie).expect("read cookie");