Re: [qubes-devel] Re: [PATCH] parser: Change warning of invalid path to error

2023-08-20 Thread Marek Marczykowski-Górecki
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

On Fri, Aug 11, 2023 at 02:13:56PM +, Ben Grande wrote:
> On 23-05-26 16:59:07, Ben Grande wrote:
> > Signed-off-by: Ben Grande 
> > ---
> >  qrexec/policy/parser.py | 11 +--
> >  1 file changed, 5 insertions(+), 6 deletions(-)
> > 
> > diff --git a/qrexec/policy/parser.py b/qrexec/policy/parser.py
> > index ab50f9e..143f77f 100644
> > --- a/qrexec/policy/parser.py
> > +++ b/qrexec/policy/parser.py
> > @@ -1956,15 +1956,14 @@ class ToposortMixIn:
> >  if "/" in key and (
> >  not key.startswith("include/") or key.count("/") > 1
> >  ):
> > -# TODO make this an error, since we shouldn't accept this 
> > anyway
> > -logging.warning(
> > -"ignoring path %r included in %s on line %d; "
> > -"expect problems with import order",
> > -included_path,
> > +raise PolicySyntaxError(
> >  filepath,
> >  lineno,
> > +"invalid path {}, only paths inside the directories {} and 
> > "
> > +"{}/include are considered".format(
> > +included_path, POLICYPATH, POLICYPATH
> > +),
> >  )
> > -return
> >  
> >  self.included_paths[key].add(included_path)
> >  
> > -- 
> > Benjamin Grande 
> 
> Reminding of unreviewed patch.

Pylint complained about duplicated POLICYPATH, so I adjusted it to use
named arguments. Otherwise, applied, thanks!

- -- 
Best Regards,
Marek Marczykowski-Górecki
Invisible Things Lab
-BEGIN PGP SIGNATURE-

iQEzBAEBCAAdFiEEhrpukzGPukRmQqkK24/THMrX1ywFAmTh//8ACgkQ24/THMrX
1yz4PQf+JidHMMTgRgpSF6hzNoQG6J9QUxmKsdAil1ZpbGlwkS7OCRxAupBsDkwc
5rYX52bPzq4UWnK1Bq8urHB0EyxaAt8y2XVtMbaTS4UMpHTEzRj34g0jrsRUkRHl
tmpAQsDbloqRA6N6IzyYOo7J8E8LldyyiueesuFBi7H/fGJZq74MQ9M1nZdC/ibn
mgHT4OsbuI2i1xapZ6sxxUFsywJHf9ojUFq7Yn+MJFcFhrB0wZ+x2fdRg5XdoJuP
UJOlRGytrznDTxvvCVermyAOo/RHAF2tIUQPkHKEak5wgywbYzPv/QTO0voO/784
ZVdvuAbJ4cjYPAfzkae2q1KZDY0hXw==
=6ED7
-END PGP SIGNATURE-

-- 
You received this message because you are subscribed to the Google Groups 
"qubes-devel" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to qubes-devel+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/qubes-devel/ZOH//g2z3Sl5tZwV%40mail-itl.


[qubes-devel] Re: [PATCH] parser: Change warning of invalid path to error

2023-08-11 Thread Ben Grande
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512

On 23-05-26 16:59:07, Ben Grande wrote:
> Signed-off-by: Ben Grande 
> ---
>  qrexec/policy/parser.py | 11 +--
>  1 file changed, 5 insertions(+), 6 deletions(-)
> 
> diff --git a/qrexec/policy/parser.py b/qrexec/policy/parser.py
> index ab50f9e..143f77f 100644
> --- a/qrexec/policy/parser.py
> +++ b/qrexec/policy/parser.py
> @@ -1956,15 +1956,14 @@ class ToposortMixIn:
>  if "/" in key and (
>  not key.startswith("include/") or key.count("/") > 1
>  ):
> -# TODO make this an error, since we shouldn't accept this anyway
> -logging.warning(
> -"ignoring path %r included in %s on line %d; "
> -"expect problems with import order",
> -included_path,
> +raise PolicySyntaxError(
>  filepath,
>  lineno,
> +"invalid path {}, only paths inside the directories {} and "
> +"{}/include are considered".format(
> +included_path, POLICYPATH, POLICYPATH
> +),
>  )
> -return
>  
>  self.included_paths[key].add(included_path)
>  
> -- 
> Benjamin Grande 

Reminding of unreviewed patch.

- -- 
Benjamin Grande
-BEGIN PGP SIGNATURE-

iNUEARYKAH0WIQRklnEdsUUe50UmvUUbcxS/DMyWhwUCZNZCJF8UgAAuAChp
c3N1ZXItZnByQG5vdGF0aW9ucy5vcGVucGdwLmZpZnRoaG9yc2VtYW4ubmV0NjQ5
NjcxMURCMTQ1MUVFNzQ1MjZCRDQ1MUI3MzE0QkYwQ0NDOTY4NwAKCRAbcxS/DMyW
hzfmAQDHXmmbDn7eE5ugN7lvDNo+Tce71D4etADXe1mj1nUy6QD/UGba23710UWi
5VxwLegw2Glvq7xBKNDGsAo38RCzkws=
=enld
-END PGP SIGNATURE-

-- 
You received this message because you are subscribed to the Google Groups 
"qubes-devel" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to qubes-devel+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/qubes-devel/ZNZCJF89k4UM3cWW%40personal-mutt.