write ProxyProtocolConfig in protobuf

sozu-proxy · Apr 5, 2023 · 6716f8a · 6716f8a
1 parent f434974
commit 6716f8a
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 20 deletions.
diff --git a/bin/src/ctl/request_builder.rs b/bin/src/ctl/request_builder.rs
@@ -4,10 +4,10 @@ use anyhow::{bail, Context};
 
 use sozu_command_lib::{
     certificate::{calculate_fingerprint, split_certificate_chain, Fingerprint},
-    config::{Config, ListenerBuilder, ProxyProtocolConfig},
+    config::{Config, ListenerBuilder},
     proto::command::{
-        AddCertificate, CertificateAndKey, FrontendFilters, PathRule, RemoveCertificate,
-        ReplaceCertificate, RequestHttpFrontend, RulePosition, TlsVersion,
+        AddCertificate, CertificateAndKey, FrontendFilters, PathRule, ProxyProtocolConfig,
+        RemoveCertificate, ReplaceCertificate, RequestHttpFrontend, RulePosition, TlsVersion,
     },
     request::{
         ActivateListener, AddBackend, Cluster, DeactivateListener, ListenerType,

diff --git a/command/src/command.proto b/command/src/command.proto
@@ -99,3 +99,9 @@ enum LoadBalancingAlgorithms {
     LEAST_LOADED = 2;
     POWER_OF_TWO = 3;
 }
+
+enum ProxyProtocolConfig {
+    EXPECT_HEADER = 0;
+    SEND_HEADER = 1;
+    RELAY_HEADER = 2;
+}
diff --git a/command/src/config.rs b/command/src/config.rs
@@ -15,8 +15,8 @@ use toml;
 use crate::{
     certificate::split_certificate_chain,
     proto::command::{
-        AddCertificate, CertificateAndKey, LoadBalancingAlgorithms, PathRule, RequestHttpFrontend,
-        RulePosition, TlsVersion,
+        AddCertificate, CertificateAndKey, LoadBalancingAlgorithms, PathRule, ProxyProtocolConfig,
+        RequestHttpFrontend, RulePosition, TlsVersion,
     },
     request::{
         ActivateListener, AddBackend, Cluster, ListenerType, LoadBalancingParams, LoadMetric,
@@ -487,15 +487,6 @@ pub struct MetricsConfig {
     pub prefix: Option<String>,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
-#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
-#[serde(deny_unknown_fields)]
-pub enum ProxyProtocolConfig {
-    ExpectHeader,
-    SendHeader,
-    RelayHeader,
-}
-
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
 #[serde(rename_all = "SCREAMING_SNAKE_CASE")]
 #[serde(deny_unknown_fields)]

diff --git a/command/src/request.rs b/command/src/request.rs
@@ -10,10 +10,10 @@ use anyhow::Context;
 
 use crate::{
     certificate::Fingerprint,
-    config::ProxyProtocolConfig,
     proto::command::{
-        AddCertificate, FrontendFilters, LoadBalancingAlgorithms, PathRuleKind, RemoveCertificate,
-        ReplaceCertificate, RequestHttpFrontend, RulePosition,
+        AddCertificate, FrontendFilters, LoadBalancingAlgorithms, PathRuleKind,
+        ProxyProtocolConfig, RemoveCertificate, ReplaceCertificate, RequestHttpFrontend,
+        RulePosition,
     },
     response::{
         HttpFrontend, HttpListenerConfig, HttpsListenerConfig, MessageId, TcpListenerConfig,
@@ -425,8 +425,9 @@ mod tests {
 
     use super::*;
     use crate::certificate::split_certificate_chain;
-    use crate::config::ProxyProtocolConfig;
-    use crate::proto::command::{CertificateAndKey, PathRule, RulePosition, TlsVersion};
+    use crate::proto::command::{
+        CertificateAndKey, PathRule, ProxyProtocolConfig, RulePosition, TlsVersion,
+    };
     use crate::response::HttpFrontend;
     use serde_json;
 

diff --git a/lib/src/tcp.rs b/lib/src/tcp.rs
@@ -34,8 +34,8 @@ use crate::{
     },
     socket::server_bind,
     sozu_command::{
-        config::ProxyProtocolConfig,
         logging,
+        proto::command::ProxyProtocolConfig,
         ready::Ready,
         request::{Request, RequestTcpFrontend, WorkerRequest},
         response::{Event, TcpListenerConfig, WorkerResponse},