On 9/22/24 15:01, Christian Schulte wrote:
> Seems I overlooked the rule_to_text function in to.c. Complete diff. Is @tech
> the correct list to discuss this, btw.?

Can this be discussed for 7.7 now? Either this diff, which does not
introduce new tokens to parse.y, or the last diff of this thread, which
introduces a new token but seems to be more in line with mail-from? Thanks.

> 
> Index: usr.sbin/smtpd//parse.y
> ===================================================================
> RCS file: /cvs/src/usr.sbin/smtpd/parse.y,v
> retrieving revision 1.299
> diff -u -p -u -r1.299 parse.y
> --- usr.sbin/smtpd//parse.y	19 Feb 2024 21:00:19 -0000	1.299
> +++ usr.sbin/smtpd//parse.y	22 Sep 2024 12:45:36 -0000
> @@ -1228,6 +1228,43 @@ negation TAG REGEX tables {
>  	rule->flag_from = $1 ? -1 : 1;
>  	rule->table_from = strdup(t->t_name);
>  }
> +| negation FROM DOMAIN tables {
> +	struct table   *t = $4;
> +
> +	if (rule->flag_from) {
> +		yyerror("from already specified for this rule");
> +		YYERROR;
> +	}
> +
> +	if (!table_check_use(t, T_DYNAMIC|T_LIST, K_DOMAIN)) {
> +		yyerror("table \"%s\" may not be used for 'from' lookups",
> +		    t->t_name);
> +		YYERROR;
> +	}
> +
> +	rule->flag_from = $1 ? -1 : 1;
> +	rule->flag_from_domain = 1;
> +	rule->table_from = strdup(t->t_name);
> +}
> +| negation FROM DOMAIN REGEX tables {
> +	struct table   *t = $5;
> +
> +	if (rule->flag_from) {
> +		yyerror("from already specified for this rule");
> +		YYERROR;
> +	}
> +
> +	if (!table_check_use(t, T_DYNAMIC|T_LIST, K_REGEX)) {
> +		yyerror("table \"%s\" may not be used for 'from' lookups",
> +		    t->t_name);
> +		YYERROR;
> +	}
> +
> +	rule->flag_from = $1 ? -1 : 1;
> +	rule->flag_from_domain = 1;
> +	rule->flag_from_regex = 1;
> +	rule->table_from = strdup(t->t_name);
> +}
>  | negation FROM SRC tables {
>  	struct table   *t = $4;
>  
> Index: usr.sbin/smtpd//ruleset.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/smtpd/ruleset.c,v
> retrieving revision 1.48
> diff -u -p -u -r1.48 ruleset.c
> --- usr.sbin/smtpd//ruleset.c	14 Jun 2021 17:58:16 -0000	1.48
> +++ usr.sbin/smtpd//ruleset.c	22 Sep 2024 12:45:36 -0000
> @@ -70,6 +70,10 @@ ruleset_match_from(struct rule *r, const
>  			return 0;
>  		key = evp->hostname;
>  	}
> +	else if (r->flag_from_domain) {
> +		key = evp->sender.domain;
> +		service = K_DOMAIN;
> +	}
>  	else {
>  		key = ss_to_text(&evp->ss);
>  		if (r->flag_from_socket) {
> Index: usr.sbin/smtpd//smtpd.conf.5
> ===================================================================
> RCS file: /cvs/src/usr.sbin/smtpd/smtpd.conf.5,v
> retrieving revision 1.272
> diff -u -p -u -r1.272 smtpd.conf.5
> --- usr.sbin/smtpd//smtpd.conf.5	26 Jul 2024 06:24:52 -0000	1.272
> +++ usr.sbin/smtpd//smtpd.conf.5	22 Sep 2024 12:45:36 -0000
> @@ -668,6 +668,23 @@ Specify that session may originate from 
>  no matter the source IP address.
>  .It Xo
>  .Op Ic \&!
> +.Cm from domain
> +.Ar domain | Pf < Ar domain Ns >
> +.Xc
> +Specify that session may originate from sender domain or sender domain list
> +.Ar domain ,
> +no matter the source IP address.
> +.It Xo
> +.Op Ic \&!
> +.Cm from domain regex
> +.Ar domain | Pf < Ar domain Ns >
> +.Xc
> +Specify that session may originate from sender domain regex or sender domain
> +regex list
> +.Ar domain ,
> +no matter the source IP address.
> +.It Xo
> +.Op Ic \&!
>  .Cm from local
>  .Xc
>  Specify that session may only originate from a local IP address,
> Index: usr.sbin/smtpd//smtpd.h
> ===================================================================
> RCS file: /cvs/src/usr.sbin/smtpd/smtpd.h,v
> retrieving revision 1.688
> diff -u -p -u -r1.688 smtpd.h
> --- usr.sbin/smtpd//smtpd.h	3 Sep 2024 12:07:40 -0000	1.688
> +++ usr.sbin/smtpd//smtpd.h	22 Sep 2024 12:45:36 -0000
> @@ -1226,6 +1226,7 @@ struct rule {
>  	int8_t	flag_tag;
>  	int8_t	flag_from;
>  	int8_t	flag_for;
> +	int8_t	flag_from_domain;
>  	int8_t	flag_from_rdns;
>  	int8_t	flag_from_socket;
>  
> Index: usr.sbin/smtpd//to.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/smtpd/to.c,v
> retrieving revision 1.50
> diff -u -p -u -r1.50 to.c
> --- usr.sbin/smtpd//to.c	31 May 2023 16:51:46 -0000	1.50
> +++ usr.sbin/smtpd//to.c	22 Sep 2024 12:45:36 -0000
> @@ -434,6 +434,10 @@ rule_to_text(struct rule *r)
>  				(void)strlcat(buf, r->table_from, sizeof buf);
>  			}
>  		}
> +		else if (r->flag_from_domain) {
> +			(void)strlcat(buf, " from domain ", sizeof buf);
> +			(void)strlcat(buf, r->table_from, sizeof buf);
> +		}
>  		else if (strcmp(r->table_from, "<anyhost>") == 0)
>  			(void)strlcat(buf, " from any", sizeof buf);
>  		else if (strcmp(r->table_from, "<localhost>") == 0)


-- 
Christian