back round 0 view raw

knotserver/xrpc: add sh.tangled.repo.deleteBranch #643

merged

opened by

oppi.li 2 months ago targeting master from push-rvtqynpmozzy

Signed-off-by: oppiliappan me@oppi.li

options

unified split

Changed files

+153

api

tangled

repodeleteBranch.go

knotserver

git

branch.go

xrpc

delete_branch.go

xrpc.go

lexicons

repo

deleteBranch.json

+30

api/tangled/repodeleteBranch.go

···

       1
       +
       // Code generated by cmd/lexgen (see Makefile's lexgen); DO NOT EDIT.

     

       2
       +
       

     

       3
       +
       package tangled

     

       4
       +
       

     

       5
       +
       // schema: sh.tangled.repo.deleteBranch

     

       6
       +
       

     

       7
       +
       import (

     

       8
       +
       	"context"

     

       9
       +
       

     

       10
       +
       	"github.com/bluesky-social/indigo/lex/util"

     

       11
       +
       )

     

       12
       +
       

     

       13
       +
       const (

     

       14
       +
       	RepoDeleteBranchNSID = "sh.tangled.repo.deleteBranch"

     

       15
       +
       )

     

       16
       +
       

     

       17
       +
       // RepoDeleteBranch_Input is the input argument to a sh.tangled.repo.deleteBranch call.

     

       18
       +
       type RepoDeleteBranch_Input struct {

     

       19
       +
       	Branch string `json:"branch" cborgen:"branch"`

     

       20
       +
       	Repo   string `json:"repo" cborgen:"repo"`

     

       21
       +
       }

     

       22
       +
       

     

       23
       +
       // RepoDeleteBranch calls the XRPC method "sh.tangled.repo.deleteBranch".

     

       24
       +
       func RepoDeleteBranch(ctx context.Context, c util.LexClient, input *RepoDeleteBranch_Input) error {

     

       25
       +
       	if err := c.LexDo(ctx, util.Procedure, "application/json", "sh.tangled.repo.deleteBranch", nil, input, nil); err != nil {

     

       26
       +
       		return err

     

       27
       +
       	}

     

       28
       +
       

     

       29
       +
       	return nil

     

       30
       +
       }

knotserver/git/branch.go

···

       110
        
       	slices.Reverse(branches)

     

       111
        
       	return branches, nil

     

       112
        
       }

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0

···

       110
        
       	slices.Reverse(branches)

     

       111
        
       	return branches, nil

     

       112
        
       }

     

       113
       +
       

     

       114
       +
       func (g *GitRepo) DeleteBranch(branch string) error {

     

       115
       +
       	ref := plumbing.NewBranchReferenceName(branch)

     

       116
       +
       	return g.r.Storer.RemoveReference(ref)

     

       117
       +
       }

+87

knotserver/xrpc/delete_branch.go

