Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 102 additions & 0 deletions cmd/gogit/daemon.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
package main

import (
"log"
"net"
"path/filepath"
"strconv"

gitserver "github.com/go-git/cli/server/git"
"github.com/go-git/go-billy/v6"
"github.com/go-git/go-billy/v6/osfs"
gitbackend "github.com/go-git/go-git/v6/backend/git"
"github.com/go-git/go-git/v6/plumbing/transport"
"github.com/go-git/go-git/v6/storage"
"github.com/spf13/cobra"
)

var (
daemonExportAll bool
daemonPort int
daemonListen string
)

func init() {
daemonCmd.Flags().BoolVarP(&daemonExportAll, "export-all", "", false, "Export all repositories")
Copy link

Copilot AI Jul 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] The --export-all flag is registered but never used. Consider wiring it into the gitbackend.NewBackend loader logic or removing the flag.

Copilot uses AI. Check for mistakes.
daemonCmd.Flags().IntVarP(&daemonPort, "port", "", 9418, "Port to run the Git daemon on")
daemonCmd.Flags().StringVarP(&daemonListen, "listen", "", "", "Address to listen on (default: all interfaces)")

rootCmd.AddCommand(daemonCmd)
}

var daemonCmd = &cobra.Command{
Use: "daemon [<options>] [<directory>...]",
Short: "Start a Git daemon server",
RunE: func(cmd *cobra.Command, args []string) error {
var dirs []string
if len(args) == 0 {
dirs = append(dirs, ".")
}

loader := NewDirsLoader(dirs, false, daemonExportAll)
addr := net.JoinHostPort(daemonListen, strconv.Itoa(daemonPort))
be := gitbackend.NewBackend(loader)
srv := &gitserver.Server{
Addr: addr,
Handler: gitserver.LoggingMiddleware(log.Default(), be),
ErrorLog: log.Default(),
}

log.Printf("Starting Git daemon on %q", addr)
return srv.ListenAndServe()
},
}

type dirsLoader struct {
loaders []transport.Loader
fss []billy.Filesystem
exportAll bool
}

var _ transport.Loader = (*dirsLoader)(nil)

// NewDirsLoader creates a new dirsLoader with the given directories.
func NewDirsLoader(dirs []string, strict, exportAll bool) *dirsLoader {
var loaders []transport.Loader
var fss []billy.Filesystem
for _, dir := range dirs {
abs, err := filepath.Abs(dir)
if err != nil {
continue
}
fs := osfs.New(abs, osfs.WithBoundOS())
fss = append(fss, fs)
loaders = append(loaders, transport.NewFilesystemLoader(fs, strict))
}
return &dirsLoader{loaders: loaders, fss: fss, exportAll: exportAll}
}

// Load implements transport.Loader.
func (d *dirsLoader) Load(ep *transport.Endpoint) (storage.Storer, error) {
for i, loader := range d.loaders {
storer, err := loader.Load(ep)
if err == nil {
if !d.exportAll {
// We need to check if git-daemon-export-ok
// file exists and if it does not, we skip this
// repository.
dfs := d.fss[i]
okFile := filepath.Join(ep.Path, "git-daemon-export-ok")
stat, err := dfs.Lstat(okFile)
if err != nil || (stat != nil && !stat.Mode().IsRegular()) {
// If the file does not exist or is a directory,
// we skip this repository.
continue
}

}
return storer, nil
}
}
return nil, transport.ErrRepositoryNotFound
}
8 changes: 7 additions & 1 deletion cmd/gogit/main.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package main

import (
"errors"
"fmt"
"os"
"strconv"
Expand Down Expand Up @@ -43,7 +44,12 @@ func init() {

func main() {
if err := rootCmd.Execute(); err != nil {
fmt.Fprintln(os.Stderr, err)
var rerr *transport.RemoteError
if errors.As(err, &rerr) {
fmt.Fprintln(os.Stderr, rerr)
} else {
fmt.Fprintln(os.Stderr, err)
}
os.Exit(1)
}
}
Expand Down
24 changes: 24 additions & 0 deletions server/git/logging.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package git

import (
"context"
"io"
"time"

"github.com/go-git/go-git/v6/plumbing/protocol/packp"
)

type Logger interface {
Printf(format string, v ...interface{})
}

func LoggingMiddleware(logger Logger, next Handler) HandlerFunc {
return func(ctx context.Context, c io.ReadWriteCloser, r *packp.GitProtoRequest) {
now := time.Now()
next.ServeTCP(ctx, c, r)
elapsedTime := time.Since(now)
if logger != nil {
logger.Printf("%s %s %s %v %v", r.Host, r.RequestCommand, r.Pathname, r.ExtraParams, elapsedTime)
}
}
}
Loading