Add a local cache module

cache_ui/advertise.go

@@ -19,6 +19,7 @@
 package cache_ui
 
 import (
+	"context"
 	"encoding/json"
 	"net/url"
 	"strings"
@@ -76,14 +77,14 @@ func (server *CacheServer) GetNamespaceAdsFromDirector() error {
 	// Attempt to get data from the 2.0 endpoint, if that returns a 404 error, then attempt to get data
 	// from the 1.0 endpoint and convert from V1 to V2
 
-	respData, err := utils.MakeRequest(directorNSListEndpointURL, "GET", nil, nil)
+	respData, err := utils.MakeRequest(context.Background(), directorNSListEndpointURL, "GET", nil, nil)
 	if err != nil {
 		if strings.Contains(err.Error(), "404") {
 			directorNSListEndpointURL, err = url.JoinPath(directorEndpoint, "api", "v1.0", "director", "listNamespaces")
 			if err != nil {
 				return err
 			}
-			respData, err = utils.MakeRequest(directorNSListEndpointURL, "GET", nil, nil)
+			respData, err = utils.MakeRequest(context.Background(), directorNSListEndpointURL, "GET", nil, nil)
 			var respNSV1 []common.NamespaceAdV1
 			if err != nil {
 				return errors.Wrap(err, "Failed to make request")

client/director.go

@@ -23,6 +23,7 @@ import (
 	"io"
 	"net/http"
 	"net/url"
+	"path"
 	"sort"
 	"strconv"
 	"strings"
@@ -244,7 +245,9 @@ func NewTransferDetailsUsingDirector(cache namespaces.DirectorCache, opts transf
 		log.Errorln("Failed to parse cache:", cache, "error:", err)
 		return nil
 	}
-	if cacheURL.Host == "" {
+	if cacheURL.Scheme == "unix" && cacheURL.Host != "" {
+		cacheURL.Path = path.Clean("/" + path.Join(cacheURL.Host, cacheURL.Path))
+	} else if cacheURL.Host == "" {
 		// Assume the cache is just a hostname
 		cacheURL.Host = cacheEndpoint
 		cacheURL.Path = ""
@@ -253,26 +256,31 @@ func NewTransferDetailsUsingDirector(cache namespaces.DirectorCache, opts transf
 	}
 	log.Debugf("Parsed Cache: %s", cacheURL.String())
 	if opts.NeedsToken {
-		cacheURL.Scheme = "https"
-		if !hasPort(cacheURL.Host) {
-			// Add port 8444 and 8443
-			urlCopy := *cacheURL
-			urlCopy.Host += ":8444"
-			details = append(details, transferAttemptDetails{
-				Url:        &urlCopy,
-				Proxy:      false,
-				PackOption: opts.PackOption,
-			})
-			// Strip the port off and add 8443
-			cacheURL.Host = cacheURL.Host + ":8443"
+		// Unless we're using the local Unix domain socket cache, force HTTPS
+		if cacheURL.Scheme != "unix" {
+			cacheURL.Scheme = "https"
+			if !hasPort(cacheURL.Host) {
+				// Add port 8444 and 8443
+				urlCopy := *cacheURL
+				urlCopy.Host += ":8444"
+				details = append(details, transferAttemptDetails{
+					Url:        &urlCopy,
+					Proxy:      false,
+					PackOption: opts.PackOption,
+				})
+				// Strip the port off and add 8443
+				cacheURL.Host = cacheURL.Host + ":8443"
+			}
 		}
 		// Whether port is specified or not, add a transfer without proxy
 		details = append(details, transferAttemptDetails{
 			Url:        cacheURL,
 			Proxy:      false,
 			PackOption: opts.PackOption,
 		})
-	} else {
+	} else if cacheURL.Scheme == "" || cacheURL.Scheme == "http" {
+		// Assume a transfer not needing a token and not specifying a scheme is HTTP
+		// WARNING: This is legacy code; we should always specify a scheme
 		cacheURL.Scheme = "http"
 		if !hasPort(cacheURL.Host) {
 			cacheURL.Host += ":8000"
@@ -290,6 +298,14 @@ func NewTransferDetailsUsingDirector(cache namespaces.DirectorCache, opts transf
 				PackOption: opts.PackOption,
 			})
 		}
+	} else {
+		// A non-HTTP scheme is specified and a token is not needed; this wasn't possible
+		// in the legacy cases.  Simply use the provided config
+		details = append(details, transferAttemptDetails{
+			Url:        cacheURL,
+			Proxy:      false,
+			PackOption: opts.PackOption,
+		})
 	}
 
 	return details