Merge pull request #71 from fhessel/feature/get-client-ip

fhessel · web-flow · commit 9ba205ea4b0e · 2020-02-20T22:42:15.000+01:00
Add getClientIP() to HTTPRequest
diff --git a/src/ConnectionContext.hpp b/src/ConnectionContext.hpp
@@ -2,6 +2,7 @@
 #define SRC_CONNECTIONCONTEXT_HPP_
 
 #include <Arduino.h>
+#include <IPAddress.h>
 
 // Required for SSL
 #include "openssl/ssl.h"
@@ -30,6 +31,7 @@ class ConnectionContext {
 
   virtual bool isSecure() = 0;
   virtual void setWebsocketHandler(WebsocketHandler *wsHandler);
+  virtual IPAddress getClientIP() = 0;
 
   WebsocketHandler * _wsHandler;
 };
diff --git a/src/HTTPConnection.cpp b/src/HTTPConnection.cpp
@@ -33,6 +33,7 @@ HTTPConnection::~HTTPConnection() {
 int HTTPConnection::initialize(int serverSocketID, HTTPHeaders *defaultHeaders) {
   if (_connectionState == STATE_UNDEFINED) {
     _defaultHeaders = defaultHeaders;
+    _addrLen = sizeof(_sockAddr);
     _socket = accept(serverSocketID, (struct sockaddr * )&_sockAddr, &_addrLen);
 
     // Build up SSL Connection context if the socket has been created successfully
@@ -42,11 +43,11 @@ int HTTPConnection::initialize(int serverSocketID, HTTPHeaders *defaultHeaders)
       _httpHeaders = new HTTPHeaders();
       refreshTimeout();
       return _socket;
-
     }
      
     HTTPS_LOGE("Could not accept() new connection");
    
+    _addrLen = 0;
     _connectionState = STATE_ERROR;
     _clientState = CSTATE_ACTIVE;
 
@@ -58,6 +59,16 @@ int HTTPConnection::initialize(int serverSocketID, HTTPHeaders *defaultHeaders)
   return -1;
 }
 
+/**
+ * Returns the client's IPv4
+ */
+IPAddress HTTPConnection::getClientIP() {
+  if (_addrLen > 0 && _sockAddr.sa_family == AF_INET) {
+    struct sockaddr_in *sockAddrIn = (struct sockaddr_in *)(&_sockAddr);
+    return IPAddress(sockAddrIn->sin_addr.s_addr);
+  }
+  return IPAddress(0, 0, 0, 0);
+}
 
 /**
  * True if the connection is timed out.
diff --git a/src/HTTPConnection.hpp b/src/HTTPConnection.hpp
@@ -2,6 +2,7 @@
 #define SRC_HTTPCONNECTION_HPP_
 
 #include <Arduino.h>
+#include <IPAddress.h>
 
 #include <string>
 #include <mbedtls/base64.h>
@@ -42,6 +43,7 @@ class HTTPConnection : private ConnectionContext {
   virtual int initialize(int serverSocketID, HTTPHeaders *defaultHeaders);
   virtual void closeConnection();
   virtual bool isSecure();
+  virtual IPAddress getClientIP();
 
   void loop();
   bool isClosed();
diff --git a/src/HTTPRequest.cpp b/src/HTTPRequest.cpp
@@ -53,6 +53,10 @@ HTTPNode * HTTPRequest::getResolvedNode() {
   return _resolvedNode;
 }
 
+IPAddress HTTPRequest::getClientIP() {
+  return _con->getClientIP();
+}
+
 size_t HTTPRequest::readBytes(byte * buffer, size_t length) {
 
   // Limit reading to content length
diff --git a/src/HTTPRequest.hpp b/src/HTTPRequest.hpp
@@ -2,6 +2,7 @@
 #define SRC_HTTPREQUEST_HPP_
 
 #include <Arduino.h>
+#include <IPAddress.h>
 #include <string>
 
 #include <mbedtls/base64.h>
@@ -29,6 +30,7 @@ class HTTPRequest {
   std::string getRequestString();
   std::string getMethod();
   std::string getTag();
+  IPAddress getClientIP();
 
   size_t readChars(char * buffer, size_t length);
   size_t readBytes(byte * buffer, size_t length);

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,10 @@ HTTPNode * HTTPRequest::getResolvedNode() {`
`53`	`53`	`return _resolvedNode;`
`54`	`54`	`}`
`55`	`55`
	`56`	`+IPAddress HTTPRequest::getClientIP() {`
	`57`	`+ return _con->getClientIP();`
	`58`	`+}`
	`59`	`+`
`56`	`60`	`size_t HTTPRequest::readBytes(byte * buffer, size_t length) {`
`57`	`61`
`58`	`62`	`// Limit reading to content length`