Merge pull request #36 from gitopia/release-v1.5.0

git credential helper for git lfs auth

Author: ProgramCpp

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes will be documented here.
 
+## [v1.5.0] - 2023-05-17
+
+- git credential helper for git lfs
+- Use git cli instead of go-git for fetch/push
+- Common http basic auth for both git push and lfs
+- Refactor wallets
+- Support fee grant
+- Upgrade gitopia version to v2.0.1
+
 ## [v1.4.0] - 2023-02-22
 
 - Upgrade gitopia version to v1.3.0

Makefile

@@ -30,18 +30,19 @@ build_tags := $(strip $(build_tags))
 BUILD_FLAGS := -tags "$(build_tags) $(GITOPIA_ENV)"
 
 appname := git-remote-gitopia
-version := 1.4.0
+version := $(shell echo $(shell git describe --tags) | sed 's/^v//')
 
 build = GOOS=$(1) GOARCH=$(2) go build $(BUILD_FLAGS) -o build/$(appname)$(3) ./cmd/git-remote-gitopia && \
-    GOOS=$(1) GOARCH=$(2) go build $(BUILD_FLAGS) -o build/git-gitopia$(3) ./cmd/git-gitopia
-tar = cd build && tar -cvzf $(appname)_$(version)_$(1)_$(2).tar.gz $(appname)$(3) git-gitopia$(3) && \
-    rm $(appname)$(3) && rm git-gitopia$(3)
-zip = cd build && zip $(appname)_$(version)_$(1)_$(2).zip $(appname)$(3) git-gitopia$(3) && \
-    rm $(appname)$(3) && rm git-gitopia$(3) 
+    GOOS=$(1) GOARCH=$(2) go build $(BUILD_FLAGS) -o build/git-gitopia$(3) ./cmd/git-gitopia && \
+	GOOS=$(1) GOARCH=$(2) go build $(BUILD_FLAGS) -o build/git-credential-gitopia$(3) ./cmd/git-credential-gitopia
+tar = cd build && tar -cvzf $(appname)_$(version)_$(1)_$(2).tar.gz $(appname)$(3) git-gitopia$(3) git-credential-gitopia$(3) && \
+    rm $(appname)$(3) && rm git-gitopia$(3) && rm git-credential-gitopia$(3)
+zip = cd build && zip $(appname)_$(version)_$(1)_$(2).zip $(appname)$(3) git-gitopia$(3) git-credential-gitopia$(3) && \
+    rm $(appname)$(3) && rm git-gitopia$(3) && rm git-credential-gitopia$(3)
 
 .PHONY: build
 
-all: windows darwin linux git_release_tar_gz git_release_zip
+all: darwin linux git_release_tar_gz git_release_zip
 
 clean:
 	rm -rf build/
@@ -99,6 +100,8 @@ install: go.sum
 	@go install -mod=readonly $(BUILD_FLAGS) ./cmd/git-remote-gitopia
 	@echo "--> Installing git-gitopia"
 	@go install -mod=readonly $(BUILD_FLAGS) ./cmd/git-gitopia
+	@echo "--> Installing git-credential-gitopia"
+	@go install -mod=readonly $(BUILD_FLAGS) ./cmd/git-credential-gitopia
 
 go.sum: go.mod
 	@echo "--> Ensure dependencies have not been modified"

cmd/git-credential-gitopia/main.go

@@ -0,0 +1,89 @@
+package main
+
+import (
+	"bufio"
+	"fmt"
+	"io"
+	"os"
+	"strings"
+
+	"github.com/gitopia/git-remote-gitopia/core/wallet"
+	"github.com/pkg/errors"
+	log "github.com/sirupsen/logrus"
+)
+
+const (
+	actionGet   = "get"
+	actionStore = "store"
+	actionErase = "erase"
+)
+
+func main() {
+	var action string
+	//nolint:gomnd // Just a count of cli arguments, no need to make a constant
+	if len(os.Args) == 2 {
+		action = os.Args[1]
+	}
+
+	switch action {
+
+	case actionGet:
+		handleGetAction()
+
+	case actionErase, actionStore:
+		// Defined action but unsupported by this provider
+		return
+
+	default:
+		log.Fatalf("Unsupported action %q", action)
+
+	}
+}
+
+func handleGetAction() {
+	values, err := readInput(os.Stdin)
+	if err != nil {
+		log.WithError(err).Fatal("Unable to parse input values")
+	}
+
+	if proto := values["protocol"]; proto != "https" {
+		log.Debugf("Unsupported protocol %q", proto)
+		return
+	}
+
+	wallet, err := wallet.InitWallet()
+	if err != nil {
+		log.Debugf(err.Error())
+		return
+	}
+
+	signature, err := wallet.SignData([]byte(values["host"]))
+	if err != nil {
+		log.Debugf(err.Error())
+		return
+	}
+
+	values["username"] = wallet.Address()
+	values["password"] = signature
+
+	fmt.Fprintln(os.Stdout, strings.Join(MapToList(values), "\n"))
+}
+
+func readInput(input io.Reader) (map[string]string, error) {
+	var (
+		lines   []string
+		scanner = bufio.NewScanner(input)
+	)
+
+	for scanner.Scan() {
+		text := strings.TrimSpace(scanner.Text())
+
+		if text == "" {
+			break
+		}
+
+		lines = append(lines, text)
+	}
+
+	return ListToMap(lines), errors.Wrap(scanner.Err(), "Unable to read input")
+}

cmd/git-credential-gitopia/util.go

@@ -0,0 +1,32 @@
+package main
+
+import (
+	"strings"
+)
+
+// ListToMap converts a list of strings in format KEY=VALUE into a map
+func ListToMap(list []string) map[string]string {
+	out := map[string]string{}
+	for _, entry := range list {
+		if len(entry) == 0 || entry[0] == '#' {
+			continue
+		}
+
+		parts := strings.SplitN(entry, "=", 2)
+		if len(parts) == 1 {
+			// No value, set to empty string
+			parts = append(parts, "")
+		}
+		out[parts[0]] = strings.Trim(parts[1], "\"")
+	}
+	return out
+}
+
+// MapToList converts a map into a list of strings in format KEY=VALUE
+func MapToList(envMap map[string]string) []string {
+	out := []string{}
+	for k, v := range envMap {
+		out = append(out, k+"="+v)
+	}
+	return out
+}