Merge pull request #2098 from Urgau/gha-logs-improv-all

Kobzol · web-flow · commit 2aaad350e266 · 2025-07-06T20:09:11.000Z
Bunch of improvements and fixes around our GHA logs viewer
diff --git a/src/gha_logs.rs b/src/gha_logs.rs
@@ -130,12 +130,12 @@ async fn process_logs(
 
     let html = format!(
         r###"<!DOCTYPE html>
-<html>
+<html lang="en" translate="no">
 <head>
-    <title>{log_uuid} - triagebot</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="icon" sizes="32x32" type="image/png" href="https://rust-lang.org/static/images/favicon-32x32.png">    
+    <title>{log_id} - {owner}/{repo}</title>
+    <link rel="icon" sizes="32x32" type="image/png" href="https://www.rust-lang.org/static/images/favicon-32x32.png">    
     <style>
         body {{
             font: 14px SFMono-Regular, Consolas, Liberation Mono, Menlo, monospace;
@@ -144,14 +144,18 @@ async fn process_logs(
             white-space: pre;
         }}
         .timestamp {{
-            color: unset;
+            color: #848484;
             text-decoration: none;
         }}
         .timestamp:hover {{
             text-decoration: underline;
         }}
         .error-marker {{
             scroll-margin-bottom: 15vh;
+            color: #e5534b;
+        }}
+        .warning-marker {{
+            color: #c69026;
         }}
     </style>
     <script type="module" nonce="{nonce}">
@@ -179,6 +183,11 @@ async fn process_logs(
         html = html.replace(/##\[error\]/g, () =>
             `<a id="error-${{++errorCounter}}" class="error-marker">##[error]</a>`
         );
+        
+        // 4.b Add a span around every "##[warning]" string
+        html = html.replace(/##\[warning\]/g, () =>
+            `<span class="warning-marker">##[warning]</span>`
+        );
 
         // 5. Add the html to the DOM
         var cdiv = document.getElementById("console");
@@ -207,7 +216,9 @@ async fn process_logs(
         .header(CONTENT_TYPE, "text/html; charset=utf-8")
         .header(
             CONTENT_SECURITY_POLICY,
-            format!("script-src 'nonce-{nonce}' {ANSI_UP_URL}"),
+            format!(
+                "default-src 'none'; script-src 'nonce-{nonce}' 'self'; style-src 'unsafe-inline'; img-src www.rust-lang.org"
+            ),
         )
         .body(Body::from(html))?);
 }
diff --git a/src/gha_logs/ansi_up@6.0.6.min.js b/src/gha_logs/ansi_up@6.0.6.min.js
diff --git a/src/github.rs b/src/github.rs
@@ -92,7 +92,7 @@ impl GithubClient {
         req: Request,
         sleep: Duration,
         remaining_attempts: u32,
-    ) -> BoxFuture<Result<Response, reqwest::Error>> {
+    ) -> BoxFuture<'_, Result<Response, reqwest::Error>> {
         #[derive(Debug, serde::Deserialize)]
         struct RateLimit {
             #[allow(unused)]
diff --git a/src/utils.rs b/src/utils.rs
@@ -1,7 +1,7 @@
 use std::borrow::Cow;
 
 /// Pluralize (add an 's' sufix) to `text` based on `count`.
-pub fn pluralize(text: &str, count: usize) -> Cow<str> {
+pub fn pluralize(text: &str, count: usize) -> Cow<'_, str> {
     if count == 1 {
         text.into()
     } else {
