Compare commits

...

54 Commits

Author SHA1 Message Date
Bo-Yi Wu 6d6124e8d8 docs: add fingerprint 2020-05-21 23:13:26 +08:00
Bo-Yi Wu f4fff01bdb chore: missing Ciphers in removeAllDestFile 2020-05-21 23:09:53 +08:00
Bo-Yi Wu ac8ff855ae chore: update ssh server 2020-05-21 23:09:10 +08:00
Bo-Yi Wu 2ff51f00ff chore: support Fingerprint (#114) 2020-05-21 23:08:17 +08:00
Bo-Yi Wu b0f9b5b277 remove load env file from urfave/cli
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2020-05-05 09:36:22 +08:00
Bo-Yi Wu 457861ab2a chore(ssh): support Ciphers
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2020-05-04 10:27:02 +08:00
techknowlogick 1996e5d780 Add option to use file for host info (#113) 2020-04-29 14:22:30 +08:00
Bo-Yi Wu c75daae1f3 upgrade go version
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2020-04-16 15:29:15 +08:00
Bo-Yi Wu 72e6ea15b6 upgrade easyssh-proxy
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2020-04-16 15:28:58 +08:00
Bo-Yi Wu bad565d475 update success message format.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2020-02-27 09:53:36 +08:00
Bo-Yi Wu 8216bd8fb8 update to go 1.14
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2020-02-27 09:51:12 +08:00
Daniel Bingham 3d36432240 Fix typo in EnvVars for ssh-passphrase (#109) 2020-02-27 08:58:49 +08:00
Bo-Yi Wu 2fcaffcac8 docs: update passphrase variable
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2020-02-07 13:27:23 +08:00
Bo-Yi Wu c1e3242f53 update module
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2020-02-07 13:24:23 +08:00
Bo-Yi Wu 8e4a3f5e0c chore(makefile): remove GOPACKAGE variable 2020-02-01 00:41:34 +08:00
Bo-Yi Wu fe231a1c43 docs: add passphrase 2020-01-20 22:37:45 +08:00
Bo-Yi Wu 177625c6e7 chore: support passphrase (#107)
* chore: support passphrase
2020-01-20 22:34:16 +08:00
Bo-Yi Wu bb6466e8d9 chore: upgrade easyssh-proxy to v1.3.0 2020-01-19 23:40:00 +08:00
Bo-Yi Wu e5eae442c3 chore: update urfave/cli to v2 2020-01-19 23:38:47 +08:00
Bo-Yi Wu b73ec894ab chore: update default timeout to 10 minutes 2019-11-30 23:08:26 +08:00
Bo-Yi Wu 05eba8f809 docs(install): Add export GO111MODULE=on 2019-11-12 10:34:51 +08:00
Bo-Yi Wu a2493062f7 upgrade go module
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2019-11-12 10:11:21 +08:00
Bo-Yi Wu b2b346a0ca update example
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2019-11-04 14:11:57 +08:00
Bo-Yi Wu 9d8f5ac419 update
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2019-11-04 13:43:54 +08:00
Bo-Yi Wu 5d93e7b8ab docs: update diff format 2019-10-18 22:40:46 +08:00
Bo-Yi Wu bf812f8e29 update docs
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2019-10-14 23:34:52 +08:00
Bo-Yi Wu 8814cfe72c docs: update drone 2019-10-14 23:33:18 +08:00
Bo-Yi Wu 954e0069e6 docs: update readme 2019-10-10 01:25:32 +08:00
Bo-Yi Wu 03524ed8bd docs: update to drone 1.0 format. 2019-09-29 02:01:24 +08:00
Bo-Yi Wu 531df19c8c docs: update drone docs. 2019-09-28 21:36:07 +08:00
Bo-Yi Wu df8214b645 chore: remove microbadge url 2019-09-28 17:33:25 +08:00
Bo-Yi Wu c85ca1ffd2 feat(tar): add Overwrite flag (#102)
* feat(tar): add Overwrite flag

* chore: remove

* chore: output

* chore: output
2019-09-28 16:59:01 +08:00
Ivo Nunes 933b45bc15 Add variable to set temporary tar upload path (#100) 2019-09-28 16:36:05 +08:00
Bo-Yi Wu 15344d67ae fix strip-components
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2019-09-28 16:30:07 +08:00
Bo-Yi Wu cf9e6f260d chore: debug command 2019-09-28 14:52:31 +08:00
Bo-Yi Wu cfa325a8c4 refactor: Add args command 2019-09-28 14:40:28 +08:00
Bo-Yi Wu c8dbddab25 chore: support -arch= 2019-09-28 14:14:15 +08:00
Bo-Yi Wu 1b27d28b27 chore: upgrade package 2019-09-28 12:52:08 +08:00
Bo-Yi Wu 8a0b0f3c0c chore(GitHub): support actions parameter. 2019-09-28 10:30:15 +08:00
Bo-Yi Wu ec489106f9 chore: upgrade to go1.13 2019-09-28 10:04:29 +08:00
Bo-Yi Wu 9ed20ee32d docs: fix markdown lint 2019-09-28 09:59:58 +08:00
Bo-Yi Wu 2aee5a3df1 docs: update 2019-08-03 23:51:16 +08:00
Bo-Yi Wu bc633e27cf docs: fix markdown lint 2019-08-03 18:55:27 +08:00
Bo-Yi Wu 9dad691d4f docs: update example 2019-08-03 18:55:02 +08:00
Bo-Yi Wu 66579b6dae chore: add proxy variable 2019-05-11 19:51:39 +08:00
Bo-Yi Wu 06609f35cf add key variable
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2019-05-11 16:50:50 +08:00
Bo-Yi Wu c9771cce78 chore: add variable 2019-05-11 16:49:20 +08:00
Bo-Yi Wu 6088f7da5a chore: update build tag 2019-05-11 16:34:36 +08:00
Bo-Yi Wu 6de8f74170 docs: add ignore list example. 2019-05-11 14:34:40 +08:00
Bo-Yi Wu bb63d55f89 Update README.md 2019-05-09 14:08:52 +08:00
Bo-Yi Wu da44b071c4 chore: switch finished to struct{} for zero allocate (#96) 2019-03-30 07:26:53 +08:00
Bo-Yi Wu a7eddc4b11 docs: fix setting
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2019-03-11 17:22:33 +08:00
Bo-Yi Wu 813faf56be chore: remove build number 2019-03-10 23:43:06 +08:00
Bo-Yi Wu 4117d2ca30 fix: trigger build fail if error (#94)
fix #93
2019-03-10 23:41:21 +08:00
14 changed files with 760 additions and 400 deletions
+14 -37
View File
@@ -9,47 +9,39 @@ platform:
steps: steps:
- name: vet - name: vet
pull: always pull: always
image: golang:1.12 image: golang:1.14
commands: commands:
- make vet - make vet
environment:
GO111MODULE: on
volumes: volumes:
- name: gopath - name: gopath
path: /go path: /go
- name: lint - name: lint
pull: always pull: always
image: golang:1.12 image: golang:1.14
commands: commands:
- make lint - make lint
environment:
GO111MODULE: on
volumes: volumes:
- name: gopath - name: gopath
path: /go path: /go
- name: misspell - name: misspell
pull: always pull: always
image: golang:1.12 image: golang:1.14
commands: commands:
- make misspell-check - make misspell-check
environment:
GO111MODULE: on
volumes: volumes:
- name: gopath - name: gopath
path: /go path: /go
- name: test - name: test
pull: always pull: always
image: golang:1.12-alpine image: golang:1.14-alpine
commands: commands:
- apk add git make curl perl bash build-base zlib-dev ucl-dev - apk add git make curl perl bash build-base zlib-dev ucl-dev
- make ssh-server - make ssh-server
- make test - make test
- make coverage - make coverage
environment:
GO111MODULE: on
volumes: volumes:
- name: gopath - name: gopath
path: /go path: /go
@@ -76,12 +68,11 @@ platform:
steps: steps:
- name: build-push - name: build-push
pull: always pull: always
image: golang:1.12 image: golang:1.14
commands: commands:
- "go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/amd64/drone-scp" - "go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/amd64/drone-scp"
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
GO111MODULE: on
when: when:
event: event:
exclude: exclude:
@@ -89,19 +80,18 @@ steps:
- name: build-tag - name: build-tag
pull: always pull: always
image: golang:1.12 image: golang:1.14
commands: commands:
- "go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/amd64/drone-scp" - "go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/amd64/drone-scp"
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
GO111MODULE: on
when: when:
event: event:
- tag - tag
- name: executable - name: executable
pull: always pull: always
image: golang:1.12 image: golang:1.14
commands: commands:
- ./release/linux/amd64/drone-scp --help - ./release/linux/amd64/drone-scp --help
@@ -157,12 +147,11 @@ platform:
steps: steps:
- name: build-push - name: build-push
pull: always pull: always
image: golang:1.12 image: golang:1.14
commands: commands:
- "go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm64/drone-scp" - "go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm64/drone-scp"
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
GO111MODULE: on
when: when:
event: event:
exclude: exclude:
@@ -170,19 +159,18 @@ steps:
- name: build-tag - name: build-tag
pull: always pull: always
image: golang:1.12 image: golang:1.14
commands: commands:
- "go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm64/drone-scp" - "go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm64/drone-scp"
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
GO111MODULE: on
when: when:
event: event:
- tag - tag
- name: executable - name: executable
pull: always pull: always
image: golang:1.12 image: golang:1.14
commands: commands:
- ./release/linux/arm64/drone-scp --help - ./release/linux/arm64/drone-scp --help
@@ -238,12 +226,11 @@ platform:
steps: steps:
- name: build-push - name: build-push
pull: always pull: always
image: golang:1.12 image: golang:1.14
commands: commands:
- "go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm/drone-scp" - "go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm/drone-scp"
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
GO111MODULE: on
when: when:
event: event:
exclude: exclude:
@@ -251,19 +238,18 @@ steps:
- name: build-tag - name: build-tag
pull: always pull: always
image: golang:1.12 image: golang:1.14
commands: commands:
- "go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm/drone-scp" - "go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm/drone-scp"
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
GO111MODULE: on
when: when:
event: event:
- tag - tag
- name: executable - name: executable
pull: always pull: always
image: golang:1.12 image: golang:1.14
commands: commands:
- ./release/linux/arm/drone-scp --help - ./release/linux/arm/drone-scp --help
@@ -319,11 +305,9 @@ platform:
steps: steps:
- name: build-all-binary - name: build-all-binary
pull: always pull: always
image: golang:1.12 image: golang:1.14
commands: commands:
- make release - make release
environment:
GO111MODULE: on
when: when:
event: event:
- tag - tag
@@ -367,13 +351,6 @@ steps:
username: username:
from_secret: docker_username from_secret: docker_username
- name: microbadger
pull: always
image: plugins/webhook:1
settings:
url:
from_secret: microbadger_url
trigger: trigger:
ref: ref:
- refs/heads/master - refs/heads/master
+88 -46
View File
@@ -11,35 +11,21 @@ image: appleboy/drone-scp
The SCP plugin copy files and artifacts to target host machine via SSH. The below pipeline configuration demonstrates simple usage: The SCP plugin copy files and artifacts to target host machine via SSH. The below pipeline configuration demonstrates simple usage:
```yaml ```yaml
pipeline: - name: scp files
scp: image: appleboy/drone-scp
image: appleboy/drone-scp settings:
settings: host: example.com
host: example.com username: foo
target: /home/deploy/web password: bar
source: release.tar.gz port: 22
``` target: /var/www/deploy/${DRONE_REPO_OWNER}/${DRONE_REPO_NAME}
source: release.tar.gz
Example configuration with custom username, password and port:
```diff
pipeline:
scp:
image: appleboy/drone-scp
settings:
host: example.com
+ username: appleboy
+ password: 12345678
+ port: 4430
target: /home/deploy/web
source: release.tar.gz
``` ```
Example configuration with multiple source and target folder: Example configuration with multiple source and target folder:
```diff ```diff
pipeline: - name: scp files
scp:
image: appleboy/drone-scp image: appleboy/drone-scp
settings: settings:
host: example.com host: example.com
@@ -54,8 +40,7 @@ pipeline:
Example configuration with multiple host: Example configuration with multiple host:
```diff ```diff
pipeline: - name: scp files
scp:
image: appleboy/drone-scp image: appleboy/drone-scp
settings: settings:
- host: example.com - host: example.com
@@ -69,8 +54,7 @@ pipeline:
Example configuration with wildcard pattern of source list: Example configuration with wildcard pattern of source list:
```diff ```diff
pipeline: - name: scp files
scp:
image: appleboy/drone-scp image: appleboy/drone-scp
settings: settings:
host: host:
@@ -86,9 +70,8 @@ pipeline:
Remove target folder before copy files and artifacts to target: Remove target folder before copy files and artifacts to target:
```diff ```diff
scp: - name: scp files
image: appleboy/drone-scp image: appleboy/drone-scp
host: example.com
settings: settings:
target: /home/deploy/web target: /home/deploy/web
source: release.tar.gz source: release.tar.gz
@@ -98,7 +81,7 @@ Remove target folder before copy files and artifacts to target:
Example for remove the specified number of leading path elements: Example for remove the specified number of leading path elements:
```diff ```diff
scp: - name: scp files
image: appleboy/drone-scp image: appleboy/drone-scp
settings: settings:
host: example.com host: example.com
@@ -110,8 +93,7 @@ Example for remove the specified number of leading path elements:
Example configuration using SSHProxyCommand: Example configuration using SSHProxyCommand:
```diff ```diff
pipeline: - name: scp files
scp:
image: appleboy/drone-scp image: appleboy/drone-scp
settings: settings:
host: host:
@@ -129,8 +111,7 @@ pipeline:
Example configuration using password from secrets: Example configuration using password from secrets:
```diff ```diff
pipeline: - name: scp files
scp:
image: appleboy/drone-scp image: appleboy/drone-scp
settings: settings:
host: host:
@@ -140,7 +121,7 @@ pipeline:
port: 22 port: 22
- password: 1234 - password: 1234
+ password: + password:
from_secret: ssh_password + from_secret: ssh_password
target: /home/deploy/web target: /home/deploy/web
source: source:
- release/*.tar.gz - release/*.tar.gz
@@ -149,24 +130,64 @@ pipeline:
Example configuration using command timeout: Example configuration using command timeout:
```diff ```diff
pipeline: - name: scp files
scp: image: appleboy/drone-scp
settings:
host:
- example1.com
- example2.com
user: ubuntu
password:
from_secret: ssh_password
port: 22
- command_timeout: 120
+ command_timeout: 2m
target: /home/deploy/web
source:
- release/*.tar.gz
```
Example configuration for ignore list:
```diff
- name: scp files
image: appleboy/drone-scp image: appleboy/drone-scp
settings: settings:
host: host:
- example1.com - example1.com
- example2.com - example2.com
user: ubuntu user: ubuntu
port: 22 password:
- command_timeout: 120
+ command_timeout: 2m
from_secret: ssh_password from_secret: ssh_password
port: 22
command_timeout: 2m
target: /home/deploy/web target: /home/deploy/web
source: source:
- release/*.tar.gz + - !release/README.md
- release/*
``` ```
# Parameter Reference Example configuration for passphrase which protecting a private key:
```diff
- name: scp files
image: appleboy/drone-scp
settings:
host:
- example1.com
- example2.com
user: ubuntu
+ key:
+ from_secret: ssh_key
+ passphrase: 1234
port: 22
command_timeout: 2m
target: /home/deploy/web
source:
- release/*
```
## Parameter Reference
host host
: target hostname or IP : target hostname or IP
@@ -183,6 +204,12 @@ password
key key
: plain text of user private key : plain text of user private key
passphrase
: The purpose of the passphrase is usually to encrypt the private key.
fingerprint
: fingerprint SHA256 of the host public key, default is to skip verification
target target
: folder path of target host : folder path of target host
@@ -193,14 +220,23 @@ rm
: remove target folder before copy files and artifacts : remove target folder before copy files and artifacts
timeout timeout
: timeout is the maximum amount of time for the TCP connection to establish : Timeout is the maximum amount of time for the ssh connection to establish, default is 30 seconds.
command_timeout command_timeout
: timeout is the maximum amount of time for execute command : Command timeout is the maximum amount of time for the execute commands, default is 10 minutes.
strip_components strip_components
: remove the specified number of leading path elements : remove the specified number of leading path elements
tar_tmp_path
: temporary path for tar file on the dest host
tar_exec
: alternative `tar` executable to on the dest host
overwrite
: use `--overwrite` flag with tar
proxy_host proxy_host
: proxy hostname or IP : proxy hostname or IP
@@ -219,7 +255,13 @@ proxy_key
proxy_key_path proxy_key_path
: key path of proxy private key : key path of proxy private key
# Template Reference proxy_passphrase
: The purpose of the passphrase is usually to encrypt the private key.
proxy_fingerprint
: fingerprint SHA256 of the host public key, default is to skip verification
## Template Reference
repo.owner repo.owner
: repository owner : repository owner
+9 -9
View File
@@ -8,7 +8,7 @@ DEPLOY_ACCOUNT := appleboy
DEPLOY_IMAGE := $(EXECUTABLE) DEPLOY_IMAGE := $(EXECUTABLE)
TARGETS ?= linux darwin windows TARGETS ?= linux darwin windows
PACKAGES ?= $(shell $(GO) list ./...) ARCHS ?= amd64 386
SOURCES ?= $(shell find . -name "*.go" -type f) SOURCES ?= $(shell find . -name "*.go" -type f)
TAGS ?= TAGS ?=
LDFLAGS ?= -X 'main.Version=$(VERSION)' LDFLAGS ?= -X 'main.Version=$(VERSION)'
@@ -31,7 +31,7 @@ fmt:
$(GOFMT) -w $(SOURCES) $(GOFMT) -w $(SOURCES)
vet: vet:
$(GO) vet $(PACKAGES) $(GO) vet ./...
lint: lint:
@hash revive > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ @hash revive > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
@@ -63,7 +63,7 @@ fmt-check:
fi; fi;
test: fmt-check test: fmt-check
@$(GO) test -v -cover -coverprofile coverage.txt $(PACKAGES) && echo "\n==>\033[32m Ok\033[m\n" || exit 1 @$(GO) test -v -cover -coverprofile coverage.txt ./... && echo "\n==>\033[32m Ok\033[m\n" || exit 1
install: $(SOURCES) install: $(SOURCES)
$(GO) install -v -tags '$(TAGS)' -ldflags '$(EXTLDFLAGS)-s -w $(LDFLAGS)' $(GO) install -v -tags '$(TAGS)' -ldflags '$(EXTLDFLAGS)-s -w $(LDFLAGS)'
@@ -82,7 +82,7 @@ release-build:
@which gox > /dev/null; if [ $$? -ne 0 ]; then \ @which gox > /dev/null; if [ $$? -ne 0 ]; then \
$(GO) get -u github.com/mitchellh/gox; \ $(GO) get -u github.com/mitchellh/gox; \
fi fi
gox -os="$(TARGETS)" -tags="$(TAGS)" -ldflags="-s -w $(LDFLAGS)" -output="$(DIST)/binaries/$(EXECUTABLE)-$(VERSION)-{{.OS}}-{{.Arch}}" gox -os="$(TARGETS)" -arch="$(ARCHS)" -tags="$(TAGS)" -ldflags="-s -w $(LDFLAGS)" -output="$(DIST)/binaries/$(EXECUTABLE)-$(VERSION)-{{.OS}}-{{.Arch}}"
release-copy: release-copy:
$(foreach file,$(wildcard $(DIST)/binaries/$(EXECUTABLE)-*),cp $(file) $(DIST)/release/$(notdir $(file));) $(foreach file,$(wildcard $(DIST)/binaries/$(EXECUTABLE)-*),cp $(file) $(DIST)/release/$(notdir $(file));)
@@ -117,15 +117,18 @@ endif
docker push $(DEPLOY_ACCOUNT)/$(DEPLOY_IMAGE):$(tag) docker push $(DEPLOY_ACCOUNT)/$(DEPLOY_IMAGE):$(tag)
ssh-server: ssh-server:
adduser -h /home/drone-scp -s /bin/bash -D -S drone-scp adduser -h /home/drone-scp -s /bin/sh -D -S drone-scp
echo drone-scp:1234 | chpasswd echo drone-scp:1234 | chpasswd
mkdir -p /home/drone-scp/.ssh mkdir -p /home/drone-scp/.ssh
chmod 700 /home/drone-scp/.ssh chmod 700 /home/drone-scp/.ssh
cp tests/.ssh/id_rsa.pub /home/drone-scp/.ssh/authorized_keys cat tests/.ssh/id_rsa.pub >> /home/drone-scp/.ssh/authorized_keys
cat tests/.ssh/test.pub >> /home/drone-scp/.ssh/authorized_keys
chmod 600 /home/drone-scp/.ssh/authorized_keys
chown -R drone-scp /home/drone-scp/.ssh chown -R drone-scp /home/drone-scp/.ssh
# install ssh and start server # install ssh and start server
apk add --update openssh openrc apk add --update openssh openrc
rm -rf /etc/ssh/ssh_host_rsa_key /etc/ssh/ssh_host_dsa_key rm -rf /etc/ssh/ssh_host_rsa_key /etc/ssh/ssh_host_dsa_key
sed -i 's/^#PubkeyAuthentication yes/PubkeyAuthentication yes/g' /etc/ssh/sshd_config
sed -i 's/AllowTcpForwarding no/AllowTcpForwarding yes/g' /etc/ssh/sshd_config sed -i 's/AllowTcpForwarding no/AllowTcpForwarding yes/g' /etc/ssh/sshd_config
./tests/entrypoint.sh /usr/sbin/sshd -D & ./tests/entrypoint.sh /usr/sbin/sshd -D &
@@ -135,6 +138,3 @@ coverage:
clean: clean:
$(GO) clean -x -i ./... $(GO) clean -x -i ./...
rm -rf coverage.txt $(EXECUTABLE) $(DIST) rm -rf coverage.txt $(EXECUTABLE) $(DIST)
version:
@echo $(VERSION)
+37 -49
View File
@@ -5,7 +5,7 @@
[![codecov](https://codecov.io/gh/appleboy/drone-scp/branch/master/graph/badge.svg)](https://codecov.io/gh/appleboy/drone-scp) [![codecov](https://codecov.io/gh/appleboy/drone-scp/branch/master/graph/badge.svg)](https://codecov.io/gh/appleboy/drone-scp)
[![Go Report Card](https://goreportcard.com/badge/github.com/appleboy/drone-scp)](https://goreportcard.com/report/github.com/appleboy/drone-scp) [![Go Report Card](https://goreportcard.com/badge/github.com/appleboy/drone-scp)](https://goreportcard.com/report/github.com/appleboy/drone-scp)
[![Docker Pulls](https://img.shields.io/docker/pulls/appleboy/drone-scp.svg)](https://hub.docker.com/r/appleboy/drone-scp/) [![Docker Pulls](https://img.shields.io/docker/pulls/appleboy/drone-scp.svg)](https://hub.docker.com/r/appleboy/drone-scp/)
[![](https://images.microbadger.com/badges/image/appleboy/drone-scp.svg)](https://microbadger.com/images/appleboy/drone-scp "Get your own image badge on microbadger.com") [![micro badger](https://images.microbadger.com/badges/image/appleboy/drone-scp.svg)](https://microbadger.com/images/appleboy/drone-scp "Get your own image badge on microbadger.com")
Copy files and artifacts via SSH using a binary, docker or [Drone CI](http://docs.drone.io/). Copy files and artifacts via SSH using a binary, docker or [Drone CI](http://docs.drone.io/).
@@ -18,17 +18,17 @@ Copy files and artifacts via SSH using a binary, docker or [Drone CI](http://doc
* [x] Support load ssh key from absolute path or raw body. * [x] Support load ssh key from absolute path or raw body.
* [x] Support SSH ProxyCommand. * [x] Support SSH ProxyCommand.
``` ```sh
+--------+ +----------+ +-----------+ +--------+ +----------+ +-----------+
| Laptop | <--> | Jumphost | <--> | FooServer | | Laptop | <--> | Jumphost | <--> | FooServer |
+--------+ +----------+ +-----------+ +--------+ +----------+ +-----------+
OR OR
+--------+ +----------+ +-----------+ +--------+ +----------+ +-----------+
| Laptop | <--> | Firewall | <--> | FooServer | | Laptop | <--> | Firewall | <--> | FooServer |
+--------+ +----------+ +-----------+ +--------+ +----------+ +-----------+
192.168.1.5 121.1.2.3 10.10.29.68 192.168.1.5 121.1.2.3 10.10.29.68
``` ```
## Breaking changes ## Breaking changes
@@ -36,18 +36,18 @@ Copy files and artifacts via SSH using a binary, docker or [Drone CI](http://doc
`v1.5.0`: change command timeout flag to `Duration`. See the following setting: `v1.5.0`: change command timeout flag to `Duration`. See the following setting:
```diff ```diff
pipeline: - name: scp files
scp:
image: appleboy/drone-scp image: appleboy/drone-scp
settings: settings:
host: host:
- example1.com - example1.com
- example2.com - example2.com
user: ubuntu username: ubuntu
password:
from_secret: ssh_password
port: 22 port: 22
- command_timeout: 120 - command_timeout: 120
+ command_timeout: 2m + command_timeout: 2m
from_secret: ssh_password
target: /home/deploy/web target: /home/deploy/web
source: source:
- release/*.tar.gz - release/*.tar.gz
@@ -63,37 +63,30 @@ The pre-compiled binaries can be downloaded from [release page](https://github.c
With `Go` installed With `Go` installed
``` ```sh
$ go get -u -v github.com/appleboy/drone-scp export GO111MODULE=on
go get -u -v github.com/appleboy/drone-scp
``` ```
or build the binary with the following command: or build the binary with the following command:
``` ```sh
$ export GOOS=linux export GOOS=linux
$ export GOARCH=amd64 export GOARCH=amd64
$ export CGO_ENABLED=0 export CGO_ENABLED=0
$ export GO111MODULE=on export GO111MODULE=on
$ go test -cover ./... go test -cover ./...
$ go build -v -a -tags netgo -o release/linux/amd64/drone-scp . go build -v -a -tags netgo -o release/linux/amd64/drone-scp .
``` ```
## Docker ## Docker
Build the docker image with the following commands: Build the docker image with the following commands:
``` ```sh
$ make docker make docker
```
Please note incorrectly building the image for the correct x64 linux and with
CGO disabled will result in an error when running the Docker image:
```
docker: Error response from daemon: Container command
'/bin/drone-scp' not found or does not exist..
``` ```
## Usage ## Usage
@@ -104,7 +97,6 @@ There are three ways to send notification.
* [usage from docker](#usage-from-docker) * [usage from docker](#usage-from-docker)
* [usage from drone ci](#usage-from-drone-ci) * [usage from drone ci](#usage-from-drone-ci)
<a name="usage-from-binary"></a>
### Usage from binary ### Usage from binary
#### Using public key #### Using public key
@@ -139,8 +131,8 @@ eval `ssh-agent -s`
Import your local public key `~/.ssh/id_rsa` Import your local public key `~/.ssh/id_rsa`
```bash ```sh
$ ssh-add ssh-add
``` ```
You don't need to add `--password` or `--key-path` arguments. You don't need to add `--password` or `--key-path` arguments.
@@ -167,10 +159,9 @@ drone-scp --host example1.com \
+ --source your_local_folder_path_2 + --source your_local_folder_path_2
``` ```
<a name="usage-from-docker"></a>
### Usage from docker ### Usage from docker
#### Using public key Using public key
```bash ```bash
docker run --rm \ docker run --rm \
@@ -185,7 +176,7 @@ docker run --rm \
appleboy/drone-scp appleboy/drone-scp
``` ```
#### Using password Using password
```diff ```diff
docker run --rm \ docker run --rm \
@@ -200,9 +191,7 @@ docker run --rm \
appleboy/drone-scp appleboy/drone-scp
``` ```
#### Using ssh-agent Using ssh-agent, start your local ssh agent:
Start your local ssh agent:
```bash ```bash
eval `ssh-agent -s` eval `ssh-agent -s`
@@ -210,11 +199,11 @@ eval `ssh-agent -s`
Import your local public key `~/.ssh/id_rsa` Import your local public key `~/.ssh/id_rsa`
```bash ```sh
$ ssh-add ssh-add
``` ```
You don't need to add `SCP_PASSWORD` or `SCP_KEY_PATH ` arguments. You don't need to add `SCP_PASSWORD` or `SCP_KEY_PATH` arguments.
```bash ```bash
docker run --rm \ docker run --rm \
@@ -228,7 +217,7 @@ docker run --rm \
appleboy/drone-scp appleboy/drone-scp
``` ```
#### Send multiple source or target folder and hosts Send multiple source or target folder and hosts
```bash ```bash
docker run --rm \ docker run --rm \
@@ -243,7 +232,6 @@ docker run --rm \
appleboy/drone-scp appleboy/drone-scp
``` ```
<a name="usage-from-drone-ci"></a>
### Usage from drone ci ### Usage from drone ci
Execute from the working directory: Execute from the working directory:
@@ -269,6 +257,6 @@ You can get more [information](http://plugins.drone.io/appleboy/drone-scp/) abou
Test the package with the following command: Test the package with the following command:
``` ```sh
$ make test make test
``` ```
+7 -8
View File
@@ -1,14 +1,13 @@
module github.com/appleboy/drone-scp module github.com/appleboy/drone-scp
go 1.12 go 1.14
require ( require (
github.com/appleboy/com v0.0.1 github.com/appleboy/com v0.0.6
github.com/appleboy/easyssh-proxy v1.2.0 github.com/appleboy/easyssh-proxy v1.3.5
github.com/fatih/color v1.7.0 github.com/fatih/color v1.9.0
github.com/joho/godotenv v1.3.0 github.com/joho/godotenv v1.3.0
github.com/mattn/go-colorable v0.1.1 // indirect github.com/stretchr/testify v1.5.1
github.com/mattn/go-isatty v0.0.6 // indirect github.com/urfave/cli/v2 v2.2.0
github.com/stretchr/testify v1.3.0 golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876
github.com/urfave/cli v1.20.0
) )
+38 -16
View File
@@ -1,26 +1,48 @@
github.com/appleboy/com v0.0.1 h1:SeP6J/YlZGWRwH7jdPYXXWA+qJy4GoQfcQFPda0ERYU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/appleboy/com v0.0.1/go.mod h1:rtwjPnHClMOJw4K5oW3ASx9BCPCJ1SDbFbzJjY4Ebqw= github.com/ScaleFT/sshkeys v0.0.0-20181112160850-82451a803681 h1:JS2rl38kZmHgWa0xINSaSYH0Whtvem64/4+Ef0+Y5pE=
github.com/appleboy/easyssh-proxy v1.2.0 h1:KvaUGC18WkBFet+N1oofQy03jkC5HaKFn2XGxFxCTtg= github.com/ScaleFT/sshkeys v0.0.0-20181112160850-82451a803681/go.mod h1:WfDateMPQ/55dPbZRp5Zxrux5WiEaHsjk9puUhz0KgY=
github.com/appleboy/easyssh-proxy v1.2.0/go.mod h1:vHskChUNhxwW4dXMe2MNE/k+UBCkBagrQDm70UWZrS0= github.com/appleboy/com v0.0.6 h1:l8cZ0aQJU/SWyL79ciYAJeqV835PRdlZ6efiPhus5Ic=
github.com/appleboy/com v0.0.6/go.mod h1:jnufjIC3opMlReyPPPye+8JqNvUzLm25o7h6SOy8nv0=
github.com/appleboy/easyssh-proxy v1.3.5 h1:EGTCbqAVRcGKHQMFSxz30lQmb+0nXL+jUiCrg/FjHQM=
github.com/appleboy/easyssh-proxy v1.3.5/go.mod h1:Kk57I3w7OCafOjp5kgZFvxk2fO8Tca5CriBTOsbSbjY=
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY=
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= github.com/dchest/bcrypt_pbkdf v0.0.0-20150205184540-83f37f9c154a h1:saTgr5tMLFnmy/yg3qDTft4rE5DY2uJ/cCxCe3q0XTU=
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/dchest/bcrypt_pbkdf v0.0.0-20150205184540-83f37f9c154a/go.mod h1:Bw9BbhOJVNR+t0jCqx2GC6zv0TGBsShs56Y3gfSCvl0=
github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s=
github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
github.com/mattn/go-colorable v0.1.1 h1:G1f5SKeVxmagw/IyvzvtZE4Gybcc4Tr1tf7I8z0XgOg= github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA=
github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
github.com/mattn/go-isatty v0.0.6 h1:SrwhHcpV4nWrMGdNcC2kXpMfcBVYGDuTArqyhocJgvA= github.com/mattn/go-isatty v0.0.11 h1:FxPOTFNqGkuDUGi3H/qkUbQO4ZiBa2brKq5r0l8TGeM=
github.com/mattn/go-isatty v0.0.6/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/urfave/cli v1.20.0 h1:fDqGv3UG/4jbVl/QkFwEdddtEDjh/5Ov6X+0B/3bPaw= github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25 h1:jsG6UpNLt9iAsb0S2AGW28DveNzzgmbXR+ENoPjUeIU= github.com/urfave/cli/v2 v2.2.0 h1:JTTnM6wKzdA0Jqodd966MVj4vWbbquZykeX1sKbe2C4=
golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= github.com/urfave/cli/v2 v2.2.0/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876 h1:sKJQZMuxjOAR/Uo2LBfU90onWEf1dF4C+0hPJCc9Mpc=
golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 h1:YyJpGZS1sBuBCzLAR1VEpK193GlqGZbnPFnPV/5Rsb4=
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+203 -158
View File
@@ -8,22 +8,28 @@ import (
"github.com/appleboy/easyssh-proxy" "github.com/appleboy/easyssh-proxy"
"github.com/joho/godotenv" "github.com/joho/godotenv"
_ "github.com/joho/godotenv/autoload" _ "github.com/joho/godotenv/autoload"
"github.com/urfave/cli" "github.com/urfave/cli/v2"
) )
// Version set at compile-time // Version set at compile-time
var ( var (
Version string Version string
BuildNum string
) )
func main() { func main() {
// Load env-file if it exists first
if filename, found := os.LookupEnv("PLUGIN_ENV_FILE"); found {
_ = godotenv.Load(filename)
}
defaultCiphers := []string{"aes128-ctr", "aes192-ctr", "aes256-ctr", "aes128-gcm@openssh.com", "arcfour256", "arcfour128", "aes128-cbc", "3des-cbc"}
app := cli.NewApp() app := cli.NewApp()
app.Name = "Drone SCP" app.Name = "Drone SCP"
app.Usage = "Copy files and artifacts via SSH." app.Usage = "Copy files and artifacts via SSH."
app.Copyright = "Copyright (c) 2017 Bo-Yi Wu" app.Copyright = "Copyright (c) 2019 Bo-Yi Wu"
app.Authors = []cli.Author{ app.Version = Version
app.Authors = []*cli.Author{
{ {
Name: "Bo-Yi Wu", Name: "Bo-Yi Wu",
Email: "appleboy.tw@gmail.com", Email: "appleboy.tw@gmail.com",
@@ -32,172 +38,212 @@ func main() {
app.Action = run app.Action = run
app.Version = Version app.Version = Version
app.Flags = []cli.Flag{ app.Flags = []cli.Flag{
cli.StringSliceFlag{ &cli.StringSliceFlag{
Name: "host, H", Name: "host, H",
Usage: "Server host", Usage: "Server host",
EnvVar: "PLUGIN_HOST,SCP_HOST,SSH_HOST", EnvVars: []string{"PLUGIN_HOST", "SCP_HOST", "SSH_HOST", "HOST", "INPUT_HOST"},
FilePath: ".host",
}, },
cli.StringFlag{ &cli.StringFlag{
Name: "port, P", Name: "port, P",
Value: "22", Value: "22",
Usage: "Server port, default to 22", Usage: "Server port, default to 22",
EnvVar: "PLUGIN_PORT,SCP_PORT,SSH_PORT", EnvVars: []string{"PLUGIN_PORT", "SCP_PORT", "SSH_PORT", "PORT", "INPUT_PORT"},
}, },
cli.StringFlag{ &cli.StringFlag{
Name: "username, u", Name: "username, u",
Usage: "Server username", Usage: "Server username",
EnvVar: "PLUGIN_USERNAME,PLUGIN_USER,SCP_USERNAME,SSH_USERNAME", EnvVars: []string{"PLUGIN_USERNAME", "PLUGIN_USER", "SCP_USERNAME", "SSH_USERNAME", "USERNAME", "INPUT_USERNAME"},
}, },
cli.StringFlag{ &cli.StringFlag{
Name: "password, p", Name: "password, p",
Usage: "Password for password-based authentication", Usage: "Password for password-based authentication",
EnvVar: "PLUGIN_PASSWORD,SCP_PASSWORD,SSH_PASSWORD", EnvVars: []string{"PLUGIN_PASSWORD", "SCP_PASSWORD", "SSH_PASSWORD", "PASSWORD", "INPUT_PASSWORD"},
}, },
cli.DurationFlag{ &cli.StringSliceFlag{
Name: "timeout", Name: "ciphers",
Usage: "connection timeout", Usage: "The allowed cipher algorithms. If unspecified then a sensible",
EnvVar: "PLUGIN_TIMEOUT,SCP_TIMEOUT", EnvVars: []string{"PLUGIN_CIPHERS", "SSH_CIPHERS", "CIPHERS", "INPUT_CIPHERS"},
Value: cli.NewStringSlice(defaultCiphers...),
}, },
cli.DurationFlag{ &cli.StringFlag{
Name: "command.timeout,T", Name: "fingerprint",
Usage: "command timeout", Usage: "fingerprint SHA256 of the host public key, default is to skip verification",
EnvVar: "PLUGIN_COMMAND_TIMEOUT,SSH_COMMAND_TIMEOUT", EnvVars: []string{"PLUGIN_FINGERPRINT", "SSH_FINGERPRINT", "FINGERPRINT", "INPUT_FINGERPRINT"},
Value: 60 * time.Second,
}, },
cli.StringFlag{ &cli.DurationFlag{
Name: "key, k", Name: "timeout",
Usage: "ssh private key", Usage: "connection timeout",
EnvVar: "PLUGIN_KEY,SCP_KEY,SSH_KEY", EnvVars: []string{"PLUGIN_TIMEOUT", "SCP_TIMEOUT", "INPUT_TIMEOUT"},
Value: 30 * time.Second,
}, },
cli.StringFlag{ &cli.DurationFlag{
Name: "key-path, i", Name: "command.timeout",
Usage: "ssh private key path", Usage: "command timeout",
EnvVar: "PLUGIN_KEY_PATH,SCP_KEY_PATH,SSH_KEY_PATH", EnvVars: []string{"PLUGIN_COMMAND_TIMEOUT", "SSH_COMMAND_TIMEOUT", "INPUT_COMMAND_TIMEOUT"},
Value: 10 * time.Minute,
}, },
cli.StringSliceFlag{ &cli.StringFlag{
Name: "target, t", Name: "ssh-key, k",
Usage: "Target path on the server", Usage: "ssh private key",
EnvVar: "PLUGIN_TARGET,SCP_TARGET", EnvVars: []string{"PLUGIN_SSH_KEY,", "PLUGIN_KEY", "SCP_KEY", "SSH_KEY", "KEY", "INPUT_KEY"},
}, },
cli.StringSliceFlag{ &cli.StringFlag{
Name: "source, s", Name: "ssh-passphrase",
Usage: "scp file list", Usage: "The purpose of the passphrase is usually to encrypt the private key.",
EnvVar: "PLUGIN_SOURCE,SCP_SOURCE", EnvVars: []string{"PLUGIN_SSH_PASSPHRASE", "PLUGIN_PASSPHRASE", "SSH_PASSPHRASE", "PASSPHRASE", "INPUT_PASSPHRASE"},
}, },
cli.BoolFlag{ &cli.StringFlag{
Name: "rm, r", Name: "key-path, i",
Usage: "remove target folder before upload data", Usage: "ssh private key path",
EnvVar: "PLUGIN_RM,SCP_RM", EnvVars: []string{"PLUGIN_KEY_PATH", "SCP_KEY_PATH", "SSH_KEY_PATH", "INPUT_KEY_PATH"},
}, },
cli.StringFlag{ &cli.StringSliceFlag{
Name: "repo.owner", Name: "target, t",
Usage: "repository owner", Usage: "Target path on the server",
EnvVar: "DRONE_REPO_OWNER", EnvVars: []string{"PLUGIN_TARGET", "SCP_TARGET", "TARGET", "INPUT_TARGET"},
}, },
cli.StringFlag{ &cli.StringSliceFlag{
Name: "repo.name", Name: "source, s",
Usage: "repository name", Usage: "scp file list",
EnvVar: "DRONE_REPO_NAME", EnvVars: []string{"PLUGIN_SOURCE", "SCP_SOURCE", "SOURCE", "INPUT_SOURCE"},
}, },
cli.StringFlag{ &cli.BoolFlag{
Name: "commit.sha", Name: "rm, r",
Usage: "git commit sha", Usage: "remove target folder before upload data",
EnvVar: "DRONE_COMMIT_SHA", EnvVars: []string{"PLUGIN_RM", "SCP_RM", "RM", "INPUT_RM"},
}, },
cli.StringFlag{ &cli.StringFlag{
Name: "commit.branch", Name: "repo.owner",
Value: "master", Usage: "repository owner",
Usage: "git commit branch", EnvVars: []string{"DRONE_REPO_OWNER"},
EnvVar: "DRONE_COMMIT_BRANCH",
}, },
cli.StringFlag{ &cli.StringFlag{
Name: "commit.author", Name: "repo.name",
Usage: "git author name", Usage: "repository name",
EnvVar: "DRONE_COMMIT_AUTHOR", EnvVars: []string{"DRONE_REPO_NAME"},
}, },
cli.StringFlag{ &cli.StringFlag{
Name: "commit.message", Name: "commit.sha",
Usage: "commit message", Usage: "git commit sha",
EnvVar: "DRONE_COMMIT_MESSAGE", EnvVars: []string{"DRONE_COMMIT_SHA"},
}, },
cli.StringFlag{ &cli.StringFlag{
Name: "build.event", Name: "commit.branch",
Value: "push", Value: "master",
Usage: "build event", Usage: "git commit branch",
EnvVar: "DRONE_BUILD_EVENT", EnvVars: []string{"DRONE_COMMIT_BRANCH"},
}, },
cli.IntFlag{ &cli.StringFlag{
Name: "build.number", Name: "commit.author",
Usage: "build number", Usage: "git author name",
EnvVar: "DRONE_BUILD_NUMBER", EnvVars: []string{"DRONE_COMMIT_AUTHOR"},
}, },
cli.StringFlag{ &cli.StringFlag{
Name: "build.status", Name: "commit.message",
Usage: "build status", Usage: "commit message",
Value: "success", EnvVars: []string{"DRONE_COMMIT_MESSAGE"},
EnvVar: "DRONE_BUILD_STATUS",
}, },
cli.StringFlag{ &cli.StringFlag{
Name: "build.link", Name: "build.event",
Usage: "build link", Value: "push",
EnvVar: "DRONE_BUILD_LINK", Usage: "build event",
EnvVars: []string{"DRONE_BUILD_EVENT"},
}, },
cli.StringFlag{ &cli.IntFlag{
Name: "env-file", Name: "build.number",
Usage: "source env file", Usage: "build number",
EnvVars: []string{"DRONE_BUILD_NUMBER"},
}, },
cli.StringFlag{ &cli.StringFlag{
Name: "proxy.ssh-key", Name: "build.status",
Usage: "private ssh key of proxy", Usage: "build status",
EnvVar: "PLUGIN_PROXY_SSH_KEY,PLUGIN_PROXY_KEY,PROXY_SSH_KEY", Value: "success",
EnvVars: []string{"DRONE_BUILD_STATUS"},
}, },
cli.StringFlag{ &cli.StringFlag{
Name: "proxy.key-path", Name: "build.link",
Usage: "ssh private key path of proxy", Usage: "build link",
EnvVar: "PLUGIN_PROXY_KEY_PATH,PROXY_SSH_KEY_PATH", EnvVars: []string{"DRONE_BUILD_LINK"},
}, },
cli.StringFlag{ &cli.StringFlag{
Name: "proxy.username", Name: "proxy.ssh-key",
Usage: "connect as user of proxy", Usage: "private ssh key of proxy",
EnvVar: "PLUGIN_PROXY_USERNAME,PLUGIN_PROXY_USER,PROXY_SSH_USERNAME", EnvVars: []string{"PLUGIN_PROXY_SSH_KEY", "PLUGIN_PROXY_KEY", "PROXY_SSH_KEY", "PROXY_KEY", "INPUT_PROXY_SSH_KEY"},
Value: "root",
}, },
cli.StringFlag{ &cli.StringFlag{
Name: "proxy.password", Name: "proxy.ssh-passphrase",
Usage: "user password of proxy", Usage: "The purpose of the passphrase is usually to encrypt the private key.",
EnvVar: "PLUGIN_PROXY_PASSWORD,PROXY_SSH_PASSWORD", EnvVars: []string{"PLUGIN_PROXY_SSH_PASSPHRASE", "PLUGIN_PROXY_PASSPHRASE", "PROXY_SSH_PASSPHRASE", "PROXY_PASSPHRASE", "INPUT_PROXY_PASSPHRASE"},
}, },
cli.StringFlag{ &cli.StringFlag{
Name: "proxy.host", Name: "proxy.key-path",
Usage: "connect to host of proxy", Usage: "ssh private key path of proxy",
EnvVar: "PLUGIN_PROXY_HOST,PROXY_SSH_HOST", EnvVars: []string{"PLUGIN_PROXY_KEY_PATH", "PROXY_SSH_KEY_PATH", "INPUT_PROXY_SSH_KEY_PATH"},
}, },
cli.StringFlag{ &cli.StringFlag{
Name: "proxy.port", Name: "proxy.username",
Usage: "connect to port of proxy", Usage: "connect as user of proxy",
EnvVar: "PLUGIN_PROXY_PORT,PROXY_SSH_PORT", EnvVars: []string{"PLUGIN_PROXY_USERNAME", "PLUGIN_PROXY_USER", "PROXY_SSH_USERNAME", "PROXY_USERNAME", "INPUT_PROXY_USERNAME"},
Value: "22", Value: "root",
}, },
cli.DurationFlag{ &cli.StringFlag{
Name: "proxy.timeout", Name: "proxy.password",
Usage: "proxy connection timeout", Usage: "user password of proxy",
EnvVar: "PLUGIN_PROXY_TIMEOUT,PROXY_SSH_TIMEOUT", EnvVars: []string{"PLUGIN_PROXY_PASSWORD", "PROXY_SSH_PASSWORD", "PROXY_PASSWORD", "INPUT_PROXY_PASSWORD"},
}, },
cli.IntFlag{ &cli.StringFlag{
Name: "strip.components", Name: "proxy.host",
Usage: "Remove the specified number of leading path elements.", Usage: "connect to host of proxy",
EnvVar: "PLUGIN_STRIP_COMPONENTS,TAR_STRIP_COMPONENTS", EnvVars: []string{"PLUGIN_PROXY_HOST", "PROXY_SSH_HOST", "PROXY_HOST", "INPUT_PROXY_HOST"},
}, },
cli.StringFlag{ &cli.StringSliceFlag{
Name: "tar.exec", Name: "proxy.ciphers",
Usage: "Alternative `tar` executable to on the dest host", Usage: "The allowed cipher algorithms. If unspecified then a sensible",
EnvVar: "PLUGIN_TAR_EXEC,SCP_TAR_EXEC", EnvVars: []string{"PLUGIN_PROXY_CIPHERS", "PROXY_SSH_CIPHERS", "PROXY_CIPHERS", "INPUT_PROXY_CIPHERS"},
Value: "tar", Value: cli.NewStringSlice(defaultCiphers...),
}, },
cli.BoolFlag{ &cli.StringFlag{
Name: "debug", Name: "proxy.fingerprint",
Usage: "remove target folder before upload data", Usage: "fingerprint SHA256 of the host public key, default is to skip verification",
EnvVar: "PLUGIN_DEBUG,DEBUG", EnvVars: []string{"PLUGIN_PROXY_FINGERPRINT", "SSH_PROXY_FINGERPRINT", "PROXY_FINGERPRINT", "INPUT_PROXY_FINGERPRINT"},
},
&cli.StringFlag{
Name: "proxy.port",
Usage: "connect to port of proxy",
EnvVars: []string{"PLUGIN_PROXY_PORT", "PROXY_SSH_PORT", "PROXY_PORT", "INPUT_PROXY_PORT"},
Value: "22",
},
&cli.DurationFlag{
Name: "proxy.timeout",
Usage: "proxy connection timeout",
EnvVars: []string{"PLUGIN_PROXY_TIMEOUT", "PROXY_SSH_TIMEOUT", "INPUT_PROXY_TIMEOUT"},
},
&cli.IntFlag{
Name: "strip.components",
Usage: "Remove the specified number of leading path elements.",
EnvVars: []string{"PLUGIN_STRIP_COMPONENTS", "TAR_STRIP_COMPONENTS", "INPUT_STRIP_COMPONENTS"},
},
&cli.StringFlag{
Name: "tar.exec",
Usage: "Alternative `tar` executable to on the dest host",
EnvVars: []string{"PLUGIN_TAR_EXEC", "SCP_TAR_EXEC", "INPUT_TAR_EXEC"},
Value: "tar",
},
&cli.StringFlag{
Name: "tar.tmp-path",
Usage: "Temporary path for tar file on the dest host",
EnvVars: []string{"PLUGIN_TAR_TMP_PATH", "SCP_TAR_TMP_PATH"},
},
&cli.BoolFlag{
Name: "debug",
Usage: "remove target folder before upload data",
EnvVars: []string{"PLUGIN_DEBUG", "DEBUG", "INPUT_DEBUG"},
},
&cli.BoolFlag{
Name: "overwrite",
Usage: "use --overwrite flag with tar",
EnvVars: []string{"PLUGIN_OVERWRITE", "SCP_OVERWRITE", "INPUT_OVERWRITE"},
}, },
} }
@@ -233,22 +279,13 @@ VERSION:
REPOSITORY: REPOSITORY:
Github: https://github.com/appleboy/drone-scp Github: https://github.com/appleboy/drone-scp
` `
app.Version = Version
if BuildNum != "" {
app.Version = app.Version + "+" + BuildNum
}
if err := app.Run(os.Args); err != nil { if err := app.Run(os.Args); err != nil {
log.Println(err) log.Fatal(err)
} }
} }
func run(c *cli.Context) error { func run(c *cli.Context) error {
if c.String("env-file") != "" {
_ = godotenv.Load(c.String("env-file"))
}
plugin := Plugin{ plugin := Plugin{
Repo: Repo{ Repo: Repo{
Owner: c.String("repo.owner"), Owner: c.String("repo.owner"),
@@ -269,9 +306,11 @@ func run(c *cli.Context) error {
Port: c.String("port"), Port: c.String("port"),
Username: c.String("username"), Username: c.String("username"),
Password: c.String("password"), Password: c.String("password"),
Passphrase: c.String("ssh-passphrase"),
Fingerprint: c.String("fingerprint"),
Timeout: c.Duration("timeout"), Timeout: c.Duration("timeout"),
CommandTimeout: c.Duration("command.timeout"), CommandTimeout: c.Duration("command.timeout"),
Key: c.String("key"), Key: c.String("ssh-key"),
KeyPath: c.String("key-path"), KeyPath: c.String("key-path"),
Target: c.StringSlice("target"), Target: c.StringSlice("target"),
Source: c.StringSlice("source"), Source: c.StringSlice("source"),
@@ -279,14 +318,20 @@ func run(c *cli.Context) error {
Debug: c.Bool("debug"), Debug: c.Bool("debug"),
StripComponents: c.Int("strip.components"), StripComponents: c.Int("strip.components"),
TarExec: c.String("tar.exec"), TarExec: c.String("tar.exec"),
TarTmpPath: c.String("tar.tmp-path"),
Overwrite: c.Bool("overwrite"),
Ciphers: c.StringSlice("ciphers"),
Proxy: easyssh.DefaultConfig{ Proxy: easyssh.DefaultConfig{
Key: c.String("proxy.ssh-key"), Key: c.String("proxy.ssh-key"),
KeyPath: c.String("proxy.key-path"), Passphrase: c.String("proxy.ssh-passphrase"),
User: c.String("proxy.username"), Fingerprint: c.String("proxy.fingerprint"),
Password: c.String("proxy.password"), KeyPath: c.String("proxy.key-path"),
Server: c.String("proxy.host"), User: c.String("proxy.username"),
Port: c.String("proxy.port"), Password: c.String("proxy.password"),
Timeout: c.Duration("proxy.timeout"), Server: c.String("proxy.host"),
Port: c.String("proxy.port"),
Timeout: c.Duration("proxy.timeout"),
Ciphers: c.StringSlice("proxy.ciphers"),
}, },
}, },
} }
+1 -1
View File
@@ -1,4 +1,4 @@
// +build darwin dragonfly freebsd linux nacl netbsd openbsd solaris // +build !windows
package main package main
+3 -1
View File
@@ -1,6 +1,8 @@
package main package main
import "testing" import (
"testing"
)
func TestGetRealPath(t *testing.T) { func TestGetRealPath(t *testing.T) {
type args struct { type args struct {
+8 -33
View File
@@ -9,11 +9,8 @@
steps: [ steps: [
{ {
name: 'vet', name: 'vet',
image: 'golang:1.12', image: 'golang:1.14',
pull: 'always', pull: 'always',
environment: {
GO111MODULE: 'on',
},
commands: [ commands: [
'make vet', 'make vet',
], ],
@@ -26,11 +23,8 @@
}, },
{ {
name: 'lint', name: 'lint',
image: 'golang:1.12', image: 'golang:1.14',
pull: 'always', pull: 'always',
environment: {
GO111MODULE: 'on',
},
commands: [ commands: [
'make lint', 'make lint',
], ],
@@ -43,11 +37,8 @@
}, },
{ {
name: 'misspell', name: 'misspell',
image: 'golang:1.12', image: 'golang:1.14',
pull: 'always', pull: 'always',
environment: {
GO111MODULE: 'on',
},
commands: [ commands: [
'make misspell-check', 'make misspell-check',
], ],
@@ -60,11 +51,8 @@
}, },
{ {
name: 'test', name: 'test',
image: 'golang:1.12-alpine', image: 'golang:1.14-alpine',
pull: 'always', pull: 'always',
environment: {
GO111MODULE: 'on',
},
commands: [ commands: [
'apk add git make curl perl bash build-base zlib-dev ucl-dev', 'apk add git make curl perl bash build-base zlib-dev ucl-dev',
'make ssh-server', 'make ssh-server',
@@ -105,11 +93,10 @@
steps: [ steps: [
{ {
name: 'build-push', name: 'build-push',
image: 'golang:1.12', image: 'golang:1.14',
pull: 'always', pull: 'always',
environment: { environment: {
CGO_ENABLED: '0', CGO_ENABLED: '0',
GO111MODULE: 'on',
}, },
commands: [ commands: [
'go build -v -ldflags \'-X main.build=${DRONE_BUILD_NUMBER}\' -a -o release/' + os + '/' + arch + '/' + name, 'go build -v -ldflags \'-X main.build=${DRONE_BUILD_NUMBER}\' -a -o release/' + os + '/' + arch + '/' + name,
@@ -122,11 +109,10 @@
}, },
{ {
name: 'build-tag', name: 'build-tag',
image: 'golang:1.12', image: 'golang:1.14',
pull: 'always', pull: 'always',
environment: { environment: {
CGO_ENABLED: '0', CGO_ENABLED: '0',
GO111MODULE: 'on',
}, },
commands: [ commands: [
'go build -v -ldflags \'-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}\' -a -o release/' + os + '/' + arch + '/' + name, 'go build -v -ldflags \'-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}\' -a -o release/' + os + '/' + arch + '/' + name,
@@ -137,7 +123,7 @@
}, },
{ {
name: 'executable', name: 'executable',
image: 'golang:1.12', image: 'golang:1.14',
pull: 'always', pull: 'always',
commands: [ commands: [
'./release/' + os + '/' + arch + '/' + name + ' --help', './release/' + os + '/' + arch + '/' + name + ' --help',
@@ -202,11 +188,8 @@
steps: [ steps: [
{ {
name: 'build-all-binary', name: 'build-all-binary',
image: 'golang:1.12', image: 'golang:1.14',
pull: 'always', pull: 'always',
environment: {
GO111MODULE: 'on',
},
commands: [ commands: [
'make release' 'make release'
], ],
@@ -256,14 +239,6 @@
ignore_missing: true, ignore_missing: true,
}, },
}, },
{
name: 'microbadger',
image: 'plugins/webhook:1',
pull: 'always',
settings: {
url: { 'from_secret': 'microbadger_url' },
},
},
], ],
depends_on: depends_on, depends_on: depends_on,
trigger: { trigger: {
+92 -37
View File
@@ -7,6 +7,7 @@ import (
"os" "os"
"os/exec" "os/exec"
"path/filepath" "path/filepath"
"strconv"
"strings" "strings"
"sync" "sync"
"time" "time"
@@ -49,6 +50,8 @@ type (
Username string Username string
Password string Password string
Key string Key string
Passphrase string
Fingerprint string
KeyPath string KeyPath string
Timeout time.Duration Timeout time.Duration
CommandTimeout time.Duration CommandTimeout time.Duration
@@ -57,8 +60,11 @@ type (
Remove bool Remove bool
StripComponents int StripComponents int
TarExec string TarExec string
TarTmpPath string
Proxy easyssh.DefaultConfig Proxy easyssh.DefaultConfig
Debug bool Debug bool
Overwrite bool
Ciphers []string
} }
// Plugin values. // Plugin values.
@@ -161,21 +167,27 @@ func (p *Plugin) removeDestFile(ssh *easyssh.MakeConfig) error {
func (p *Plugin) removeAllDestFile() error { func (p *Plugin) removeAllDestFile() error {
for _, host := range p.Config.Host { for _, host := range p.Config.Host {
ssh := &easyssh.MakeConfig{ ssh := &easyssh.MakeConfig{
Server: host, Server: host,
User: p.Config.Username, User: p.Config.Username,
Password: p.Config.Password, Password: p.Config.Password,
Port: p.Config.Port, Port: p.Config.Port,
Key: p.Config.Key, Key: p.Config.Key,
KeyPath: p.Config.KeyPath, KeyPath: p.Config.KeyPath,
Timeout: p.Config.Timeout, Passphrase: p.Config.Passphrase,
Timeout: p.Config.Timeout,
Ciphers: p.Config.Ciphers,
Fingerprint: p.Config.Fingerprint,
Proxy: easyssh.DefaultConfig{ Proxy: easyssh.DefaultConfig{
Server: p.Config.Proxy.Server, Server: p.Config.Proxy.Server,
User: p.Config.Proxy.User, User: p.Config.Proxy.User,
Password: p.Config.Proxy.Password, Password: p.Config.Proxy.Password,
Port: p.Config.Proxy.Port, Port: p.Config.Proxy.Port,
Key: p.Config.Proxy.Key, Key: p.Config.Proxy.Key,
KeyPath: p.Config.Proxy.KeyPath, KeyPath: p.Config.Proxy.KeyPath,
Timeout: p.Config.Proxy.Timeout, Passphrase: p.Config.Proxy.Passphrase,
Timeout: p.Config.Proxy.Timeout,
Ciphers: p.Config.Proxy.Ciphers,
Fingerprint: p.Config.Proxy.Fingerprint,
}, },
} }
@@ -194,6 +206,32 @@ type fileList struct {
Source []string Source []string
} }
func (p *Plugin) buildArgs(target string) []string {
args := []string{}
args = append(args,
p.Config.TarExec,
"-xf",
p.DestFile,
)
if p.Config.StripComponents > 0 {
args = append(args, "--strip-components")
args = append(args, strconv.Itoa(p.Config.StripComponents))
}
if p.Config.Overwrite {
args = append(args, "--overwrite")
}
args = append(args,
"-C",
target,
)
return args
}
// Exec executes the plugin. // Exec executes the plugin.
func (p *Plugin) Exec() error { func (p *Plugin) Exec() error {
if len(p.Config.Host) == 0 { if len(p.Config.Host) == 0 {
@@ -237,30 +275,39 @@ func (p *Plugin) Exec() error {
wg := sync.WaitGroup{} wg := sync.WaitGroup{}
wg.Add(len(p.Config.Host)) wg.Add(len(p.Config.Host))
errChannel := make(chan error, 1) errChannel := make(chan error)
finished := make(chan bool, 1) finished := make(chan struct{})
for _, host := range p.Config.Host { for _, host := range p.Config.Host {
go func(host string) { go func(host string) {
// Create MakeConfig instance with remote username, server address and path to private key. // Create MakeConfig instance with remote username, server address and path to private key.
ssh := &easyssh.MakeConfig{ ssh := &easyssh.MakeConfig{
Server: host, Server: host,
User: p.Config.Username, User: p.Config.Username,
Password: p.Config.Password, Password: p.Config.Password,
Port: p.Config.Port, Port: p.Config.Port,
Key: p.Config.Key, Key: p.Config.Key,
KeyPath: p.Config.KeyPath, KeyPath: p.Config.KeyPath,
Timeout: p.Config.Timeout, Passphrase: p.Config.Passphrase,
Timeout: p.Config.Timeout,
Ciphers: p.Config.Ciphers,
Fingerprint: p.Config.Fingerprint,
Proxy: easyssh.DefaultConfig{ Proxy: easyssh.DefaultConfig{
Server: p.Config.Proxy.Server, Server: p.Config.Proxy.Server,
User: p.Config.Proxy.User, User: p.Config.Proxy.User,
Password: p.Config.Proxy.Password, Password: p.Config.Proxy.Password,
Port: p.Config.Proxy.Port, Port: p.Config.Proxy.Port,
Key: p.Config.Proxy.Key, Key: p.Config.Proxy.Key,
KeyPath: p.Config.Proxy.KeyPath, KeyPath: p.Config.Proxy.KeyPath,
Timeout: p.Config.Proxy.Timeout, Passphrase: p.Config.Proxy.Passphrase,
Timeout: p.Config.Proxy.Timeout,
Ciphers: p.Config.Proxy.Ciphers,
Fingerprint: p.Config.Proxy.Fingerprint,
}, },
} }
// upload file to the tmp path
p.DestFile = fmt.Sprintf("%s%s", p.Config.TarTmpPath, p.DestFile)
// Call Scp method with file you want to upload to remote server. // Call Scp method with file you want to upload to remote server.
p.log(host, "scp file to server.") p.log(host, "scp file to server.")
err := ssh.Scp(tar, p.DestFile) err := ssh.Scp(tar, p.DestFile)
@@ -298,10 +345,18 @@ func (p *Plugin) Exec() error {
// untar file // untar file
p.log(host, "untar file", p.DestFile) p.log(host, "untar file", p.DestFile)
if p.Config.StripComponents > 0 { commamd := strings.Join(p.buildArgs(target), " ")
_, _, _, err = ssh.Run(fmt.Sprintf("%s -xf %s --strip-components=%d -C %s", p.Config.TarExec, p.DestFile, p.Config.StripComponents, target), p.Config.CommandTimeout) if p.Config.Debug {
} else { fmt.Println("$", commamd)
_, _, _, err = ssh.Run(fmt.Sprintf("%s -xf %s -C %s", p.Config.TarExec, p.DestFile, target), p.Config.CommandTimeout) }
outStr, errStr, _, err := ssh.Run(commamd, p.Config.CommandTimeout)
if outStr != "" {
p.log(host, "output: ", outStr)
}
if errStr != "" {
p.log(host, "error: ", errStr)
} }
if err != nil { if err != nil {
@@ -341,9 +396,9 @@ func (p *Plugin) Exec() error {
} }
} }
fmt.Println("================================================") fmt.Println("===================================================")
fmt.Println("Successfully executed transfer data to all host.") fmt.Println("Successfully executed transfer data to all host")
fmt.Println("================================================") fmt.Println("===================================================")
return nil return nil
} }
+205 -1
View File
@@ -1,15 +1,19 @@
package main package main
import ( import (
"io/ioutil"
"log"
"os" "os"
"os/exec" "os/exec"
"os/user" "os/user"
"path/filepath" "path/filepath"
"reflect"
"testing" "testing"
"time" "time"
"github.com/appleboy/easyssh-proxy" "github.com/appleboy/easyssh-proxy"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"golang.org/x/crypto/ssh"
) )
func TestMissingAllConfig(t *testing.T) { func TestMissingAllConfig(t *testing.T) {
@@ -129,6 +133,129 @@ func TestSCPFileFromPublicKey(t *testing.T) {
} }
} }
func TestSCPFileFromPublicKeyWithPassphrase(t *testing.T) {
if os.Getenv("SSH_AUTH_SOCK") != "" {
if err := exec.Command("eval", "`ssh-agent -k`").Run(); err != nil {
t.Fatalf("exec: %v", err)
}
}
u, err := user.Lookup("drone-scp")
if err != nil {
t.Fatalf("Lookup: %v", err)
}
plugin := Plugin{
Config: Config{
Host: []string{"localhost"},
Username: "drone-scp",
Port: "22",
KeyPath: "tests/.ssh/test",
Passphrase: "1234",
Source: []string{"tests/a.txt", "tests/b.txt"},
Target: []string{filepath.Join(u.HomeDir, "/test2")},
CommandTimeout: 60 * time.Second,
TarExec: "tar",
},
}
err = plugin.Exec()
assert.Nil(t, err)
// check file exist
if _, err := os.Stat(filepath.Join(u.HomeDir, "/test2/tests/a.txt")); os.IsNotExist(err) {
t.Fatalf("SCP-error: %v", err)
}
if _, err := os.Stat(filepath.Join(u.HomeDir, "/test2/tests/b.txt")); os.IsNotExist(err) {
t.Fatalf("SCP-error: %v", err)
}
}
func TestWrongFingerprint(t *testing.T) {
u, err := user.Lookup("drone-scp")
if err != nil {
t.Fatalf("Lookup: %v", err)
}
plugin := Plugin{
Config: Config{
Host: []string{"localhost"},
Username: "drone-scp",
Port: "22",
KeyPath: "./tests/.ssh/id_rsa",
Source: []string{"tests/a.txt", "tests/b.txt"},
Target: []string{filepath.Join(u.HomeDir, "/test2")},
CommandTimeout: 60 * time.Second,
TarExec: "tar",
Fingerprint: "wrong",
},
}
err = plugin.Exec()
log.Println(err)
assert.NotNil(t, err)
}
func getHostPublicKeyFile(keypath string) (ssh.PublicKey, error) {
var pubkey ssh.PublicKey
var err error
buf, err := ioutil.ReadFile(keypath)
if err != nil {
return nil, err
}
pubkey, _, _, _, err = ssh.ParseAuthorizedKey(buf)
if err != nil {
return nil, err
}
return pubkey, nil
}
func TestSCPFileFromPublicKeyWithFingerprint(t *testing.T) {
if os.Getenv("SSH_AUTH_SOCK") != "" {
if err := exec.Command("eval", "`ssh-agent -k`").Run(); err != nil {
t.Fatalf("exec: %v", err)
}
}
u, err := user.Lookup("drone-scp")
if err != nil {
t.Fatalf("Lookup: %v", err)
}
hostKey, err := getHostPublicKeyFile("/etc/ssh/ssh_host_rsa_key.pub")
assert.NoError(t, err)
plugin := Plugin{
Config: Config{
Host: []string{"localhost"},
Username: "drone-scp",
Port: "22",
KeyPath: "./tests/.ssh/id_rsa",
Fingerprint: ssh.FingerprintSHA256(hostKey),
Source: []string{"tests/a.txt", "tests/b.txt"},
Target: []string{filepath.Join(u.HomeDir, "/test2")},
CommandTimeout: 60 * time.Second,
TarExec: "tar",
},
}
err = plugin.Exec()
assert.Nil(t, err)
// check file exist
if _, err := os.Stat(filepath.Join(u.HomeDir, "/test2/tests/a.txt")); os.IsNotExist(err) {
t.Fatalf("SCP-error: %v", err)
}
if _, err := os.Stat(filepath.Join(u.HomeDir, "/test2/tests/b.txt")); os.IsNotExist(err) {
t.Fatalf("SCP-error: %v", err)
}
}
func TestSCPWildcardFileList(t *testing.T) { func TestSCPWildcardFileList(t *testing.T) {
if os.Getenv("SSH_AUTH_SOCK") != "" { if os.Getenv("SSH_AUTH_SOCK") != "" {
if err := exec.Command("eval", "`ssh-agent -k`").Run(); err != nil { if err := exec.Command("eval", "`ssh-agent -k`").Run(); err != nil {
@@ -267,6 +394,7 @@ func TestIgnoreList(t *testing.T) {
Target: []string{filepath.Join(u.HomeDir, "ignore")}, Target: []string{filepath.Join(u.HomeDir, "ignore")},
CommandTimeout: 60 * time.Second, CommandTimeout: 60 * time.Second,
TarExec: "tar", TarExec: "tar",
Debug: true,
}, },
} }
@@ -387,7 +515,7 @@ func TestGlobList(t *testing.T) {
assert.Equal(t, expects, globList(paterns).Source) assert.Equal(t, expects, globList(paterns).Source)
paterns = []string{"tests/*.txt", "tests/.ssh/*", "abc*"} paterns = []string{"tests/*.txt", "tests/.ssh/*", "abc*"}
expects = []string{"tests/a.txt", "tests/b.txt", "tests/.ssh/id_rsa", "tests/.ssh/id_rsa.pub"} expects = []string{"tests/a.txt", "tests/b.txt", "tests/.ssh/id_rsa", "tests/.ssh/id_rsa.pub", "tests/.ssh/test", "tests/.ssh/test.pub"}
assert.Equal(t, expects, globList(paterns).Source) assert.Equal(t, expects, globList(paterns).Source)
paterns = []string{"tests/?.txt"} paterns = []string{"tests/?.txt"}
@@ -456,3 +584,79 @@ func TestRemoveDestFile(t *testing.T) {
err = plugin.removeDestFile(ssh) err = plugin.removeDestFile(ssh)
assert.Error(t, err) assert.Error(t, err)
} }
func TestPlugin_buildArgs(t *testing.T) {
type fields struct {
Repo Repo
Build Build
Config Config
DestFile string
}
type args struct {
target string
}
tests := []struct {
name string
fields fields
args args
want []string
}{
{
name: "default command",
fields: fields{
Config: Config{
Overwrite: false,
TarExec: "tar",
},
DestFile: "foo.tar",
},
args: args{
target: "foo",
},
want: []string{"tar", "-xf", "foo.tar", "-C", "foo"},
},
{
name: "strip components",
fields: fields{
Config: Config{
Overwrite: false,
TarExec: "tar",
StripComponents: 2,
},
DestFile: "foo.tar",
},
args: args{
target: "foo",
},
want: []string{"tar", "-xf", "foo.tar", "--strip-components", "2", "-C", "foo"},
},
{
name: "overwrite",
fields: fields{
Config: Config{
TarExec: "tar",
StripComponents: 2,
Overwrite: true,
},
DestFile: "foo.tar",
},
args: args{
target: "foo",
},
want: []string{"tar", "-xf", "foo.tar", "--strip-components", "2", "--overwrite", "-C", "foo"},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
p := &Plugin{
Repo: tt.fields.Repo,
Build: tt.fields.Build,
Config: tt.fields.Config,
DestFile: tt.fields.DestFile,
}
if got := p.buildArgs(tt.args.target); !reflect.DeepEqual(got, tt.want) {
t.Errorf("Plugin.buildArgs() = %v, want %v", got, tt.want)
}
})
}
}
+50
View File
@@ -0,0 +1,50 @@
-----BEGIN OPENSSH PRIVATE KEY-----
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
l4njcaMpg4tpQMHtCBOicGyV0=
-----END OPENSSH PRIVATE KEY-----
+1
View File
@@ -0,0 +1 @@
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDz6aZ1jY2onnuj2YNHJ/HhfvIu0B973v/+pFFOavnTUOhEEKEy3TASu+s9CkHrYZAtRc+QYIkNZI31mhHBhotdeP/7GoO2UirkFtrzyQKPNJxEcv0RBoG9ssN8jex0PyK6DHIYYFnIWadVBEEOh/H+rK7j7u2/big3oTzYBuFrCwmYFcz5na99MzFeAUhazF44gVBma+zO+1quGeqF51UDIg1SMGvX8I7LNEqrKEBaIUQJKFQcxlOWlRLQsjJCymrOujsXsRrXHAQWcnxDcNevv2ZMOUl0ybvv9yH0BiGbRBd1Hy8/QPILbAQaqu0oQE7fubN8Q8lqb3Jg0loID4x/5GPhSY8WAXpuLcXTOrb93SnCw1JsAgJDNqpuuRFy3BSZ7wBOr1jfeIoo7xk14OHiUjJ0uXDL9cLMkcw6ElWz81mrD2VCkXUz+qFyjJ+G7aGWRtctZoOzKln4yfNfUmwW8/8ra3QnmrMZ2xW2Ylw3ZhO+tLi7jINHYFb54bAdLVPUU1ctIuJns2qkWnjJCxxMiynIqCif20/OU1n8CTJuOWiURmRdmvKOH4PE3JxC2Qnk/3tV3Cf8hp1CH5VjBZ9AjGj5MDMHXyu34VY2WvYo5QyzfS3ySPoT8kCO0G0xpvjwCMHOK+G2RP4kqb/KKZguiKdgintBXuskTlJmD7kcMQ== deploy@easyssh