Add org mapping

Signed-off-by: Tamal Saha <tamal@appscode.com>

Author: tamalsaha

main.go

@@ -27,7 +27,7 @@ func main() {
 	logger := logging.FromContext(context.Background())
 
 	if !opts.EnableSSL {
-		http.Handle("/", redirect.New())
+		http.Handle("/", redirect.New(opts))
 
 		logger.Infof("Listening on port %d", opts.Port)
 		logger.Fatal(http.ListenAndServe(fmt.Sprintf(":%d", opts.Port), nil))
@@ -45,7 +45,7 @@ func main() {
 	}
 	server := &http.Server{
 		Addr:         ":https",
-		Handler:      redirect.New(),
+		Handler:      redirect.New(opts),
 		ReadTimeout:  5 * time.Second,
 		WriteTimeout: 5 * time.Second,
 		IdleTimeout:  120 * time.Second,

pkg/redirect/options.go

@@ -5,11 +5,12 @@ import (
 )
 
 type Options struct {
-	CertDir   string
-	CertEmail string
-	Hosts     []string
-	Port      int
-	EnableSSL bool
+	CertDir    string
+	CertEmail  string
+	Hosts      []string
+	Port       int
+	EnableSSL  bool
+	OrgMapping map[string]string
 }
 
 func NewOptions() *Options {
@@ -18,6 +19,17 @@ func NewOptions() *Options {
 		CertEmail: "tamal@appscode.com",
 		Hosts:     []string{"r.appscode.com", "r.appscode.ninja", "r.byte.builders"},
 		Port:      8080,
+		OrgMapping: map[string]string{
+			"appscode":  "appscode",
+			"charts":    "appscode-charts",
+			"kubedb":    "kubedb",
+			"kubeform":  "kubeform",
+			"kubestash": "kubestash",
+			"kubevault": "kubevault",
+			"library":   "appscode-images",
+			"stash":     "stashed",
+			"voyager":   "voyagermesh",
+		},
 	}
 }
 
@@ -27,4 +39,5 @@ func (s *Options) AddFlags(fs *pflag.FlagSet) {
 	fs.StringSliceVar(&s.Hosts, "ssl.hosts", s.Hosts, "Hosts for which certificate will be issued")
 	fs.IntVar(&s.Port, "port", s.Port, "Port used when SSL is not enabled")
 	fs.BoolVar(&s.EnableSSL, "ssl", s.EnableSSL, "Set true to enable SSL via Let's Encrypt")
+	fs.StringToStringVar(&s.OrgMapping, "org-mapping", s.OrgMapping, "Proxy org to GitHub org mappings")
 }

pkg/redirect/redirect.go

@@ -16,10 +16,7 @@ import (
 	"knative.dev/pkg/logging"
 )
 
-var orgMappings = map[string]string{
-	"appscode": "appscode-images",
-	"kubedb":   "kubedb-images",
-}
+var opts *Options
 
 func redact(in http.Header) http.Header {
 	h := in.Clone()
@@ -29,7 +26,8 @@ func redact(in http.Header) http.Header {
 	return h
 }
 
-func New() http.Handler {
+func New(o *Options) http.Handler {
+	opts = o
 	router := mux.NewRouter()
 
 	router.Use(func(next http.Handler) http.Handler {
@@ -114,7 +112,7 @@ func token(resp http.ResponseWriter, req *http.Request) {
 
 	vals := req.URL.Query()
 	scope := vals.Get("scope")
-	for orgKey, ghOrg := range orgMappings {
+	for orgKey, ghOrg := range opts.OrgMapping {
 		if strings.HasPrefix(scope, "repository:"+orgKey+"/") {
 			scope = strings.Replace(scope, "repository:"+orgKey+"/", "repository:"+ghOrg+"/", 1)
 			break
@@ -166,7 +164,7 @@ func proxy(resp http.ResponseWriter, req *http.Request) {
 	repo := mux.Vars(req)["repo"]
 	rest := mux.Vars(req)["rest"]
 
-	url := fmt.Sprintf("https://ghcr.io/v2/%s/%s/%s", orgMappings[org], repo, rest)
+	url := fmt.Sprintf("https://ghcr.io/v2/%s/%s/%s", opts.OrgMapping[org], repo, rest)
 	if query := req.URL.Query().Encode(); query != "" {
 		url += "?" + query
 	}
@@ -221,7 +219,7 @@ func proxy(resp http.ResponseWriter, req *http.Request) {
 	link := back.Header.Get("Link")
 	if link != "" {
 		rewrittenLink := link
-		for orgKey, ghOrg := range orgMappings {
+		for orgKey, ghOrg := range opts.OrgMapping {
 			if strings.HasPrefix(link, "/v2/"+ghOrg+"/") {
 				rewrittenLink = strings.Replace(link, "/v2/"+ghOrg+"/", "/v2/"+orgKey+"/", 1)
 				break
@@ -240,7 +238,7 @@ func proxy(resp http.ResponseWriter, req *http.Request) {
 			http.Error(resp, err.Error(), http.StatusInternalServerError)
 			return
 		}
-		for _, ghOrg := range orgMappings {
+		for _, ghOrg := range opts.OrgMapping {
 			if strings.HasPrefix(lr.Name, ghOrg+"/") {
 				lr.Name = strings.TrimPrefix(lr.Name, ghOrg+"/")
 				break
@@ -279,7 +277,7 @@ func ghpage(resp http.ResponseWriter, req *http.Request) {
 	logger := logging.FromContext(ctx)
 
 	url := req.URL.String()
-	for orgKey, ghOrg := range orgMappings {
+	for orgKey, ghOrg := range opts.OrgMapping {
 		if req.URL.Path == "/"+orgKey || strings.HasPrefix(req.URL.Path, "/"+orgKey+"/") {
 			url = fmt.Sprintf("https://ghcr.io%s", strings.Replace(req.URL.Path, "/"+orgKey, "/"+ghOrg, 1))
 			break

pkg/redirect/redirect_test.go

@@ -18,7 +18,7 @@ import (
 )
 
 func TestRedirect(t *testing.T) {
-	s := httptest.NewServer(redirect.New())
+	s := httptest.NewServer(redirect.New(redirect.NewOptions()))
 	defer s.Close()
 
 	reg := strings.TrimPrefix(s.URL, "http://")
@@ -44,7 +44,7 @@ func TestRedirect(t *testing.T) {
 }
 
 func TestGHPageRedirect(t *testing.T) {
-	s := httptest.NewServer(redirect.New())
+	s := httptest.NewServer(redirect.New(redirect.NewOptions()))
 
 	for _, path := range []string{
 		"/",
@@ -53,7 +53,7 @@ func TestGHPageRedirect(t *testing.T) {
 		"/busybox@sha256:abcdef",
 	} {
 		t.Run(path, func(t *testing.T) {
-			req, err := http.NewRequest(http.MethodGet, s.URL+"/appscode"+path, nil)
+			req, err := http.NewRequest(http.MethodGet, s.URL+"/library"+path, nil)
 			if err != nil {
 				t.Fatal(err)
 			}