Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hardened compiled '--with-uploadscript' and Environment Var 'FTP_UPLOADSCRIPT' #173

Open
wants to merge 42 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
6a1364c
Added secure new defaults, ref issue #10
stilliard Nov 21, 2015
3645b49
Merge branch 'master' into hardened
stilliard Nov 21, 2015
31503c1
Bug fix for incorrect configuration on 'hardened' branch.
jzaremba Jul 17, 2016
4c95b52
Merge pull request #19 from jzaremba/hardened_config_fix
stilliard Jul 17, 2016
81f44f9
Merge branch 'master' into hardened
stilliard Nov 12, 2016
fb538d8
Merge branch 'master' into hardened
stilliard Nov 14, 2016
da55e1a
Merge branch 'master' into hardened
stilliard Nov 30, 2016
e390aa7
Merge branch 'master' into hardened
stilliard Jan 17, 2017
1c994ab
Merge branch 'master' into hardened
stilliard Mar 22, 2017
4035e52
Merge branch 'master' into hardened
stilliard Mar 22, 2017
2f2dab7
Merge branch 'master' into hardened
stilliard Aug 29, 2017
f8b7a75
Merge branch 'master' into hardened
stilliard Aug 30, 2017
48b571e
Swapped conf file usage for flags on hardened branch as we dont curre…
stilliard Aug 30, 2017
06d36cd
Merge branch 'master' into hardened
stilliard Aug 30, 2017
056097a
add missing space
Oct 25, 2017
3e2a9b3
Merge pull request #52 from dbeneker/hardened
stilliard Oct 25, 2017
e1b14b9
Merge branch 'master' into hardened
stilliard Feb 9, 2018
38f4a43
Merge branch 'master' into hardened
stilliard May 20, 2018
4f1c1e5
Merge branch 'master' into hardened
stilliard May 20, 2018
360bc70
Merge branch 'master' into hardened
stilliard Jun 10, 2018
3ce896e
Merge branch 'master' into hardened
stilliard Jun 10, 2018
1e05b7e
Merge branch 'master' into hardened
stilliard Jun 20, 2018
c1082d4
Merge branch 'master' into hardened
stilliard Jun 20, 2018
ef3de15
Merge branch 'master' into hardened
stilliard Aug 24, 2018
9123516
Merge branch 'master' into hardened
stilliard Oct 3, 2018
f61343a
Merge branch 'master' into hardened
stilliard Nov 13, 2018
42deb93
test: use tls for ci tests
stilliard Nov 14, 2018
054b0d9
fix: auto-gen tls certs now use "-dsaparam"
stilliard Nov 14, 2018
5f44572
fix: test should use auto generated cert to verify connection
stilliard Nov 14, 2018
85ae410
feat: added TLS_USE_DSAPRAM flag, see #89, thanks @lafriks
stilliard Nov 14, 2018
7430767
Merge branch 'master' into hardened
stilliard Nov 14, 2018
f28a58b
Merge branch 'master' into hardened
stilliard Nov 15, 2018
55e2d69
Merge branch 'master' into hardened
stilliard Nov 15, 2018
2a65cbe
Merge branch 'master' into hardened
stilliard Nov 15, 2018
4acc810
Merge branch 'master' into hardened
stilliard Feb 4, 2019
42ed4fe
Thin image (#102)
jmdilly Mar 7, 2019
d2964d5
Merge branch 'master' into hardened
stilliard Jul 24, 2019
573c3c2
Merge branch 'master' into hardened
stilliard May 7, 2020
3d3e7e3
Merge branch 'master' into hardened
stilliard Aug 17, 2020
ab007c2
Merge branch 'master' into hardened
stilliard Jun 26, 2021
8c069c1
Merge branch 'master' into hardened
stilliard Jun 26, 2021
7668ca4
adding with-uploadscript flag and new env var 'FTP_UPLOADSCRIPT'
adrian-baehler Nov 22, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN mkdir /tmp/pure-ftpd/ && \
cd /tmp/pure-ftpd/ && \
apt-get source pure-ftpd && \
cd pure-ftpd-* && \
./configure --with-tls | grep -v '^checking' | grep -v ': Entering directory' | grep -v ': Leaving directory' && \
./configure --with-tls --with-uploadscript | grep -v '^checking' | grep -v ': Entering directory' | grep -v ': Leaving directory' && \
sed -i '/CAP_SYS_NICE,/d; /CAP_DAC_READ_SEARCH/d; s/CAP_SYS_CHROOT,/CAP_SYS_CHROOT/;' src/caps_p.h && \
dpkg-buildpackage -b -uc | grep -v '^checking' | grep -v ': Entering directory' | grep -v ': Leaving directory'

Expand Down Expand Up @@ -90,6 +90,6 @@ ENV PUBLICHOST localhost
VOLUME ["/home/ftpusers", "/etc/pure-ftpd/passwd"]

# startup
CMD /run.sh -l puredb:/etc/pure-ftpd/pureftpd.pdb -E -j -R -P $PUBLICHOST
CMD /run.sh -l puredb:/etc/pure-ftpd/pureftpd.pdb -E -j -R -P $PUBLICHOST -s -A -j -Z -H -4 -E -R -G -X -x

EXPOSE 21 30000-30009
8 changes: 8 additions & 0 deletions run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,14 @@ then
PURE_FTPD_FLAGS="$PURE_FTPD_FLAGS -C $FTP_MAX_CONNECTIONS"
fi

# Start upload script
if [ ! -z "$FTP_UPLOADSCRIPT" ]
then
echo "Starting Pure-Uploadscript"
chmod +x $FTP_UPLOADSCRIPT
/usr/sbin/pure-uploadscript -B -r $FTP_UPLOADSCRIPT &
fi

# let users know what flags we've ended with (useful for debug)
echo "Starting Pure-FTPd:"
echo " pure-ftpd $PURE_FTPD_FLAGS"
Expand Down