regen: article_{virus,spam}_filter

8 files changed, 226 insertions, 0 deletions

diff --git a/fml/doc/en/tutorial/variables/class.sgml b/fml/doc/en/tutorial/variables/class.sgml
index 06434c2c..b47adf98 100644
--- a/fml/doc/en/tutorial/variables/class.sgml
+++ b/fml/doc/en/tutorial/variables/class.sgml
@@ -96,7 +96,9 @@ article {
 
    article_spam_filter { 
     ?     $article_spam_filter_bogofilter_options
+    ?     $article_spam_filter_drivers
           $article_spam_filter_functions
+          $article_spam_filter_rules
     ?     $article_spam_filter_spamassassin_options
     ?     $article_spam_filter_spamc_options
           $use_article_spam_filter
@@ -107,6 +109,12 @@ article {
           $use_article_text_plain_filter
    }
 
+   article_virus_filter { 
+    ?     $article_virus_filter_drivers
+          $article_virus_filter_rules
+          $use_article_virus_filter
+   }
+
    article_* {
           $article_sequence_file
     ?     $article_subject_tag
diff --git a/fml/doc/en/tutorial/variables/filter.rules.sgml b/fml/doc/en/tutorial/variables/filter.rules.sgml
index c1413208..cb2c5533 100644
--- a/fml/doc/en/tutorial/variables/filter.rules.sgml
+++ b/fml/doc/en/tutorial/variables/filter.rules.sgml
@@ -35,6 +35,8 @@ article_filter_functions	=	article_size_filter
 					article_non_mime_filter
 					article_mime_component_filter
 					article_text_plain_filter
+					article_spam_filter
+					article_virus_filter
 
 
 =head2	size based filter
@@ -160,6 +162,54 @@ article_text_plain_filter_rules	=	reject_not_iso2022jp_japanese_string
 					permit
 
 
+=head2	external SPAM filter
+
+
+# Descriptions: use external spam checker.
+#		disabled by default.
+#		add flag to header and go through if the message looks a spam.
+#      History: none
+#        Value: yes | no
+#     Examples: no
+use_article_spam_filter		=	no
+
+
+# Descriptions: action if the message looks a spam.
+#      History: none
+#        Value: reject | ignore | header_rewrite
+#     Examples: header_rewrite
+article_spam_filter_rules	=	header_rewrite
+
+
+# Descriptions: external spam checker.
+#		if plural drivers specified, try them sequentially.
+#      History: none
+#        Value: spamassasin | spamc | bogofilter
+#     Examples: bogofilter
+article_spam_filter_drivers	=	bogofilter
+
+
+# Descriptions: external virus checker. disabled by default.
+#      History: none
+#        Value: yes | no
+#     Examples: no
+use_article_virus_filter	=	no
+
+
+# Descriptions: action if virus found.
+#      History: none
+#        Value: reject | ignore | header_rewrite
+#     Examples: reject
+article_virus_filter_rules	=	reject
+
+
+# Descriptions: external virus checker.
+#		if plural drivers specified, try them sequentially.
+#      History: none
+#        Value: clamscan 
+#     Examples: clamscan
+article_virus_filter_drivers	=	clamscan
+
 =head2	inform the filter rejection
 
 
diff --git a/fml/doc/en/tutorial/variables/filter.size.sgml b/fml/doc/en/tutorial/variables/filter.size.sgml
index bf07a930..4e5db296 100644
--- a/fml/doc/en/tutorial/variables/filter.size.sgml
+++ b/fml/doc/en/tutorial/variables/filter.size.sgml
@@ -87,6 +87,8 @@ article_filter_functions	=	article_size_filter
 					article_non_mime_filter
 					article_mime_component_filter
 					article_text_plain_filter
+					article_spam_filter
+					article_virus_filter
 
 
 =head2	size based filter
diff --git a/fml/doc/en/tutorial/variables/list.sgml b/fml/doc/en/tutorial/variables/list.sgml
index a749bc4d..e362e1c5 100644
--- a/fml/doc/en/tutorial/variables/list.sgml
+++ b/fml/doc/en/tutorial/variables/list.sgml
@@ -195,6 +195,15 @@ article_spam_filter_bogofilter_options</entry>
 </row>
 <row>
 <entry>
+article_spam_filter_drivers</entry>
+<entry>
+ external spam checker.</entry>
+<entry>
+bogofilter
+   </entry>
+</row>
+<row>
+<entry>
 article_spam_filter_functions</entry>
 <entry>
  list up driver names used as spam checker.</entry>
@@ -204,6 +213,15 @@ bogofilter
 </row>
 <row>
 <entry>
+article_spam_filter_rules</entry>
+<entry>
+ action if the message looks a spam.</entry>
+<entry>
+header_rewrite
+   </entry>
+</row>
+<row>
+<entry>
 article_spam_filter_spamassassin_options</entry>
 <entry>
  exit non-zero status code when spam caught if "-e" specified.</entry>
@@ -274,6 +292,24 @@ reject_not_iso2022jp_japanese_string
 </row>
 <row>
 <entry>
+article_virus_filter_drivers</entry>
+<entry>
+ external virus checker.</entry>
+<entry>
+clamscan
+   </entry>
+</row>
+<row>
+<entry>
+article_virus_filter_rules</entry>
+<entry>
+ action if virus found.</entry>
+<entry>
+reject
+   </entry>
+</row>
+<row>
+<entry>
 cgi_base_dir</entry>
 <entry>
  base directory which locates .cgi for this domain.</entry>
@@ -1751,6 +1787,15 @@ yes
 </row>
 <row>
 <entry>
+use_article_spam_filter</entry>
+<entry>
+ use external spam checker.</entry>
+<entry>
+no
+   </entry>
+</row>
+<row>
+<entry>
 use_article_text_plain_filter</entry>
 <entry>
  use text/plain filter, which is a simple syntax checker.</entry>
@@ -1760,6 +1805,15 @@ yes
 </row>
 <row>
 <entry>
+use_article_virus_filter</entry>
+<entry>
+ external virus checker. disabled by default.</entry>
+<entry>
+no
+   </entry>
+</row>
+<row>
+<entry>
 use_command_mail_filter_reject_notice</entry>
 <entry>
  inform filter rejection ?</entry>
diff --git a/fml/doc/ja/tutorial/variables/class.sgml b/fml/doc/ja/tutorial/variables/class.sgml
index 06434c2c..b47adf98 100644
--- a/fml/doc/ja/tutorial/variables/class.sgml
+++ b/fml/doc/ja/tutorial/variables/class.sgml
@@ -96,7 +96,9 @@ article {
 
    article_spam_filter { 
     ?     $article_spam_filter_bogofilter_options
+    ?     $article_spam_filter_drivers
           $article_spam_filter_functions
+          $article_spam_filter_rules
     ?     $article_spam_filter_spamassassin_options
     ?     $article_spam_filter_spamc_options
           $use_article_spam_filter
@@ -107,6 +109,12 @@ article {
           $use_article_text_plain_filter
    }
 
+   article_virus_filter { 
+    ?     $article_virus_filter_drivers
+          $article_virus_filter_rules
+          $use_article_virus_filter
+   }
+
    article_* {
           $article_sequence_file
     ?     $article_subject_tag
diff --git a/fml/doc/ja/tutorial/variables/filter.rules.sgml b/fml/doc/ja/tutorial/variables/filter.rules.sgml
index 41d7f1c5..52516fc4 100644
--- a/fml/doc/ja/tutorial/variables/filter.rules.sgml
+++ b/fml/doc/ja/tutorial/variables/filter.rules.sgml
@@ -21,6 +21,8 @@ article_filter_functions	=	article_size_filter
 					article_non_mime_filter
 					article_mime_component_filter
 					article_text_plain_filter
+					article_spam_filter
+					article_virus_filter
 
 
 # Descriptions: サイズ情報を根拠にしたフィルタリングをするか？
@@ -134,6 +136,52 @@ article_text_plain_filter_rules	=	reject_not_iso2022jp_japanese_string
 					permit
 
 
+# Descriptions: 外部のSPAMチェッカを使った検査、デフォルトでは無効。
+#		また有効にした場合、ヘッダにSPAMであることを知らせる
+#		フラッグをつけ通過させる動作がデフォルト。
+#      History: none
+#        Value: yes | no
+#     Examples: no
+use_article_spam_filter		=	no
+
+
+# Descriptions: SPAMだと判定された場合、どうするか？
+#      History: none
+#        Value: reject | ignore | header_rewrite
+#     Examples: header_rewrite
+article_spam_filter_rules	=	header_rewrite
+
+
+# Descriptions: SPAMチェッカとして使う外部プログラム。
+#		複数指定すると、複数のプログラムを順に試す。
+#      History: none
+#        Value: spamassasin | spamc | bogofilter
+#     Examples: bogofilter
+article_spam_filter_drivers	=	bogofilter
+
+
+# Descriptions: 外部のVirusチェッカを使った検査、デフォルトでは無効。
+#      History: none
+#        Value: yes | no
+#     Examples: no
+use_article_virus_filter	=	no
+
+
+# Descriptions: ウィルスだと判定された場合、どうするか？
+#      History: none
+#        Value: reject | ignore | header_rewrite
+#     Examples: reject
+article_virus_filter_rules	=	reject
+
+
+# Descriptions: ウィルスチェッカとして使う外部プログラム
+#		複数指定すると、複数のプログラムを順に試す。
+#      History: none
+#        Value: clamscan 
+#     Examples: clamscan
+article_virus_filter_drivers	=	clamscan
+
+
 # Descriptions: フィルタで弾かれたことを教える
 #      History: maintainer には常に弾かれたことを知らせるが、
 #		sender に対しては $FILTER_NOTIFY_REJECTION (= 0 by default)。
diff --git a/fml/doc/ja/tutorial/variables/filter.size.sgml b/fml/doc/ja/tutorial/variables/filter.size.sgml
index 485584c1..a55046e6 100644
--- a/fml/doc/ja/tutorial/variables/filter.size.sgml
+++ b/fml/doc/ja/tutorial/variables/filter.size.sgml
@@ -87,6 +87,8 @@ article_filter_functions	=	article_size_filter
 					article_non_mime_filter
 					article_mime_component_filter
 					article_text_plain_filter
+					article_spam_filter
+					article_virus_filter
 
 
 # Descriptions: サイズ情報を根拠にしたフィルタリングをするか？
diff --git a/fml/doc/ja/tutorial/variables/list.sgml b/fml/doc/ja/tutorial/variables/list.sgml
index 0028c84b..2e9bd7a7 100644
--- a/fml/doc/ja/tutorial/variables/list.sgml
+++ b/fml/doc/ja/tutorial/variables/list.sgml
@@ -196,6 +196,15 @@ article_spam_filter_bogofilter_options</entry>
 </row>
 <row>
 <entry>
+article_spam_filter_drivers</entry>
+<entry>
+ SPAMチェッカとして使う外部プログラム。</entry>
+<entry>
+bogofilter
+   </entry>
+</row>
+<row>
+<entry>
 article_spam_filter_functions</entry>
 <entry>
  list up driver names used as spam checker.</entry>
@@ -205,6 +214,15 @@ bogofilter
 </row>
 <row>
 <entry>
+article_spam_filter_rules</entry>
+<entry>
+ SPAMだと判定された場合、どうするか？</entry>
+<entry>
+header_rewrite
+   </entry>
+</row>
+<row>
+<entry>
 article_spam_filter_spamassassin_options</entry>
 <entry>
  exit non-zero status code when spam caught if "-e" specified.</entry>
@@ -257,6 +275,24 @@ reject_not_iso2022jp_japanese_string
 </row>
 <row>
 <entry>
+article_virus_filter_drivers</entry>
+<entry>
+ ウィルスチェッカとして使う外部プログラム</entry>
+<entry>
+clamscan
+   </entry>
+</row>
+<row>
+<entry>
+article_virus_filter_rules</entry>
+<entry>
+ ウィルスだと判定された場合、どうするか？</entry>
+<entry>
+reject
+   </entry>
+</row>
+<row>
+<entry>
 cgi_base_dir</entry>
 <entry>
  CGI を置くトップディレクトリ</entry>
@@ -1743,6 +1779,15 @@ yes
 </row>
 <row>
 <entry>
+use_article_spam_filter</entry>
+<entry>
+ 外部のSPAMチェッカを使った検査、デフォルトでは無効。</entry>
+<entry>
+no
+   </entry>
+</row>
+<row>
+<entry>
 use_article_text_plain_filter</entry>
 <entry>
  先頭の text/plain 部分に対するフィルタ。</entry>
@@ -1752,6 +1797,15 @@ yes
 </row>
 <row>
 <entry>
+use_article_virus_filter</entry>
+<entry>
+ 外部のVirusチェッカを使った検査、デフォルトでは無効。</entry>
+<entry>
+no
+   </entry>
+</row>
+<row>
+<entry>
 use_command_mail_filter_reject_notice</entry>
 <entry>
  フィルタで弾かれたことを教える</entry>