Fixed issue with concurrent map reads and writes causing crashes

Author: sktan

src/tools/proxy.go

@@ -11,13 +11,17 @@ import (
 	"net/url"
 	"strconv"
 	"strings"
+	"sync"
 )
 
 var originalUrlResolver = make(map[string]*url.URL)
+var mutex = &sync.Mutex{}
 
 // ProxyRequestHandler intercepts requests to CodeArtifact and add the Authorization header + correct Host header
 func ProxyRequestHandler(p *httputil.ReverseProxy) func(http.ResponseWriter, *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
+
+		mutex.Lock()
 		// Store the original host header for each request
 		originalUrlResolver[r.RemoteAddr] = r.URL
 		originalUrlResolver[r.RemoteAddr].Host = r.Host
@@ -28,6 +32,7 @@ func ProxyRequestHandler(p *httputil.ReverseProxy) func(http.ResponseWriter, *ht
 		} else {
 			originalUrlResolver[r.RemoteAddr].Scheme = "http"
 		}
+		mutex.Unlock()
 
 		// Override the Host header with the CodeArtifact Host
 		u, _ := url.Parse(CodeArtifactAuthInfo.Url)
@@ -51,8 +56,10 @@ func ProxyResponseHandler() func(*http.Response) error {
 
 		contentType := r.Header.Get("Content-Type")
 
+		mutex.Lock()
 		originalUrl := originalUrlResolver[r.Request.RemoteAddr]
 		delete(originalUrlResolver, r.Request.RemoteAddr)
+		mutex.Unlock()
 
 		u, _ := url.Parse(CodeArtifactAuthInfo.Url)
 		hostname := u.Host + ":443"