From 0b751ca163fb92540094796e9315fd80d6277ab1 Mon Sep 17 00:00:00 2001
From: Yann Stepienik <azukaar@gmail.com>
Date: Sat, 22 Jul 2023 15:46:43 +0100
Subject: [PATCH] [release] 0.9.10

---
 changelog.md          |  5 +++++
 package.json          |  2 +-
 readme.md             |  1 -
 src/docker/network.go | 14 ++++++++------
 src/proxy/shield.go   |  6 ++++++
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/changelog.md b/changelog.md
index 5ac6d72..1c7c81c 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,8 @@
+## Version 0.9.10
+ - Never ban gateway ips
+ - Prevent deleting networks if there's an error on disconnect
+ - Disabling network pruning now also disables cleaning up Cosmos networks
+
 ## Version 0.9.9
  - Add new filters for routes based on method, query strings and headers (missing UI)
 
diff --git a/package.json b/package.json
index 3e879be..cd2746b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cosmos-server",
-  "version": "0.9.9",
+  "version": "0.9.10",
   "description": "",
   "main": "test-server.js",
   "bugs": {
diff --git a/readme.md b/readme.md
index 229b361..234f8c8 100644
--- a/readme.md
+++ b/readme.md
@@ -7,7 +7,6 @@
 <p align="center"><a href="https://github.com/zarevskaya"><img src="https://avatars.githubusercontent.com/zarevskaya" style="border-radius:48px" width="48" height="48" alt="zarev" title="zarev" /></a>
 <a href="https://github.com/DrMxrcy"><img src="https://avatars.githubusercontent.com/DrMxrcy" style="border-radius:48px" width="48" height="48" alt="null" title="null" /></a>
 <a href="https://github.com/soldier1"><img src="https://avatars.githubusercontent.com/soldier1" style="border-radius:48px" width="48" height="48" alt="null" title="null" /></a>
-<a href="https://github.com/LarsNorgaard"><img src="https://avatars.githubusercontent.com/LarsNorgaard" style="border-radius:48px" width="48" height="48" alt="Lars Nørgaard" title="Lars Nørgaard" /></a>
 <a href="https://github.com/devcircus"><img src="https://avatars.githubusercontent.com/devcircus" style="border-radius:48px" width="48" height="48" alt="Clayton Stone" title="Clayton Stone" /></a>
 <a href="https://github.com/vp-en"><img src="https://avatars.githubusercontent.com/vp-en" style="border-radius:48px" width="48" height="48" alt="vp-en" title="vp-en" /></a>
 </p><!-- /sponsors -->
diff --git a/src/docker/network.go b/src/docker/network.go
index ef06e1d..d826575 100644
--- a/src/docker/network.go
+++ b/src/docker/network.go
@@ -392,10 +392,15 @@ func CreateLinkNetwork(containerName string, container2Name string) error {
 var DebouncedNetworkCleanUp = _debounceNetworkCleanUp()
 
 func NetworkCleanUp() {
+	config := utils.GetMainConfig()
+	
+	if(config.DockerConfig.SkipPruneNetwork) {
+		return
+	}
+
 	DockerNetworkLock <- true
 	defer func() { <-DockerNetworkLock }()
 
-	config := utils.GetMainConfig()
 	
 	utils.Log("Cleaning up orphan networks...")
 
@@ -427,12 +432,8 @@ func NetworkCleanUp() {
 		}
 
 		utils.Debug("Ready to Check network: " + network.Name)
-
-		if(config.DockerConfig.SkipPruneNetwork){
-			utils.Debug("Skipping network prune")
-		}
 		
-		if(!config.DockerConfig.SkipPruneNetwork && len(network.Containers) == 0) {
+		if(len(network.Containers) == 0) {
 			utils.Log("Removing orphan network: " + network.Name)
 			err := DockerClient.NetworkRemove(DockerContext, network.ID)
 			if err != nil {
@@ -463,6 +464,7 @@ func NetworkCleanUp() {
 			err := DockerClient.NetworkDisconnect(DockerContext, network.ID, self, true)
 			if err != nil {
 				utils.Error("DockerNetworkCleanupDisconnect", err)
+				continue
 			}
 			err = DockerClient.NetworkRemove(DockerContext, network.ID)
 			if err != nil {
diff --git a/src/proxy/shield.go b/src/proxy/shield.go
index 95b8c89..01f6a68 100644
--- a/src/proxy/shield.go
+++ b/src/proxy/shield.go
@@ -118,6 +118,12 @@ func (shield *smartShieldState) isAllowedToReqest(policy utils.SmartShieldPolicy
 	defer shield.Unlock()
 
 	ClientID := userConsumed.ClientID
+
+	if ClientID == "192.168.1.1" || 
+		 ClientID == "192.168.0.1" ||
+		 ClientID == "172.17.0.1" {
+		return true
+	}
 	
 	nbTempBans := 0
 	nbStrikes := 0