[gentoo-dev] [PATCH] eclass/acct-user.eclass: disable fcaps() on Prefix.

[gentoo-dev] [PATCH] eclass/acct-user.eclass: disable fcaps() on Prefix.

[heroxbd]

From: Benda Xu <heroxbd@gentoo.org>

  Gentoo Prefix runs with a normal user and cannot grant extra
  capabilities.  Exit gracefully with a message.

Closes: https://bugs.gentoo.org/699526
Signed-off-by: Benda Xu <heroxbd@gentoo.org>
---
 eclass/fcaps.eclass | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/eclass/fcaps.eclass b/eclass/fcaps.eclass
index 467f955f5e9a..563d177c92d5 100644
--- a/eclass/fcaps.eclass
+++ b/eclass/fcaps.eclass
@@ -78,6 +78,11 @@ DEPEND="filecaps? ( sys-libs/libcap )"
 fcaps() {
 	debug-print-function ${FUNCNAME} "$@"
 
+	if [[ ${EUID} != 0 ]] ; then
+		einfo "Insufficient privileges to execute ${FUNCNAME[0]}"
+		return 0
+	fi
+
 	# Process the user options first.
 	local owner='root'
 	local group='0'
-- 
2.25.0

Re: [gentoo-dev] [PATCH] eclass/acct-user.eclass: disable fcaps() on Prefix.

[Michał Górny]

[-- Attachment #1: Type: text/plain, Size: 991 bytes --]

^ wrong subject.

On Sun, 2020-03-08 at 12:20 +0800, heroxbd@gentoo.org wrote:
> From: Benda Xu <heroxbd@gentoo.org>
> 
>   Gentoo Prefix runs with a normal user and cannot grant extra
>   capabilities.  Exit gracefully with a message.

Please don't add this weird indent.

> 
> Closes: https://bugs.gentoo.org/699526
> Signed-off-by: Benda Xu <heroxbd@gentoo.org>
> ---
>  eclass/fcaps.eclass | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/eclass/fcaps.eclass b/eclass/fcaps.eclass
> index 467f955f5e9a..563d177c92d5 100644
> --- a/eclass/fcaps.eclass
> +++ b/eclass/fcaps.eclass
> @@ -78,6 +78,11 @@ DEPEND="filecaps? ( sys-libs/libcap )"
>  fcaps() {
>  	debug-print-function ${FUNCNAME} "$@"
>  
> +	if [[ ${EUID} != 0 ]] ; then
> +		einfo "Insufficient privileges to execute ${FUNCNAME[0]}"
> +		return 0
> +	fi
> +
>  	# Process the user options first.
>  	local owner='root'
>  	local group='0'

-- 
Best regards,
Michał Górny


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 618 bytes --]

Re: [gentoo-dev] [PATCH] eclass/acct-user.eclass: disable fcaps() on Prefix.

[Benda Xu]

[-- Attachment #1: Type: text/plain, Size: 465 bytes --]

Michał Górny <mgorny@gentoo.org> writes:

> ^ wrong subject.

OK. should be `acct-user.eclass: disable fcaps() on Prefix.`

> On Sun, 2020-03-08 at 12:20 +0800, heroxbd@gentoo.org wrote:
>> From: Benda Xu <heroxbd@gentoo.org>
>> 
>>   Gentoo Prefix runs with a normal user and cannot grant extra
>>   capabilities.  Exit gracefully with a message.
>
> Please don't add this weird indent.

OK, thanks for pointing out.  Didn't notice that.

Benda

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[gentoo-dev] [PATCH] fcaps.eclass: disable fcaps() on Prefix.

[heroxbd]

From: Benda Xu <heroxbd@gentoo.org>

Gentoo Prefix runs with a normal user and cannot grant extra
capabilities.  Exit gracefully with a message.

Signed-off-by: Benda Xu <heroxbd@gentoo.org>
---
 eclass/fcaps.eclass | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/eclass/fcaps.eclass b/eclass/fcaps.eclass
index 467f955f5e9a..563d177c92d5 100644
--- a/eclass/fcaps.eclass
+++ b/eclass/fcaps.eclass
@@ -78,6 +78,11 @@ DEPEND="filecaps? ( sys-libs/libcap )"
 fcaps() {
 	debug-print-function ${FUNCNAME} "$@"
 
+	if [[ ${EUID} != 0 ]] ; then
+		einfo "Insufficient privileges to execute ${FUNCNAME[0]}"
+		return 0
+	fi
+
 	# Process the user options first.
 	local owner='root'
 	local group='0'
-- 
2.25.0

Re: [gentoo-dev] [PATCH] fcaps.eclass: disable fcaps() on Prefix.

[Fabian Groffen]

[-- Attachment #1: Type: text/plain, Size: 1046 bytes --]

On 08-03-2020 15:26:50 +0800, heroxbd@gentoo.org wrote:
> From: Benda Xu <heroxbd@gentoo.org>
> 
> Gentoo Prefix runs with a normal user and cannot grant extra
> capabilities.  Exit gracefully with a message.
> 
> Signed-off-by: Benda Xu <heroxbd@gentoo.org>
> ---
>  eclass/fcaps.eclass | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/eclass/fcaps.eclass b/eclass/fcaps.eclass
> index 467f955f5e9a..563d177c92d5 100644
> --- a/eclass/fcaps.eclass
> +++ b/eclass/fcaps.eclass
> @@ -78,6 +78,11 @@ DEPEND="filecaps? ( sys-libs/libcap )"
>  fcaps() {
>  	debug-print-function ${FUNCNAME} "$@"
>  
> +	if [[ ${EUID} != 0 ]] ; then
> +		einfo "Insufficient privileges to execute ${FUNCNAME[0]}"
> +		return 0

Perhaps add "ignoring" or something in the message here to make it clear
this isn't treated as an error?

Thanks,
Fabian

> +	fi
> +
>  	# Process the user options first.
>  	local owner='root'
>  	local group='0'
> -- 
> 2.25.0
> 
> 

-- 
Fabian Groffen
Gentoo on a different level

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [gentoo-dev] [PATCH] fcaps.eclass: disable fcaps() on Prefix.

[Ulrich Mueller]

[-- Attachment #1: Type: text/plain, Size: 380 bytes --]

>>>>> On Sun, 08 Mar 2020, heroxbd  wrote:
>  	debug-print-function ${FUNCNAME} "$@"
>  
> +	if [[ ${EUID} != 0 ]] ; then
> +		einfo "Insufficient privileges to execute ${FUNCNAME[0]}"

Just a small comment on style, maybe try to stay consistent with the
rest of the eclass? That is, either have just FUNCNAME here, or change
it to FUNCNAME[0] everywhere else.

Ulrich

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 507 bytes --]

[gentoo-dev] [PATCH] fcaps.eclass: skip fcaps() on Prefix.

[heroxbd]

From: Benda Xu <heroxbd@gentoo.org>

Gentoo Prefix runs with a normal user and cannot grant extra
capabilities.  Exit gracefully with a message.

Signed-off-by: Benda Xu <heroxbd@gentoo.org>
---
 eclass/fcaps.eclass | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/eclass/fcaps.eclass b/eclass/fcaps.eclass
index 467f955f5e9a..ddc4d3ccc6d8 100644
--- a/eclass/fcaps.eclass
+++ b/eclass/fcaps.eclass
@@ -78,6 +78,11 @@ DEPEND="filecaps? ( sys-libs/libcap )"
 fcaps() {
 	debug-print-function ${FUNCNAME} "$@"
 
+	if [[ ${EUID} != 0 ]] ; then
+		einfo "Insufficient privileges to execute ${FUNCNAME}, skip."
+		return 0
+	fi
+
 	# Process the user options first.
 	local owner='root'
 	local group='0'
-- 
2.25.0

Re: [gentoo-dev] [PATCH] fcaps.eclass: skip fcaps() on Prefix.

[Mike Gilbert]

On Sun, Mar 8, 2020 at 5:20 AM <heroxbd@gentoo.org> wrote:
>
> From: Benda Xu <heroxbd@gentoo.org>
>
> Gentoo Prefix runs with a normal user and cannot grant extra
> capabilities.  Exit gracefully with a message.
>
> Signed-off-by: Benda Xu <heroxbd@gentoo.org>
> ---
>  eclass/fcaps.eclass | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/eclass/fcaps.eclass b/eclass/fcaps.eclass
> index 467f955f5e9a..ddc4d3ccc6d8 100644
> --- a/eclass/fcaps.eclass
> +++ b/eclass/fcaps.eclass
> @@ -78,6 +78,11 @@ DEPEND="filecaps? ( sys-libs/libcap )"
>  fcaps() {
>         debug-print-function ${FUNCNAME} "$@"
>
> +       if [[ ${EUID} != 0 ]] ; then
> +               einfo "Insufficient privileges to execute ${FUNCNAME}, skip."
> +               return 0
> +       fi
> +

It seems like you are commanding the user to skip.

s/skip/skipping/

[gentoo-dev] [PATCH] fcaps.eclass: skip fcaps() on Prefix.

[heroxbd]

From: Benda Xu <heroxbd@gentoo.org>

Gentoo Prefix runs with a normal user and cannot grant extra
capabilities.  Exit gracefully with a message.

Signed-off-by: Benda Xu <heroxbd@gentoo.org>
---
 eclass/fcaps.eclass | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/eclass/fcaps.eclass b/eclass/fcaps.eclass
index 467f955f5e9a..fb0af8cbbde6 100644
--- a/eclass/fcaps.eclass
+++ b/eclass/fcaps.eclass
@@ -78,6 +78,11 @@ DEPEND="filecaps? ( sys-libs/libcap )"
 fcaps() {
 	debug-print-function ${FUNCNAME} "$@"
 
+	if [[ ${EUID} != 0 ]] ; then
+		einfo "Insufficient privileges to execute ${FUNCNAME}, skipping."
+		return 0
+	fi
+
 	# Process the user options first.
 	local owner='root'
 	local group='0'
-- 
2.25.0