Merge pull request #1486 from ikedas/deprecate_dkim_authentication_me…

…thod by ikedas

Deprecate `dkim` authentication method for scenarios

default/Makefile.am

@@ -52,11 +52,9 @@ nobase_default_DATA = \
 	create_list_templates/public_web_forum/comment.tt2 \
 	create_list_templates/public_web_forum/config.tt2 \
 	scenari/add.auth \
-	scenari/add.authdkim \
 	scenari/add.closed \
 	scenari/add.owner \
 	scenari/add.owner_notify \
-	scenari/add.ownerdkim \
 	scenari/archive_mail_access.closed \
 	scenari/archive_mail_access.owner \
 	scenari/archive_mail_access.private \
@@ -77,11 +75,9 @@ nobase_default_DATA = \
 	scenari/d_edit.private-https \
 	scenari/d_edit.public \
 	scenari/del.auth \
-	scenari/del.authdkim \
 	scenari/del.closed \
 	scenari/del.owner \
 	scenari/del.owner_notify \
-	scenari/del.ownerdkim \
 	scenari/d_read.owner \
 	scenari/d_read.private \
 	scenari/d_read.private-https \
@@ -100,17 +96,14 @@ nobase_default_DATA = \
 	scenari/move_user.closed \
 	scenari/move_user.listmaster \
 	scenari/remind.listmaster \
-	scenari/remind.listmasterdkim \
 	scenari/remind.owner \
-	scenari/remind.ownerdkim \
 	scenari/review.closed \
 	scenari/review.listmaster \
 	scenari/review.owner \
 	scenari/review.private \
 	scenari/review.public \
 	scenari/send.closed \
 	scenari/send.confidential \
-	scenari/send.editordkim \
 	scenari/send.editorkey \
 	scenari/send.editorkeyonly \
 	scenari/send.editorkeyonlyauth \
@@ -138,11 +131,8 @@ nobase_default_DATA = \
 	scenari/spam_status.spamassassin \
 	scenari/spam_status.x-spam-status \
 	scenari/subscribe.auth \
-	scenari/subscribe.authdkim \
 	scenari/subscribe.auth_notify \
-	scenari/subscribe.auth_notifydkim \
 	scenari/subscribe.auth_owner \
-	scenari/subscribe.auth_ownerdkim \
 	scenari/subscribe.closed \
 	scenari/subscribe.open \
 	scenari/subscribe.open_notify \
@@ -156,9 +146,7 @@ nobase_default_DATA = \
 	scenari/tracking.owner \
 	scenari/tracking.private \
 	scenari/unsubscribe.auth \
-	scenari/unsubscribe.authdkim \
 	scenari/unsubscribe.auth_notify \
-	scenari/unsubscribe.auth_notifydkim \
 	scenari/unsubscribe.closed \
 	scenari/unsubscribe.open \
 	scenari/unsubscribe.open_notify \

default/scenari/add.auth

@@ -1,7 +1,7 @@
 title.gettext restricted to owner with authentication
 
-is_owner([listname],[sender]) smtp,dkim -> request_auth
-is_listmaster([sender])	      smtp,dkim -> request_auth
+is_owner([listname],[sender]) smtp -> request_auth
+is_listmaster([sender])       smtp -> request_auth
 is_owner([listname],[sender]) md5,smime -> do_it
 is_listmaster([sender])       md5,smime -> do_it
-true()                        smtp,dkim,md5,smime -> reject(reason='add_owner')
+true()                        smtp,md5,smime -> reject(reason='add_owner')

default/scenari/add.closed

@@ -1,12 +1,3 @@
 title.gettext add impossible
 
-true()   smtp,dkim,md5,smime -> reject('add_closed')
-
-
-
-
-
-
-
-
-
+true()   smtp,md5,smime -> reject('add_closed')

default/scenari/add.owner

@@ -1,6 +1,6 @@
 title.gettext add performed by list owner does not need authentication
 
-is_owner([listname],[sender])  smtp,dkim,md5,smime -> do_it
-is_listmaster([sender])        smtp,dkim -> request_auth
+is_owner([listname],[sender])  smtp,md5,smime -> do_it
+is_listmaster([sender])        smtp -> request_auth
 is_listmaster([sender])        md5,smime -> do_it
-true()                         smtp,dkim,md5,smime -> reject(reason='add_owner')	
+true()                         smtp,md5,smime -> reject(reason='add_owner')

default/scenari/add.owner_notify

@@ -1,7 +1,6 @@
 title.gettext add performed by owner does not need authentication (notification)
 
-is_owner([listname],[sender])  smtp,dkim,md5,smime -> do_it,notify
+is_owner([listname],[sender])  smtp,md5,smime -> do_it,notify
 is_listmaster([sender])        smtp           -> request_auth
