From 35cdff904fcd70f9204165444fd8c9abf146854e Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Sun, 1 Dec 2019 15:27:53 -0800
Subject: [PATCH] [#3896bk] Support using configuration param inline with other
 values

---
 parser/helpers.go | 18 ++++++++++++++++--
 parser/parser.go  | 10 ----------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/parser/helpers.go b/parser/helpers.go
index de449c6..abdd071 100644
--- a/parser/helpers.go
+++ b/parser/helpers.go
@@ -7,10 +7,20 @@ import (
 	"github.com/pkg/errors"
 	"io/ioutil"
 	"os"
+	"regexp"
 	"strconv"
 	"strings"
 )
 
+// Regex to match anything that has a value matching the format of {{ config.$1 }} which
+// will cause the program to lookup that configuration value from itself and set that
+// value to the configuration one.
+//
+// This allows configurations to reference values that are node dependent, such as the
+// internal IP address used by the daemon, useful in Bungeecord setups for example, where
+// it is common to see variables such as "{{config.docker.interface}}"
+var configMatchRegex = regexp.MustCompile(`{{\s?config\.([\w.-]+)\s?}}`)
+
 // Gets the []byte representation of a configuration file to be passed through to other
 // handler functions. If the file does not currently exist, it will be created.
 func readFileBytes(path string) ([]byte, error) {
@@ -106,7 +116,9 @@ func (f *ConfigurationFile) LookupConfigurationValue(cfr ConfigurationFileReplac
 	// If there is a match, lookup the value in the configuration for the Daemon. If no key
 	// is found, just return the string representation, otherwise use the value from the
 	// daemon configuration here.
-	huntPath := configMatchRegex.ReplaceAllString(cfr.Value, "$1")
+	huntPath := configMatchRegex.ReplaceAllString(
+		configMatchRegex.FindString(cfr.Value), "$1",
+	)
 
 	var path []string
 	// The camel casing is important here, the configuration for the Daemon does not use
@@ -128,6 +140,8 @@ func (f *ConfigurationFile) LookupConfigurationValue(cfr ConfigurationFileReplac
 		// is a replace issue at play.
 		return []byte(cfr.Value), cfr.ValueType, nil
 	} else {
-		return match, cfr.ValueType, nil
+		replaced := []byte(configMatchRegex.ReplaceAllString(cfr.Value, string(match)))
+
+		return replaced, cfr.ValueType, nil
 	}
 }
diff --git a/parser/parser.go b/parser/parser.go
index eb5b36b..1bd8a05 100644
--- a/parser/parser.go
+++ b/parser/parser.go
@@ -14,7 +14,6 @@ import (
 	"gopkg.in/ini.v1"
 	"io/ioutil"
 	"os"
-	"regexp"
 	"strings"
 )
 
@@ -28,15 +27,6 @@ const (
 	Xml        = "xml"
 )
 
-// Regex to match anything that has a value matching the format of {{ config.$1 }} which
-// will cause the program to lookup that configuration value from itself and set that
-// value to the configuration one.
-//
-// This allows configurations to reference values that are node dependent, such as the
-// internal IP address used by the daemon, useful in Bungeecord setups for example, where
-// it is common to see variables such as "{{config.docker.interface}}"
-var configMatchRegex = regexp.MustCompile(`^{{\s?config\.([\w.-]+)\s?}}$`)
-
 type ConfigurationParser string
 
 // Defines a configuration file for the server startup. These will be looped over