fix: cidr and dns config not being overwritten

hez2010 · hez2010 · commit 37d9cb91a8c1 · 2024-03-31T20:27:19.000+09:00
diff --git a/src/GZCTF/Extensions/CaptchaExtension.cs b/src/GZCTF/Extensions/CaptchaExtension.cs
@@ -99,7 +99,7 @@ public override async Task<bool> VerifyAsync(ModelWithCaptcha model, HttpContext
 public static class CaptchaServiceExtension
 {
     internal static IServiceCollection AddCaptchaService(this IServiceCollection services,
-        ConfigurationManager configuration)
+        IConfiguration configuration)
     {
         CaptchaConfig config = configuration.GetSection(nameof(CaptchaConfig)).Get<CaptchaConfig>() ?? new();
 
diff --git a/src/GZCTF/Models/Internal/Configs.cs b/src/GZCTF/Models/Internal/Configs.cs
@@ -142,12 +142,8 @@ public class KubernetesConfig
 {
     public string Namespace { get; set; } = "gzctf-challenges";
     public string KubeConfig { get; set; } = "kube-config.yaml";
-
-    [JsonObjectCreationHandling(JsonObjectCreationHandling.Replace)]
-    public List<string> AllowCidr { get; set; } = ["10.0.0.0/8"];
-
-    [JsonObjectCreationHandling(JsonObjectCreationHandling.Replace)]
-    public List<string> Dns { get; set; } = ["8.8.8.8", "223.5.5.5", "114.114.114.114"];
+    public string[]? AllowCidr { get; set; }
+    public string[]? Dns { get; set; }
 }
 
 public class RegistryConfig
diff --git a/src/GZCTF/Services/Container/ContainerServiceExtension.cs b/src/GZCTF/Services/Container/ContainerServiceExtension.cs
@@ -28,7 +28,7 @@ public class ContainerProviderMetadata
 public static class ContainerServiceExtension
 {
     internal static IServiceCollection AddContainerService(this IServiceCollection services,
-        ConfigurationManager configuration)
+        IConfiguration configuration)
     {
         ContainerProvider config = configuration.GetSection(nameof(ContainerProvider)).Get<ContainerProvider>() ??
                                    new();
diff --git a/src/GZCTF/Services/Container/Manager/KubernetesManager.cs b/src/GZCTF/Services/Container/Manager/KubernetesManager.cs
@@ -63,7 +63,7 @@ authSecretName is null
                         ? Array.Empty<V1LocalObjectReference>()
                         : new List<V1LocalObjectReference> { new() { Name = authSecretName } },
                 DnsPolicy = "None",
-                DnsConfig = new() { Nameservers = options.Dns },
+                DnsConfig = new() { Nameservers = options.Dns ?? ["8.8.8.8", "223.5.5.5", "114.114.114.114"] },
                 EnableServiceLinks = false,
                 Containers =
                 [
diff --git a/src/GZCTF/Services/Container/Provider/KubernetesProvider.cs b/src/GZCTF/Services/Container/Provider/KubernetesProvider.cs
@@ -115,7 +115,7 @@ void InitKubernetes(bool withAuth, RegistryConfig? registry)
                                 {
                                     IpBlock = new()
                                     {
-                                        Cidr = "0.0.0.0/0", Except = _kubernetesMetadata.Config.AllowCidr
+                                        Cidr = "0.0.0.0/0", Except = _kubernetesMetadata.Config.AllowCidr ?? ["10.0.0.0/8"]
                                     }
                                 }
                             ]

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public override async Task<bool> VerifyAsync(ModelWithCaptcha model, HttpContext`
`99`	`99`	`public static class CaptchaServiceExtension`
`100`	`100`	`{`
`101`	`101`	`internal static IServiceCollection AddCaptchaService(this IServiceCollection services,`
`102`		`- ConfigurationManager configuration)`
	`102`	`+ IConfiguration configuration)`
`103`	`103`	`{`
`104`	`104`	`CaptchaConfig config = configuration.GetSection(nameof(CaptchaConfig)).Get<CaptchaConfig>() ?? new();`
`105`	`105`
Original file line number	Diff line number	Diff line change
`@@ -142,12 +142,8 @@ public class KubernetesConfig`
`142`	`142`	`{`
`143`	`143`	`public string Namespace { get; set; } = "gzctf-challenges";`
`144`	`144`	`public string KubeConfig { get; set; } = "kube-config.yaml";`
`145`		`-`
`146`		`- [JsonObjectCreationHandling(JsonObjectCreationHandling.Replace)]`
`147`		`- public List<string> AllowCidr { get; set; } = ["10.0.0.0/8"];`
`148`		`-`
`149`		`- [JsonObjectCreationHandling(JsonObjectCreationHandling.Replace)]`
`150`		`- public List<string> Dns { get; set; } = ["8.8.8.8", "223.5.5.5", "114.114.114.114"];`
	`145`	`+ public string[]? AllowCidr { get; set; }`
	`146`	`+ public string[]? Dns { get; set; }`
`151`	`147`	`}`
`152`	`148`
`153`	`149`	`public class RegistryConfig`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public class ContainerProviderMetadata`
`28`	`28`	`public static class ContainerServiceExtension`
`29`	`29`	`{`
`30`	`30`	`internal static IServiceCollection AddContainerService(this IServiceCollection services,`
`31`		`- ConfigurationManager configuration)`
	`31`	`+ IConfiguration configuration)`
`32`	`32`	`{`
`33`	`33`	`ContainerProvider config = configuration.GetSection(nameof(ContainerProvider)).Get<ContainerProvider>() ??`
`34`	`34`	`new();`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ authSecretName is null`
`63`	`63`	`? Array.Empty<V1LocalObjectReference>()`
`64`	`64`	`: new List<V1LocalObjectReference> { new() { Name = authSecretName } },`
`65`	`65`	`DnsPolicy = "None",`
`66`		`- DnsConfig = new() { Nameservers = options.Dns },`
	`66`	`+ DnsConfig = new() { Nameservers = options.Dns ?? ["8.8.8.8", "223.5.5.5", "114.114.114.114"] },`
`67`	`67`	`EnableServiceLinks = false,`
`68`	`68`	`Containers =`
`69`	`69`	`[`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ void InitKubernetes(bool withAuth, RegistryConfig? registry)`
`115`	`115`	`{`
`116`	`116`	`IpBlock = new()`
`117`	`117`	`{`
`118`		`- Cidr = "0.0.0.0/0", Except = _kubernetesMetadata.Config.AllowCidr`
	`118`	`+ Cidr = "0.0.0.0/0", Except = _kubernetesMetadata.Config.AllowCidr ?? ["10.0.0.0/8"]`
`119`	`119`	`}`
`120`	`120`	`}`
`121`	`121`	`]`