add serde features for ipnet

Author: 4t145

spi/spi-conf/Cargo.toml

@@ -29,7 +29,7 @@ tardis = { workspace = true, features = [
 bios-basic = { path = "../../basic", features = ["default"] }
 lazy_static = { workspace = true }
 jsonwebtoken = "8"
-poem-grpc = "0.2.21"
+poem-grpc = "=0.2.22"
 prost = "0.11.9"
 poem = "1"
 prost-types = "0.11.9"
@@ -39,11 +39,11 @@ bios-sdk-invoke = { path = "../../sdk/invoke", features = [
     "iam",
     "macro",
 ], default-features = false }
-
+ipnet = { version = "2", features = ["serde"] }
 [dev-dependencies]
 tardis = { workspace = true, features = ["test", "conf-remote", "mq"] }
 bios-basic = { path = "../../basic", features = ["default", "test"] }
 reqwest = "*"
 testcontainers-modules = { workspace = true }
 [build-dependencies]
-poem-grpc-build = "0.2.21"
+poem-grpc-build = "0.2.22"

spi/spi-conf/src/conf_config.rs

@@ -1,5 +1,5 @@
 use std::net::IpAddr;
-
+use ipnet::IpNet;
 use bios_basic::rbum::rbum_config::RbumConfig;
 use serde::{Deserialize, Serialize};
 use tardis::consts::{IP_LOCALHOST, IP_UNSPECIFIED};
@@ -19,15 +19,14 @@ pub struct ConfConfig {
     pub nacos_port: u16,
     pub nacos_grpc_port: u16,
     pub nacos_host: IpAddr,
-    pub placeholder_white_list: Vec<IpAddr>,
+    pub placeholder_white_list: Vec<IpNet>,
     pub iam_client: IamClientConfig,
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone, Default)]
 #[serde(default)]
 pub struct IamClientConfig {
     pub base_url: String,
-    pub cert_encode_key: String,
 }
 
 impl ConfConfig {
@@ -54,7 +53,7 @@ impl Default for ConfConfig {
             nacos_port: 8848,
             nacos_grpc_port: 9848,
             nacos_host: IP_UNSPECIFIED,
-            placeholder_white_list: vec![IP_LOCALHOST],
+            placeholder_white_list: vec![IpNet::from(IP_LOCALHOST)],
             iam_client: Default::default(),
         }
     }

spi/spi-conf/src/serv/placehodler.rs

@@ -71,7 +71,7 @@ async fn get_kvmap(codes: HashSet<&str>, config: &ConfConfig, funs: &tardis::Tar
 
 pub fn has_placeholder_auth(source_addr: IpAddr, funs: &tardis::TardisFunsInst) -> bool {
     let cfg = funs.conf::<ConfConfig>();
-    cfg.placeholder_white_list.contains(&source_addr)
+    cfg.placeholder_white_list.iter().any(|net| net.contains(&source_addr))
 }
 
 pub async fn render_content_for_ip(content: String, source_addr: IpAddr, funs: &tardis::TardisFunsInst, ctx: &tardis::basic::dto::TardisContext) -> TardisResult<String> {