Merge pull request #9333 from rpastrana/HPCC-16169SecureContextupdate

HPCC-16169 Extend securecontext

Reviewed-By: Russ Whitehead <william.whitehead@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

esp/bindings/http/platform/httpsecurecontext.cpp

@@ -16,6 +16,7 @@
 ############################################################################## */
 
 #include "httpsecurecontext.hpp"
+#define MAX_ADDRESS_LEN 256
 
 class CHttpSecureContext : extends CEspBaseSecureContext
 {
@@ -52,6 +53,12 @@ public:
         case HTTP_PROPERTY_TYPE_COOKIE:
             result = getCookie(name, value);
             break;
+        case HTTP_PROPERTY_TYPE_HEADER:
+            result = getHeader(name, value);
+            break;
+        case HTTP_PROPERTY_TYPE_REMOTE_ADDRESS:
+            result = getRemoteAddress(value);
+            break;
         default:
             break;
         }
@@ -77,6 +84,31 @@ private:
 
         return result;
     }
+
+    bool getHeader(const char* name, StringBuffer& value)
+    {
+        if (name && *name)
+        {
+            value.clear();
+
+            if (m_request->getHeader(name, value).length())
+                return true;
+        }
+
+        return false;
+    }
+
+    bool getRemoteAddress(StringBuffer& value)
+    {
+        char address[MAX_ADDRESS_LEN] = {0,};
+        int  port = m_request->getSocket()->peer_name(address, MAX_ADDRESS_LEN);
+        bool result = (*address != 0);
+
+        if (result)
+            value.set(address);
+
+        return result;
+    }
 };
 
 IEspSecureContext* createHttpSecureContext(CHttpRequest* request)

esp/bindings/http/platform/httpsecurecontext.hpp

@@ -25,6 +25,8 @@
 enum HttpPropertyType
 {
     HTTP_PROPERTY_TYPE_COOKIE,
+    HTTP_PROPERTY_TYPE_HEADER,
+    HTTP_PROPERTY_TYPE_REMOTE_ADDRESS,
 };
 
 ESPHTTP_API IEspSecureContext* createHttpSecureContext(CHttpRequest* request);