mirror of
https://github.com/atmoz/sftp.git
synced 2024-11-17 12:51:33 -05:00
Merge branch 'master' into feature/user-create-on-restart
This commit is contained in:
Alexander Kuemmel
GitHub
commit
6385df2e9a
9 changed files with 413 additions and 69 deletions
179
.github/public-keys/atmoz.asc
vendored
Normal file
179
.github/public-keys/atmoz.asc
vendored
Normal file
|
|
@ -0,0 +1,179 @@
|
|||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
|
||||
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
|
||||
dFqBkw==
|
||||
=4DZp
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
86
.github/workflows/build.yml
vendored
Normal file
86
.github/workflows/build.yml
vendored
Normal file
|
|
@ -0,0 +1,86 @@
|
|||
name: build
|
||||
|
||||
on:
|
||||
schedule:
|
||||
- cron: "0 12 * * *"
|
||||
push:
|
||||
paths-ignore:
|
||||
- "*.md"
|
||||
- "*.txt"
|
||||
- "*.png"
|
||||
pull_request:
|
||||
|
||||
env:
|
||||
IMAGE_NAME: atmoz/sftp
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
fetch-depth: 0 # for proper signature verification
|
||||
submodules: true # for shunit2
|
||||
|
||||
- name: Run ShellCheck
|
||||
uses: ludeeus/action-shellcheck@master
|
||||
with:
|
||||
ignore: tests/shunit2
|
||||
|
||||
- name: Build debian image
|
||||
run: |
|
||||
docker build . \
|
||||
--pull=true \
|
||||
--file=Dockerfile \
|
||||
--tag="$IMAGE_NAME:latest" \
|
||||
--tag="$IMAGE_NAME:debian" \
|
||||
--label="org.opencontainers.image.source=$GITHUB_SERVER_URL/$GITHUB_REPOSITORY" \
|
||||
--label="org.opencontainers.image.revision=$GITHUB_SHA" \
|
||||
--label="org.opencontainers.image.created=$(date --rfc-3339=seconds)"
|
||||
|
||||
- name: Test debian image
|
||||
run: tests/run $IMAGE_NAME:debian
|
||||
|
||||
- name: Build alpine image
|
||||
run: |
|
||||
docker build . \
|
||||
--pull=true \
|
||||
--file=Dockerfile-alpine \
|
||||
--tag="$IMAGE_NAME:alpine" \
|
||||
--label="org.opencontainers.image.source=$GITHUB_SERVER_URL/$GITHUB_REPOSITORY" \
|
||||
--label="org.opencontainers.image.revision=$GITHUB_SHA" \
|
||||
--label="org.opencontainers.image.created=$(date --rfc-3339=seconds)"
|
||||
|
||||
- name: Test alpine image
|
||||
run: tests/run $IMAGE_NAME:alpine
|
||||
|
||||
- name: Verify signature
|
||||
if: github.ref == 'refs/heads/master'
|
||||
uses: atmoz/git-verify-ref@master
|
||||
with:
|
||||
import-github-users: atmoz
|
||||
|
||||
- name: Push images to Docker Hub registry
|
||||
if: github.ref == 'refs/heads/master'
|
||||
run: |
|
||||
echo "${{ secrets.DOCKER_HUB_PASSWORD }}" | docker login \
|
||||
-u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
|
||||
|
||||
docker push $IMAGE_NAME # no tags specified to include all tags
|
||||
docker logout
|
||||
|
||||
- name: Push images to GitHub registry
|
||||
if: github.ref == 'refs/heads/master'
|
||||
run: |
|
||||
echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com \
|
||||
-u ${{ github.actor }} --password-stdin
|
||||
|
||||
TAG_DEBIAN=docker.pkg.github.com/$GITHUB_REPOSITORY/debian
|
||||
TAG_ALPINE=docker.pkg.github.com/$GITHUB_REPOSITORY/alpine
|
||||
docker tag $IMAGE_NAME:debian $TAG_DEBIAN
|
||||
docker tag $IMAGE_NAME:alpine $TAG_ALPINE
|
||||
docker push $TAG_DEBIAN
|
||||
docker push $TAG_ALPINE
|
||||
docker logout docker.pkg.github.com
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
FROM debian:stretch
|
||||
FROM debian:buster
|
||||
MAINTAINER Adrian Dvergsdal [atmoz.net]
|
||||
|
||||
# Steps done in one RUN layer:
|
||||
|
|
|
|||
21
Dockerfile-alpine
Normal file
21
Dockerfile-alpine
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
FROM alpine:latest
|
||||
MAINTAINER Adrian Dvergsdal [atmoz.net]
|
||||
|
||||
# Steps done in one RUN layer:
|
||||
# - Install packages
|
||||
# - Fix default group (1000 does not exist)
|
||||
# - OpenSSH needs /var/run/sshd to run
|
||||
# - Remove generic host keys, entrypoint generates unique keys
|
||||
RUN echo "@community http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories && \
|
||||
apk add --no-cache bash shadow@community openssh openssh-sftp-server && \
|
||||
sed -i 's/GROUP=1000/GROUP=100/' /etc/default/useradd && \
|
||||
mkdir -p /var/run/sshd && \
|
||||
rm -f /etc/ssh/ssh_host_*key*
|
||||
|
||||
COPY files/sshd_config /etc/ssh/sshd_config
|
||||
COPY files/create-sftp-user /usr/local/bin/
|
||||
COPY files/entrypoint /
|
||||
|
||||
EXPOSE 22
|
||||
|
||||
ENTRYPOINT ["/entrypoint"]
|
||||
30
README.md
30
README.md
|
|
@ -1,19 +1,17 @@
|
|||
# SFTP
|
||||
|
||||
   