-is_listmaster([sender])        dkim,md5,smime      -> do_it,notify
-true()                         smtp,dkim,md5,smime -> reject(reason='add_owner')	
-
+is_listmaster([sender])        md5,smime      -> do_it,notify
+true()                         smtp,md5,smime -> reject(reason='add_owner')

default/scenari/archive_mail_access.closed

@@ -1,5 +1,3 @@
 title.gettext closed
 
-true()   smtp,dkim,smime,md5 -> reject(reason='mail_archive_closed')
-
-
+true()   smtp,md5,smime -> reject(reason='mail_archive_closed')

default/scenari/archive_mail_access.owner

@@ -1,5 +1,5 @@
 title.gettext by owner
 
-is_owner([listname],[sender])  smtp,dkim,md5,smime  -> do_it
-is_listmaster([sender])        smtp,dkim,md5,smime  -> do_it
-true()                         smtp,dkim,md5,smime -> reject(reason='mail_archive_owner')   
+is_owner([listname],[sender])  smtp,md5,smime  -> do_it
+is_listmaster([sender])        smtp,md5,smime  -> do_it
+true()                         smtp,md5,smime  -> reject(reason='mail_archive_owner')   

default/scenari/archive_mail_access.private

@@ -1,6 +1,6 @@
 title.gettext subscribers only
 
-is_subscriber([listname],[sender])  smtp,dkim,md5,smime  -> do_it
-is_owner([listname],[sender])  smtp,dkim,md5,smime  -> do_it
-is_listmaster([sender])        smtp,dkim,md5,smime  -> do_it
-true()                         smtp,dkim,md5,smime  -> reject(reason='mail_archive_subscriber') 
+is_subscriber([listname],[sender])  smtp,md5,smime  -> do_it
+is_owner([listname],[sender])       smtp,md5,smime  -> do_it
+is_listmaster([sender])             smtp,md5,smime  -> do_it
+true()                              smtp,md5,smime  -> reject(reason='mail_archive_subscriber') 

default/scenari/archive_mail_access.public

@@ -1,5 +1,3 @@
 title.gettext public
 
-true()  smtp,dkim,md5,smime  -> do_it
-
-
+true()  smtp,md5,smime  -> do_it

default/scenari/automatic_list_creation.family_owner

@@ -1,5 +1,5 @@
 title.gettext Restricted to people subscribed to the list of family owners.
 
-is_listmaster([sender])	smtp,dkim,md5,smime		->	do_it
-is_subscriber([family->family_owners_list],[sender])	smtp,dkim,md5,smime		->	do_it
-true()	smtp,dkim,md5,smime		->	reject,quiet
+is_listmaster([sender])	smtp,md5,smime		->	do_it
+is_subscriber([family->family_owners_list],[sender])	smtp,md5,smime		->	do_it
+true()	smtp,md5,smime		->	reject,quiet

default/scenari/automatic_list_creation.listmaster

@@ -1,4 +1,4 @@
 title.gettext restricted to listmaster
 
-is_listmaster([sender])                 smime,md5 -> do_it
-true()                    		smtp,dkim,md5,smime -> reject
+is_listmaster([sender])                 md5,smime -> do_it
+true()                    		smtp,md5,smime -> reject

default/scenari/automatic_list_creation.public

@@ -1,3 +1,3 @@
 title.gettext anybody. Be sure you know what you are doing
 
-true()                    smtp,dkim,md5,smime -> do_it
+true()                    smtp,md5,smime -> do_it

default/scenari/create_list.closed

@@ -1,4 +1,3 @@
 title.gettext closed
 
-true()   smtp,dkim,md5,smime -> reject('create_list_closed')
-
+true()   smtp,md5,smime -> reject('create_list_closed')

default/scenari/create_list.listmaster

@@ -1,4 +1,4 @@
 title.gettext restricted to listmaster
 
 is_listmaster([sender])                 md5,smime -> do_it
-true()                    		smtp,dkim,md5,smime -> reject(reason='create_list_listmaster')
+true()                    		smtp,md5,smime -> reject(reason='create_list_listmaster')

default/scenari/create_list.public_listmaster

@@ -1,4 +1,4 @@
 title.gettext anybody by validation by listmaster required
 
 is_listmaster([sender])   md5,smime -> do_it
-true()                    smtp,dkim,md5,smime -> listmaster,notify
+true()                    smtp,md5,smime -> listmaster,notify

default/scenari/del.auth

@@ -1,7 +1,7 @@
 title.gettext deletion performed only by list owners, need authentication
 
-is_owner([listname],[sender])  smtp,dkim      -> request_auth
-is_listmaster([sender])        smtp,dkim       -> request_auth
+is_owner([listname],[sender])  smtp      -> request_auth
+is_listmaster([sender])        smtp      -> request_auth
 is_owner([listname],[sender])  md5,smime -> do_it
 is_listmaster([sender])        md5,smime -> do_it
