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

Fix for #8 - Allow softfail when refusing email #9

Merged
merged 2 commits into from
Sep 9, 2016
Merged

Fix for #8 - Allow softfail when refusing email #9

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
12cbfed
Fix for #8 - Allow softfail when refusing email
jcbf Sep 9, 2016
ae6113e
* Corrected var name
jcbf Sep 9, 2016
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
17 changes: 12 additions & 5 deletions smf-spf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
#define SYSLOG_FACILITY LOG_MAIL
#define SPF_TTL 3600
#define REFUSE_FAIL 1
#define SOFT_FAIL 0
#define TAG_SUBJECT 1
#define ADD_HEADER 1
#define QUARANTINE 0
Expand Down Expand Up @@ -130,6 +131,7 @@ typedef struct config {
STR *froms;
STR *tos;
int refuse_fail;
int soft_fail;
int tag_subject;
int add_header;
int quarantine;
Expand Down Expand Up @@ -366,6 +368,7 @@ static int load_config(void) {
conf.sendmail_socket = strdup(OCONN);
conf.syslog_facility = SYSLOG_FACILITY;
conf.refuse_fail = REFUSE_FAIL;
conf.soft_fail = SOFT_FAIL;
conf.tag_subject = TAG_SUBJECT;
conf.add_header = ADD_HEADER;
conf.quarantine = QUARANTINE;
Expand Down Expand Up @@ -452,6 +455,10 @@ static int load_config(void) {
}
continue;
}
if (!strcasecmp(key, "softfail") && !strcasecmp(val, "on")) {
conf.soft_fail = 1;
continue;
}
if (!strcasecmp(key, "refusefail") && !strcasecmp(val, "off")) {
conf.refuse_fail = 0;
continue;
Expand Down Expand Up @@ -676,7 +683,7 @@ static sfsistat smf_envfrom(SMFICTX *ctx, char **args) {
}
else
if (!address_preparation(context->sender, context->from)) {
smfi_setreply(ctx, "550", "5.1.7", "Sender address does not conform to RFC-2821 syntax");
smfi_setreply(ctx, conf.softfail ? "450" : "550", conf.soft_fail ? "4.1.7" : "5.1.7", "Sender address does not conform to RFC-2821 syntax");
return SMFIS_REJECT;
}
if (!strstr(context->from, "<>")) {
Expand Down Expand Up @@ -711,7 +718,7 @@ static sfsistat smf_envfrom(SMFICTX *ctx, char **args) {
char reject[2 * MAXLINE];

snprintf(reject, sizeof(reject), "Rejected, look at http://www.openspf.org/why.html?sender=%s&ip=%s&receiver=%s", context->sender, context->addr, context->site);
smfi_setreply(ctx, "550", "5.7.23", reject);
smfi_setreply(ctx, conf.soft_fail ? "450" : "550", conf.soft_fail ? "4.7.23" : "4.7.23", reject);
return SMFIS_REJECT;
}
context->status = status;
Expand Down Expand Up @@ -762,7 +769,7 @@ static sfsistat smf_envfrom(SMFICTX *ctx, char **args) {
if (spf_response) SPF_response_free(spf_response);
if (spf_request) SPF_request_free(spf_request);
if (spf_server) SPF_server_free(spf_server);
smfi_setreply(ctx, "550", "5.7.23", reject);
smfi_setreply(ctx, conf.soft_fail ? "450" : "550", conf.soft_fail ? "4.7.23" : "4.7.23", reject);
return SMFIS_REJECT;
}
done:
Expand All @@ -777,7 +784,7 @@ static sfsistat smf_envrcpt(SMFICTX *ctx, char **args) {

if (*args) strscpy(context->rcpt, *args, sizeof(context->rcpt) - 1);
if (!address_preparation(context->recipient, context->rcpt)) {
smfi_setreply(ctx, "550", "5.1.3", "Recipient address does not conform to RFC-2821 syntax");
smfi_setreply(ctx, conf.soft_fail ? "450" : "550", conf.soft_fail ? "4.1.3" : "5.1.3", "Recipient address does not conform to RFC-2821 syntax");
return SMFIS_REJECT;
}
if (conf.tos) {
Expand All @@ -787,7 +794,7 @@ static sfsistat smf_envrcpt(SMFICTX *ctx, char **args) {
char reject[2 * MAXLINE];

snprintf(reject, sizeof(reject), "Rejected, look at http://www.openspf.org/why.html?sender=%s&ip=%s&receiver=%s", context->sender, context->addr, context->site);
smfi_setreply(ctx, "550", "5.1.1", reject);
smfi_setreply(ctx, conf.soft_fail ? "450" : "550", conf.soft_fail ? "4.1.1" : "5.1.1", reject);
return SMFIS_REJECT;
}
}
Expand Down
6 changes: 6 additions & 0 deletions smf-spf.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@ WhitelistIP 192.168.0.0/16
#
#RefuseFail on # (on|off)

# When refusing e-Mail messages use a 450 SMTP code
#
# Default: off
#
#SoftFail off # (on|off)

# Subject tagging of e-Mail messages at SPF SoftFail
# and Fail (if RefuseFail set to off) results
#
Expand Down