From 28930cd837fd74e8366e11dd10c5c0f4ba1a4fc9 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Wed, 18 Oct 2017 11:31:18 +0200 Subject: [PATCH] add static user possibility --- Dockerfile | 2 +- README.md | 14 +++++++++++++- rootfs/etc/confd/templates/proftpd.conf.tmpl | 6 ++++++ rootfs/etc/cont-init.d/04-static-user | 14 ++++++++++++++ 4 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 rootfs/etc/cont-init.d/04-static-user diff --git a/Dockerfile b/Dockerfile index 6773539..d39301d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM registry.gitlab.com/thallian/docker-confd-env:master RUN apk add --no-cache libressl openssh-client openldap zlib RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing \ - proftpd proftpd-mod_ldap proftpd-mod_sftp + proftpd proftpd-mod_ldap proftpd-mod_sftp proftpd-utils RUN addgroup -g 2222 access RUN addgroup proftpd access diff --git a/README.md b/README.md index 2a1602f..5fd89d8 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,20 @@ File access with [ProFTPD](http://www.proftpd.org/) over sftp and ldap authentic ## SERVER_NAME Name displayed to connecting users. +## STATIC_USER +A static username for authentication. + +## STATIC_PASSWORD +Password for the static user. + +## STATIC_UID +Uid for the static user. + +## STATIC_GID +Gid for the static user. + ## LDAP_URI -Full ldap uri with search qualifier. +Full ldap uri with search qualifier. Disables ldap auth if empty. For example: `ldap://ldap:389/??sub` diff --git a/rootfs/etc/confd/templates/proftpd.conf.tmpl b/rootfs/etc/confd/templates/proftpd.conf.tmpl index a546591..16f66b1 100644 --- a/rootfs/etc/confd/templates/proftpd.conf.tmpl +++ b/rootfs/etc/confd/templates/proftpd.conf.tmpl @@ -20,6 +20,10 @@ WtmpLog off LoadModule mod_ldap.c LoadModule mod_sftp.c +{{if (getenv "STATIC_USER")}} +AuthUserFile /etc/proftpd/passwd +{{end}} + SFTPEngine on SFTPAuthMethods password @@ -28,6 +32,7 @@ LoadModule mod_sftp.c SFTPOptions IgnoreSCPUploadPerms IgnoreSFTPUploadPerms +{{if (getenv "LDAP_URI")}} AuthOrder mod_ldap.c @@ -47,3 +52,4 @@ LoadModule mod_sftp.c LDAPGenerateHomedirPrefix /var/lib/ftp/data LDAPForceGeneratedHomedir on +{{end}} diff --git a/rootfs/etc/cont-init.d/04-static-user b/rootfs/etc/cont-init.d/04-static-user new file mode 100644 index 0000000..3a92097 --- /dev/null +++ b/rootfs/etc/cont-init.d/04-static-user @@ -0,0 +1,14 @@ +#!/usr/bin/with-contenv sh + +if [ ! -z ${STATIC_USER+x} ]; then + ftpasswd \ + --sha512 \ + --passwd \ + --home /var/lib/ftp/data \ + --uid ${STATIC_UID} \ + --gid ${STATIC_GID} \ + --name ${STATIC_USER} \ + --shell /bin/sh \ + --file /etc/proftpd/passwd \ + --stdin ${STATIC_PASSWORD} +fi