-true()                         smtp,dkim,md5,smime -> reject(reason='del_owner')
+true()                         smtp,md5,smime -> reject(reason='del_owner')

default/scenari/del.closed

@@ -1,3 +1,3 @@
 title.gettext remove subscriber impossible
 
-true()   smtp,dkim,md5,smime -> reject(reason='del_closed')
+true()   smtp,md5,smime -> reject(reason='del_closed')

default/scenari/del.owner

@@ -1,7 +1,6 @@
 title.gettext by owner without authentication
 
-is_owner([listname],[sender])  smtp,dkim,md5,smime -> do_it
-is_listmaster([sender])        smtp,dkim       -> request_auth
-is_listmaster([sender])        md5,smime       -> do_it
-true()                         smtp,dkim,md5,smime -> reject(reason='del_owner')	
-
+is_owner([listname],[sender])  smtp,md5,smime -> do_it
+is_listmaster([sender])        smtp           -> request_auth
+is_listmaster([sender])        md5,smime      -> do_it
+true()                         smtp,md5,smime -> reject(reason='del_owner')

default/scenari/del.owner_notify

@@ -1,7 +1,6 @@
 title.gettext list owners, authentication not needed (notification)
 
-is_owner([listname],[sender])  smtp,dkim,smime,md5 -> do_it,notify
-is_listmaster([sender])        smtp,dkim           -> request_auth
+is_owner([listname],[sender])  smtp,md5,smime -> do_it,notify
+is_listmaster([sender])        smtp           -> request_auth
 is_listmaster([sender])        md5,smime      -> do_it,notify
-true()                         smtp,dkim,md5,smime -> reject(reason='del_owner')	
-
+true()                         smtp,md5,smime -> reject(reason='del_owner')

default/scenari/family_signoff.auth

@@ -1,6 +1,6 @@
 # family_signoff.auth
 title.gettext need authentication
 
-!equal([sender],[email])           smtp,dkim,md5,smime -> request_auth([email])
-true()                             smtp,dkim           -> request_auth([email])
-true()                             md5,smime           -> do_it
+!equal([sender],[email])           smtp,md5,smime -> request_auth([email])
+true()                             smtp           -> request_auth([email])
+true()                             md5,smime      -> do_it

default/scenari/family_signoff.closed

@@ -1,4 +1,4 @@
 # family_signoff.closed
 title.gettext impossible
 
-true()  smtp,dkim,md5,smime -> reject(reason='unsub_closed')
+true()  smtp,md5,smime -> reject(reason='unsub_closed')

default/scenari/global_remind.listmaster

@@ -1,5 +1,5 @@
 title.gettext only for listmaster
 
-is_listmaster([sender])     smtp,dkim -> request_auth
+is_listmaster([sender])     smtp -> request_auth
 is_listmaster([sender])     md5,smime -> do_it
-true()                      smtp,dkim,md5,smime -> reject(reason='global_remind_listmaster')	
+true()                      smtp,md5,smime -> reject(reason='global_remind_listmaster')	

default/scenari/info.conceal

@@ -1,7 +1,7 @@
 title.gettext restricted to subscribers - Silent rejection otherwise.
 
-is_subscriber([listname],[sender])   	smtp,dkim,md5,smime -> do_it
-is_listmaster([sender])			smtp,dkim,md5,smime -> do_it
-is_owner([listname],[sender])           smtp,dkim,md5,smime  -> do_it
-is_editor([listname],[sender])          smtp,dkim,md5,smime  -> do_it
-true()                                  smtp,dkim,md5,smime -> reject
+is_subscriber([listname],[sender])   	smtp,md5,smime -> do_it
+is_listmaster([sender])			smtp,md5,smime -> do_it
+is_owner([listname],[sender])           smtp,md5,smime -> do_it
+is_editor([listname],[sender])          smtp,md5,smime -> do_it
+true()                                  smtp,md5,smime -> reject

default/scenari/info.open

@@ -1,3 +1,3 @@
 title.gettext for anyone
 
-true()   smtp,dkim,md5,smime -> do_it
+true()   smtp,md5,smime -> do_it

default/scenari/info.private

@@ -1,7 +1,7 @@
 title.gettext restricted to subscribers
 
-is_subscriber([listname],[sender])   	smtp,dkim,md5,smime -> do_it
-is_listmaster([sender])			smtp,dkim,md5,smime -> do_it
-is_owner([listname],[sender])           smtp,dkim,md5,smime  -> do_it
-is_editor([listname],[sender])          smtp,dkim,md5,smime  -> do_it
-true()                                  smtp,dkim,md5,smime -> reject(reason='info_subscriber')	
+is_subscriber([listname],[sender])   	smtp,md5,smime -> do_it
+is_listmaster([sender])			smtp,md5,smime -> do_it
+is_owner([listname],[sender])           smtp,md5,smime -> do_it
+is_editor([listname],[sender])          smtp,md5,smime -> do_it
+true()                                  smtp,md5,smime -> reject(reason='info_subscriber')	

