Skip to content

Set secure cookie flag properly with WebAuthSSLReturn #6

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
rra wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Set secure cookie flag properly with WebAuthSSLReturn #6

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06b0565
Set secure cookie flag properly with WebAuthSSLReturn
rra Aug 9, 2015
ffb2934
Add missing semicolon
rra Dec 29, 2017
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: 5 additions & 2 deletions modules/webauth/mod_webauth.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ nuke_cookie(MWA_REQ_CTXT *rc, const char *name, int if_set)
{
char *cookie;
const char *path = "/";
bool is_secure = is_https(rc->r) || rc->dconf->ssl_return;

if (if_set && find_cookie(rc, name) == NULL)
return;
Expand All @@ -244,7 +245,7 @@ nuke_cookie(MWA_REQ_CTXT *rc, const char *name, int if_set)
"%s=; path=%s; expires=%s;%s",
name, path,
"Thu, 26-Mar-1998 00:00:01 GMT",
is_https(rc->r) ? "secure" : "");
is_secure ? "secure" : "");
if (rc->sconf->debug)
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, rc->r->server,
"mod_webauth: nuking cookie(%s): (%s)",
Expand Down Expand Up @@ -305,6 +306,8 @@ static void
fixup_setcookie(MWA_REQ_CTXT *rc, const char *name, const char *value,
const char *path)
{
bool is_secure = is_https(rc->r) || rc->dconf->ssl_return;

if (path == NULL)
path = "/";
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, rc->r->server,
Expand All @@ -317,7 +320,7 @@ fixup_setcookie(MWA_REQ_CTXT *rc, const char *name, const char *value,
name,
value,
path,
is_https(rc->r) ? "; secure" : "",
is_secure ? "; secure" : "",
rc->sconf->httponly ? "; HttpOnly" : "");
}

Expand Down