-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor, fix object upload bugs, prep for metadata (mtime/mode) copy
- Loading branch information
Showing
8 changed files
with
244 additions
and
41 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,150 @@ | ||
| /* copied from: https://github.com/bramvdbogaerde/go-scp | ||
| * Copyright (c) 2018 Bram Vandenbogaerde | ||
| * You may use, distribute or modify this code under the | ||
| * terms of the Mozilla Public License 2.0, which is distributed | ||
| * along with the source code. | ||
| */ | ||
| package scp | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "errors" | ||
| "fmt" | ||
| "golang.org/x/crypto/ssh" | ||
| "io" | ||
| "io/ioutil" | ||
| "os" | ||
| "path" | ||
| "sync" | ||
| "time" | ||
| ) | ||
|
|
||
| type Client struct { | ||
| // the host to connect to | ||
| Host string | ||
|
|
||
| // the client config to use | ||
| ClientConfig *ssh.ClientConfig | ||
|
|
||
| // stores the SSH session while the connection is running | ||
| Session *ssh.Session | ||
|
|
||
| // stores the SSH connection itself in order to close it after transfer | ||
| Conn ssh.Conn | ||
|
|
||
| // the clients waits for the given timeout until given up the connection | ||
| Timeout time.Duration | ||
|
|
||
| // the absolute path to the remote SCP binary | ||
| RemoteBinary string | ||
| } | ||
|
|
||
| // Connects to the remote SSH server, returns error if it couldn't establish a session to the SSH server | ||
| func (a *Client) Connect() error { | ||
| client, err := ssh.Dial("tcp", a.Host, a.ClientConfig) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| a.Conn = client.Conn | ||
| a.Session, err = client.NewSession() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| //Copies the contents of an os.File to a remote location, it will get the length of the file by looking it up from the filesystem | ||
| func (a *Client) CopyFromFile(file os.File, remotePath string, permissions string) error { | ||
| stat, _ := file.Stat() | ||
| return a.Copy(&file, remotePath, permissions, stat.Size()) | ||
| } | ||
|
|
||
| // Copies the contents of an io.Reader to a remote location, the length is determined by reading the io.Reader until EOF | ||
| // if the file length in know in advance please use "Copy" instead | ||
| func (a *Client) CopyFile(fileReader io.Reader, remotePath string, permissions string) error { | ||
| contents_bytes, _ := ioutil.ReadAll(fileReader) | ||
| bytes_reader := bytes.NewReader(contents_bytes) | ||
|
|
||
| return a.Copy(bytes_reader, remotePath, permissions, int64(len(contents_bytes))) | ||
| } | ||
|
|
||
| // waitTimeout waits for the waitgroup for the specified max timeout. | ||
| // Returns true if waiting timed out. | ||
| func waitTimeout(wg *sync.WaitGroup, timeout time.Duration) bool { | ||
| c := make(chan struct{}) | ||
| go func() { | ||
| defer close(c) | ||
| wg.Wait() | ||
| }() | ||
| select { | ||
| case <-c: | ||
| return false // completed normally | ||
| case <-time.After(timeout): | ||
| return true // timed out | ||
| } | ||
| } | ||
|
|
||
| // Copies the contents of an io.Reader to a remote location | ||
| func (a *Client) Copy(r io.Reader, remotePath string, permissions string, size int64) error { | ||
| filename := path.Base(remotePath) | ||
| directory := path.Dir(remotePath) | ||
|
|
||
| wg := sync.WaitGroup{} | ||
| wg.Add(2) | ||
|
|
||
| errCh := make(chan error, 2) | ||
|
|
||
| go func() { | ||
| defer wg.Done() | ||
| w, err := a.Session.StdinPipe() | ||
| if err != nil { | ||
| errCh <- err | ||
| return | ||
| } | ||
| defer w.Close() | ||
|
|
||
| _, err = fmt.Fprintln(w, "C"+permissions, size, filename) | ||
| if err != nil { | ||
| errCh <- err | ||
| return | ||
| } | ||
|
|
||
| _, err = io.Copy(w, r) | ||
| if err != nil { | ||
| errCh <- err | ||
| return | ||
| } | ||
|
|
||
| _, err = fmt.Fprint(w, "\x00") | ||
| if err != nil { | ||
| errCh <- err | ||
| return | ||
| } | ||
| }() | ||
|
|
||
| go func() { | ||
| defer wg.Done() | ||
| err := a.Session.Run(fmt.Sprintf("%s -qt %s", a.RemoteBinary, directory)) | ||
| if err != nil { | ||
| errCh <- err | ||
| return | ||
| } | ||
| }() | ||
|
|
||
| if waitTimeout(&wg, a.Timeout) { | ||
| return errors.New("timeout when upload files") | ||
| } | ||
| close(errCh) | ||
| for err := range errCh { | ||
| if err != nil { | ||
| return err | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func (a *Client) Close() { | ||
| a.Session.Close() | ||
| a.Conn.Close() | ||
| } |
Oops, something went wrong.