Fixes #411

Author: vfarcic

server/server.go

@@ -264,20 +264,26 @@ func (m *serve) getServiceFromEnvVars(prefix string) (proxy.Service, error) {
 	httpsOnly, _ := strconv.ParseBool(os.Getenv(prefix + "_HTTPS_ONLY"))
 	httpsRedirectCode := os.Getenv(prefix + "_HTTPS_REDIRECT_CODE")
 	globalOutboundHostname := os.Getenv(prefix + "_OUTBOUND_HOSTNAME")
+	reqPathSearchReplace := os.Getenv(prefix + "_REQ_PATH_SEARCH_REPLACE")
+	reqPathSearchReplaceFormatted := []string{}
+	if len(reqPathSearchReplace) > 0 {
+		reqPathSearchReplaceFormatted = strings.Split(reqPathSearchReplace, ":")
+	}
 
 	if len(path) > 0 || len(port) > 0 {
 		sd = append(
 			sd,
 			proxy.ServiceDest{
-				HttpsOnly:            httpsOnly,
-				HttpsRedirectCode:    httpsRedirectCode,
-				OutboundHostname:     globalOutboundHostname,
-				Port:                 port,
-				ReqMode:              reqMode,
-				ReqPathSearchReplace: os.Getenv(prefix + "_REQ_PATH_SEARCH_REPLACE"),
-				ServiceDomain:        domain,
-				ServicePath:          path,
-				SrcPort:              srcPort,
+				HttpsOnly:                     httpsOnly,
+				HttpsRedirectCode:             httpsRedirectCode,
+				OutboundHostname:              globalOutboundHostname,
+				Port:                          port,
+				ReqMode:                       reqMode,
+				ReqPathSearchReplace:          reqPathSearchReplace,
+				ReqPathSearchReplaceFormatted: reqPathSearchReplaceFormatted,
+				ServiceDomain:                 domain,
+				ServicePath:                   path,
+				SrcPort:                       srcPort,
 			},
 		)
 	}
@@ -286,6 +292,10 @@ func (m *serve) getServiceFromEnvVars(prefix string) (proxy.Service, error) {
 		path := os.Getenv(fmt.Sprintf("%s_SERVICE_PATH_%d", prefix, i))
 		reqMode := os.Getenv(fmt.Sprintf("%s_REQ_MODE_%d", prefix, i))
 		reqPathSearchReplace := os.Getenv(fmt.Sprintf("%s_REQ_PATH_SEARCH_REPLACE_%d", prefix, i))
+		reqPathSearchReplaceFormatted := []string{}
+		if len(reqPathSearchReplace) > 0 {
+			reqPathSearchReplaceFormatted = strings.Split(reqPathSearchReplace, ":")
+		}
 		httpsOnly, _ := strconv.ParseBool(os.Getenv(fmt.Sprintf("%s_HTTPS_ONLY_%d", prefix, i)))
 		httpsRedirectCode := os.Getenv(fmt.Sprintf("%s_HTTPS_REDIRECT_CODE_%d", prefix, i))
 		if len(reqMode) == 0 {
@@ -300,14 +310,15 @@ func (m *serve) getServiceFromEnvVars(prefix string) (proxy.Service, error) {
 			sd = append(
 				sd,
 				proxy.ServiceDest{
-					HttpsOnly:            httpsOnly,
-					HttpsRedirectCode:    httpsRedirectCode,
-					OutboundHostname:     outboundHostname,
-					Port:                 port,
-					ReqPathSearchReplace: reqPathSearchReplace,
-					SrcPort:              srcPort,
-					ServicePath:          strings.Split(path, ","),
-					ReqMode:              reqMode,
+					HttpsOnly:                     httpsOnly,
+					HttpsRedirectCode:             httpsRedirectCode,
+					OutboundHostname:              outboundHostname,
+					Port:                          port,
+					ReqPathSearchReplace:          reqPathSearchReplace,
+					ReqPathSearchReplaceFormatted: reqPathSearchReplaceFormatted,
+					SrcPort:     srcPort,
+					ServicePath: strings.Split(path, ","),
+					ReqMode:     reqMode,
 				},
 			)
 		} else {

server/server_test.go

@@ -686,15 +686,16 @@ func (s *ServerTestSuite) Test_GetServicesFromEnvVars_ReturnsServices() {
 		TimeoutTunnel:         "my-TimeoutTunnel",
 		ServiceDest: []proxy.ServiceDest{
 			{
-				HttpsOnly:            true,
-				HttpsRedirectCode:    "302",
-				OutboundHostname:     "my-OutboundHostname",
-				Port:                 "1111",
-				ReqPathSearchReplace: "/something,/else",
-				ServiceDomain:        []string{"my-domain-1.com", "my-domain-2.com"},
-				ServicePath:          []string{"my-path-11", "my-path-12"},
-				SrcPort:              1112,
-				ReqMode:              "my-ReqMode",
+				HttpsOnly:                     true,
+				HttpsRedirectCode:             "302",
+				OutboundHostname:              "my-OutboundHostname",
+				Port:                          "1111",
+				ReqPathSearchReplace:          "/something,/else:/this,/that",
+				ReqPathSearchReplaceFormatted: []string{"/something,/else", "/this,/that"},
+				ServiceDomain:                 []string{"my-domain-1.com", "my-domain-2.com"},
+				ServicePath:                   []string{"my-path-11", "my-path-12"},
+				SrcPort:                       1112,
+				ReqMode:                       "my-ReqMode",
 			},
 		},
 	}
@@ -779,9 +780,10 @@ func (s *ServerTestSuite) Test_GetServicesFromEnvVars_SetsServiceDomainAlgoToHdr
 		ServiceName: "my-ServiceName",
 		ServiceDest: []proxy.ServiceDest{
 			{
-				ServiceDomain: []string{"my-domain-1.com", "my-domain-2.com"},
-				ServicePath:   []string{"my-path-11", "my-path-12"},
-				ReqMode:       "http",
+				ReqMode: "http",
+				ReqPathSearchReplaceFormatted: []string{},
+				ServiceDomain:                 []string{"my-domain-1.com", "my-domain-2.com"},
+				ServicePath:                   []string{"my-path-11", "my-path-12"},
 			},
 		},
 		ServiceDomainAlgo: "hdr_dom(host)",
@@ -809,18 +811,20 @@ func (s *ServerTestSuite) Test_GetServicesFromEnvVars_ReturnsServicesWithIndexed
 		ServiceName: "my-ServiceName",
 		ServiceDest: []proxy.ServiceDest{
 			{
-				Port:                 "1111",
-				ReqPathSearchReplace: "/this,/that",
-				ServicePath:          []string{"my-path-11", "my-path-12"},
-				SrcPort:              1112,
-				HttpsOnly:            true,
+				Port:                          "1111",
+				ReqPathSearchReplace:          "/this,/that",
+				ReqPathSearchReplaceFormatted: []string{"/this,/that"},
+				ServicePath:                   []string{"my-path-11", "my-path-12"},
+				SrcPort:                       1112,
+				HttpsOnly:                     true,
 			}, {
-				Port:                 "2221",
-				ReqPathSearchReplace: "/something,/else",
-				ServicePath:          []string{"my-path-21", "my-path-22"},
-				SrcPort:              2222,
-				HttpsOnly:            false,
-				OutboundHostname:     "my-outbound-domain.com",
+				Port:                          "2221",
+				ReqPathSearchReplace:          "/something,/else",
+				ReqPathSearchReplaceFormatted: []string{"/something,/else"},
+				ServicePath:                   []string{"my-path-21", "my-path-22"},
+				SrcPort:                       2222,
+				HttpsOnly:                     false,
+				OutboundHostname:              "my-outbound-domain.com",
 			},
 		},
 	}
@@ -872,11 +876,12 @@ func (s *ServerTestSuite) Test_GetServicesFromEnvVars_ReturnsMultipleServices()
 		ServiceName: "my-ServiceName",
 		ServiceDest: []proxy.ServiceDest{
 			{
-				Port:          "1111",
-				ServiceDomain: []string{},
-				ServicePath:   []string{"my-path-11", "my-path-12"},
-				SrcPort:       1112,
-				ReqMode:       "http",
+				Port: "1111",
+				ReqPathSearchReplaceFormatted: []string{},
+				ServiceDomain:                 []string{},
+				ServicePath:                   []string{"my-path-11", "my-path-12"},
+				SrcPort:                       1112,
+				ReqMode:                       "http",
 			},
 		},
 	}