[MEDIUM] cookie: reassign set-cookie status flags to store more states

The set-cookie status flags were not very handy and limited. Reorder
them to save some room for additional values and add the "U" flags
(for Updated expiration date) that will be used with expirable cookies
in insert mode.
(cherry picked from commit 5bab52f821bb0fa99fc48ad1b400769e66196ece)

diff --git a/include/types/proto_http.h b/include/types/proto_http.h
index 5ee2e0fd477a0a821da67dcafe8ba389c971dc80..05bd5e91c54b165786eeed553730e92c227271d9 100644 (file)
--- a/include/types/proto_http.h
+++ b/include/types/proto_http.h
@@ -46,14 +46,17 @@
 #define TX_CK_MASK     0x000000E0      /* mask to get this session's cookie flags */
 #define TX_CK_SHIFT    5               /* bit shift */
 
-/* cookie information, bits values 0x100 to 0x700 (0-7 shift 8) */
-#define TX_SCK_NONE    0x00000000      /* no set-cookie seen for the server cookie */
-#define TX_SCK_DELETED 0x00000100      /* existing set-cookie deleted or changed */
-#define TX_SCK_INSERTED        0x00000200      /* new set-cookie inserted or changed existing one */
-#define TX_SCK_SEEN    0x00000400      /* set-cookie seen for the server cookie */
+/* response cookie information, bits values 0x100 to 0x700 (0-7 shift 8) */
+#define TX_SCK_NONE    0x00000000      /* no cookie found in the response */
+#define TX_SCK_FOUND    0x00000100     /* a persistence cookie was found and forwarded */
+#define TX_SCK_DELETED 0x00000200      /* an existing persistence cookie was deleted */
+#define TX_SCK_INSERTED        0x00000300      /* a persistence cookie was inserted */
+#define TX_SCK_REPLACED        0x00000400      /* a persistence cookie was present and rewritten */
+#define TX_SCK_UPDATED 0x00000500      /* an expirable persistence cookie was updated */
 #define TX_SCK_MASK    0x00000700      /* mask to get the set-cookie field */
 #define TX_SCK_SHIFT   8               /* bit shift */
-#define TX_SCK_ANY     0x00000800      /* at least one set-cookie seen (not to be counted) */
+
+#define TX_SCK_PRESENT  0x00000800     /* a cookie was found in the server's response */
 
 /* cacheability management, bits values 0x1000 to 0x3000 (0-3 shift 12) */
 #define TX_CACHEABLE   0x00001000      /* at least part of the response is cacheable */

diff --git a/src/proto_http.c b/src/proto_http.c
index 71f5af5994cdac3005627e1beafa24ff2d44450b..36694db050a58fe606a17a1a59055c3784ce7415 100644 (file)
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -837,10 +837,10 @@ void http_return_srv_error(struct session *s, struct stream_interface *si)
 extern const char sess_term_cond[8];
 extern const char sess_fin_state[8];
 extern const char *monthname[12];
-const char sess_cookie[8]     = "NIDVEO67";    /* No cookie, Invalid cookie, cookie for a Down server, Valid cookie, Expired cookie, Old cookie */
-const char sess_set_cookie[8] = "N1I3PD5R";    /* No set-cookie, unknown, Set-Cookie Inserted, unknown,
-                                                  Set-cookie seen and left unchanged (passive), Set-cookie Deleted,
-                                                  unknown, Set-cookie Rewritten */
+const char sess_cookie[8]     = "NIDVEO67";    /* No cookie, Invalid cookie, cookie for a Down server, Valid cookie, Expired cookie, Old cookie, unknown */
+const char sess_set_cookie[8] = "NPDIRU67";    /* No set-cookie, Set-cookie found and left unchanged (passive),
+                                                  Set-cookie Deleted, Set-Cookie Inserted, Set-cookie Rewritten,
+                                                  Set-cookie Updated, unknown, unknown */
 struct pool_head *pool2_requri;
 struct pool_head *pool2_capture;
 
