Update Vendors (#250)
update go min version Update Vendors: * code.gitea.io/gitea-vet v0.2.0 -> v0.2.1 * code.gitea.io/sdk/gitea v0.13.0 -> v0.13.1 * github.com/AlecAivazis/survey v2.1.1 -> v2.2.2 * github.com/adrg/xdg v0.2.1 -> v0.2.2 * github.com/araddon/dateparse d820a6159ab1 -> 8aadafed4dc4 * github.com/go-git/go-git v5.1.0 -> v5.2.0 * github.com/muesli/termenv v0.7.2 -> v0.7.4 * github.com/stretchr/testify v1.5.1 -> v1.6.1 * github.com/urfave/cli v2.2.0 -> v2.3.0 Co-authored-by: 6543 <6543@obermui.de> Reviewed-on: https://gitea.com/gitea/tea/pulls/250 Reviewed-by: Andrew Thornton <art27@cantab.net> Reviewed-by: mrsdizzie <info@mrsdizzie.com> Co-Authored-By: 6543 <6543@noreply.gitea.io> Co-Committed-By: 6543 <6543@noreply.gitea.io>
This commit is contained in:
31
vendor/github.com/xanzy/ssh-agent/sshagent_windows.go
generated
vendored
31
vendor/github.com/xanzy/ssh-agent/sshagent_windows.go
generated
vendored
@@ -27,17 +27,40 @@ import (
|
||||
"net"
|
||||
"sync"
|
||||
|
||||
"github.com/Microsoft/go-winio"
|
||||
"golang.org/x/crypto/ssh/agent"
|
||||
)
|
||||
|
||||
const (
|
||||
sshAgentPipe = `\\.\pipe\openssh-ssh-agent`
|
||||
)
|
||||
|
||||
// Available returns true if Pageant is running
|
||||
func Available() bool {
|
||||
if pageantWindow() != 0 {
|
||||
return true
|
||||
}
|
||||
conn, err := winio.DialPipe(sshAgentPipe, nil)
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
conn.Close()
|
||||
return true
|
||||
}
|
||||
|
||||
// New returns a new agent.Agent and the (custom) connection it uses
|
||||
// to communicate with a running pagent.exe instance (see README.md)
|
||||
func New() (agent.Agent, net.Conn, error) {
|
||||
if !Available() {
|
||||
return nil, nil, errors.New("SSH agent requested but Pageant not running")
|
||||
if pageantWindow() != 0 {
|
||||
return agent.NewClient(&conn{}), nil, nil
|
||||
}
|
||||
|
||||
return agent.NewClient(&conn{}), nil, nil
|
||||
conn, err := winio.DialPipe(sshAgentPipe, nil)
|
||||
if err != nil {
|
||||
return nil, nil, errors.New(
|
||||
"SSH agent requested, but could not detect Pageant or Windows native SSH agent",
|
||||
)
|
||||
}
|
||||
return agent.NewClient(conn), nil, nil
|
||||
}
|
||||
|
||||
type conn struct {
|
||||
|
||||
Reference in New Issue
Block a user