default/scenari/invite.closed

@@ -1,3 +1,3 @@
 title.gettext closed
 
-true() smtp,dkim,md5,smime -> reject(reason='invite_closed')
+true() smtp,md5,smime -> reject(reason='invite_closed')

default/scenari/invite.owner

@@ -1,7 +1,6 @@
 title.gettext invite perform by list owner do not need authentication
 
-is_owner([listname],[sender])  smtp,dkim,md5,smime -> do_it
-is_listmaster([sender])        smtp,dkim -> request_auth
+is_owner([listname],[sender])  smtp,md5,smime -> do_it
+is_listmaster([sender])        smtp -> request_auth
 is_listmaster([sender])        md5,smime -> do_it
-true()                         smtp,dkim,md5,smime -> reject(reason='invite_owner')	
-
+true()                         smtp,md5,smime -> reject(reason='invite_owner')	

default/scenari/invite.private

@@ -1,7 +1,7 @@
 title.gettext restricted to subscribers
 
-is_subscriber([listname],[sender])      smtp,dkim,md5,smime  -> do_it
-is_owner([listname],[sender])           smtp,dkim,md5,smime  -> do_it
-is_editor([listname],[sender])          smtp,dkim,md5,smime  -> do_it
-is_listmaster([sender])                 smtp,dkim,md5,smime  -> do_it
-true()                                  smtp,dkim,md5,smime  -> reject(reason='invite_subscriber')	
+is_subscriber([listname],[sender])      smtp,md5,smime  -> do_it
+is_owner([listname],[sender])           smtp,md5,smime  -> do_it
+is_editor([listname],[sender])          smtp,md5,smime  -> do_it
+is_listmaster([sender])                 smtp,md5,smime  -> do_it
+true()                                  smtp,md5,smime  -> reject(reason='invite_subscriber')	

default/scenari/invite.public

@@ -1,4 +1,3 @@
 title.gettext public
 
-true() smtp,dkim,md5,smime -> do_it
-
+true() smtp,md5,smime -> do_it

default/scenari/move_user.auth

@@ -1,6 +1,6 @@
 title.gettext need authentication
 
-equal([sender],[current_email])     smtp,dkim,md5,smime -> request_auth([email])
-is_listmaster([sender])             md5,smime           -> do_it
-equal([sender],[email])             md5,smime           -> do_it
-true()                              smtp,dkim,md5,smime -> reject
+equal([sender],[current_email])     smtp,md5,smime -> request_auth([email])
+is_listmaster([sender])             md5,smime      -> do_it
+equal([sender],[email])             md5,smime      -> do_it
+true()                              smtp,md5,smime -> reject

default/scenari/move_user.closed

@@ -1,3 +1,3 @@
 title.gettext impossible
 
-true()  smtp,dkim,md5,smime -> reject(reason='move_user_closed')
+true()  smtp,md5,smime -> reject(reason='move_user_closed')

default/scenari/move_user.listmaster

@@ -1,4 +1,4 @@
 title.gettext listmaster only
 
-is_listmaster([sender])             md5,smime           -> do_it
-true()                              smtp,dkim,md5,smime -> reject(reason='move_user_listmaster')
+is_listmaster([sender])             md5,smime      -> do_it
+true()                              smtp,md5,smime -> reject(reason='move_user_listmaster')

default/scenari/remind.listmaster

@@ -1,6 +1,6 @@
 title.gettext listmaster only
 
 # only listmaster can perform remind
-is_listmaster([sender])   smtp,dkim   -> request_auth
+is_listmaster([sender])   smtp   -> request_auth
 is_listmaster([sender])   md5,smime    -> do_it
-true()                    smtp,dkim,md5,smime -> reject(reason='remind_listmaster')	
+true()                    smtp,md5,smime -> reject(reason='remind_listmaster')	

default/scenari/remind.owner

@@ -1,8 +1,8 @@
 title.gettext restricted to list owners
 
 # only owner's may perform a reminder command
-is_owner([listname],[sender])      smtp,dkim      -> request_auth
+is_owner([listname],[sender])      smtp           -> request_auth
 is_owner([listname],[sender])      md5,smime      -> do_it
-is_listmaster([sender])            smtp,dkim      -> request_auth
+is_listmaster([sender])            smtp           -> request_auth
 is_listmaster([sender])		   md5,smime      -> do_it
-true()                             smtp,dkim,md5,smime -> reject(reason='remind_owner')	
+true()                             smtp,md5,smime -> reject(reason='remind_owner')