Validate backends when parsing GitHub commands

Author: Kobzol

database/src/lib.rs

@@ -406,6 +406,10 @@ impl CodegenBackend {
             CodegenBackend::Cranelift => "cranelift",
         }
     }
+
+    pub fn all_values() -> &'static [Self] {
+        &[Self::Llvm, Self::Cranelift]
+    }
 }
 
 impl FromStr for CodegenBackend {
@@ -1009,12 +1013,7 @@ impl BenchmarkRequest {
             return Ok(vec![CodegenBackend::Llvm]);
         }
 
-        self.backends
-            .split(',')
-            .map(|s| {
-                CodegenBackend::from_str(s).map_err(|_| anyhow::anyhow!("Invalid backend: {s}"))
-            })
-            .collect()
+        parse_backends(&self.backends).map_err(|e| anyhow::anyhow!("{e}"))
     }
 
     /// Get the profiles for the request
@@ -1040,6 +1039,13 @@ impl BenchmarkRequest {
     }
 }
 
+pub fn parse_backends(backends: &str) -> Result<Vec<CodegenBackend>, String> {
+    backends
+        .split(',')
+        .map(|s| CodegenBackend::from_str(s).map_err(|_| format!("Invalid backend: {s}")))
+        .collect()
+}
+
 /// Cached information about benchmark requests in the DB
 pub struct BenchmarkRequestIndex {
     /// Tags (SHA or release name) of all known benchmark requests

site/src/request_handlers/github.rs

@@ -6,7 +6,7 @@ use crate::github::{
 use crate::job_queue::should_use_job_queue;
 use crate::load::SiteCtxt;
 
-use database::BenchmarkRequest;
+use database::{parse_backends, BenchmarkRequest, CodegenBackend};
 use hashbrown::HashMap;
 use std::sync::Arc;
 
@@ -265,6 +265,19 @@ fn parse_benchmark_parameters<'a>(
         };
         params.runs = Some(runs as i32);
     }
+    if let Some(backends) = &params.backends {
+        // Make sure that the backends are correct
+        parse_backends(backends).map_err(|e| {
+            format!(
+                "Cannot parse backends: {e}. Valid values are: {}",
+                CodegenBackend::all_values()
+                    .iter()
+                    .map(|b| b.as_str())
+                    .collect::<Vec<_>>()
+                    .join(", ")
+            )
+        })?;
+    }
 
     if !args.is_empty() {
         Err(format!(