v0.25.4

src/admin/tests/part_04.rs

@@ -312,6 +312,7 @@
         for (path, method) in [
             ("/api/config", "PUT"),
             ("/api/config/cache", "PUT"),
+            ("/api/config/history/restore", "POST"),
             ("/api/acme/issue", "POST"),
             ("/api/acme/renew", "POST"),
             ("/api/docker/refresh", "POST"),

src/admin/tests/part_05.rs

@@ -55,6 +55,7 @@
             "cookie"
         );
         assert!(spec["paths"].get("/api/config").is_some());
+        assert!(spec["paths"].get("/api/config/history/restore").is_some());
         let response = router
             .clone()
             .oneshot(
@@ -170,3 +171,84 @@
         }
         store.close().await;
     }
+
+    #[tokio::test]
+    async fn retained_configuration_revision_can_be_restored_as_a_new_revision() {
+        let (router, store, _dir, secret, csrf) = fixture().await;
+        let cookie = format!("{}={secret}", auth::COOKIE_NAME);
+
+        let mut first = Config::default();
+        first.server_header.value = "first".into();
+        let response = router
+            .clone()
+            .oneshot(
+                request("/api/config")
+                    .method("PUT")
+                    .header("content-type", "application/json")
+                    .header("cookie", &cookie)
+                    .header("origin", "http://127.0.0.1:9090")
+                    .header("x-rustproxy-request", "1")
+                    .header("x-csrf-token", &csrf)
+                    .body(Body::from(
+                        json!({"expected_revision":0,"config":first}).to_string(),
+                    ))
+                    .unwrap(),
+            )
+            .await
+            .unwrap();
+        assert_eq!(response.status(), StatusCode::OK);
+        assert_eq!(json_body(response).await["revision"], 1);
+
+        let mut second = Config::default();
+        second.server_header.value = "second".into();
+        let response = router
+            .clone()
+            .oneshot(
+                request("/api/config")
+                    .method("PUT")
+                    .header("content-type", "application/json")
+                    .header("cookie", &cookie)
+                    .header("origin", "http://127.0.0.1:9090")
+                    .header("x-rustproxy-request", "1")
+                    .header("x-csrf-token", &csrf)
+                    .body(Body::from(
+                        json!({"expected_revision":1,"config":second}).to_string(),
+                    ))
+                    .unwrap(),
+            )
+            .await
+            .unwrap();
+        assert_eq!(response.status(), StatusCode::OK);
+        assert_eq!(json_body(response).await["revision"], 2);
+
+        let response = router
+            .clone()
+            .oneshot(
+                request("/api/config/history/restore")
+                    .method("POST")
+                    .header("content-type", "application/json")
+                    .header("cookie", &cookie)
+                    .header("origin", "http://127.0.0.1:9090")
+                    .header("x-rustproxy-request", "1")
+                    .header("x-csrf-token", &csrf)
+                    .body(Body::from(
+                        json!({"revision":1,"expected_revision":2}).to_string(),
+                    ))
+                    .unwrap(),
+            )
+            .await
+            .unwrap();
+        assert_eq!(response.status(), StatusCode::OK);
+        let restored = json_body(response).await;
+        assert_eq!(restored["revision"], 3);
+        assert_eq!(restored["config"]["server_header"]["value"], "first");
+
+        let audit = store.recent_audit().await.unwrap();
+        assert_eq!(audit[0].actor, "owner");
+        assert_eq!(audit[0].action, "config.restore");
+        assert_eq!(audit[0].detail, "source_revision=1 revision=3");
+        let detail = store.configuration_revision(3).await.unwrap().unwrap();
+        assert_eq!(detail.config.server_header.value, "first");
+        assert_eq!(detail.previous_config.unwrap().server_header.value, "second");
+        store.close().await;
+    }