fic/server
Archived
1
0
Fork 0
Code Issues Pull requests 10 Releases Wiki Activity

sync: Try to use a ssh key if no ssh-agent configured

Browse source
This commit is contained in:
nemunaire 2021-11-13 19:52:59 +01:00
parent 3625af47d9
commit 9fe1374a77
1 changed files with 29 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

29
admin/sync/importer_git.go
View file

@ -2,10 +2,14 @@ package sync
import ( import (
"bufio" "bufio"
"io/ioutil"
"log"
"os" "os"
"path"
"github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5"
"github.com/go-git/go-git/v5/config" "github.com/go-git/go-git/v5/config"
"github.com/go-git/go-git/v5/plumbing/transport/ssh"
) )
// GitImporter implements an Importer, where files to imports are located // GitImporter implements an Importer, where files to imports are located
@ -13,12 +17,35 @@ import (
type GitImporter struct { type GitImporter struct {
li LocalImporter li LocalImporter
Remote string Remote string
Auth ssh.AuthMethod
} }
func NewGitImporter(li LocalImporter, remote string) GitImporter { func NewGitImporter(li LocalImporter, remote string) GitImporter {
var auth ssh.AuthMethod
// If there is no ssh-agent setup, try to use a default ssh key
if _, exists := os.LookupEnv("SSH_AUTH_SOCK"); !exists {
if home, exists := os.LookupEnv("HOME"); exists {
for _, d := range []string{"id_fic", "id_ed25519", "id_rsa"} {
pemBytes, err := ioutil.ReadFile(path.Join(home, ".ssh", d))
if err == nil {
log.Println("[GitImporter] Using", path.Join(home, ".ssh", d), "as ssh key to sync repository")
auth, err = ssh.NewPublicKeys("git", pemBytes, "")
if ccfg, err := auth.ClientConfig(); err != nil {
if hkc, err := ssh.NewKnownHostsCallback(); err != nil {
ccfg.HostKeyCallback = hkc
}
}
break
}
}
}
}
return GitImporter{ return GitImporter{
li: li, li: li,
Remote: remote, Remote: remote,
Auth: auth,
} }
} }
@ -57,6 +84,7 @@ func (i GitImporter) Init() error {
_, err = git.PlainClone(i.li.Base, false, &git.CloneOptions{ _, err = git.PlainClone(i.li.Base, false, &git.CloneOptions{
URL: i.Remote, URL: i.Remote,
RecurseSubmodules: git.DefaultSubmoduleRecursionDepth, RecurseSubmodules: git.DefaultSubmoduleRecursionDepth,
Auth: i.Auth,
}) })
if err != nil { if err != nil {
return err return err
@ -98,6 +126,7 @@ func (i GitImporter) Sync() error {
Depth: 1, Depth: 1,
RecurseSubmodules: git.DefaultSubmoduleRecursionDepth, RecurseSubmodules: git.DefaultSubmoduleRecursionDepth,
Force: true, Force: true,
Auth: i.Auth,
}) })
return err return err
} }