commit 3f7f0cfd054f5da747b90cbc24cc3e96f74c67b3 · kot.pink/core

+9 -12
appview/state/git_http.go
···

       3
       3
        
       import (

     

       4
       4
        
       	"fmt"

     

       5
       5
        
       	"io"

     

       6
       6
       +
       	"maps"

     

       6
       7
        
       	"net/http"

     

       7
       8
        
       

     

       8
       9
        
       	"github.com/bluesky-social/indigo/atproto/identity"

     

       9
       10
        
       	"github.com/go-chi/chi/v5"

     

       11
       11
       +
       	"tangled.sh/tangled.sh/core/appview/db"

     

       10
       12
        
       )

     

       11
       13
        
       

     

       12
       14
        
       func (s *State) InfoRefs(w http.ResponseWriter, r *http.Request) {

     

       13
       15
        
       	user := r.Context().Value("resolvedId").(identity.Identity)

     

       14
       14
       -
       	knot := r.Context().Value("knot").(string)

     

       15
       15
       -
       	repo := chi.URLParam(r, "repo")

     

       16
       16
       +
       	repo := r.Context().Value("repo").(*db.Repo)

     

       16
       17
        
       

     

       17
       18
        
       	scheme := "https"

     

       18
       19
        
       	if s.config.Core.Dev {

     

       19
       20
        
       		scheme = "http"

     

       20
       21
        
       	}

     

       21
       22
        
       

     

       22
       22
       -
       	targetURL := fmt.Sprintf("%s://%s/%s/%s/info/refs?%s", scheme, knot, user.DID, repo, r.URL.RawQuery)

     

       23
       23
       +
       	targetURL := fmt.Sprintf("%s://%s/%s/%s/info/refs?%s", scheme, repo.Knot, user.DID, repo.Name, r.URL.RawQuery)

     

       23
       24
        
       	s.proxyRequest(w, r, targetURL)

     

       24
       25
        
       

     

       25
       26
        
       }

     
···

       30
       31
        
       		http.Error(w, "failed to resolve user", http.StatusInternalServerError)

     

       31
       32
        
       		return

     

       32
       33
        
       	}

     

       33
       33
       -
       	knot := r.Context().Value("knot").(string)

     

       34
       34
       -
       	repo := chi.URLParam(r, "repo")

     

       34
       34
       +
       	repo := r.Context().Value("repo").(*db.Repo)

     

       35
       35
        
       

     

       36
       36
        
       	scheme := "https"

     

       37
       37
        
       	if s.config.Core.Dev {

     

       38
       38
        
       		scheme = "http"

     

       39
       39
        
       	}

     

       40
       40
        
       

     

       41
       41
       -
       	targetURL := fmt.Sprintf("%s://%s/%s/%s/git-upload-pack?%s", scheme, knot, user.DID, repo, r.URL.RawQuery)

     

       41
       41
       +
       	targetURL := fmt.Sprintf("%s://%s/%s/%s/git-upload-pack?%s", scheme, repo.Knot, user.DID, repo.Name, r.URL.RawQuery)

     

       42
       42
        
       	s.proxyRequest(w, r, targetURL)

     

       43
       43
        
       }

     

       44
       44
        
       

     
···

       48
       48
        
       		http.Error(w, "failed to resolve user", http.StatusInternalServerError)

     

       49
       49
        
       		return

     

       50
       50
        
       	}

     

       51
       51
       -
       	knot := r.Context().Value("knot").(string)

     

       52
       52
       -
       	repo := chi.URLParam(r, "repo")

     

       51
       51
       +
       	repo := r.Context().Value("repo").(*db.Repo)

     

       53
       52
        
       

     

       54
       53
        
       	scheme := "https"

     

       55
       54
        
       	if s.config.Core.Dev {

     

       56
       55
        
       		scheme = "http"

     

       57
       56
        
       	}

     

       58
       57
        
       

     

       59
       59
       -
       	targetURL := fmt.Sprintf("%s://%s/%s/%s/git-receive-pack?%s", scheme, knot, user.DID, repo, r.URL.RawQuery)

     

       58
       58
       +
       	targetURL := fmt.Sprintf("%s://%s/%s/%s/git-receive-pack?%s", scheme, repo.Knot, user.DID, repo.Name, r.URL.RawQuery)

     

       60
       59
        
       	s.proxyRequest(w, r, targetURL)

     

       61
       60
        
       }

     

       62
       61
        
       

     
···

       85
       84
        
       	defer resp.Body.Close()

     

       86
       85
        
       

     

       87
       86
        
       	// Copy response headers

     

       88
       88
       -
       	for k, v := range resp.Header {

     

       89
       89
       -
       		w.Header()[k] = v

     

       90
       90
       -
       	}

     

       87
       87
       +
       	maps.Copy(w.Header(), resp.Header)

     

       91
       88
        
       

     

       92
       89
        
       	// Set response status code

     

       93
       90
        
       	w.WriteHeader(resp.StatusCode)