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

Added support for SameSite=None #12

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added support for SameSite=None #12

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
0811608
Added support for SameSite=None
Jan 18, 2020
9a7761a
Update README.md
clagio Jan 24, 2020
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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ It is possible to set a default value using symbol "*". In this case flags will

-| -
--- | ---
**Syntax** | **set_cookie_flag** \<cookie_name\|*\> [HttpOnly] [secure] [SameSite\|SameSite=[Lax\|Strict]];
**Syntax** | **set_cookie_flag** \<cookie_name\|*\> [HttpOnly] [secure] [SameSite\|SameSite=[Lax\|Strict\|None]];
**Default** | -
**Context** | server, location

Description: Add flag to desired cookie.

## Author
Anton Saraykin [<[email protected]>]
Anton Saraykin [<[email protected]>]
15 changes: 15 additions & 0 deletions ngx_http_cookie_flag_filter_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ typedef struct {
ngx_flag_t secure;
ngx_flag_t samesite;
ngx_flag_t samesite_lax;
ngx_flag_t samesite_none;
ngx_flag_t samesite_strict;
} ngx_http_cookie_t;

Expand Down Expand Up @@ -164,6 +165,7 @@ ngx_http_cookie_flag_filter_cmd(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
cookie->secure = 0;
cookie->samesite = 0;
cookie->samesite_lax = 0;
cookie->samesite_none = 0;
cookie->samesite_strict = 0;

// normalize and check 2nd and 3rd parameters
Expand All @@ -176,6 +178,8 @@ ngx_http_cookie_flag_filter_cmd(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
cookie->samesite = 1;
} else if (ngx_strncasecmp(value[i].data, (u_char *) "samesite=lax", 12) == 0 && value[i].len == 12) {
cookie->samesite_lax = 1;
} else if (ngx_strncasecmp(value[i].data, (u_char *) "samesite=none", 13) == 0 && value[i].len == 13) {
cookie->samesite_none = 1;
} else if (ngx_strncasecmp(value[i].data, (u_char *) "samesite=strict", 15) == 0 && value[i].len == 15) {
cookie->samesite_strict = 1;
} else {
Expand Down Expand Up @@ -277,6 +281,16 @@ ngx_http_cookie_flag_filter_append(ngx_http_request_t *r, ngx_http_cookie_t *coo
header->value.len = tmp.len;
}

if (cookie->samesite_none == 1 && ngx_strcasestrn(header->value.data, "; SameSite=None", 15 - 1) == NULL) {
tmp.data = ngx_pnalloc(r->pool, header->value.len + sizeof("; SameSite=None") - 1);
if (tmp.data == NULL) {
return NGX_ERROR;
}
tmp.len = ngx_sprintf(tmp.data, "%V; SameSite=None", &header->value) - tmp.data;
header->value.data = tmp.data;
header->value.len = tmp.len;
}

if (cookie->samesite_strict == 1 && ngx_strcasestrn(header->value.data, "; SameSite=Strict", 17 - 1) == NULL) {
tmp.data = ngx_pnalloc(r->pool, header->value.len + sizeof("; SameSite=Strict") - 1);
if (tmp.data == NULL) {
Expand Down Expand Up @@ -365,3 +379,4 @@ ngx_http_cookie_flag_filter_handler(ngx_http_request_t *r)

return ngx_http_next_header_filter(r);
}