re
/
afero
forked from mirror/afero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Dont read HOME/.ssh/id_rsa, create todo

This commit is contained in:
Jerry Jacobs 2016-01-02 14:24:58 +01:00
parent acdc8aab04
commit 719e24f1e2
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sftp_test.go
View File

@ -37,7 +37,10 @@ type SftpFsContext struct {
sftpc *sftp.Client sftpc *sftp.Client
} }
// TODO we only connect with hardcoded user+pass for now
// it should be possible to use $HOME/.ssh/id_rsa to login into the stub sftp server
func SftpConnect(user, password, host string) (*SftpFsContext, error) { func SftpConnect(user, password, host string) (*SftpFsContext, error) {
/*
pemBytes, err := ioutil.ReadFile(os.Getenv("HOME") + "/.ssh/id_rsa") pemBytes, err := ioutil.ReadFile(os.Getenv("HOME") + "/.ssh/id_rsa")
if err != nil { if err != nil {
return nil,err return nil,err
@ -55,6 +58,14 @@ func SftpConnect(user, password, host string) (*SftpFsContext, error) {
ssh.PublicKeys(signer), ssh.PublicKeys(signer),
}, },
} }
*/
sshcfg := &ssh.ClientConfig{
User: user,
Auth: []ssh.AuthMethod{
ssh.Password(password),
},
}
sshc, err := ssh.Dial("tcp", host, sshcfg) sshc, err := ssh.Dial("tcp", host, sshcfg)
if err != nil { if err != nil {
@ -100,7 +111,7 @@ func RunSftpServer(rootpath string) {
debugStream := ioutil.Discard debugStream := ioutil.Discard
if debugStderr { if debugStderr {
debugStream = os.Stderr debugStream = os.Stderr
debugLevel = 5 debugLevel = 1
} }
// An SSH server is represented by a ServerConfig, which holds // An SSH server is represented by a ServerConfig, which holds
@ -234,7 +245,7 @@ func TestSftpCreate(t *testing.T) {
MakeSSHKeyPair(1024, "./test/id_rsa.pub", "./test/id_rsa") MakeSSHKeyPair(1024, "./test/id_rsa.pub", "./test/id_rsa")
go RunSftpServer("./test/") go RunSftpServer("./test/")
time.Sleep(2 * time.Second) time.Sleep(5 * time.Second)
ctx, err := SftpConnect("test", "test", "localhost:2022") ctx, err := SftpConnect("test", "test", "localhost:2022")
if err != nil { if err != nil {
@ -248,6 +259,7 @@ func TestSftpCreate(t *testing.T) {
AppFs.MkdirAll("test/dir1/dir2/dir3", os.FileMode(0777)) AppFs.MkdirAll("test/dir1/dir2/dir3", os.FileMode(0777))
AppFs.Mkdir("test/foo", os.FileMode(0000)) AppFs.Mkdir("test/foo", os.FileMode(0000))
AppFs.Chmod("test/foo", os.FileMode(0700))
AppFs.Mkdir("test/bar", os.FileMode(0777)) AppFs.Mkdir("test/bar", os.FileMode(0777))
file, err := AppFs.Create("file1") file, err := AppFs.Create("file1")