From 089a76952b50bd77501a249c21b407abacff83da Mon Sep 17 00:00:00 2001
From: nnposter <nnposter@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Sun, 1 Apr 2018 22:40:26 +0000
Subject: [PATCH] Improves unit testing for parse_set_cookie (parser for
 Set-Cookie header)

---
 nselib/http.lua | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/nselib/http.lua b/nselib/http.lua
index 4a3f49545..f9dbd3498 100644
--- a/nselib/http.lua
+++ b/nselib/http.lua
@@ -2843,14 +2843,22 @@ test_suite = unittest.TestSuite:new()
 
 do
   local cookie_tests = {
-    { -- #844
+    { -- #1169: empty attributes
+      " JSESSIONID=aaa; ; Path=/;;Secure;", {
+        name = "JSESSIONID",
+        value = "aaa",
+        path = "/",
+        secure = true
+      }
+    },
+    { -- #844: space in a cookie name
       " SESSIONID=IgAAABjN8b3xxxNsLRIiSpHLPn1lE=&IgAAAxxxMT6Bw==&Huawei USG6320&langfrombrows=en-US&copyright=2014;secure", {
         name = "SESSIONID",
         value = "IgAAABjN8b3xxxNsLRIiSpHLPn1lE=&IgAAAxxxMT6Bw==&Huawei USG6320&langfrombrows=en-US&copyright=2014",
         secure = true
       }
     },
-    { -- #866
+    { -- #866: unexpected attribute
       " SID=c98fefa3ad659caa20b89582419bb14f; Max-Age=1200; Version=1", {
         name = "SID",
         value = "c98fefa3ad659caa20b89582419bb14f",
@@ -2858,13 +2866,13 @@ do
         version = "1"
       }
     },
-    { -- #731
+    { -- #731: trailing semicolon
       "session_id=76ca8bc8c19;", {
         name = "session_id",
         value = "76ca8bc8c19"
         }
     },
-    { -- #229
+    { -- #229: comma is not a delimiter
       "c1=aaa; path=/bbb/ccc,ddd/eee", {
         name = "c1",
         value = "aaa",
@@ -2875,7 +2883,10 @@ do
 
   for _, test in ipairs(cookie_tests) do
     local parsed = parse_set_cookie(test[1])
-    test_suite:add_test(unittest.keys_equal(parsed, test[2], test[1]))
+    test_suite:add_test(unittest.not_nil(parsed), test[1])
+    if parsed then
+      test_suite:add_test(unittest.keys_equal(parsed, test[2], test[1]), test[1])
+    end
   end
 end