@@ -4983,6 +4983,7 @@ int http_process_res_common(struct session *t, struct buffer *rep, int an_bit, s
                        if (unlikely(http_header_add_tail2(rep, &txn->rsp, &txn->hdr_idx,
                                                           trash, len) < 0))
                                goto return_bad_resp;
+                       txn->flags &= ~TX_SCK_MASK;
                        txn->flags |= TX_SCK_INSERTED;
 
                        /* Here, we will tell an eventual cache on the client side that we don't
@@ -5005,8 +5006,8 @@ int http_process_res_common(struct session *t, struct buffer *rep, int an_bit, s
                 * We'll block the response if security checks have caught
                 * nasty things such as a cacheable cookie.
                 */
-               if (((txn->flags & (TX_CACHEABLE | TX_CACHE_COOK | TX_SCK_ANY)) ==
-                    (TX_CACHEABLE | TX_CACHE_COOK | TX_SCK_ANY)) &&
+               if (((txn->flags & (TX_CACHEABLE | TX_CACHE_COOK | TX_SCK_PRESENT)) ==
+                    (TX_CACHEABLE | TX_CACHE_COOK | TX_SCK_PRESENT)) &&
                    (t->be->options & PR_O_CHK_CACHE)) {
 
                        /* we're in presence of a cacheable response containing
@@ -6400,7 +6401,7 @@ void manage_server_side_cookies(struct session *t, struct buffer *res)
                /* OK, right now we know we have a Set-Cookie* at hdr_beg, and
                 * <prev> points to the colon.
                 */
-               txn->flags |= TX_SCK_ANY;
+               txn->flags |= TX_SCK_PRESENT;
 
                /* Maybe we only wanted to see if there was a Set-Cookie (eg:
                 * check-cache is enabled) and we are not interested in checking
@@ -6561,7 +6562,9 @@ void manage_server_side_cookies(struct session *t, struct buffer *res)
                        if (!(t->flags & SN_IGNORE_PRST) &&
                            (att_end - att_beg == t->be->cookie_len) && (t->be->cookie_name != NULL) &&
                            (memcmp(att_beg, t->be->cookie_name, att_end - att_beg) == 0)) {
-                               txn->flags |= TX_SCK_SEEN;
+                               /* assume passive cookie by default */
+                               txn->flags &= ~TX_SCK_MASK;
+                               txn->flags |= TX_SCK_FOUND;
                        
                                /* If the cookie is in insert mode on a known server, we'll delete
                                 * this occurrence because we'll insert another one later.
@@ -6591,6 +6594,7 @@ void manage_server_side_cookies(struct session *t, struct buffer *res)
                                                cur_hdr->len += delta;
                                                http_msg_move_end(&txn->rsp, delta);
                                        }
+                                       txn->flags &= ~TX_SCK_MASK;
                                        txn->flags |= TX_SCK_DELETED;
                                        /* and go on with next cookie */
                                }
@@ -6606,7 +6610,8 @@ void manage_server_side_cookies(struct session *t, struct buffer *res)
                                        cur_hdr->len += delta;
                                        http_msg_move_end(&txn->rsp, delta);
 
-                                       txn->flags |= TX_SCK_INSERTED | TX_SCK_DELETED;
+                                       txn->flags &= ~TX_SCK_MASK;
+                                       txn->flags |= TX_SCK_REPLACED;
                                }
                                else if ((t->srv) && (t->srv->cookie) &&
                                         (t->be->options & PR_O_COOK_PFX)) {
@@ -6621,7 +6626,8 @@ void manage_server_side_cookies(struct session *t, struct buffer *res)
                                        http_msg_move_end(&txn->rsp, delta);
 
                                        val_beg[t->srv->cklen] = COOKIE_DELIM;
-                                       txn->flags |= TX_SCK_INSERTED | TX_SCK_DELETED;
+                                       txn->flags &= ~TX_SCK_MASK;
+                                       txn->flags |= TX_SCK_REPLACED;
                                }
                        }
                        /* next, let's see if the cookie is our appcookie, unless persistence must be ignored */