refactor: adjust plugin handle

Cargo.toml

@@ -15,7 +15,7 @@ rust-version = "1.74"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-async-trait = "0.1.79"
+async-trait = "0.1.80"
 base64 = "0.22.0"
 bytes = "1.6.0"
 bytesize = "1.3.0"

TODO.md

@@ -6,6 +6,7 @@
 - [ ] tls cert auto update
 - [ ] support validate config before save(web)
 - [ ] auto reload config and restart
+- [ ] support plugin for proxy and response
 - [x] authentication for admin page
 - [x] custom error for pingora error
 - [x] support alpn for location

src/config/load.rs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::{proxy::Limiter, utils};
+use crate::utils;
 use base64::{engine::general_purpose::STANDARD, Engine};
 use glob::glob;
 use http::HeaderValue;
@@ -127,7 +127,6 @@ pub struct LocationConf {
     pub gzip_level: Option<u32>,
     pub br_level: Option<u32>,
     pub zstd_level: Option<u32>,
-    pub limit: Option<String>,
     pub remark: Option<String>,
 }
 
@@ -158,11 +157,7 @@ impl LocationConf {
                 message: format!("{} upstream is not found(location:{name})", self.upstream),
             });
         }
-        if let Some(limit) = &self.limit {
-            Limiter::new(limit).map_err(|err| Error::Invalid {
-                message: format!("{err}({limit})"),
-            })?;
-        }
+
         Ok(())
     }
 

src/lib.rs

@@ -14,6 +14,7 @@
 
 pub mod config;
 pub mod http_extra;
+pub mod plugin;
 pub mod proxy;
 pub mod serve;
 pub mod state;

src/main.rs

@@ -25,6 +25,7 @@ use std::sync::Arc;
 
 mod config;
 mod http_extra;
+mod plugin;
 mod proxy;
 mod serve;
 mod state;

src/proxy/limit.rs → src/plugin/limit.rs

@@ -12,8 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use super::ProxyPlugin;
 use crate::state::State;
 use crate::utils;
+use async_trait::async_trait;
 use pingora::proxy::Session;
 use pingora_limits::inflight::Inflight;
 use snafu::{ResultExt, Snafu};
@@ -108,6 +110,16 @@ impl Limiter {
         Ok(())
     }
 }
+#[async_trait]
+impl ProxyPlugin for Limiter {
+    async fn handle(&self, session: &mut Session, ctx: &mut State) -> pingora::Result<bool> {
+        let _ = self
+            .incr(session, ctx)
+            .map_err(|e| utils::new_internal_error(429, e.to_string()))?;
+        Ok(false)
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use crate::state::State;