diff mbox series

[1/2] Tor: fix permissions of /var/ipfire/tor/torrc after installation

Message ID 20191112200649.5021-1-sfeddersen@ipfire.org
State Superseded
Headers
Series [1/2] Tor: fix permissions of /var/ipfire/tor/torrc after installation |

Commit Message

Stephan Feddersen Nov. 12, 2019, 8:06 p.m. UTC 
  From: "peter.mueller@ipfire.org" <peter.mueller@ipfire.org>

Fixes #12220

Reported-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---
 lfs/tor                 | 2 +-
 src/paks/tor/install.sh | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

Comments

Peter Müller Nov. 12, 2019, 9:32 p.m. UTC | #1 
Hello Stephan,

unfortunately, I do not understand this mail. Isn't that the Tor
permission patch of mine sent in a while ago? What is the relationship
to wio?

Besides: Your other patches miss the "Signed-off-by"-Tag. Just
thought you might want to know...

Thanks, and best regards,
Peter Müller


> From: "peter.mueller@ipfire.org" <peter.mueller@ipfire.org>
> 
> Fixes #12220
> 
> Reported-by: Michael Tremer <michael.tremer@ipfire.org>
> Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
> Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
> ---
>  lfs/tor                 | 2 +-
>  src/paks/tor/install.sh | 8 ++++----
>  2 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/lfs/tor b/lfs/tor
> index ea07f6ce2..178f84be9 100644
> --- a/lfs/tor
> +++ b/lfs/tor
> @@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
>  DIR_APP    = $(DIR_SRC)/$(THISAPP)
>  TARGET     = $(DIR_INFO)/$(THISAPP)
>  PROG       = tor
> -PAK_VER    = 43
> +PAK_VER    = 44
>  
>  DEPS       = "libseccomp"
>  
> diff --git a/src/paks/tor/install.sh b/src/paks/tor/install.sh
> index 4d0353155..369b65f71 100644
> --- a/src/paks/tor/install.sh
> +++ b/src/paks/tor/install.sh
> @@ -36,10 +36,10 @@ extract_files
>  restore_backup ${NAME}
>  
>  # Adjust some folder permission for new UID/GID
> -chown -R tor:tor /var/lib/tor /var/ipfire/tor
> +chown -R tor:tor /var/lib/tor
> +chown -R tor:nobody /var/ipfire/tor
>  
> -# Tor settings file needs to be writeable by nobody group for WebUI
> -chown tor:nobody /var/ipfire/tor/settings
> -chmod 664 /var/ipfire/tor/settings
> +# Tor settings files needs to be writeable by nobody group for WebUI
> +chmod 664 /var/ipfire/tor/{settings,torrc}
>  
>  start_service --background ${NAME}
>
Michael Tremer Nov. 13, 2019, 10:04 a.m. UTC | #2 
Hi Peter,

Stephan contacted me yesterday and said he just pressed a wrong button and sent his patch and the previous commit together as one patchset.

So just ignore this.

Best,
-Michael

> On 12 Nov 2019, at 21:32, Peter Müller <peter.mueller@ipfire.org> wrote:
> 
> Hello Stephan,
> 
> unfortunately, I do not understand this mail. Isn't that the Tor
> permission patch of mine sent in a while ago? What is the relationship
> to wio?
> 
> Besides: Your other patches miss the "Signed-off-by"-Tag. Just
> thought you might want to know...
> 
> Thanks, and best regards,
> Peter Müller
> 
> 
>> From: "peter.mueller@ipfire.org" <peter.mueller@ipfire.org>
>> 
>> Fixes #12220
>> 
>> Reported-by: Michael Tremer <michael.tremer@ipfire.org>
>> Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
>> Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
>> ---
>> lfs/tor                 | 2 +-
>> src/paks/tor/install.sh | 8 ++++----
>> 2 files changed, 5 insertions(+), 5 deletions(-)
>> 
>> diff --git a/lfs/tor b/lfs/tor
>> index ea07f6ce2..178f84be9 100644
>> --- a/lfs/tor
>> +++ b/lfs/tor
>> @@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
>> DIR_APP    = $(DIR_SRC)/$(THISAPP)
>> TARGET     = $(DIR_INFO)/$(THISAPP)
>> PROG       = tor
>> -PAK_VER    = 43
>> +PAK_VER    = 44
>> 
>> DEPS       = "libseccomp"
>> 
>> diff --git a/src/paks/tor/install.sh b/src/paks/tor/install.sh
>> index 4d0353155..369b65f71 100644
>> --- a/src/paks/tor/install.sh
>> +++ b/src/paks/tor/install.sh
>> @@ -36,10 +36,10 @@ extract_files
>> restore_backup ${NAME}
>> 
>> # Adjust some folder permission for new UID/GID
>> -chown -R tor:tor /var/lib/tor /var/ipfire/tor
>> +chown -R tor:tor /var/lib/tor
>> +chown -R tor:nobody /var/ipfire/tor
>> 
>> -# Tor settings file needs to be writeable by nobody group for WebUI
>> -chown tor:nobody /var/ipfire/tor/settings
>> -chmod 664 /var/ipfire/tor/settings
>> +# Tor settings files needs to be writeable by nobody group for WebUI
>> +chmod 664 /var/ipfire/tor/{settings,torrc}
>> 
>> start_service --background ${NAME}
>>
diff mbox series

Patch

diff --git a/lfs/tor b/lfs/tor
index ea07f6ce2..178f84be9 100644
--- a/lfs/tor
+++ b/lfs/tor
@@ -32,7 +32,7 @@  DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tor
-PAK_VER    = 43
+PAK_VER    = 44
 
 DEPS       = "libseccomp"
 
diff --git a/src/paks/tor/install.sh b/src/paks/tor/install.sh
index 4d0353155..369b65f71 100644
--- a/src/paks/tor/install.sh
+++ b/src/paks/tor/install.sh
@@ -36,10 +36,10 @@  extract_files
 restore_backup ${NAME}
 
 # Adjust some folder permission for new UID/GID
-chown -R tor:tor /var/lib/tor /var/ipfire/tor
+chown -R tor:tor /var/lib/tor
+chown -R tor:nobody /var/ipfire/tor
 
-# Tor settings file needs to be writeable by nobody group for WebUI
-chown tor:nobody /var/ipfire/tor/settings
-chmod 664 /var/ipfire/tor/settings
+# Tor settings files needs to be writeable by nobody group for WebUI
+chmod 664 /var/ipfire/tor/{settings,torrc}
 
 start_service --background ${NAME}