Detect peer closed connection

f-michaut · f-michaut · commit 561686f1362a · 2023-07-22T22:54:38.000-04:00
- update IAddress port from int to the right type (uint16)
- allow for defaulted Socket + TLSSocket
- other improvements
- some bugfixes
diff --git a/include/CppSockets/Address.hpp b/include/CppSockets/Address.hpp
@@ -4,7 +4,7 @@
 ** Author Francois Michaut
 **
 ** Started on  Sun Feb 13 17:09:05 2022 Francois Michaut
-** Last update Tue Jul 18 13:34:19 2023 Francois Michaut
+** Last update Thu Jul 20 21:17:13 2023 Francois Michaut
 **
 ** Address.hpp : Interface to represent network addresses
 */
@@ -30,7 +30,7 @@ namespace CppSockets {
     class IEndpoint {
         public:
             [[nodiscard]]
-            virtual int getPort() const = 0;
+            virtual std::uint16_t getPort() const = 0;
             [[nodiscard]]
             virtual const IAddress &getAddr() const = 0;
             [[nodiscard]]
@@ -47,12 +47,12 @@ namespace CppSockets {
                       "Endpoint address must derive from IAddress"
         );
         public:
-            Endpoint(T addr, int port) :
+            Endpoint(T addr, std::uint16_t port) :
                 addr(std::move(addr)), port(port), str(makeString())
             {};
 
             [[nodiscard]]
-            int getPort() const override {
+            std::uint16_t getPort() const override {
                 return port;
             }
 
@@ -66,7 +66,7 @@ namespace CppSockets {
                 return str;
             }
         private:
-            int port;
+            std::uint16_t port;
             T addr;
             std::string str;
     };
diff --git a/include/CppSockets/IPv4.hpp b/include/CppSockets/IPv4.hpp
@@ -4,7 +4,7 @@
 ** Author Francois Michaut
 **
 ** Started on  Sun Feb 13 17:05:02 2022 Francois Michaut
-** Last update Thu Feb  9 08:55:24 2023 Francois Michaut
+** Last update Thu Jul 20 20:23:05 2023 Francois Michaut
 **
 ** IPv4.hpp : Class used to represent and manipulate IPv4 addresses
 */
@@ -17,7 +17,7 @@ namespace CppSockets {
     class IPv4 : public IAddress {
         public:
             explicit IPv4(std::uint32_t addr);
-            explicit IPv4(const char *addr);
+            IPv4(const char *addr);
 
             [[nodiscard]]
             std::uint32_t getAddress() const override;
diff --git a/include/CppSockets/Socket.hpp b/include/CppSockets/Socket.hpp
@@ -4,7 +4,7 @@
 ** Author Francois Michaut
 **
 ** Started on  Sat Jan 15 01:17:42 2022 Francois Michaut
-** Last update Tue May  9 23:31:24 2023 Francois Michaut
+** Last update Sat Jul 22 19:43:35 2023 Francois Michaut
 **
 ** Socket.hpp : Portable C++ socket class
 */
@@ -13,6 +13,7 @@
 
 #include "CppSockets/OSDetection.hpp"
 
+// TODO: move the RawSocketType in CppSockets namespace
 #ifdef OS_WINDOWS
   #define NOMINMAX
   #include <winsock2.h>
@@ -33,7 +34,9 @@ namespace CppSockets {
 
     class Socket {
         public:
+            Socket();
             Socket(int domain, int type, int protocol);
+            Socket(RawSocketType fd, bool connected);
             ~Socket();
 
             // TODO Maybe enable copy with dup(2) ?
@@ -47,17 +50,18 @@ namespace CppSockets {
             std::size_t write(const std::string &buff);
             std::size_t write(const char *buff, std::size_t len);
 
+            int set_reuseaddr(bool value);
             int getsockopt(int level, int optname, void *optval, socklen_t *optlen);
             int setsockopt(int level, int optname, const void *optval, socklen_t optlen);
 
+            void close();
             int connect(const IEndpoint &endpoint);
-            int connect(const std::string &addr, int port);
+            int connect(const std::string &addr, uint16_t port);
 
-            int bind(std::uint32_t addr, int port); // TODO remove ?
             int bind(const IEndpoint &endpoint);
-            int bind(const std::string &addr, int port);
+            int bind(const std::string &addr, uint16_t port);
             int listen(int backlog);
-            std::shared_ptr<Socket> accept(void *addr_out);
+            std::shared_ptr<Socket> accept(void *addr_out = nullptr);
 
             void set_blocking(bool val);
 
@@ -79,14 +83,13 @@ namespace CppSockets {
             static char *strerror(int err);
             static char *strerror();
 
-        private:
-            Socket(int domain, int type, int protocol, int sockfd);
-
+        protected:
             static int getsockopt(int fd, int level, int optname, void *optval, socklen_t *optlen);
+            int bind(std::uint32_t addr, uint16_t port);
 
-            int domain;
-            int type;
-            int protocol;
+            int domain = 0;
+            int type = 0;
+            int protocol = 0;
             RawSocketType sockfd;
             bool is_connected = false;
     };
diff --git a/include/CppSockets/TlsSocket.hpp b/include/CppSockets/TlsSocket.hpp
@@ -4,7 +4,7 @@
 ** Author Francois Michaut
 **
 ** Started on  Wed Sep 14 20:51:23 2022 Francois Michaut
-** Last update Tue May  9 23:29:53 2023 Francois Michaut
+** Last update Sat Jul 22 22:45:28 2023 Francois Michaut
 **
 ** SecureSocket.hpp : TLS socket wrapper using openssl
 */
@@ -23,6 +23,7 @@
 #include <functional>
 
 // TODO: find a better way do to this
+using BIO = struct bio_st;
 using SSL = struct ssl_st;
 using SSL_METHOD = struct ssl_method_st;
 using SSL_CTX = struct ssl_ctx_st;
@@ -33,6 +34,7 @@ using EVP_MD = struct evp_md_st;
 using EVP_MD_CTX = struct evp_md_ctx_st;
 
 namespace CppSockets {
+    using BIO_ptr=std::unique_ptr<BIO, std::function<void(BIO *)>>;
     using SSL_CTX_ptr=std::unique_ptr<SSL_CTX, std::function<void(SSL_CTX *)>>;
     using SSL_ptr=std::unique_ptr<SSL, std::function<void(SSL *)>>;
     using X509_ptr=std::unique_ptr<X509, std::function<void(X509 *)>>;
@@ -44,8 +46,10 @@ namespace CppSockets {
     // TODO add more TLS-related functions
     class TlsSocket : public Socket {
         public:
-            explicit TlsSocket(Socket &&other);
+            TlsSocket() = default;
             TlsSocket(int domain, int type, int protocol);
+            TlsSocket(Socket &&other, SSL_ptr ssl = nullptr);
+            TlsSocket(RawSocketType fd, SSL_ptr ssl = nullptr);
             ~TlsSocket();
 
             TlsSocket(const TlsSocket &other) = delete;
@@ -58,9 +62,10 @@ namespace CppSockets {
             std::size_t write(const std::string &buff);
             std::size_t write(const char *buff, std::size_t len);
 
+            void set_certificate(std::string cert_path, std::string pkey_path);
             int connect(const IEndpoint &endpoint);
 
-            std::shared_ptr<TlsSocket> accept(void *addr_out);
+            std::shared_ptr<TlsSocket> accept(void *addr_out = nullptr);
 
             [[nodiscard]]
             const SSL_CTX_ptr &get_ssl_ctx() const;
@@ -72,26 +77,30 @@ namespace CppSockets {
             [[nodiscard]]
             const std::string tls_strerror(int ret);
         private:
-            SSL_CTX_ptr ctx;
-            SSL_ptr ssl;
-            X509_ptr peer_cert;
-            bool do_shutdown = true;
+            SSL_CTX_ptr m_ctx;
+            SSL_ptr m_ssl;
+            X509_ptr m_peer_cert;
+            X509_ptr m_cert;
+            EVP_PKEY_ptr m_pkey;
+            bool m_do_shutdown = true;
+
+            void check_for_error(std::string error_msg, int ret);
     };
 
     inline std::size_t TlsSocket::write(const std::string &buff) {
-        return write(buff.data(), buff.size());
+        return write(buff.c_str(), buff.size());
     }
 
     inline const SSL_CTX_ptr &TlsSocket::get_ssl_ctx() const {
-        return ctx;
+        return m_ctx;
     }
 
     inline const SSL_ptr &TlsSocket::get_ssl() const {
-        return ssl;
+        return m_ssl;
     }
 
     inline const X509_ptr &TlsSocket::get_client_cert() const {
-        return peer_cert;
+        return m_peer_cert;
     }
 }
 #endif
diff --git a/source/IPv4.cpp b/source/IPv4.cpp
@@ -4,14 +4,16 @@
 ** Author Francois Michaut
 **
 ** Started on  Sun Feb 13 18:52:28 2022 Francois Michaut
-** Last update Mon Aug 29 20:45:54 2022 Francois Michaut
+** Last update Thu Jul 20 23:08:49 2023 Francois Michaut
 **
 ** IPv4.cpp : Implementation of IPv4 class
 */
 
 #include "CppSockets/IPv4.hpp"
 #include "CppSockets/Socket.hpp"
 
+#include <stdexcept>
+
 #include <arpa/inet.h>
 
 namespace CppSockets {
@@ -24,8 +26,14 @@ namespace CppSockets {
     }
 
     IPv4::IPv4(const char *addr) :
-        addr(inet_addr(addr))
-    {}
+        str(addr)
+    {
+        struct in_addr in;
+
+        if (inet_aton(addr, &in) == 0)
+            throw std::runtime_error("Invalid IPv4 address");
+        this->addr = in.s_addr;
+    }
 
     std::uint32_t IPv4::getAddress() const {
         return addr;
diff --git a/source/Socket.cpp b/source/Socket.cpp
diff --git a/source/TlsSocket.cpp b/source/TlsSocket.cpp
