Fixes in templating

Author: pomo-mondreganto

config.yml

@@ -18,6 +18,9 @@ vulnboxes:
 farm:
   addr: 127.0.0.1:5137
 
+proxy:
+  addr: 127.0.0.1:8888
+
 mongol:
   addr: 127.0.0.1:5138
 

internal/common/config.go

@@ -23,6 +23,10 @@ type Neo struct {
 	Version string `json:"version" mapstructure:"version"`
 }
 
+type Proxy struct {
+	Addr string `json:"addr" mapstructure:"addr"`
+}
+
 type Service struct {
 	Name       string `json:"name" mapstructure:"name"`
 	Proto      string `json:"proto" mapstructure:"proto"`
@@ -54,6 +58,7 @@ type Config struct {
 	Vulnboxes     []Vulnbox `json:"vulnboxes" mapstructure:"vulnboxes"`
 	Farm          Farm      `json:"farm" mapstructure:"farm"`
 	Neo           Neo       `json:"neo" mapstructure:"neo"`
+	Proxy         Proxy     `json:"proxy" mapstructure:"proxy"`
 	ResourcesPath string    `json:"resources_path" mapstructure:"resources_path"`
 	KeyFile       string    `json:"key_file" mapstructure:"key_file"`
 }

internal/web/routes.go

@@ -89,9 +89,11 @@ func (s *Server) addSSHKey() gin.HandlerFunc {
 
 func (s *Server) replaceVariables(data []byte) []byte {
 	replacements := map[string]string{
-		"VERSION":  s.cfg.Neo.Version,
-		"HOST":     s.cfg.Neo.Addr,
-		"AUTH_KEY": s.cfg.Auth.Password,
+		"NEO_VERSION": s.cfg.Neo.Version,
+		"NEO_ADDR":    s.cfg.Neo.Addr,
+		"FARM_ADDR":   s.cfg.Farm.Addr,
+		"PROXY_ADDR":  s.cfg.Proxy.Addr,
+		"PASSWORD":    s.cfg.Auth.Password,
 	}
 	for k, v := range replacements {
 		data = bytes.ReplaceAll(data, []byte(fmt.Sprintf("$$%s$$", k)), []byte(v))

resources/neo.sh

@@ -4,12 +4,12 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
 COMMAND="$*"
 
 # shellcheck disable=SC2016
-VERSION='v$$VERSION$$'
+VERSION='v$$NEO_VERSION$$'
 
 cat >"${DIR}/client_config.yml" <<-EOT
-host: "$$HOST$$"
+host: "$$NEO_ADDR$$"
 exploit_dir: "data"
-grpc_auth_key: "$$AUTH_KEY$$"
+grpc_auth_key: "$$PASSWORD$$"
 EOT
 
 IMAGE="ghcr.io/pomo-mondreganto/neo_env:${VERSION}"

resources/neo_light.sh

@@ -4,12 +4,12 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
 COMMAND="$*"
 
 # shellcheck disable=SC2016
-VERSION='v$$VERSION$$'
+VERSION='v$$NEO_VERSION$$'
 
 cat >"${DIR}/client_config.yml" <<-EOT
-host: "$$HOST$$"
+host: "$$NEO_ADDR$$"
 exploit_dir: "data"
-grpc_auth_key: "$$AUTH_KEY$$"
+grpc_auth_key: "$$PASSWORD$$"
 EOT
 
 IMAGE="ghcr.io/pomo-mondreganto/neo_env_light:${VERSION}"

resources/neo_sage.sh

@@ -4,12 +4,12 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
 COMMAND="$*"
 
 # shellcheck disable=SC2016
-VERSION='v$$VERSION$$'
+VERSION='v$$NEO_VERSION$$'
 
 cat >"${DIR}/client_config.yml" <<-EOT
-host: "$$HOST$$"
+host: "$$NEO_ADDR$$"
 exploit_dir: "data"
-grpc_auth_key: "$$AUTH_KEY$$"
+grpc_auth_key: "$$PASSWORD$$"
 EOT
 
 IMAGE="ghcr.io/pomo-mondreganto/neo_env_sage:${VERSION}"

resources/start_sploit.py

@@ -78,7 +78,7 @@ def parse_args():
 
     parser.add_argument('sploit',
                         help="Sploit executable (should take a victim's host as the first argument)")
-    parser.add_argument('--server-url', metavar='URL', default='$$SERVER_URL$$',
+    parser.add_argument('--server-url', metavar='URL', default='$$FARM_ADDR$$',
                         help='Server URL')
     parser.add_argument('--server-pass', metavar='PASS', default='$$PASSWORD$$',
                         help='Server password')