|
||||
   
|
||||
|
||||
|
||||
|
||||
# Supported tags and respective `Dockerfile` links
|
||||
|
||||
- [`debian-stretch`, `debian`, `latest` (*Dockerfile*)](https://github.com/atmoz/sftp/blob/master/Dockerfile) [](http://microbadger.com/images/atmoz/sftp "Get your own image badge on microbadger.com")
|
||||
- [`debian-jessie` (*Dockerfile*)](https://github.com/atmoz/sftp/blob/debian-jessie/Dockerfile) [](http://microbadger.com/images/atmoz/sftp:debian-jessie "Get your own image badge on microbadger.com")
|
||||
- [`alpine` (*Dockerfile*)](https://github.com/atmoz/sftp/blob/alpine/Dockerfile) [](http://microbadger.com/images/atmoz/sftp:alpine "Get your own image badge on microbadger.com")
|
||||
- [`debian`, `latest` (*Dockerfile*)](https://github.com/atmoz/sftp/blob/master/Dockerfile) 
|
||||
- [`alpine` (*Dockerfile*)](https://github.com/atmoz/sftp/blob/master/Dockerfile-alpine) 
|
||||
|
||||
# Securely share your files
|
||||
|
||||
Easy to use SFTP ([SSH File Transfer Protocol](https://en.wikipedia.org/wiki/SSH_File_Transfer_Protocol)) server with [OpenSSH](https://en.wikipedia.org/wiki/OpenSSH).
|
||||
This is an automated build linked with the [debian](https://hub.docker.com/_/debian/) and [alpine](https://hub.docker.com/_/alpine/) repositories.
|
||||
|
||||
# Usage
|
||||
|
||||
|
|
@ -49,7 +47,7 @@ Let's mount a directory and set UID:
|
|||
|
||||
```
|
||||
docker run \
|
||||
-v /host/upload:/home/foo/upload \
|
||||
-v <host-dir>/upload:/home/foo/upload \
|
||||
-p 2222:22 -d atmoz/sftp \
|
||||
foo:pass:1001
|
||||
```
|
||||
|
|
@ -60,7 +58,7 @@ docker run \
|
|||
sftp:
|
||||
image: atmoz/sftp
|
||||
volumes:
|
||||
- /host/upload:/home/foo/upload
|
||||
- <host-dir>/upload:/home/foo/upload
|
||||
ports:
|
||||
- "2222:22"
|
||||
command: foo:pass:1001
|
||||
|
|
@ -74,12 +72,12 @@ The OpenSSH server runs by default on port 22, and in this example, we are forwa
|
|||
|
||||
```
|
||||
docker run \
|
||||
-v /host/users.conf:/etc/sftp/users.conf:ro \
|
||||
-v <host-dir>/users.conf:/etc/sftp/users.conf:ro \
|
||||
-v mySftpVolume:/home \
|
||||
-p 2222:22 -d atmoz/sftp
|
||||
```
|
||||
|
||||
/host/users.conf:
|
||||
<host-dir>/users.conf:
|
||||
|
||||
```
|
||||
foo:123:1001:100
|
||||
|
|
@ -93,7 +91,7 @@ Add `:e` behind password to mark it as encrypted. Use single quotes if using ter
|
|||
|
||||
```
|
||||
docker run \
|
||||
-v /host/share:/home/foo/share \
|
||||
-v <host-dir>/share:/home/foo/share \
|
||||
-p 2222:22 -d atmoz/sftp \
|
||||
'foo:$1$0G2g0GSt$ewU0t6GXG15.0hWoOX8X9.:e:1001'
|
||||
```
|
||||
|
|
@ -107,9 +105,9 @@ Mount public keys in the user's `.ssh/keys/` directory. All keys are automatical
|
|||
|
||||
```
|
||||
docker run \
|
||||
-v /host/id_rsa.pub:/home/foo/.ssh/keys/id_rsa.pub:ro \
|
||||
-v /host/id_other.pub:/home/foo/.ssh/keys/id_other.pub:ro \
|
||||
-v /host/share:/home/foo/share \
|
||||
-v <host-dir>/id_rsa.pub:/home/foo/.ssh/keys/id_rsa.pub:ro \
|
||||
-v <host-dir>/id_other.pub:/home/foo/.ssh/keys/id_other.pub:ro \
|
||||
-v <host-dir>/share:/home/foo/share \
|
||||
-p 2222:22 -d atmoz/sftp \
|
||||
foo::1001
|
||||
```
|
||||
|
|
@ -120,9 +118,9 @@ This container will generate new SSH host keys at first run. To avoid that your
|
|||
|
||||
```
|
||||
docker run \
|
||||
-v /host/ssh_host_ed25519_key:/etc/ssh/ssh_host_ed25519_key \
|
||||
-v /host/ssh_host_rsa_key:/etc/ssh/ssh_host_rsa_key \
|
||||
-v /host/share:/home/foo/share \
|
||||
-v <host-dir>/ssh_host_ed25519_key:/etc/ssh/ssh_host_ed25519_key \
|
||||
-v <host-dir>/ssh_host_rsa_key:/etc/ssh/ssh_host_rsa_key \
|
||||
-v <host-dir>/share:/home/foo/share \
|
||||
-p 2222:22 -d atmoz/sftp \
|
||||
foo::1001
|
||||
```
|
||||
|
|
|
|||
|
|
@ -81,12 +81,20 @@ else
|
|||
fi
|
||||
|
||||
# Add SSH keys to authorized_keys with valid permissions
|
||||
if [ -d "/home/$user/.ssh/keys" ]; then
|
||||
for publickey in "/home/$user/.ssh/keys"/*; do
|
||||
cat "$publickey" >> "/home/$user/.ssh/authorized_keys"
|
||||
userKeysQueuedDir="/home/$user/.ssh/keys"
|
||||
if [ -d "$userKeysQueuedDir" ]; then
|
||||
userKeysAllowedFileTmp="$(mktemp)"
|
||||
userKeysAllowedFile="/home/$user/.ssh/authorized_keys"
|
||||
|
||||
for publickey in "$userKeysQueuedDir"/*; do
|
||||
cat "$publickey" >> "$userKeysAllowedFileTmp"
|
||||
done
|
||||
chown "$uid" "/home/$user/.ssh/authorized_keys"
|
||||
chmod 600 "/home/$user/.ssh/authorized_keys"
|
||||
|
||||
# Remove duplicate keys
|
||||
sort < "$userKeysAllowedFileTmp" | uniq > "$userKeysAllowedFile"
|
||||
|
||||
chown "$uid" "$userKeysAllowedFile"
|
||||
chmod 600 "$userKeysAllowedFile"
|
||||
fi
|
||||
|
||||
# Make sure dirs exists
|
||||
|
|
|
|||
|
|
@ -89,6 +89,10 @@ if [ ! -f "$userConfFinalPath" ] || [ -n "$SFTP_USERS" ]; then
|
|||
if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
|
||||
ssh-keygen -t rsa -b 4096 -f /etc/ssh/ssh_host_rsa_key -N ''
|
||||
fi
|
||||
|
||||
# Restrict access from other users
|
||||
chmod 600 /etc/ssh/ssh_host_ed25519_key || true
|
||||
chmod 600 /etc/ssh/ssh_host_rsa_key || true
|
||||
fi
|
||||
|
||||
# Source custom scripts, if any
|
||||
|
|
|
|||
141
tests/run
141
tests/run
|
|
@ -1,18 +1,33 @@
|
|||
#!/bin/bash
|
||||
# See: https://github.com/kward/shunit2
|
||||
|
||||
argImage=$1
|
||||
argOutput=${2:-"quiet"}
|
||||
argCleanup=${3:-"cleanup"}
|
||||
testDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
imageName="$argImage"
|
||||
tmpDir="$(mktemp -d /tmp/atmoz_sftp_XXXX)"
|
||||
sshKeyPri="$tmpDir/rsa"
|
||||
sshKeyPub="$tmpDir/rsa.pub"
|
||||
sshHostEd25519Key="$tmpDir/ssh_host_ed25519_key"
|
||||
sshHostKeyMountArg="--volume=$sshHostEd25519Key:/etc/ssh/ssh_host_ed25519_key"
|
||||
sshKnownHosts="$tmpDir/known_hosts"
|
||||
|
||||
if [ $UID != 0 ] && ! groups | grep -qw docker; then
|
||||
echo "Run with sudo/root or add user $USER to group 'docker'"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
argBuild=${1:-"build"}
|
||||
argOutput=${2:-"quiet"}
|
||||
argCleanup=${3:-"cleanup"}
|
||||
testDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
buildDir="$testDir/.."
|
||||
imageName="atmoz/sftp_test"
|
||||
buildOptions=(--tag "$imageName")
|
||||
if [ ! -f "$testDir/shunit2/shunit2" ]; then
|
||||
echo "Could not find shunit2 in $testDir/shunit2."
|
||||
echo "Run 'git submodule update --init'"
|
||||
exit 2
|
||||
fi
|
||||
|
||||
if [ -z "$argImage" ]; then
|
||||
echo "Missing image name"
|
||||
exit 3
|
||||
fi
|
||||
|
||||
if [ "$argOutput" == "quiet" ]; then
|
||||
redirect="/dev/null"
|
||||
|
|
@ -20,12 +35,6 @@ else
|
|||
redirect="/dev/stdout"
|
||||
fi
|
||||
|
||||
if [ ! -f "$testDir/shunit2/shunit2" ]; then
|
||||
echo "Could not find shunit2 in $testDir/shunit2."
|
||||
echo "Run 'git submodules init && git submodules update'"
|
||||
exit 2
|
||||
fi
|
||||
|
||||
# clear argument list (or shunit2 will try to use them)
|
||||
set --
|
||||
|
||||
|
|
@ -34,29 +43,16 @@ set --
|
|||
##############################################################################
|
||||
|
||||
function oneTimeSetUp() {
|
||||
if [ "$argBuild" == "build" ]; then
|
||||
buildOptions+=("--no-cache" "--pull=true")
|
||||
fi
|
||||
|
||||
# Build image
|
||||
if ! docker build "${buildOptions[@]}" "$buildDir"; then
|
||||
echo "Build failed"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Generate temporary ssh keys for testing
|
||||
if [ ! -f "/tmp/atmoz_sftp_test_rsa" ]; then
|
||||
ssh-keygen -t rsa -f "/tmp/atmoz_sftp_test_rsa" -N '' > "$redirect" 2>&1
|
||||
if [ ! -f "$sshKeyPri" ]; then
|
||||
ssh-keygen -t rsa -f "$sshKeyPri" -N '' > "$redirect" 2>&1
|
||||
fi
|
||||
|
||||
# Private key can not be read by others (sshd will complain)
|
||||
chmod go-rw "/tmp/atmoz_sftp_test_rsa"
|
||||
}
|
||||
chmod go-rw "$sshKeyPri"
|
||||
|
||||
function oneTimeTearDown() {
|
||||
if [ "$argCleanup" == "cleanup" ]; then
|
||||
docker image rm "$imageName" > "$redirect" 2>&1
|
||||
fi
|
||||
# Generate host key
|
||||
ssh-keygen -t ed25519 -f "$sshHostEd25519Key" < /dev/null
|
||||
}
|
||||
|
||||
function setUp() {
|
||||
|
|
@ -72,7 +68,7 @@ function tearDown() {
|
|||
retireContainer "$containerName"
|
||||
|
||||
if [ "$argCleanup" == "cleanup" ] && [ -d "$containerTmpDir" ]; then
|
||||
rm -rf "$containerTmpDir"
|
||||
rm -rf "$containerTmpDir" || true # Can fail on GitHub Actions
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -98,15 +94,16 @@ function runSftpCommands() {
|
|||
user="$2"
|
||||
shift 2
|
||||
|
||||
echo "$ip $(cat "$sshHostEd25519Key.pub")" >> "$sshKnownHosts"
|
||||
|
||||
commands=""
|
||||
for cmd in "$@"; do
|
||||
commands="$commands$cmd"$'\n'
|
||||
done
|
||||
|
||||
echo "$commands" | sftp \
|
||||
-i "/tmp/atmoz_sftp_test_rsa" \
|
||||
-oStrictHostKeyChecking=no \
|
||||
-oUserKnownHostsFile=/dev/null \
|
||||
-i "$sshKeyPri" \
|
||||
-oUserKnownHostsFile="$sshKnownHosts" \
|
||||
-b - "$user@$ip" \
|
||||
> "$redirect" 2>&1
|
||||
|
||||
|
|
@ -138,7 +135,7 @@ function waitForServer() {
|
|||
##############################################################################
|
||||
|
||||
function testSmallestUserConfig() {
|
||||
docker run --name "$containerName" \
|
||||
docker run --name "$containerName" "$sshHostKeyMountArg" \
|
||||
--entrypoint="/bin/sh" \
|
||||
"$imageName" \
|
||||
-c "create-sftp-user u: && id u" \
|
||||
|
|
@ -147,7 +144,7 @@ function testSmallestUserConfig() {
|
|||
}
|
||||
|
||||
function testCreateUserWithDot() {
|
||||
docker run --name "$containerName" \
|
||||
docker run --name "$containerName" "$sshHostKeyMountArg" \
|
||||
--entrypoint="/bin/sh" \
|
||||
"$imageName" \
|
||||
-c "create-sftp-user user.with.dot: && id user.with.dot" \
|
||||
|
|
@ -156,7 +153,7 @@ function testCreateUserWithDot() {
|
|||
}
|
||||
|
||||
function testUserCustomUidAndGid() {
|
||||
id="$(docker run --name "$containerName" \
|
||||
id="$(docker run --name "$containerName" "$sshHostKeyMountArg" \
|
||||
--entrypoint="/bin/sh" \
|
||||
"$imageName" \
|
||||
-c "create-sftp-user u::1234:4321: > /dev/null && id u" )"
|
||||
|
|
@ -172,14 +169,14 @@ function testUserCustomUidAndGid() {
|
|||
}
|
||||
|
||||
function testCommandPassthrough() {
|
||||
docker run --name "$containerName" \
|
||||
docker run --name "$containerName" "$sshHostKeyMountArg" \
|
||||
"$imageName" test 1 -eq 1 \
|
||||
> "$redirect" 2>&1
|
||||
assertTrue "command passthrough" $?
|
||||
}
|
||||
|
||||
function testUsersConf() {
|
||||
docker run --name "$containerName" -d \
|
||||
docker run --name "$containerName" "$sshHostKeyMountArg" -d \
|
||||
-v "$testDir/files/users.conf:/etc/sftp/users.conf:ro" \
|
||||
"$imageName" \
|
||||
> "$redirect" 2>&1
|
||||
|
|
@ -232,7 +229,7 @@ function testAddUsersConf() {
|
|||
}
|
||||
|
||||
function testLegacyUsersConf() {
|
||||
docker run --name "$containerName" -d \
|
||||
docker run --name "$containerName" "$sshHostKeyMountArg" -d \
|
||||
-v "$testDir/files/users.conf:/etc/sftp-users.conf:ro" \
|
||||
"$imageName" \
|
||||
> "$redirect" 2>&1
|
||||
|
|
@ -245,7 +242,7 @@ function testLegacyUsersConf() {
|
|||
}
|
||||
|
||||
function testCreateUsersUsingEnv() {
|
||||
docker run --name "$containerName" -d \
|
||||
docker run --name "$containerName" "$sshHostKeyMountArg" -d \
|
||||
-e "SFTP_USERS=user-from-env: user-from-env-2:" \
|
||||
"$imageName" \
|
||||
> "$redirect" 2>&1
|
||||
|
|
@ -261,7 +258,7 @@ function testCreateUsersUsingEnv() {
|
|||
}
|
||||
|
||||
function testCreateUsersUsingCombo() {
|
||||
docker run --name "$containerName" -d \
|
||||
docker run --name "$containerName" "$sshHostKeyMountArg" -d \
|
||||
-v "$testDir/files/users.conf:/etc/sftp-users.conf:ro" \
|
||||
-e "SFTP_USERS=user-from-env:" \
|
||||
"$imageName" \
|
||||
|
|
@ -282,8 +279,8 @@ function testCreateUsersUsingCombo() {
|
|||
}
|
||||
|
||||
function testWriteAccessToAutocreatedDirs() {
|
||||
docker run --name "$containerName" -d \
|
||||
-v "/tmp/atmoz_sftp_test_rsa.pub":/home/test/.ssh/keys/id_rsa.pub:ro \
|
||||
docker run --name "$containerName" "$sshHostKeyMountArg" -d \
|
||||
-v "$sshKeyPub":/home/test/.ssh/keys/id_rsa.pub:ro \
|
||||
"$imageName" "test::::testdir,dir with spaces" \
|
||||
> "$redirect" 2>&1
|
||||
|
||||
|
|
@ -305,6 +302,41 @@ function testWriteAccessToAutocreatedDirs() {
|
|||
assertTrue "dir with spaces write access" $?
|
||||
}
|
||||
|
||||
function testWriteAccessToLimitedChroot() {
|
||||
# Modified sshd_config with chrooted home subdir
|
||||
tmpConfig="$(mktemp)"
|
||||
sed 's/^ChrootDirectory.*/ChrootDirectory %h\/sftp/' \
|
||||
< "$testDir/../files/sshd_config" > "$tmpConfig"
|
||||
|
||||
# Set correct permissions on chroot
|
||||
tmpScript="$(mktemp)"
|
||||
cat > "$tmpScript" <<EOF
|
||||
mkdir -p /home/*/sftp
|
||||
chown root:root /home/*/sftp
|
||||
chmod 755 /home/*/sftp
|
||||
EOF
|
||||
chmod +x "$tmpScript"
|
||||
|
||||
docker run --name "$containerName" "$sshHostKeyMountArg" -d \
|
||||
-v "$sshKeyPub":/home/test/.ssh/keys/id_rsa.pub:ro \
|
||||
-v "$tmpConfig:/etc/ssh/sshd_config" \
|
||||
-v "$tmpScript:/etc/sftp.d/limited_home_dir" \
|
||||
"$imageName" "test::::sftp/upload" \
|
||||
> "$redirect" 2>&1
|
||||
|
||||
waitForServer "$containerName"
|
||||
assertTrue "waitForServer" $?
|
||||
|
||||
runSftpCommands "$containerName" "test" \
|
||||
"cd upload" \
|
||||
"mkdir test" \
|
||||
"exit"
|
||||
assertTrue "runSftpCommands" $?
|
||||
|
||||
docker exec "$containerName" test -d /home/test/sftp/upload/test
|
||||
assertTrue "limited chroot write access" $?
|
||||
}
|
||||
|
||||
function testBindmountDirScript() {
|
||||
mkdir -p "$containerTmpDir/custom/bindmount"
|
||||
echo "mkdir -p /home/custom/bindmount && \
|
||||
|
|
@ -313,9 +345,9 @@ function testBindmountDirScript() {
|
|||
> "$containerTmpDir/mount.sh"
|
||||
chmod +x "$containerTmpDir/mount.sh"
|
||||
|
||||
docker run --name "$containerName" -d \
|
||||
docker run --name "$containerName" "$sshHostKeyMountArg" -d \
|
||||
--privileged=true \
|
||||
-v "/tmp/atmoz_sftp_test_rsa.pub":/home/custom/.ssh/keys/id_rsa.pub:ro \
|
||||
-v "$sshKeyPub":/home/custom/.ssh/keys/id_rsa.pub:ro \
|
||||
-v "$containerTmpDir/custom/bindmount":/custom \
|
||||
-v "$containerTmpDir/mount.sh":/etc/sftp.d/mount.sh \
|
||||
"$imageName" custom:123 \
|
||||
|
|
@ -334,6 +366,21 @@ function testBindmountDirScript() {
|
|||
assertTrue "directory exist" $?
|
||||
}
|
||||
|
||||
function testDuplicateSshKeys() {
|
||||
docker run --name "$containerName" "$sshHostKeyMountArg" -d \
|
||||
-v "$sshKeyPub":/home/user/.ssh/keys/key1.pub:ro \
|
||||
-v "$sshKeyPub":/home/user/.ssh/keys/key2.pub:ro \
|
||||
"$imageName" "user:" \
|
||||
> "$redirect" 2>&1
|
||||
|
||||
waitForServer "$containerName"
|
||||
assertTrue "waitForServer" $?
|
||||
|
||||
lines="$(docker exec "$containerName" sh -c \
|
||||
"wc -l < /home/user/.ssh/authorized_keys")"
|
||||
assertEquals "1" "$lines"
|
||||
}
|
||||
|
||||
##############################################################################
|
||||
## Run
|
||||
##############################################################################
|
||||
|
|
|
|||
1
tests/shunit2
Submodule
1
tests/shunit2
Submodule
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 3f2bff2a815097be557a5c0af77f967a87139409
|
||||
Loading…
Reference in a new issue