From owner-svn-ports-all@freebsd.org Tue Mar 5 21:13:34 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DC11815138C6; Tue, 5 Mar 2019 21:13:33 +0000 (UTC) (envelope-from rm@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A384A890BA; Tue, 5 Mar 2019 21:13:33 +0000 (UTC) (envelope-from rm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7FE6721B3E; Tue, 5 Mar 2019 21:13:33 +0000 (UTC) (envelope-from rm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x25LDXix032999; Tue, 5 Mar 2019 21:13:33 GMT (envelope-from rm@FreeBSD.org) Received: (from rm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x25LDXbh032996; Tue, 5 Mar 2019 21:13:33 GMT (envelope-from rm@FreeBSD.org) Message-Id: <201903052113.x25LDXbh032996@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rm set sender to rm@FreeBSD.org using -f From: Ruslan Makhmatkhanov Date: Tue, 5 Mar 2019 21:13:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r494743 - in head/net-p2p/deluge-cli: . files X-SVN-Group: ports-head X-SVN-Commit-Author: rm X-SVN-Commit-Paths: in head/net-p2p/deluge-cli: . files X-SVN-Commit-Revision: 494743 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A384A890BA X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.978,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Mar 2019 21:13:34 -0000 Author: rm Date: Tue Mar 5 21:13:32 2019 New Revision: 494743 URL: https://svnweb.freebsd.org/changeset/ports/494743 Log: net-p2p/deluge-cli: correct deluge_web rc-script From the PR: The rc.d script for deluge_web outright disrespects a user's home directory and instead tries to execute against hardcoded /home/${deluge_web_user} paths. This is invalid and dangerous behavior. When running as a user, the user's home directory must be respected. The attached patch fixes this behavior as a break-fix. PR: 234902 Submitted by: Phillip R. Jaenke Modified: head/net-p2p/deluge-cli/Makefile head/net-p2p/deluge-cli/files/deluge_web.in Modified: head/net-p2p/deluge-cli/Makefile ============================================================================== --- head/net-p2p/deluge-cli/Makefile Tue Mar 5 21:05:28 2019 (r494742) +++ head/net-p2p/deluge-cli/Makefile Tue Mar 5 21:13:32 2019 (r494743) @@ -3,7 +3,7 @@ PORTNAME= deluge DISTVERSIONPREFIX= ${PORTNAME}- DISTVERSION= 1.3.15 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= net-p2p python PKGNAMESUFFIX= -cli Modified: head/net-p2p/deluge-cli/files/deluge_web.in ============================================================================== --- head/net-p2p/deluge-cli/files/deluge_web.in Tue Mar 5 21:05:28 2019 (r494742) +++ head/net-p2p/deluge-cli/files/deluge_web.in Tue Mar 5 21:13:32 2019 (r494743) @@ -39,11 +39,16 @@ command_interpreter=%%PYTHON_CMD%% start_precmd=${name}_prestart stop_postcmd=${name}_poststop + deluge_web_prestart() { if [ "$deluge_web_user" = 'asjklasdfjklasdf' ]; then err 1 "You must set deluge_web_user to a real, unprivileged user" fi + deluge_web_home=$(pw user show ${deluge_web_user} | cut -d : -f 9) + if [ -z ${deluge_web_home} ]; then + err 1 "deluge_web_user does not have a valid home directory." + fi if [ ! -d "/var/run/${name}" ]; then if [ -e "/var/run/${name}" ]; then @@ -52,14 +57,13 @@ deluge_web_prestart() mkdir -p /var/run/${name} fi - if [ ! -d "/home/${deluge_web_user}/.python-eggs" ]; then - mkdir -p /home/${deluge_web_user}/.python-eggs - fi + if [ ! -d "${deluge_web_home}/.python-eggs" ]; then + mkdir ${deluge_web_home}/.python-eggs + chown -R $deluge_web_user ${deluge_web_home}/.python-eggs chmod 0755 /var/run/${name} chown -R $deluge_web_user /var/run/${name} - chown -R $deluge_web_user /home/${deluge_web_user}/.python-eggs - export PYTHON_EGG_CACHE="/home/${deluge_web_user}/.python-eggs" + export PYTHON_EGG_CACHE="${deluge_web_home}/.python-eggs" } deluge_web_poststop() @@ -72,7 +76,7 @@ load_rc_config $name : ${deluge_web_enable:="NO"} : ${deluge_web_user:="asjklasdfjklasdf"} -: ${deluge_web_confdir:="/home/${deluge_web_user}/.config/deluge"} +: ${deluge_web_confdir:="${deluge_web_home}/.config/deluge"} : ${deluge_web_loglevel:="error"} : ${deluge_web_logfile:="/var/tmp/${name}.log"}