Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

replace blacklist and whitelist with denylist and allowlist in ERJava… #931

Merged
merged 3 commits into from
Jan 16, 2022
Merged

replace blacklist and whitelist with denylist and allowlist in ERJava… #931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bfe4b47
replace blacklist and whitelist with denylist and allowlist in ERJava…
elemgee Jun 13, 2020
ea68e8c
Fix Javadoc warnings
hprange Jan 15, 2022
7880968
Remove unnecessary suppress warnings annotation
hprange Jan 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Frameworks/Core/ERJavaMail/Documentation/README.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,14 @@ The X-Mailer header to put into all outgoing mail messages. Defaults to nothing.
er.javamail.defaultEncoding = UTF-8
The default character encoding to use for message content. Defaults to ???.

er.javamail.WhiteListEmailAddressPatterns =
A comma-separated list of whitelisted email address patterns. If set, then only addresses that match one of the whitelisted
er.javamail.AllowEmailAddressPatterns =
A comma-separated list of allowed email address patterns. If set, then only addresses that match one of the allowed
patterns will delivered to. Pattern syntax is the same as EOQualifier's caseInsensitiveLike.

er.javamail.BlackListEmailAddressPatterns =
A comma-separated list of blacklisted email address patterns. If set, then any email addresses that match a blacklist pattern
will not be delivered to. Pattern syntax is the same as EOQualifier's caseInsensitiveLike. The blacklist filter is processed
last, so a blacklist pattern beats a whitelist pattern.
er.javamail.DenyEmailAddressPatterns =
A comma-separated list of disallowed email address patterns. If set, then any email addresses that match a disallowed pattern
will not be delivered to. Pattern syntax is the same as EOQualifier's caseInsensitiveLike. The disallowed filter is processed
last, so a disallowed pattern beats a allowed pattern.

CODE SAMPLE
- - - - - -
Expand Down Expand Up @@ -212,14 +212,14 @@ Don't hesitate to send {postcards, feedback, love letters} to Camille Troillard
## セットされている場合にはホワイト・リストに含まれるメールしか送信されません。
## パタン・シンタクスは EOQualifier caseInsensitiveLike 同様
## この場合には次の様に追加します：
@property # er.javamail.WhiteListEmailAddressPatterns=("*@mycompany.com", "somebody@mac.com")
@property # er.javamail.AllowEmailAddressPatterns=("*@mycompany.com", "somebody@mac.com")

## 送信したくないアドレスがある場合にはブラック・リストを使用できます。
## コンマ区切りされているメールアドレス・パタンのブラック・リスト
## セットされているアドレスへはメール送信されません。
## パタン・シンタクスは EOQualifier caseInsensitiveLike 同様
## ブラック・リスト・パタンは最後に処理されるので、ホワイト・リストよりも優先です。
@property # er.javamail.BlackListEmailAddressPatterns=("*@baddomain.com", "badperson@mycompany.com")
@property # er.javamail.DenyEmailAddressPatterns=("*@baddomain.com", "badperson@mycompany.com")

## SMTP 又は SMTPS を使用するかどうか
## 基本的にはここで指定する必要がありません。
Expand Down
8 changes: 4 additions & 4 deletions Frameworks/Core/ERJavaMail/Resources/Properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ er.javamail.milliSecondsWaitIfSenderOverflowed = 6000
# Used to set a default X-Mailer
#er.javamail.mailer.XMailerHeader =

# White and black email address patterns
# Allow and deny email address patterns
# This can be useful in testing when say
# you only want to allow emails to be sent to *@mycompany.com
# In this case you would add:
# er.javamail.WhiteListEmailAddressPatterns=("*@mycompany.com", "somebody@mac.com")
# er.javamail.AllowEmailAddressPatterns=("*@mycompany.com", "somebody@mac.com")

# To prevent sending mail to certain addresses you can use the black list
# er.javamail.BlackListEmailAddressPatterns=("*@baddomain.com", "badperson@mycompany.com")
# To prevent sending mail to certain addresses you can use the deny list
# er.javamail.DenyEmailAddressPatterns=("*@baddomain.com", "badperson@mycompany.com")


# * The port to use with the smtp server, if not set, defaults to 25
Expand Down
4 changes: 2 additions & 2 deletions Frameworks/Core/ERJavaMail/Resources/_Properties_ja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@ er.javamail.milliSecondsWaitIfSenderOverflowed = 6000
## セットされている場合にはホワイト・リストに含まれるメールしか送信されません。
## パタン・シンタクスは EOQualifier caseInsensitiveLike 同様
## この場合には次の様に追加します：
# er.javamail.WhiteListEmailAddressPatterns=("*@mycompany.com", "somebody@mac.com")
# er.javamail.AllowEmailAddressPatterns=("*@mycompany.com", "somebody@mac.com")

## 送信したくないアドレスがある場合にはブラック・リストを使用できます。
## コンマ区切りされているメールアドレス・パタンのブラック・リスト
## セットされているアドレスへはメール送信されません。
## パタン・シンタクスは EOQualifier caseInsensitiveLike 同様
## ブラック・リスト・パタンは最後に処理されるので、ホワイト・リストよりも優先です。
# er.javamail.BlackListEmailAddressPatterns=("*@baddomain.com", "badperson@mycompany.com")
# er.javamail.DenyEmailAddressPatterns=("*@baddomain.com", "badperson@mycompany.com")

## SMTP 送信ポート
## セットされていない場合には 25 が使用されます。
Expand Down
Loading