Fixed #24: An exception nil value (local 'origin') is thrown when an …

…OPTIONS request is sent that is not a CORS preflight request (which does not include an Options header).
haproxytech · Mar 21, 2021 · acaa902 · acaa902
1 parent f534376
commit acaa902
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/example/haproxy/cors.lua b/example/haproxy/cors.lua
@@ -108,6 +108,12 @@ function cors_request(txn, allowed_methods, allowed_origins, allowed_headers)
     core.Debug("CORS: Got 'Origin' header: " .. headers["origin"][0])
     origin = headers["origin"][0]
   end
+
+  -- Bail if client did not send an Origin
+  -- for example, it may be a regular OPTIONS request that is not a CORS preflight request
+  if origin == nil or origin == '' then
+    return
+  end
 
   transaction_data["origin"] = origin
   transaction_data["allowed_methods"] = allowed_methods

diff --git a/lib/cors.lua b/lib/cors.lua
@@ -108,6 +108,12 @@ function cors_request(txn, allowed_methods, allowed_origins, allowed_headers)
     core.Debug("CORS: Got 'Origin' header: " .. headers["origin"][0])
     origin = headers["origin"][0]
   end
+
+  -- Bail if client did not send an Origin
+  -- for example, it may be a regular OPTIONS request that is not a CORS preflight request
+  if origin == nil or origin == '' then
+    return
+  end
 
   transaction_data["origin"] = origin
   transaction_data["allowed_methods"] = allowed_methods