Bug#691649: deluged: Move umask setting to /etc/default/deluged

[Daniel Baumann]

retitle 691649 make default umask configurable
tag 691649 - patch
severity 691649 wishlist
thanks

Hi,

thank you for reporting this and thanks for the patch (this needs to be
reworked for the systemd integration). I'll make it configurable and add
a debconf question for this in one of the next uploads in the next few days.

Regards,
Daniel

Bug#691649: deluged: Move umask setting to /etc/default/deluged

[Diederik de Haas]

tags 691649 patch
thanks

On Mon, 01 Sep 2014 16:17:30 -0700 Will Conley  wrote:
> I have attached a patch file that modifies the init-script to read the
> umask from /etc/default/deluged, as the original bug reporter suggested.
> In the patch I left the default umask as 0027.

Then lets mark the bug accordingly

signature.asc
Description: This is a digitally signed message part.

Bug#691649: deluged: Move umask setting to /etc/default/deluged

[Will Conley]

I can confirm this, and I agree that the umask should be more easily
configurable by the user. Furthermore, I wonder why the default umask is
so paranoid. Should the default really be 0027? I think (the fairly
standard) 0022 should be restrictive enough for most users, although I
still agree that this should be user-configurable.

Incidentally, users who *are* paranoid (as I am) and want their
downloaded torrents to not be world-readable can still have a umask of
0022 (or even 0002 as I do) and simply have deluged download everything
into a directory that is not world-readable. Likewise, if desired, for
the config directory and the log files: just give /var/lib/deluged and
/var/log/deluged permissions of 0750 or similar.

I have attached a patch file that modifies the init-script to read the
umask from /etc/default/deluged, as the original bug reporter suggested.
In the patch I left the default umask as 0027.



diff -rupN deluge-1.3.7/debian/deluged.default deluge-1.3.7-new/debian/deluged.default
--- deluge-1.3.7/debian/deluged.default	2014-08-30 14:45:20.0 -0700
+++ deluge-1.3.7-new/debian/deluged.default	2014-09-01 16:12:12.0 -0700
@@ -3,3 +3,6 @@
 
 # change to 1 to enable daemon
 ENABLE_DELUGED=0
+
+# the umask of the deluged process
+UMASK=0027
diff -rupN deluge-1.3.7/debian/deluged.init deluge-1.3.7-new/debian/deluged.init
--- deluge-1.3.7/debian/deluged.init	2014-08-30 14:45:20.0 -0700
+++ deluge-1.3.7-new/debian/deluged.init	2014-09-01 16:15:22.0 -0700
@@ -20,7 +20,6 @@ NAME=deluged
 DAEMON=/usr/bin/$NAME
 DAEMON_ARGS=-d -c /var/lib/deluged/config -l /var/log/deluged/daemon.log -L info
 USER=debian-deluged
-MASK=0027
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 
@@ -53,11 +52,11 @@ do_start()
 #   1 if daemon was already running
 #   2 if daemon could not be started
 start-stop-daemon --start --background --quiet --pidfile $PIDFILE --exec $DAEMON \
-  --chuid $USER --umask $MASK --test  /dev/null \
+  --chuid $USER --umask $UMASK --test  /dev/null \
   || return 1
 
 start-stop-daemon --start --background --quiet --pidfile $PIDFILE --make-pidfile --exec $DAEMON \
-  --chuid $USER --umask $MASK -- $DAEMON_ARGS \
+  --chuid $USER --umask $UMASK -- $DAEMON_ARGS \
   || return 2
   fi
 }

Bug#691649: deluged: Move umask setting to /etc/default/deluged

[Diederik de Haas]

Package: deluged
Version: 1.3.5-1
Severity: normal

Dear Maintainer,

If I want to change permissions on the downloaded files, I now have to modify
the init script (MASK setting). This is unfortunate since (afaik) this will
prevent you (the maintainer) from providing a new one.
To me, moving that setting to /etc/default/deluged (for example) seems more
logical and allows you to provide a new init script.
The same logic could be applied to the USER setting btw.

-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-4-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages deluged depends on:
ii  adduser3.113+nmu3
ii  deluge-common  1.3.5-1
ii  lsb-base   4.1+Debian7
ii  python 2.7.3~rc2-1
ii  python-libtorrent  0.15.10-1+b1

deluged recommends no packages.

deluged suggests no packages.

-- Configuration Files:
/etc/default/deluged changed:
ENABLE_DELUGED=1

/etc/init.d/deluged changed:
PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC=Deluge BitTorrent Daemon
NAME=deluged
DAEMON=/usr/bin/$NAME
DAEMON_ARGS=-d -c /var/lib/deluged/config -l /var/log/deluged/daemon.log -L 
info
USER=debian-deluged
MASK=0007
PIDFILE=/var/run/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME
[ -x $DAEMON ] || exit 0
ENABLE_DELUGED=1
[ -r /etc/default/$NAME ]  . /etc/default/$NAME
[ -f /etc/default/rcS ]  . /etc/default/rcS
. /lib/lsb/init-functions
do_start()
{
  if [ $ENABLE_DELUGED != 1 ]; then
log_progress_msg Not starting ${DESC} ${NAME}, disabled in 
/etc/default/${NAME}
  else
# Return
#   0 if daemon has been started
#   1 if daemon was already running
#   2 if daemon could not be started
start-stop-daemon --start --background --quiet --pidfile $PIDFILE --exec 
$DAEMON \
  --chuid $USER --umask $MASK --test  /dev/null \
  || return 1
start-stop-daemon --start --background --quiet --pidfile $PIDFILE --make-
pidfile --exec $DAEMON \
  --chuid $USER --umask $MASK -- $DAEMON_ARGS \
  || return 2
  fi
}
do_stop()
{
  # Return
  #   0 if daemon has been stopped
  #   1 if daemon was already stopped
  #   2 if daemon could not be stopped
  #   other if a failure occurred
  start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
  RETVAL=$?
  [ $RETVAL = 2 ]  return 2
  rm -f $PIDFILE
  return $RETVAL
}
case $1 in
  start)
[ $VERBOSE != no ]  log_daemon_msg Starting $DESC $NAME
do_start
case $? in
  0|1) [ $VERBOSE != no ]  log_end_msg 0 ;;
  2) [ $VERBOSE != no ]  log_end_msg 1 ;;
esac
;;
  stop)
[ $VERBOSE != no ]  log_daemon_msg Stopping $DESC $NAME
do_stop
case $? in
  0|1) [ $VERBOSE != no ]  log_end_msg 0 ;;
  2) [ $VERBOSE != no ]  log_end_msg 1 ;;
esac
;;
  status)
status_of_proc $DAEMON $NAME  exit 0 || exit $?
;;
  restart|force-reload)
log_daemon_msg Restarting $DESC $NAME
do_stop
case $? in
  0|1)
do_start
case $? in
  0) log_end_msg 0 ;;
  1) log_end_msg 1 ;; # Old process is still running
  *) log_end_msg 1 ;; # Failed to start
esac
;;
  *)
# Failed to stop
log_end_msg 1
;;
esac
;;
  *)
echo Usage: $SCRIPTNAME {start|stop|status|restart|force-reload} 2
exit 3
;;
esac
:


-- no debconf information


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org