Port allocation bug removed and added comments

.env-example

@@ -4,19 +4,16 @@ SERVER = 0.0.0.0
 PORT = 9080
 APP_CONF_DIR = ./conf
 
-CADDY_DOMAIN = webtun.mydomain.com
-NGINX_DOMAIN = sshtun.mydomain.com
-
 # Caddy Specifications
 CADDY_CONF_DIR = /etc/caddy
 CADDY_INTERFACE_NAME = Caddyfile
+CADDY_DOMAIN = webtun.mydomain.com
+CADDY_UPPER_RANGE = 9000
+CADDY_LOWER_RANGE = 8000
 
 # NGINX Specifications
 NGINX_CONF_DIR = /etc/nginx
 NGINX_INTERFACE_NAME = sites-available/tunnel.mydomain.com
-
-# Port values
-CADDY_UPPER_RANGE = 9000
-CADDY_LOWER_RANGE = 8000
+NGINX_DOMAIN = sshtun.mydomain.com
 NGINX_UPPER_RANGE = 7000
 NGINX_LOWER_RANGE = 6000

api/v1/caddy/caddy.go

@@ -35,35 +35,47 @@ func addTunnel(c *gin.Context) {
 	// port allocation
 	max, _ := strconv.Atoi(os.Getenv("CADDY_UPPER_RANGE"))
 	min, _ := strconv.Atoi(os.Getenv("CADDY_LOWER_RANGE"))
-	port, err := core.GetPort(max, min)
-	if err != nil {
-		panic(err)
-	}
 
-	// check validity of tunnel name and port
-	value, msg, err := middleware.IsValidWeb(name, port)
-	if err != nil {
-		resp = util.Message(500, "Server error, Try after some time or Contact Admin...")
-		c.JSON(http.StatusOK, resp)
-	} else if value == -1 {
-		resp = util.Message(404, msg)
-		c.JSON(http.StatusBadRequest, resp)
-	} else if value == 1 {
-		//create a tunnel struct object
-		var data model.Tunnel
-		data.Name = name
-		data.Port = strconv.Itoa(port)
-		data.CreatedAt = time.Now().UTC().Format(time.RFC3339)
-		data.Domain = os.Getenv("CADDY_DOMAIN")
-
-		//to add tunnel config
-		err := middleware.AddWebTunnel(data)
+	for {
+		port, err := core.GetPort(max, min)
+		if err != nil {
+			panic(err)
+		}
+
+		// check validity of tunnel name and port
+		value, msg, err := middleware.IsValidWeb(name, port)
+
 		if err != nil {
 			resp = util.Message(500, "Server error, Try after some time or Contact Admin...")
-			c.JSON(http.StatusInternalServerError, resp)
-		} else {
-			resp = util.MessageTunnel(200, data)
 			c.JSON(http.StatusOK, resp)
+			break
+		} else if value == -1 {
+			if msg == "Port Already in use" {
+				continue
+			}
+
+			resp = util.Message(404, msg)
+			c.JSON(http.StatusBadRequest, resp)
+			break
+		} else if value == 1 {
+			//create a tunnel struct object
+			var data model.Tunnel
+			data.Name = name
+			data.Port = strconv.Itoa(port)
+			data.CreatedAt = time.Now().UTC().Format(time.RFC3339)
+			data.Domain = os.Getenv("CADDY_DOMAIN")
+
+			//to add tunnel config
+			err := middleware.AddWebTunnel(data)
+			if err != nil {
+				resp = util.Message(500, "Server error, Try after some time or Contact Admin...")
+				c.JSON(http.StatusInternalServerError, resp)
+				break
+			} else {
+				resp = util.MessageTunnel(200, data)
+				c.JSON(http.StatusOK, resp)
+				break
+			}
 		}
 	}
 }

api/v1/nginx/nginx.go

@@ -35,34 +35,45 @@ func addTunnel(c *gin.Context) {
 	// port allocation
 	max, _ := strconv.Atoi(os.Getenv("NGINX_UPPER_RANGE"))
 	min, _ := strconv.Atoi(os.Getenv("NGINX_LOWER_RANGE"))
-	port, err := core.GetPort(max, min)
-	if err != nil {
-		panic(err)
-	}
 
-	value, msg, err := middleware.IsValidSSH(name, port)
-	if err != nil {
-		resp = util.Message(500, "Server error, Try after some time or Contact Admin...")
-		c.JSON(http.StatusOK, resp)
-	} else if value == -1 {
-		resp = util.Message(404, msg)
-		c.JSON(http.StatusBadRequest, resp)
-	} else if value == 1 {
-		//create a tunnel struct object
-		var data model.Tunnel
-		data.Name = name
-		data.Port = strconv.Itoa(port)
-		data.CreatedAt = time.Now().UTC().Format(time.RFC3339)
-		data.Domain = os.Getenv("NGINX_DOMAIN")
-
-		//to add tunnel config
-		err := middleware.AddSSHTunnel(data)
+	for {
+		port, err := core.GetPort(max, min)
+		if err != nil {
+			panic(err)
+		}
+
+		value, msg, err := middleware.IsValidSSH(name, port)
 		if err != nil {
 			resp = util.Message(500, "Server error, Try after some time or Contact Admin...")
-			c.JSON(http.StatusInternalServerError, resp)
-		} else {
-			resp = util.MessageTunnel(200, data)
 			c.JSON(http.StatusOK, resp)
+			break
+		} else if value == -1 {
+			if msg == "Port Already in use" {
+				continue
+			}
+
+			resp = util.Message(404, msg)
+			c.JSON(http.StatusBadRequest, resp)
+			break
+		} else if value == 1 {
+			//create a tunnel struct object
+			var data model.Tunnel
+			data.Name = name
+			data.Port = strconv.Itoa(port)
+			data.CreatedAt = time.Now().UTC().Format(time.RFC3339)
+			data.Domain = os.Getenv("NGINX_DOMAIN")
+
+			//to add tunnel config
+			err := middleware.AddSSHTunnel(data)
+			if err != nil {
+				resp = util.Message(500, "Server error, Try after some time or Contact Admin...")
+				c.JSON(http.StatusInternalServerError, resp)
+				break
+			} else {
+				resp = util.MessageTunnel(200, data)
+				c.JSON(http.StatusOK, resp)
+				break
+			}
 		}
 	}
 }

core/core.go

@@ -12,30 +12,36 @@ import (
 	"github.com/TheLazarusNetwork/LazarusTunnel/util"
 )
 
+var AppConfDir = "./conf"
+var CaddyJSON = "caddy.json"
+var NginxJSON = "nginx.json"
+
+var CaddyConfDir = os.Getenv("CADDY_CONF_DIR")
+var CaddyFile = os.Getenv("CADDY_INTERFACE_NAME")
+
+var NginxConfDir = os.Getenv("NGINX_CONF_DIR")
+var NginxFile = os.Getenv("NGINX_INTERFACE_NAME")
+
 //Init initializes json file for caddy and nginx
 func Init() {
 	//caddy.json path
-	path := filepath.Join(os.Getenv("APP_CONF_DIR"), "caddy.json")
-
+	path := filepath.Join(AppConfDir, CaddyJSON)
 	//check if exists
 	if !util.FileExists(path) {
-		file, err := os.OpenFile(path, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
-		util.CheckError("caddy.json error: ", err)
-
-		_, err = file.Write([]byte("[]"))
-		util.CheckError("caddy.json error: ", err)
+		err := util.CreateJSONFile(path)
+		if err != nil {
+			util.CheckError("caddy.json error: ", err)
+		}
 	}
 
 	//nginx.json path
-	path = filepath.Join(os.Getenv("APP_CONF_DIR"), "nginx.json")
-
+	path = filepath.Join(os.Getenv("APP_CONF_DIR"), NginxJSON)
 	//check if exists
 	if !util.FileExists(path) {
-		file, err := os.OpenFile(path, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
-		util.CheckError("nginx.json error: ", err)
-
-		_, err = file.Write([]byte("[]"))
-		util.CheckError("nginx.json error: ", err)
+		err := util.CreateJSONFile(path)
+		if err != nil {
+			util.CheckError("nginx.json error: ", err)
+		}
 	}
 }
 

main.go

@@ -42,12 +42,14 @@ func init() {
 		}
 	}
 
+	// initialize json files and update config files
 	core.Init()
-	middleware.Init()
+	middleware.UpdateCaddyConfig()
+	middleware.UpdateNginxConfig()
 }
 
 func main() {
-	log.WithFields(util.StandardFields).Infof("Starting WalletServices Version: %s", util.Version)
+	log.WithFields(util.StandardFields).Infof("Starting TunnelServices Version: %s", util.Version)
 
 	if os.Getenv("RUNTYPE") == "debug" {
 		// set gin release debug