Skip to content

Bug: Server should check only specific tls-auth #489

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

Open
bilias wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bug: Server should check only specific tls-auth #489

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 21 additions & 21 deletions options.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2025,6 +2025,27 @@ acl_check_incoming(struct acl_options* acl, struct query* q,
}
#endif
if(acl_addr_matches(acl, q) && acl_key_matches(acl, q)) {
#ifdef HAVE_SSL
/* we are in a acl with tls_auth */
if (acl->tls_auth_name) {
/* we have auth_domain_name in tls_auth */
if (acl->tls_auth_options && acl->tls_auth_options->auth_domain_name) {
if (!acl_tls_hostname_matches(q->tls_auth, acl->tls_auth_options->auth_domain_name)) {
VERBOSITY(3, (LOG_WARNING,
"client cert does not match %s %s",
acl->tls_auth_name, acl->tls_auth_options->auth_domain_name));
q->cert_cn = NULL;
return -1;
}
VERBOSITY(5, (LOG_INFO, "%s %s verified",
acl->tls_auth_name, acl->tls_auth_options->auth_domain_name));
q->cert_cn = acl->tls_auth_options->auth_domain_name;
} else {
/* nsd gives error on start for this, but check just in case */
log_msg(LOG_ERR, "auth-domain-name not defined in %s", acl->tls_auth_name);
}
}
#endif
if(!match)
{
match = acl; /* remember first match */
Expand All @@ -2036,27 +2057,6 @@ acl_check_incoming(struct acl_options* acl, struct query* q,
return -1;
}
}
#ifdef HAVE_SSL
/* we are in a acl with tls_auth */
if (acl->tls_auth_name) {
/* we have auth_domain_name in tls_auth */
if (acl->tls_auth_options && acl->tls_auth_options->auth_domain_name) {
if (!acl_tls_hostname_matches(q->tls_auth, acl->tls_auth_options->auth_domain_name)) {
VERBOSITY(3, (LOG_WARNING,
"client cert does not match %s %s",
acl->tls_auth_name, acl->tls_auth_options->auth_domain_name));
q->cert_cn = NULL;
return -1;
}
VERBOSITY(5, (LOG_INFO, "%s %s verified",
acl->tls_auth_name, acl->tls_auth_options->auth_domain_name));
q->cert_cn = acl->tls_auth_options->auth_domain_name;
} else {
/* nsd gives error on start for this, but check just in case */
log_msg(LOG_ERR, "auth-domain-name not defined in %s", acl->tls_auth_name);
}
}
#endif
number++;
acl = acl->next;
}
Expand Down
Loading