Redirection and URL rewrite

bin/src/ctl/request_builder.rs

@@ -250,6 +250,13 @@
                         Some(tags) => tags,
                         None => BTreeMap::new(),
                     },
+                    required_auth: todo!(),
+                    redirect: todo!(),
+                    redirect_scheme: todo!(),
+                    redirect_template: todo!(),
+                    rewrite_host: todo!(),
+                    rewrite_path: todo!(),
+                    rewrite_port: todo!(),
                 })
                 .into(),
             ),
@@ -298,6 +305,13 @@
                         Some(tags) => tags,
                         None => BTreeMap::new(),
                     },
+                    required_auth: todo!(),
+                    redirect: todo!(),
+                    redirect_scheme: todo!(),
+                    redirect_template: todo!(),
+                    rewrite_host: todo!(),
+                    rewrite_path: todo!(),
+                    rewrite_port: todo!(),
                 })
                 .into(),
             ),
@@ -341,8 +355,8 @@
             } => {
                 let https_listener = ListenerBuilder::new_https(address.into())
                     .with_public_address(public_address)
-                    .with_answer_404_path(answer_404)
-                    .with_answer_503_path(answer_503)
+                    .with_answer("404", answer_404)
+                    .with_answer("503", answer_503)
                     .with_tls_versions(tls_versions)
                     .with_cipher_list(cipher_list)
                     .with_expect_proxy(expect_proxy)
@@ -384,8 +398,8 @@
             } => {
                 let http_listener = ListenerBuilder::new_http(address.into())
                     .with_public_address(public_address)
-                    .with_answer_404_path(answer_404)
-                    .with_answer_503_path(answer_503)
+                    .with_answer("404", answer_404)
+                    .with_answer("503", answer_503)
                     .with_expect_proxy(expect_proxy)
                     .with_sticky_name(sticky_name)
                     .with_front_timeout(front_timeout)

command/assets/config.toml

@@ -17,7 +17,7 @@ protocol = "http"
 [[listeners]]
 address = "0.0.0.0:443"
 protocol = "https"
-answer_404 = "./assets/custom_404.html"
+answers = { "404" = "./assets/custom_404.html" }
 tls_versions = ["TLS_V12"]
 
 [[listeners]]
@@ -28,7 +28,7 @@ expect_proxy = true
 [clusters]
 [clusters.MyCluster]
 protocol = "http"
-answer_503 = "./assets/custom_503.html"
+answers = { "503" = "./assets/custom_503.html" }
 #sticky_session = false
 #https_redirect = false
 frontends = [

command/assets/custom_200.html

@@ -0,0 +1,7 @@
+HTTP/1.1 200 OK
+%Content-Length: %CONTENT_LENGTH
+Sozu-Id: %REQUEST_ID
+
+<h1>%CLUSTER_ID Custom 200</h1>
+<p>original url: %ROUTE</p>
+<p>rewritten url: %REDIRECT_LOCATION</p>

command/assets/custom_404.html

@@ -1,7 +1,7 @@
 HTTP/1.1 404 Not Found
 Cache-Control: no-cache
 Connection: close
-Sozu-Id: %SOZU_ID
+Sozu-Id: %REQUEST_ID
 
 <h1>My own 404 error page</h1>
-<p>Your request %SOZU_ID found no frontend and cannot be redirected.</p>
+<p>Your request %REQUEST_ID found no frontend and cannot be redirected.</p>

command/assets/custom_503.html

@@ -2,10 +2,10 @@
 Cache-Control: no-cache
 Connection: close
 %Content-Length: %CONTENT_LENGTH
-Sozu-Id: %SOZU_ID
+Sozu-Id: %REQUEST_ID
 
 <h1>MyCluster: 503 Service Unavailable</h1>
-<p>No server seems to be alive, could not redirect request %SOZU_ID.</p>
+<p>No server seems to be alive, could not redirect request %REQUEST_ID.</p>
 <pre>
-%DETAILS
+%MESSAGE
 <pre>

command/src/command.proto

@@ -129,7 +129,7 @@ message HttpListenerConfig {
     required uint32 request_timeout = 10 [default = 10];
     // wether the listener is actively listening on its socket
     required bool active = 11 [default = false];
-    optional CustomHttpAnswers http_answers = 12;
+    map<string, string> answers = 13;
 }
 
 // details of an HTTPS listener
@@ -161,7 +161,7 @@ message HttpsListenerConfig {
     // The tickets allow the client to resume a session. This protects the client
     // agains session tracking. Defaults to 4.
     required uint64 send_tls13_tickets = 20;
-    optional CustomHttpAnswers http_answers = 21;
+    map<string, string> answers = 22;
 }
 
 // details of an TCP listener
@@ -179,31 +179,6 @@ message TcpListenerConfig {
     required bool active = 7 [default = false];
 }
 
-// custom HTTP answers, useful for 404, 503 pages
-message CustomHttpAnswers {
-    // MovedPermanently
-    optional string answer_301 = 1;
-    // BadRequest
-    optional string answer_400 = 2;
-    // Unauthorized
-    optional string answer_401 = 3;
-    // NotFound
-    optional string answer_404 = 4;
-    // RequestTimeout
-    optional string answer_408 = 5;
-    // PayloadTooLarge
-    optional string answer_413 = 6;
-    // BadGateway
-    optional string answer_502 = 7;
-    // ServiceUnavailable
-    optional string answer_503 = 8;
-    // GatewayTimeout
-    optional string answer_504 = 9;
-    // InsufficientStorage
-    optional string answer_507 = 10;
-
-}
-
 message ActivateListener {
     required SocketAddress address = 1;
     required ListenerType proxy = 2;
@@ -237,6 +212,18 @@ message ListenersList {
     map<string, TcpListenerConfig> tcp_listeners = 3;
 }
 
+enum RedirectPolicy {
+    FORWARD = 0;
+    PERMANENT = 1;
+    UNAUTHORIZED = 2;
+}
+
+enum RedirectScheme {
+    USE_SAME = 0;
+    USE_HTTP = 1;
+    USE_HTTPS = 2;
+}
+
 // An HTTP or HTTPS frontend, as order to, or received from, Sōzu
 message RequestHttpFrontend {
     optional string cluster_id = 1;
@@ -247,6 +234,13 @@ message RequestHttpFrontend {
     required RulePosition position = 6 [default = TREE];
     // custom tags to identify the frontend in the access logs
     map<string, string> tags = 7;
+    optional RedirectPolicy redirect = 8;
+    optional bool required_auth = 9;
+    optional RedirectScheme redirect_scheme = 10;
+    optional string redirect_template = 11;
+    optional string rewrite_host = 12;
+    optional string rewrite_path = 13;
+    optional uint32 rewrite_port = 14;
 }
 
 message RequestTcpFrontend {
@@ -374,8 +368,10 @@ message Cluster {
     required bool https_redirect = 3;
     optional ProxyProtocolConfig proxy_protocol = 4;
     required LoadBalancingAlgorithms load_balancing = 5 [default = ROUND_ROBIN];
-    optional string answer_503 = 6;
     optional LoadMetric load_metric = 7;
+    optional uint32 https_redirect_port = 8;
+    map<string, string> answers = 9;
+    repeated uint64 authorized_hashes = 10;
 }
 
 enum LoadBalancingAlgorithms {