Address Tangled review feedback

abhinavgautam01 · abhinavgautam01 · commit 3563ff772dee · 2026-07-02T14:33:29.000+05:30
diff --git a/tangled/branches.go b/tangled/branches.go
@@ -17,7 +17,10 @@ func (s *branchService) List(ctx context.Context, owner, repo string, opts forge
 	if err != nil {
 		return nil, err
 	}
+	return s.list(ctx, repoDID, opts)
+}
 
+func (s *branchService) list(ctx context.Context, repoDID string, opts forges.ListBranchOpts) ([]forges.Branch, error) {
 	var branches []forges.Branch
 	cursor := ""
 	for {
diff --git a/tangled/repos.go b/tangled/repos.go
@@ -31,7 +31,14 @@ func (s *repoService) Get(ctx context.Context, owner, repo string) (*forges.Repo
 		HasIssues:           true,
 		PullRequestsEnabled: true,
 	}
-	if branches, err := s.f.Branches().List(ctx, owner, repo, forges.ListBranchOpts{Limit: 1}); err == nil && len(branches) > 0 {
+	repoDID := meta.DID
+	if repoDID == "" && strings.HasPrefix(owner, "did:") {
+		repoDID = owner
+	}
+	if repoDID == "" {
+		return result, nil
+	}
+	if branches, err := (&branchService{f: s.f}).list(ctx, repoDID, forges.ListBranchOpts{Limit: 1}); err == nil && len(branches) > 0 {
 		result.DefaultBranch = branches[0].Name
 	}
 	return result, nil
diff --git a/tangled/tangled.go b/tangled/tangled.go
@@ -21,6 +21,7 @@ const (
 	xrpcListBranches = "sh.tangled.git.temp.listBranches"
 	xrpcListTags     = "sh.tangled.git.temp.listTags"
 	xrpcGetTree      = "sh.tangled.git.temp.getTree"
+	maxRepoHTMLBytes = 1 << 20
 )
 
 type tangledForge struct {
@@ -154,13 +155,24 @@ func (f *tangledForge) repoMeta(ctx context.Context, owner, repo string) (*repoM
 		return nil, &forges.HTTPError{StatusCode: resp.StatusCode, URL: req.URL.String(), Body: string(body)}
 	}
 
-	body, err := io.ReadAll(resp.Body)
+	body, err := readLimited(resp.Body, maxRepoHTMLBytes)
 	if err != nil {
 		return nil, err
 	}
 	return parseRepoMeta(string(body)), nil
 }
 
+func readLimited(r io.Reader, limit int64) ([]byte, error) {
+	body, err := io.ReadAll(io.LimitReader(r, limit+1))
+	if err != nil {
+		return nil, err
+	}
+	if int64(len(body)) > limit {
+		return nil, fmt.Errorf("tangled repository metadata response exceeds %d bytes", limit)
+	}
+	return body, nil
+}
+
 func (f *tangledForge) repoDID(ctx context.Context, owner, repo string) (string, error) {
 	if strings.HasPrefix(owner, "did:") {
 		return owner, nil
diff --git a/tangled/tangled_test.go b/tangled/tangled_test.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"net/http"
 	"net/http/httptest"
+	"strings"
 	"testing"
 
 	forges "github.com/git-pkgs/forge"
@@ -32,6 +33,54 @@ func TestRepoGetUsesAppviewMetadataAndBranches(t *testing.T) {
 	}
 }
 
+func TestRepoGetReusesMetadataDIDForDefaultBranch(t *testing.T) {
+	var metadataRequests int
+	mux := http.NewServeMux()
+	mux.HandleFunc("GET /tangled.org/core", func(w http.ResponseWriter, r *http.Request) {
+		metadataRequests++
+		_, _ = fmt.Fprintf(w, `<meta name="vcs:clone" content="%s/tangled.org/core">
+<body data-star-subject-at="at://did:plc:owner/sh.tangled.repo/core"></body>`, "http://"+r.Host)
+	})
+	mux.HandleFunc("GET /xrpc/sh.tangled.git.temp.listBranches", func(w http.ResponseWriter, r *http.Request) {
+		if got := r.URL.Query().Get("repo"); got != "did:plc:owner" {
+			t.Errorf("repo query = %q", got)
+		}
+		_, _ = fmt.Fprint(w, `{"branches":[{"name":"master"}]}`)
+	})
+	srv := httptest.NewServer(mux)
+	defer srv.Close()
+
+	f := New(srv.URL, "", srv.Client())
+	repo, err := f.Repos().Get(context.Background(), "tangled.org", "core")
+	if err != nil {
+		t.Fatalf("Get returned error: %v", err)
+	}
+	if repo.DefaultBranch != "master" {
+		t.Errorf("DefaultBranch = %q", repo.DefaultBranch)
+	}
+	if metadataRequests != 1 {
+		t.Errorf("metadata requests = %d, want 1", metadataRequests)
+	}
+}
+
+func TestRepoGetRejectsOversizedMetadata(t *testing.T) {
+	mux := http.NewServeMux()
+	mux.HandleFunc("GET /tangled.org/core", func(w http.ResponseWriter, r *http.Request) {
+		_, _ = w.Write([]byte(strings.Repeat("x", maxRepoHTMLBytes+1)))
+	})
+	srv := httptest.NewServer(mux)
+	defer srv.Close()
+
+	f := New(srv.URL, "", srv.Client())
+	_, err := f.Repos().Get(context.Background(), "tangled.org", "core")
+	if err == nil {
+		t.Fatal("expected oversized metadata error")
+	}
+	if !strings.Contains(err.Error(), "exceeds") {
+		t.Errorf("expected size limit error, got %v", err)
+	}
+}
+
 func TestBranchListUsesTangledXRPC(t *testing.T) {
 	srv := tangledTestServer(t)
 	f := New(srv.URL, "", srv.Client())
