From 172217a48e84bb8b64173fd2068af7178e000a43 Mon Sep 17 00:00:00 2001 From: Matt Taggart Date: Mon, 2 Jul 2018 14:17:49 -0700 Subject: [PATCH 1/8] make info text more clear --- default/scenari/info.conceal | 2 +- default/scenari/info.open | 2 +- default/scenari/info.private | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/default/scenari/info.conceal b/default/scenari/info.conceal index 40488a3ca..9c51a4c28 100644 --- a/default/scenari/info.conceal +++ b/default/scenari/info.conceal @@ -1,4 +1,4 @@ -title.gettext restricted to subscribers - Silent rejection otherwise. +title.gettext visible only to subscribers, silent rejection otherwise. is_subscriber([listname],[sender]) smtp,md5,smime -> do_it is_listmaster([sender]) smtp,md5,smime -> do_it diff --git a/default/scenari/info.open b/default/scenari/info.open index c04ccc3a6..a79fecb7d 100644 --- a/default/scenari/info.open +++ b/default/scenari/info.open @@ -1,3 +1,3 @@ -title.gettext for anyone +title.gettext publically visible true() smtp,md5,smime -> do_it diff --git a/default/scenari/info.private b/default/scenari/info.private index fa6263636..fc685f8b4 100644 --- a/default/scenari/info.private +++ b/default/scenari/info.private @@ -1,4 +1,4 @@ -title.gettext restricted to subscribers +title.gettext visible only to subscribers is_subscriber([listname],[sender]) smtp,md5,smime -> do_it is_listmaster([sender]) smtp,md5,smime -> do_it From 58fd11484b0adf0e8bd1c537f48a6ae03f5fc2cb Mon Sep 17 00:00:00 2001 From: Matt Taggart Date: Mon, 2 Jul 2018 14:28:00 -0700 Subject: [PATCH 2/8] create invite.ownerauth, make invite.owner text more consistent --- default/scenari/invite.owner | 2 +- default/scenari/invite.ownerauth | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 default/scenari/invite.ownerauth diff --git a/default/scenari/invite.owner b/default/scenari/invite.owner index 5a42f079a..834eb95e6 100644 --- a/default/scenari/invite.owner +++ b/default/scenari/invite.owner @@ -1,4 +1,4 @@ -title.gettext invite perform by list owner do not need authentication +title.gettext restricted to list owner do not need authentication is_owner([listname],[sender]) smtp,dkim,md5,smime -> do_it is_listmaster([sender]) smtp,dkim -> request_auth diff --git a/default/scenari/invite.ownerauth b/default/scenari/invite.ownerauth new file mode 100644 index 000000000..6a2134f19 --- /dev/null +++ b/default/scenari/invite.ownerauth @@ -0,0 +1,8 @@ +title.gettext restricted to list owner, with authentication + +is_owner([listname],[sender]) smtp,dkim -> request_auth +is_listmaster([sender]) smtp,dkim -> request_auth +is_owner([listname],[sender]) md5,smime -> do_it +is_listmaster([sender]) md5,smime -> do_it +true() smtp,dkim,md5,smime -> reject(reason='invite_ownerauth') + From 8e37abb833469b9cc12272249dea6233a5f347fa Mon Sep 17 00:00:00 2001 From: Matt Taggart Date: Mon, 2 Jul 2018 14:34:32 -0700 Subject: [PATCH 3/8] add invite.privateauth --- default/scenari/invite.privateauth | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 default/scenari/invite.privateauth diff --git a/default/scenari/invite.privateauth b/default/scenari/invite.privateauth new file mode 100644 index 000000000..7a0abebc4 --- /dev/null +++ b/default/scenari/invite.privateauth @@ -0,0 +1,11 @@ +title.gettext restricted to subscribers, with authentication + +is_subscriber([listname],[sender]) smtp,dkim -> request_auth +is_owner([listname],[sender]) smtp,dkim -> request_auth +is_editor([listname],[sender]) smtp,dkim -> request_auth +is_listmaster([sender]) smtp,dkim -> request_auth +is_subscriber([listname],[sender]) md5,smime -> do_it +is_owner([listname],[sender]) md5,smime -> do_it +is_editor([listname],[sender]) md5,smime -> do_it +is_listmaster([sender]) md5,smime -> do_it +true() smtp,dkim,md5,smime -> reject(reason='invite_subscriber') From de7bd9b17ee6ed55ac00cc1bf29afd0fc4931491 Mon Sep 17 00:00:00 2001 From: Matt Taggart Date: Mon, 2 Jul 2018 14:52:23 -0700 Subject: [PATCH 4/8] send.editor* changes get rid of confusing send.editorkeyonlyauth which didn't do anything create send.editorkeyauth type clarify text --- default/scenari/send.editorkey | 2 +- default/scenari/send.editorkeyauth | 8 ++++++++ default/scenari/send.editorkeyonly | 2 +- default/scenari/send.editorkeyonlyauth | 4 ---- 4 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 default/scenari/send.editorkeyauth delete mode 100644 default/scenari/send.editorkeyonlyauth diff --git a/default/scenari/send.editorkey b/default/scenari/send.editorkey index 7c92ffb60..e2c27d0b0 100644 --- a/default/scenari/send.editorkey +++ b/default/scenari/send.editorkey @@ -1,4 +1,4 @@ -title.gettext Moderated +title.gettext anyone, editor accepted, others moderated is_editor([listname],[sender]) smtp,dkim,smime,md5 -> do_it is_editor([listname],[header->X-sender][-1]) smtp,dkim,smime,md5 -> do_it diff --git a/default/scenari/send.editorkeyauth b/default/scenari/send.editorkeyauth new file mode 100644 index 000000000..1c7f67de7 --- /dev/null +++ b/default/scenari/send.editorkeyauth @@ -0,0 +1,8 @@ +title.gettext anyone, editor accepted(with auth), others moderated + +is_editor([listname],[sender]) smtp,dkim -> request_auth +is_editor([listname],[header->X-sender][-1]) smtp,dkim -> request_auth +is_editor([listname],[sender]) smime,md5 -> do_it +is_editor([listname],[header->X-sender][-1]) smime,md5 -> do_it +true() smtp,dkim,smime,md5 -> editorkey + diff --git a/default/scenari/send.editorkeyonly b/default/scenari/send.editorkeyonly index a9a2b1d31..40836ce68 100644 --- a/default/scenari/send.editorkeyonly +++ b/default/scenari/send.editorkeyonly @@ -1,3 +1,3 @@ -title.gettext Moderated, even for moderators +title.gettext anyone, all messages are moderated true() smtp,dkim,smime,md5 -> editorkey diff --git a/default/scenari/send.editorkeyonlyauth b/default/scenari/send.editorkeyonlyauth deleted file mode 100644 index 578c8255d..000000000 --- a/default/scenari/send.editorkeyonlyauth +++ /dev/null @@ -1,4 +0,0 @@ -title.gettext Moderated, need authentication from editor - -is_editor([listname],[sender]) smtp,dkim -> request_auth -true() smtp,dkim,smime,md5 -> editorkey From 1e9aadd52ad652d4d344fa37a7e32ef58bf2ab57 Mon Sep 17 00:00:00 2001 From: Matt Taggart Date: Mon, 2 Jul 2018 15:12:41 -0700 Subject: [PATCH 5/8] make the send.public* text more consistent --- default/scenari/send.public | 2 +- default/scenari/send.public_nobcc | 2 +- default/scenari/send.publicnoattachment | 2 +- default/scenari/send.publicnomultipart | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/default/scenari/send.public b/default/scenari/send.public index d7c8cd8f4..9509a8c17 100644 --- a/default/scenari/send.public +++ b/default/scenari/send.public @@ -1,4 +1,4 @@ -title.gettext public list +title.gettext anyone, no moderation, use with caution true() smtp,dkim,md5,smime -> do_it diff --git a/default/scenari/send.public_nobcc b/default/scenari/send.public_nobcc index f806fd73f..117f89816 100644 --- a/default/scenari/send.public_nobcc +++ b/default/scenari/send.public_nobcc @@ -1,4 +1,4 @@ -title.gettext public list, Bcc rejected (anti-spam) +title.gettext anyone, Bcc rejected (anti-spam) equal([is_bcc],1) smtp,dkim,md5,smime -> reject true() smtp,dkim,md5,smime -> do_it diff --git a/default/scenari/send.publicnoattachment b/default/scenari/send.publicnoattachment index a76193006..09a10a819 100644 --- a/default/scenari/send.publicnoattachment +++ b/default/scenari/send.publicnoattachment @@ -1,4 +1,4 @@ -title.gettext public list multipart/mixed messages are forwarded to moderator +title.gettext anyone, multipart/mixed messages are moderated match([header->Content-Disposition][0],/attachment/) smtp,dkim,md5,smime -> editorkey match([header->Content-Type][0],/multipart\/mixed/) smtp,dkim,md5,smime -> editorkey diff --git a/default/scenari/send.publicnomultipart b/default/scenari/send.publicnomultipart index 461eb6e71..c2d0319f5 100644 --- a/default/scenari/send.publicnomultipart +++ b/default/scenari/send.publicnomultipart @@ -1,4 +1,4 @@ -title.gettext public list multipart messages are rejected +title.gettext anyone, multipart messages are rejected match([header->Content-Type][0],/multipart/) smtp,dkim,md5,smime -> reject(reason='send_multipart') true() smtp,dkim,md5,smime -> do_it From 5d680b27b9b0131d1c62d10eb0e96a46cc6d720c Mon Sep 17 00:00:00 2001 From: Matt Taggart Date: Mon, 2 Jul 2018 15:13:32 -0700 Subject: [PATCH 6/8] remove send.publickey send.publickey is weird, it does a request_auth for all smtp, but the user authenticating wouldn't need to be a subscriber/editor/owner/ listmaster, so would just need an account on the server? OR have DKIM This doesn't seem that useful, but if it is it should probably be named send.publicauthdkim or something --- default/scenari/send.publickey | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 default/scenari/send.publickey diff --git a/default/scenari/send.publickey b/default/scenari/send.publickey deleted file mode 100644 index 24abe711e..000000000 --- a/default/scenari/send.publickey +++ /dev/null @@ -1,8 +0,0 @@ -title.gettext anyone no authentication if DKIM signature is OK - -true() smtp -> request_auth -true() dkim,md5,smime -> do_it - - - - From 55ee4f630c62dc7a7de4e193f7b9889ef83aa7e2 Mon Sep 17 00:00:00 2001 From: Matt Taggart Date: Mon, 2 Jul 2018 16:36:34 -0700 Subject: [PATCH 7/8] make send.* text more consistent --- default/scenari/send.newsletter | 2 +- default/scenari/send.newsletterkeyonly | 2 +- default/scenari/send.private | 2 +- default/scenari/send.privateandeditorkey | 2 +- default/scenari/send.privatekey | 2 +- default/scenari/send.privatekeyandeditorkeyonly | 2 +- default/scenari/send.privateoreditorkey | 2 +- default/scenari/send.privateorpublickey | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/default/scenari/send.newsletter b/default/scenari/send.newsletter index abbff9c9e..0cba9e367 100644 --- a/default/scenari/send.newsletter +++ b/default/scenari/send.newsletter @@ -1,4 +1,4 @@ -title.gettext Newsletter, restricted to moderators +title.gettext editors, others rejected (newsletter) is_editor([listname],[sender]) smtp,dkim,smime,md5 -> do_it true() smtp,dkim,smime,md5 -> reject(reason='send_editor') diff --git a/default/scenari/send.newsletterkeyonly b/default/scenari/send.newsletterkeyonly index 4914a87ec..4de967dcd 100644 --- a/default/scenari/send.newsletterkeyonly +++ b/default/scenari/send.newsletterkeyonly @@ -1,4 +1,4 @@ -title.gettext Newsletter, restricted to moderators after confirmation +title.gettext editors after moderation, others rejected (newsletter) is_editor([listname],[sender]) smime -> do_it is_editor([listname],[sender]) smtp,dkim,md5,smime -> editorkey diff --git a/default/scenari/send.private b/default/scenari/send.private index e9026d280..2757b5516 100644 --- a/default/scenari/send.private +++ b/default/scenari/send.private @@ -1,4 +1,4 @@ -title.gettext restricted to subscribers +title.gettext subscribers, others rejected is_subscriber([listname],[sender]) smtp,dkim,smime,md5 -> do_it is_editor([listname],[sender]) smtp,dkim,smime,md5 -> do_it diff --git a/default/scenari/send.privateandeditorkey b/default/scenari/send.privateandeditorkey index d812ea586..df565da46 100644 --- a/default/scenari/send.privateandeditorkey +++ b/default/scenari/send.privateandeditorkey @@ -1,4 +1,4 @@ -title.gettext Moderated, restricted to subscribers +title.gettext subscribers after moderation, editors accepted, others rejected is_editor([listname],[sender]) smtp,dkim,smime,md5 -> do_it is_subscriber([listname],[sender]) smtp,dkim,smime,md5 -> editorkey diff --git a/default/scenari/send.privatekey b/default/scenari/send.privatekey index 3d58be1f4..9235d7139 100644 --- a/default/scenari/send.privatekey +++ b/default/scenari/send.privatekey @@ -1,4 +1,4 @@ -title.gettext restricted to subscribers with previous md5 authentication +title.gettext subscribers (authenticated), others rejected is_subscriber([listname],[sender]) smtp,dkim -> request_auth is_subscriber([listname],[sender]) md5,smime -> do_it diff --git a/default/scenari/send.privatekeyandeditorkeyonly b/default/scenari/send.privatekeyandeditorkeyonly index 2da4cf35f..471f11183 100644 --- a/default/scenari/send.privatekeyandeditorkeyonly +++ b/default/scenari/send.privatekeyandeditorkeyonly @@ -1,4 +1,4 @@ -title.gettext Moderated, for subscribers and even moderators themself +title.gettext subscribers/editors (with authentication) after moderation, others rejected is_subscriber([listname],[sender]) smtp,dkim -> request_auth is_subscriber([listname],[sender]) md5,smime -> editorkey diff --git a/default/scenari/send.privateoreditorkey b/default/scenari/send.privateoreditorkey index fcd9e47cc..46195c3be 100644 --- a/default/scenari/send.privateoreditorkey +++ b/default/scenari/send.privateoreditorkey @@ -1,4 +1,4 @@ -title.gettext Private, moderated for non subscribers +title.gettext subscribers/editors, others moderated is_subscriber([listname],[sender]) smtp,dkim,md5,smime -> do_it is_editor([listname],[sender]) smtp,dkim,md5,smime -> do_it diff --git a/default/scenari/send.privateorpublickey b/default/scenari/send.privateorpublickey index 6de5b6e09..9a8e860bf 100644 --- a/default/scenari/send.privateorpublickey +++ b/default/scenari/send.privateorpublickey @@ -1,4 +1,4 @@ -title.gettext Private, confirmation for non subscribers +title.gettext subscriber or authenticated true() md5,smime -> do_it is_subscriber([listname],[sender]) smtp,dkim -> do_it From cf652af1ccf1c1b6c1fb4489e1b27a73f64a800c Mon Sep 17 00:00:00 2001 From: Matt Taggart Date: Mon, 2 Jul 2018 16:57:21 -0700 Subject: [PATCH 8/8] indicate that noconceal means the list existance is public --- default/scenari/visibility.noconceal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default/scenari/visibility.noconceal b/default/scenari/visibility.noconceal index d4fd614f6..6ba075f88 100644 --- a/default/scenari/visibility.noconceal +++ b/default/scenari/visibility.noconceal @@ -1,4 +1,4 @@ -title.gettext no conceal +title.gettext no conceal, list is publicly visible true() smtp,dkim,md5,smime -> do_it