v0.25.7

src/admin/session.rs

@@ -267,10 +267,35 @@ const LIVE_LOG_COLUMNS: &[&str] = &[
     "websocket",
     "upstream_error",
 ];
+const BACKEND_TABLE_COLUMNS: &[&str] = &[
+    "vhost",
+    "backend",
+    "status",
+    "active",
+    "requests",
+    "errors",
+    "latency",
+    "traffic",
+    "generation",
+    "generationRequests",
+    "generationAge",
+    "rotations",
+    "lastFailure",
+    "lastRecovery",
+];
 
 fn default_admin_theme() -> String {
     "dark".to_owned()
 }
+fn default_backend_table_columns() -> Vec<String> {
+    BACKEND_TABLE_COLUMNS
+        .iter()
+        .map(|value| (*value).to_owned())
+        .collect()
+}
+fn default_backend_table_sort() -> String {
+    "vhost".to_owned()
+}
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]
@@ -278,6 +303,12 @@ struct AdminPreferences {
     live_log_columns: Vec<String>,
     #[serde(default = "default_admin_theme")]
     theme: String,
+    #[serde(default = "default_backend_table_columns")]
+    backend_table_columns: Vec<String>,
+    #[serde(default = "default_backend_table_sort")]
+    backend_table_sort: String,
+    #[serde(default)]
+    backend_table_descending: bool,
 }
 
 impl Default for AdminPreferences {
@@ -288,6 +319,9 @@ impl Default for AdminPreferences {
                 .map(|value| (*value).to_owned())
                 .collect(),
             theme: default_admin_theme(),
+            backend_table_columns: default_backend_table_columns(),
+            backend_table_sort: default_backend_table_sort(),
+            backend_table_descending: false,
         }
     }
 }
@@ -316,6 +350,29 @@ fn validate_admin_preferences(preferences: &AdminPreferences) -> Result<(), ApiE
             "invalid administration theme preference".into(),
         ));
     }
+    if preferences.backend_table_columns.is_empty()
+        || preferences.backend_table_columns.len() > BACKEND_TABLE_COLUMNS.len()
+    {
+        return Err(ApiError(
+            StatusCode::UNPROCESSABLE_ENTITY,
+            "at least one backend table column must be visible".into(),
+        ));
+    }
+    let mut seen = std::collections::HashSet::new();
+    for column in &preferences.backend_table_columns {
+        if !BACKEND_TABLE_COLUMNS.contains(&column.as_str()) || !seen.insert(column.as_str()) {
+            return Err(ApiError(
+                StatusCode::UNPROCESSABLE_ENTITY,
+                "invalid backend table column preference".into(),
+            ));
+        }
+    }
+    if !BACKEND_TABLE_COLUMNS.contains(&preferences.backend_table_sort.as_str()) {
+        return Err(ApiError(
+            StatusCode::UNPROCESSABLE_ENTITY,
+            "invalid backend table sort preference".into(),
+        ));
+    }
     Ok(())
 }