On Mon, 7 Jun 2021 at 08:13, <[email protected]> wrote: > > This is an automated email from the ASF dual-hosted git repository. > > humbedooh pushed a commit to branch master > in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git > > > The following commit(s) were added to refs/heads/master by this push: > new 483d166 Allow for list@domain override from certain end-points > 483d166 is described below > > commit 483d16657f011bd55e328555b44d275a0c17939f > Author: Daniel Gruno <[email protected]> > AuthorDate: Mon Jun 7 09:12:51 2021 +0200 > > Allow for list@domain override from certain end-points > --- > server/plugins/defuzzer.py | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/server/plugins/defuzzer.py b/server/plugins/defuzzer.py > index bdd3133..bfa9975 100644 > --- a/server/plugins/defuzzer.py > +++ b/server/plugins/defuzzer.py > @@ -27,7 +27,7 @@ It turns a URL search query into an ES query > """ > > > -def defuzz(formdata: dict, nodate: bool = False) -> dict: > +def defuzz(formdata: dict, nodate: bool = False, list_override: str = None) > -> dict: > # Default to 30 day date range > daterange = {"gt": "now-30d", "lt": "now+1d"} > > @@ -84,6 +84,9 @@ def defuzz(formdata: dict, nodate: bool = False) -> dict: > # List parameter(s) > fqdn = formdata.get("domain", "*") # If left out entirely, assume > wildcard search > listname = formdata.get("list", "*") # If left out entirely, assume > wildcard search > + if list_override: # Certain requests use the full list ID as a single > variable. Allow for that if so. > + assert list_override.count("@") == 1, "list_override must contain > exactly one @ character" > + listname, fqdn = list_override.split("@", 1)
I think it's wrong to reference domain if list_override is specified. Surely the caller will know which is being provided, and pass the appropriate parameters? > assert fqdn, "You must specify a domain part of the mailing list(s) to > search, or * for wildcard search." > assert listname, "You must specify a list part of the mailing list(s) to > search, or * for wildcard search." > assert '@' not in listname, "The list component of the List ID(s) cannot > contain @, please use both list and domain keywords for searching."