···

       1
       +
       package xrpc

     

       2
       +
       

     

       3
       +
       import (

     

       4
       +
       	"encoding/json"

     

       5
       +
       	"fmt"

     

       6
       +
       	"net/http"

     

       7
       +
       

     

       8
       +
       	comatproto "github.com/bluesky-social/indigo/api/atproto"

     

       9
       +
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       10
       +
       	"github.com/bluesky-social/indigo/xrpc"

     

       11
       +
       	securejoin "github.com/cyphar/filepath-securejoin"

     

       12
       +
       	"tangled.org/core/api/tangled"

     

       13
       +
       	"tangled.org/core/knotserver/git"

     

       14
       +
       	"tangled.org/core/rbac"

     

       15
       +
       

     

       16
       +
       	xrpcerr "tangled.org/core/xrpc/errors"

     

       17
       +
       )

     

       18
       +
       

     

       19
       +
       func (x *Xrpc) DeleteBranch(w http.ResponseWriter, r *http.Request) {

     

       20
       +
       	l := x.Logger

     

       21
       +
       	fail := func(e xrpcerr.XrpcError) {

     

       22
       +
       		l.Error("failed", "kind", e.Tag, "error", e.Message)

     

       23
       +
       		writeError(w, e, http.StatusBadRequest)

     

       24
       +
       	}

     

       25
       +
       

     

       26
       +
       	actorDid, ok := r.Context().Value(ActorDid).(syntax.DID)

     

       27
       +
       	if !ok {

     

       28
       +
       		fail(xrpcerr.MissingActorDidError)

     

       29
       +
       		return

     

       30
       +
       	}

     

       31
       +
       

     

       32
       +
       	var data tangled.RepoDeleteBranch_Input

     

       33
       +
       	if err := json.NewDecoder(r.Body).Decode(&data); err != nil {

     

       34
       +
       		fail(xrpcerr.GenericError(err))

     

       35
       +
       		return

     

       36
       +
       	}

     

       37
       +
       

     

       38
       +
       	// unfortunately we have to resolve repo-at here

     

       39
       +
       	repoAt, err := syntax.ParseATURI(data.Repo)

     

       40
       +
       	if err != nil {

     

       41
       +
       		fail(xrpcerr.InvalidRepoError(data.Repo))

     

       42
       +
       		return

     

       43
       +
       	}

     

       44
       +
       

     

       45
       +
       	// resolve this aturi to extract the repo record

     

       46
       +
       	ident, err := x.Resolver.ResolveIdent(r.Context(), repoAt.Authority().String())

     

       47
       +
       	if err != nil || ident.Handle.IsInvalidHandle() {

     

       48
       +
       		fail(xrpcerr.GenericError(fmt.Errorf("failed to resolve handle: %w", err)))

     

       49
       +
       		return

     

       50
       +
       	}

     

       51
       +
       

     

       52
       +
       	xrpcc := xrpc.Client{Host: ident.PDSEndpoint()}

     

       53
       +
       	resp, err := comatproto.RepoGetRecord(r.Context(), &xrpcc, "", tangled.RepoNSID, repoAt.Authority().String(), repoAt.RecordKey().String())

     

       54
       +
       	if err != nil {

     

       55
       +
       		fail(xrpcerr.GenericError(err))

     

       56
       +
       		return

     

       57
       +
       	}

     

       58
       +
       

     

       59
       +
       	repo := resp.Value.Val.(*tangled.Repo)

     

       60
       +
       	didPath, err := securejoin.SecureJoin(actorDid.String(), repo.Name)

     

       61
       +
       	if err != nil {

     

       62
       +
       		fail(xrpcerr.GenericError(err))

     

       63
       +
       		return

     

       64
       +
       	}

     

       65
       +
       

     

       66
       +
       	if ok, err := x.Enforcer.IsPushAllowed(actorDid.String(), rbac.ThisServer, didPath); !ok || err != nil {

     

       67
       +
       		l.Error("insufficent permissions", "did", actorDid.String())

     

       68
       +
       		writeError(w, xrpcerr.AccessControlError(actorDid.String()), http.StatusUnauthorized)

     

       69
       +
       		return

     

       70
       +
       	}

     

       71
       +
       

     

       72
       +
       	path, _ := securejoin.SecureJoin(x.Config.Repo.ScanPath, didPath)

     

       73
       +
       	gr, err := git.PlainOpen(path)

     

       74
       +
       	if err != nil {

     

       75
       +
       		fail(xrpcerr.GenericError(err))

     

       76
       +
       		return

     

       77
       +
       	}

     

       78
       +
       

     

       79
       +
       	err = gr.DeleteBranch(data.Branch)

     

       80
       +
       	if err != nil {

     

       81
       +
       		l.Error("deleting branch", "error", err.Error(), "branch", data.Branch)

     

       82
       +
       		writeError(w, xrpcerr.GitError(err), http.StatusInternalServerError)

     

       83
       +
       		return

     

       84
       +
       	}

     

       85
       +
       

     

       86
       +
       	w.WriteHeader(http.StatusOK)

     

       87
       +
       }

knotserver/xrpc/xrpc.go

···

       38
        
       		r.Use(x.ServiceAuth.VerifyServiceAuth)

     

       39
        
       

     

       40
        
       		r.Post("/"+tangled.RepoSetDefaultBranchNSID, x.SetDefaultBranch)

     

       0
        
       
     

       41
        
       		r.Post("/"+tangled.RepoCreateNSID, x.CreateRepo)

     

       42
        
       		r.Post("/"+tangled.RepoDeleteNSID, x.DeleteRepo)

     

       43
        
       		r.Post("/"+tangled.RepoForkStatusNSID, x.ForkStatus)

···

       38
        
       		r.Use(x.ServiceAuth.VerifyServiceAuth)

     

       39
        
       

     

       40
        
       		r.Post("/"+tangled.RepoSetDefaultBranchNSID, x.SetDefaultBranch)

     

       41
       +
       		r.Post("/"+tangled.RepoDeleteBranchNSID, x.DeleteBranch)

     

       42
        
       		r.Post("/"+tangled.RepoCreateNSID, x.CreateRepo)

     

       43
        
       		r.Post("/"+tangled.RepoDeleteNSID, x.DeleteRepo)

     

       44
        
       		r.Post("/"+tangled.RepoForkStatusNSID, x.ForkStatus)

+30

lexicons/repo/deleteBranch.json

···

       1
       +
       {

     

       2
       +
         "lexicon": 1,

     

       3
       +
         "id": "sh.tangled.repo.deleteBranch",

     

       4
       +
         "defs": {

     

       5
       +
           "main": {

     

       6
       +
             "type": "procedure",

     

       7
       +
             "description": "Delete a branch on this repository",

     

       8
       +
             "input": {

     

       9
       +
               "encoding": "application/json",

     

       10
       +
               "schema": {

     

       11
       +
                 "type": "object",

     

       12
       +
                 "required": [

     

       13
       +
                   "repo",

     

       14
       +
                   "branch"

     

       15
       +
                 ],

     

       16
       +
                 "properties": {

     

       17
       +
                   "repo": {

     

       18
       +
                     "type": "string",

     

       19
       +
                     "format": "at-uri"

     

       20
       +
                   },

     

       21
       +
                   "branch": {

     

       22
       +
                     "type": "string"

     

       23
       +
                   }

     

       24
       +
                 }

     

       25
       +
               }

     

       26
       +
             }

     

       27
       +
           }

     

       28
       +
         }

     

       29
       +
       }

     

       30
       +