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

Fix #643 - Update of opendkim lens to match current opendkim.conf file format #644

Merged
merged 2 commits into from
Aug 23, 2019
Merged

Fix #643 - Update of opendkim lens to match current opendkim.conf file format #644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a54f71
Fix #643 - Update of opendkim lens to match current opendkim.conf fil…
doc75 Aug 20, 2019
767ef0f
add test for opendkim lens update
doc75 Aug 20, 2019
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
7 changes: 4 additions & 3 deletions lenses/opendkim.aug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ module Opendkim =
| /OversignHeaders|PeerList|POPDBFile|RemoveARFrom|ResignMailTo/
| /SenderHeaders|SignHeaders|SigningTable|TrustSignaturesFrom/
let stringkv = key stringkv_rx .
del /[ \t]+/ " " . store /[a-zA-Z][^ \t\n#]+/ . eol
del /[ \t]+/ " " . store /[0-9a-zA-Z\/][^ \t\n#]+/ . eol

let integerkv_rx = /AutoRestartCount|ClockDrift|DNSTimeout/
| /LDAPKeepaliveIdle|LDAPKeepaliveInterval|LDAPKeepaliveProbes|LDAPTimeout/
Expand All @@ -48,12 +48,13 @@ module Opendkim =
| /Quarantine|QueryCache|RemoveARAll|RemoveOldSignatures|ResolverTracing/
| /SelectorHeaderRemove|SendADSPReports|SendReports|SoftwareHeader/
| /StrictHeaders|StrictTestMode|SubDomains|Syslog|SyslogSuccess/
| /VBR-TrustedCertifiersOnly|WeakSyntaxChecks/
| /VBR-TrustedCertifiersOnly|WeakSyntaxChecks|LogWhy/
let booleankv = key booleankv_rx .
del /[ \t]+/ " " . store /(true|false|yes|no|1|0)/ . eol
del /[ \t]+/ " " . store /([Tt]rue|[Ff]alse|[Yy]es|[Nn]o|1|0)/ . eol

let entry = [ integerkv ] | [ booleankv ] | [ stringkv ]

let lns = (comment | empty | entry)*

let xfm = transform lns (incl "/etc/opendkim.conf")

42 changes: 42 additions & 0 deletions lenses/tests/test_opendkim.aug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,48 @@ module Test_Opendkim =
test Opendkim.lns put one_boolean_value after
set "AddAllSignatureResults" "1" = one_boolean_value

let one_boolean_value_uppercase_yes = "AutoRestart Yes\n"
test Opendkim.lns get one_boolean_value_uppercase_yes =
{ "AutoRestart" = "Yes" }
test Opendkim.lns put one_boolean_value_uppercase_yes after
set "AutoRestart" "Yes" = one_boolean_value_uppercase_yes

let one_boolean_value_uppercase_no = "AutoRestart No\n"
test Opendkim.lns get one_boolean_value_uppercase_no =
{ "AutoRestart" = "No" }
test Opendkim.lns put one_boolean_value_uppercase_no after
set "AutoRestart" "No" = one_boolean_value_uppercase_no

let one_boolean_value_uppercase_true = "AutoRestart True\n"
test Opendkim.lns get one_boolean_value_uppercase_true =
{ "AutoRestart" = "True" }
test Opendkim.lns put one_boolean_value_uppercase_true after
set "AutoRestart" "True" = one_boolean_value_uppercase_true

let one_boolean_value_uppercase_false = "AutoRestart False\n"
test Opendkim.lns get one_boolean_value_uppercase_false =
{ "AutoRestart" = "False" }
test Opendkim.lns put one_boolean_value_uppercase_false after
set "AutoRestart" "False" = one_boolean_value_uppercase_false

let string_value_starting_with_number = "AutoRestartRate 10/1h\n"
test Opendkim.lns get string_value_starting_with_number =
{ "AutoRestartRate" = "10/1h" }
test Opendkim.lns put string_value_starting_with_number after
set "AutoRestartRate" "10/1h" = string_value_starting_with_number

let string_value_containing_slash = "TrustAnchorFile /usr/share/dns/root.key\n"
test Opendkim.lns get string_value_containing_slash =
{ "TrustAnchorFile" = "/usr/share/dns/root.key" }
test Opendkim.lns put string_value_containing_slash after
set "TrustAnchorFile" "/usr/share/dns/root.key" = string_value_containing_slash

let logwhy_keyword_boolean = "LogWhy Yes\n"
test Opendkim.lns get logwhy_keyword_boolean =
{ "LogWhy" = "Yes" }
test Opendkim.lns put logwhy_keyword_boolean after
set "LogWhy" "Yes" = logwhy_keyword_boolean

let three_type_value = "AddAllSignatureResults false\nADSPAction discard\nAutoRestartCount 2\n"
test Opendkim.lns get three_type_value =
{ "AddAllSignatureResults" = "false" }
Expand Down