IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-26 08:51:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Userid: userid_flags fixup.

Browse Source 
In 7717:e3e8b8234f05, the 1st bit was incorrectly used.  It shouldn't
be used for bitmask values, as it is used by NGX_CONF_BITMASK_SET.

Additionally, special value "off" added to make it possible to clear
inherited userid_flags value.
This commit is contained in:
Maxim Dounin 2020-09-29 15:52:18 +03:00
parent 279efaab66
commit 718d589091
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/http/modules/ngx_http_userid_filter_module.c
View File

@ -15,12 +15,13 @@
#define NGX_HTTP_USERID_V1 2 #define NGX_HTTP_USERID_V1 2
#define NGX_HTTP_USERID_ON 3 #define NGX_HTTP_USERID_ON 3
#define NGX_HTTP_USERID_COOKIE_SECURE 0x0001 #define NGX_HTTP_USERID_COOKIE_OFF 0x0002
#define NGX_HTTP_USERID_COOKIE_HTTPONLY 0x0002 #define NGX_HTTP_USERID_COOKIE_SECURE 0x0004
#define NGX_HTTP_USERID_COOKIE_SAMESITE 0x0004 #define NGX_HTTP_USERID_COOKIE_HTTPONLY 0x0008
#define NGX_HTTP_USERID_COOKIE_SAMESITE_STRICT 0x0008 #define NGX_HTTP_USERID_COOKIE_SAMESITE 0x0010
#define NGX_HTTP_USERID_COOKIE_SAMESITE_LAX 0x0010 #define NGX_HTTP_USERID_COOKIE_SAMESITE_STRICT 0x0020
#define NGX_HTTP_USERID_COOKIE_SAMESITE_NONE 0x0020 #define NGX_HTTP_USERID_COOKIE_SAMESITE_LAX 0x0040
#define NGX_HTTP_USERID_COOKIE_SAMESITE_NONE 0x0080
/* 31 Dec 2037 23:55:55 GMT */ /* 31 Dec 2037 23:55:55 GMT */
#define NGX_HTTP_USERID_MAX_EXPIRES 2145916555 #define NGX_HTTP_USERID_MAX_EXPIRES 2145916555
@ -97,6 +98,7 @@ static ngx_conf_enum_t ngx_http_userid_state[] = {
static ngx_conf_bitmask_t ngx_http_userid_flags[] = { static ngx_conf_bitmask_t ngx_http_userid_flags[] = {
{ ngx_string("off"), NGX_HTTP_USERID_COOKIE_OFF },
{ ngx_string("secure"), NGX_HTTP_USERID_COOKIE_SECURE }, { ngx_string("secure"), NGX_HTTP_USERID_COOKIE_SECURE },
{ ngx_string("httponly"), NGX_HTTP_USERID_COOKIE_HTTPONLY }, { ngx_string("httponly"), NGX_HTTP_USERID_COOKIE_HTTPONLY },
{ ngx_string("samesite=strict"), { ngx_string("samesite=strict"),
@ -752,7 +754,7 @@ ngx_http_userid_merge_conf(ngx_conf_t *cf, void *parent, void *child)
NGX_HTTP_USERID_OFF); NGX_HTTP_USERID_OFF);
ngx_conf_merge_bitmask_value(conf->flags, prev->flags, ngx_conf_merge_bitmask_value(conf->flags, prev->flags,
NGX_CONF_BITMASK_SET); (NGX_CONF_BITMASK_SET|NGX_HTTP_USERID_COOKIE_OFF));
ngx_conf_merge_str_value(conf->name, prev->name, "uid"); ngx_conf_merge_str_value(conf->name, prev->name, "uid");
ngx_conf_merge_str_value(conf->domain, prev->domain, ""); ngx_conf_merge_str_value(conf->domain, prev->domain, "");