This adds spawn-filter binary for filtering message passed to qmail-remote/qmail-local by mbhangui · Pull Request #50 · notqmail/notqmail

mbhangui · 2019-07-29T11:46:00Z

@schmonz I have created a pull request for the QMAILREMOTE/QMAILLOCAL changes. You can view it now

QMAILREMOTE env variable added to qmail-rspawn.c, taken from Run alternate qmail-remote by setting QMAILREMOTE. #46
Same change added to qmail-lspawn.c using env variable QMAILLOCAL
Modification of man pages qmail-rspawn.8, qmail-lspawn.8 for QMAILREMOTE, QMAILLOCAL
Modification of man page for qmail-control (for new control file filterargs)
addition of a new program spawn-filter (which can be called by setting QMAILREMOTE or QMAILLOCAL. e.g. QMAILREMOTE=/var/qmail/bin/spawn-filter
Addition of a C file wildmat.c for wildmat_internal() function
modification of Makefile, TARGETS
modification of hier.c for installing spawn-filter and spawn-filter man page

DerDakon · 2019-08-13T16:47:31Z

please rebase this on current master so it get's easier to review

mbhangui · 2019-08-13T16:53:55Z

please rebase this on current master so it get's easier to review

I am a noob when using git. How do I do that. in the webui, the 'Rebase and Merge' shows greyed out

DerDakon · 2019-08-13T16:57:52Z

Do it on the commandline:

git fetch
git rebase origin/master
git push --force

mbhangui · 2019-08-13T17:08:30Z

I did this and I get this error
argos:/usr/local/src/projects/spawn-filter/notqmail>git fetch
remote: Enumerating objects: 17, done.
remote: Counting objects: 100% (17/17), done.
remote: Compressing objects: 100% (13/13), done.
remote: Total 17 (delta 8), reused 7 (delta 4), pack-reused 0
Unpacking objects: 100% (17/17), done.
From git://github.com/notqmail/notqmail

e45ee24...1640bdb instqueue -> origin/instqueue (forced update)
65ceaec..81b5f8e spawn-filter -> origin/spawn-filter

[new branch] sysdeps-not-quite-dead -> origin/sysdeps-not-quite-dead
argos:/usr/local/src/projects/spawn-filter/notqmail>git rebase origin/master
Current branch spawn-filter is up to date.
argos:/usr/local/src/projects/spawn-filter/notqmail>git push --force
fatal: remote error:
You can't push to git://github.com/notqmail/notqmail.git
Use https://github.com/notqmail/notqmail.git

mbhangui · 2019-08-13T17:27:31Z

OK. I changed it to https in .git/config and did a push. It has gone through
git push --force
Username for 'https://github.com': mbhangui@gmail.com
Password for 'https://mbhangui@gmail.com@github.com':
Enumerating objects: 16, done.
Counting objects: 100% (16/16), done.
Delta compression using up to 4 threads
Compressing objects: 100% (10/10), done.
Writing objects: 100% (10/10), 7.86 KiB | 1.31 MiB/s, done.
Total 10 (delta 6), reused 3 (delta 0)
remote: Resolving deltas: 100% (6/6), completed with 6 local objects.
To https://github.com/notqmail/notqmail.git

81b5f8e...d6eb292 spawn-filter -> spawn-filter (forced update)

DerDakon · 2019-08-13T19:01:44Z

 then runs
 .B qmail-local
 under the user's uid and gid.
-It does not set up any supplementary groups.


Why do you remove this line?

Oops. That's by mistake

fixed it. I think I am making too many mistakes. Somehow I lost the changes made to the three man pages that I had made around few weeks earlier. I have pushed the corrections just now

schmonz · 2019-08-26T15:44:35Z

We're agreed on QMAILREMOTE in some form for 1.08. Marking this one 1.08 for consideration alongside #46.

DerDakon · 2019-09-03T06:15:22Z

+					return matched;
+			return ABORT;
+		case '[':
+			reverse = p[1] == NEGATE_CLASS ? TRUE : FALSE;


I think that will overflow the input string if passed something that ends in "[" or "[^" as it will go one char too far when entering the for loop below.

Indeed yes. I don't like the function now. Is there a better way? spawn-filter already has code to use regexec() if env variable QREGEX is set. I can remove wildmat.c totally and use regexec() instead. Or is there a better function you are aware of that can be used for pattern matching?

Just thinking out aloud. Is the need for pattern matching for domains really required. regex matching or using wildmat can be totally avoided if we use exact domains in the control file filterargs.

DerDakon · 2019-09-03T07:12:27Z

If it is ok with you I would rebase the branch on the current master to reduce the complexity in git history.

mbhangui · 2019-09-03T07:22:03Z

If it is ok with you I would rebase the branch on the current master to reduce the complexity in git history.

That would be awesome. I'm still struggling with knowing how to do things properly with git.

DerDakon · 2019-09-03T09:52:48Z

Ok, I have rebased it and squashed a few of your fix commits to those commits that introduced the error. Please do:

git fetch
git reset --hard origin/spawn-filter

mbhangui added the enhancement New feature or request label Jul 29, 2019

mbhangui added this to the 1.08 milestone Jul 29, 2019

schmonz mentioned this pull request Jul 29, 2019

Run alternate qmail-remote by setting QMAILREMOTE. #46

Merged

DerDakon reviewed Jul 29, 2019

View reviewed changes

Comment thread qmail-rspawn.c Outdated

mbhangui force-pushed the spawn-filter branch from 81b5f8e to d6eb292 Compare August 13, 2019 17:26

mbhangui changed the title ~~This adds spawn-filter binary. Following are the changes~~ This adds spawn-filter binary for filtering message passed to qmail-remote/qmail-local Aug 13, 2019

DerDakon reviewed Aug 13, 2019

View reviewed changes

Comment thread qmail-rspawn.8 Outdated

alanpost modified the milestones: 1.08, 1.9 Aug 25, 2019

schmonz modified the milestones: 1.9, 1.08 Aug 26, 2019

DerDakon reviewed Sep 3, 2019

View reviewed changes

Comment thread Makefile

DerDakon reviewed Sep 3, 2019

View reviewed changes

Comment thread hier.c Outdated

DerDakon reviewed Sep 3, 2019

View reviewed changes

mbhangui and others added 7 commits September 3, 2019 11:44

added spawn-filter for alternate qmail-remote/qmail-local

10dcf81

fix dependencies to envread()

88201e3

added reference to filterargs control file used by spawn-filter

20a989d

added note on QMAILREMOTE environment variable

8241af8

added note on QMAILLOCAL environment variable

ca1ee98

added reference to spawn-filter

7d377c1

updated for adding spawn-filter

9ad6534

DerDakon force-pushed the spawn-filter branch from d6c14fc to 9ad6534 Compare September 3, 2019 09:51

mbhangui added 3 commits September 3, 2019 20:14

removed wildmat function

a656f62

removed wildmat funciton

b27c6ae

ignore regex compilation error for invalid regular expressions

f910327

schmonz modified the milestones: 1.09, 1.90 Nov 20, 2020

Conversation

mbhangui commented Jul 29, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

DerDakon commented Aug 13, 2019

Uh oh!

mbhangui commented Aug 13, 2019

Uh oh!

DerDakon commented Aug 13, 2019

Uh oh!

mbhangui commented Aug 13, 2019

Uh oh!

mbhangui commented Aug 13, 2019

Uh oh!

DerDakon Aug 13, 2019

Choose a reason for hiding this comment

Uh oh!

mbhangui Aug 13, 2019

Choose a reason for hiding this comment

Uh oh!

mbhangui Aug 13, 2019

Choose a reason for hiding this comment

Uh oh!

Uh oh!

schmonz commented Aug 26, 2019

Uh oh!

Uh oh!

Uh oh!

DerDakon Sep 3, 2019

Choose a reason for hiding this comment

Uh oh!

mbhangui Sep 3, 2019

Choose a reason for hiding this comment

Uh oh!

mbhangui Sep 3, 2019

Choose a reason for hiding this comment

Uh oh!

DerDakon commented Sep 3, 2019

Uh oh!

mbhangui commented Sep 3, 2019

Uh oh!

DerDakon commented Sep 3, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

mbhangui commented Jul 29, 2019 •

edited

Loading