Implement TLS for Windows

Author: f-michaut

CMakeLists.txt

@@ -15,6 +15,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED True)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
+set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 
 project(LibCppSockets VERSION 0.1.0 LANGUAGES C CXX)
 configure_file(include/CppSockets/Version.hpp.in include/CppSockets/Version.hpp)
@@ -23,12 +24,16 @@ add_library(cppsockets
  source/Address.cpp
  source/IPv4.cpp
  source/Socket.cpp
+ source/SocketInit.cpp
  source/TlsSocket.cpp
 )
 target_include_directories(cppsockets PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>)
 
 find_package(OpenSSL 3.0 COMPONENTS SSL)
 target_link_libraries(cppsockets OpenSSL::SSL)
+if(WIN32)
+ target_link_libraries(cppsockets wsock32 ws2_32)
+endif()
 
 option(CPPSOCKETS_TESTS "TRUE to build the libcppsockets tests" FALSE)
 if(CPPSOCKETS_TESTS)

include/CppSockets/Socket.hpp

@@ -12,27 +12,27 @@
 #pragma once
 
 #include "CppSockets/OSDetection.hpp"
+#include "CppSockets/SocketInit.hpp"
 
 // TODO: move the RawSocketType in CppSockets namespace
 #ifdef OS_WINDOWS
  #define NOMINMAX
  #include <winsock2.h>
  using RawSocketType=SOCKET;
  using socklen_t=int;
+ using SockOptType=char;
 #else
  #include <sys/socket.h>
  using RawSocketType=int;
+ using SockOptType=void;
 #endif
 
 #include <memory>
 
 #include "CppSockets/Address.hpp"
 
 namespace CppSockets {
- void init(bool init_ssl = true, bool init_wsa = true);
- void deinit(bool deinit_ssl = true, bool deinit_wsa = true);
-
- class Socket {
+ class Socket : SocketInit {
  public:
  Socket();
  Socket(int domain, int type, int protocol);
@@ -51,8 +51,8 @@ namespace CppSockets {
  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);
+ int getsockopt(int level, int optname, SockOptType *optval, socklen_t *optlen);
+ int setsockopt(int level, int optname, const SockOptType *optval, socklen_t optlen);
 
  void close();
  int connect(const IEndpoint &endpoint);
@@ -84,7 +84,7 @@ namespace CppSockets {
  static char *strerror();
 
  protected:
- static int getsockopt(int fd, int level, int optname, void *optval, socklen_t *optlen);
+ static int getsockopt(int fd, int level, int optname, SockOptType *optval, socklen_t *optlen);
  int bind(std::uint32_t addr, uint16_t port);
 
  int m_domain = 0;

include/CppSockets/SocketInit.hpp

@@ -0,0 +1,24 @@
+/*
+** Project CppSockets, 2022
+**
+** Author Francois Michaut
+**
+** Started on Sat Jan 15 01:17:42 2022 Francois Michaut
+** Last update Tue Nov 14 19:37:59 2023 Francois Michaut
+**
+** SocketInit.hpp : Socket class automatic initialization and teardown
+*/
+
+// Inspired from https://stackoverflow.com/questions/64753466/how-do-i-automatically-implicitly-create-a-instance-of-a-class-at-program-launch/64754436#64754436
+
+namespace CppSockets
+{
+ class SocketInit {
+ struct Cleanup {
+ ~Cleanup();
+ };
+
+ static bool init;
+ static Cleanup cleanup;
+ };
+}

include/CppSockets/TlsSocket.hpp

@@ -13,10 +13,6 @@
 
 #include "CppSockets/OSDetection.hpp"
 
-#ifdef OS_WINDOWS
-// TODO Currently disabling TlsSocket for windows
-#else
-
 #include "CppSockets/IPv4.hpp"
 #include "CppSockets/Socket.hpp"
 
@@ -107,4 +103,3 @@ namespace CppSockets {
  return m_peer_cert;
  }
 }
-#endif

source/IPv4.cpp

@@ -12,6 +12,7 @@
 #include "CppSockets/IPv4.hpp"
 #include "CppSockets/Socket.hpp"
 
+#include <array>
 #include <stdexcept>
 
 #ifdef OS_WINDOWS
@@ -24,9 +25,10 @@ namespace CppSockets {
  IPv4::IPv4(std::uint32_t addr) :
  addr(htonl(addr))
  {
- struct in_addr tmp {.s_addr = this->addr};
+ std::array<char, 17> buff = {0};
 
- str = inet_ntoa(tmp);
+ inet_ntop(AF_INET, &this->addr, buff.data(), buff.size());
+ str = buff.data();
  }
 
  IPv4::IPv4(const char *addr) :

source/Socket.cpp

@@ -25,6 +25,9 @@
  // To match windows's constants
  static constexpr int INVALID_SOCKET = -1;
  static constexpr int SOCKET_ERROR = -1;
+
+ #include <arpa/inet.h>
+ #include <unistd.h>
 #endif
 
 static constexpr int BUFF_SIZE = 4096;
@@ -35,7 +38,6 @@ static constexpr int BUFF_SIZE = 4096;
 #include <sstream>
 #include <stdexcept>
 
-
 // TODO add exceptions on error retunrs
 // TODO throw custom exceptions on invalid status (eg: socket already connected)
 namespace CppSockets {
@@ -44,8 +46,8 @@ namespace CppSockets {
  {
  socklen_t len = sizeof(int);
 
- Socket::getsockopt(sockfd, SOL_SOCKET, SO_TYPE, &m_type, &len);
-#if !defined (OS_APPLE) && !defined (OS_WINDOWS)
+ Socket::getsockopt(sockfd, SOL_SOCKET, SO_TYPE, (SockOptType *)&m_type, &len);
+#ifdef OS_LINUX
  Socket::getsockopt(sockfd, SOL_SOCKET, SO_DOMAIN, &m_domain, &len);
  Socket::getsockopt(sockfd, SOL_SOCKET, SO_PROTOCOL, &m_protocol, &len);
 #endif
@@ -95,7 +97,7 @@ namespace CppSockets {
  close();
  }
 
- int Socket::getsockopt(int fd, int level, int optname, void *optval, socklen_t *optlen) {
+ int Socket::getsockopt(int fd, int level, int optname, SockOptType *optval, socklen_t *optlen) {
  int ret = ::getsockopt(fd, level, optname, optval, optlen);
 
  if (ret == SOCKET_ERROR) {
@@ -109,14 +111,12 @@ namespace CppSockets {
  }
 
  char *Socket::strerror(int err) {
-#ifdef OS_WINDOWS
-#else
  return ::strerror(err);
-#endif
  }
 
  int Socket::get_errno() {
 #ifdef OS_WINDOWS
+ return WSAGetLastError();
 #else
  return errno;
 #endif
@@ -170,14 +170,14 @@ namespace CppSockets {
  int Socket::set_reuseaddr(bool value) {
  int val = value;
 
- return this->setsockopt(SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));
+ return this->setsockopt(SOL_SOCKET, SO_REUSEADDR, (SockOptType *)&val, sizeof(val));
  }
 
- int Socket::getsockopt(int level, int optname, void *optval, socklen_t *optlen) {
+ int Socket::getsockopt(int level, int optname, SockOptType *optval, socklen_t *optlen) {
  return this->getsockopt(m_sockfd, level, optname, optval, optlen);
  }
 
- int Socket::setsockopt(int level, int optname, const void *optval, socklen_t optlen) {
+ int Socket::setsockopt(int level, int optname, const SockOptType *optval, socklen_t optlen) {
  int ret = ::setsockopt(m_sockfd, level, optname, optval, optlen);
 
  if (ret < 0) {
@@ -257,6 +257,13 @@ namespace CppSockets {
  }
 
  void Socket::set_blocking(bool val) {
+#ifdef OS_WINDOWS
+ u_long mode = val ? 0 : 1;
+ int result = ioctlsocket(m_sockfd, FIONBIO, &mode);
+ if (result != NO_ERROR) {
+ throw std::runtime_error(std::string("Failed to change socket: ") + Socket::strerror());
+ }
+#else
  int flags = fcntl(m_sockfd, F_GETFL, 0);
  int ret = flags;
 
@@ -270,6 +277,7 @@ namespace CppSockets {
  if (ret < 0) {
  throw std::runtime_error(std::string("Failed to change socket: ") + Socket::strerror());
  }
+#endif
  }
 
  RawSocketType Socket::get_fd() const {

source/SocketInit.cpp

@@ -0,0 +1,65 @@
+/*
+** Project LibCppSockets, 2022
+**
+** Author Francois Michaut
+**
+** Started on Thu Sep 15 14:24:25 2022 Francois Michaut
+** Last update Tue May 9 23:34:46 2023 Francois Michaut
+**
+** init.cpp : Startup/Cleanup functions implementation
+*/
+
+#include "CppSockets/OSDetection.hpp"
+#include "CppSockets/SocketInit.hpp"
+
+#include <stdexcept>
+#include <string>
+
+#ifdef OS_WINDOWS
+ #include <winsock2.h>
+ #include <openssl/applink.c>
+#else
+ #include <openssl/err.h>
+ #include <openssl/ssl.h>
+#endif
+
+namespace CppSockets {
+ static bool init() {
+#ifdef OS_WINDOWS
+ WSADATA wsa_data;
+
+ // TODO check value in wsa_data
+ if (WSAStartup(MAKEWORD(2, 2), &wsa_data) != 0) {
+ // TODO: use WSAGetLastError
+ throw std::runtime_error(std::string("WASStartup Failed : ") + std::strerror(errno));
+ }
+#else
+ // TODO check if all of this is needed (commented out because it should not)
+ // TODO check return values / raise errors
+ // SSL_load_error_strings();
+ // SSL_library_init();
+ // OpenSSL_add_all_algorithms();
+#endif
+ return true;
+ }
+
+ static void deinit() {
+#ifdef OS_WINDOWS
+ if (WSACleanup() == SOCKET_ERROR) {
+ // TODO use FormatMessage to get the error string
+ throw std::runtime_error(std::string("WSACleanup Failed : ") + std::to_string(WSAGetLastError()));
+ }
+#else
+ // TODO check return values / raise errors
+ // ERR_free_strings();
+ // EVP_cleanup();
+#endif
+ }
+
+ SocketInit::Cleanup::~Cleanup() {
+ deinit();
+ }
+
+ bool SocketInit::init = CppSockets::init();
+ SocketInit::Cleanup SocketInit::cleanup;
+}

source/TlsSocket.cpp

@@ -12,10 +12,6 @@
 #include "CppSockets/OSDetection.hpp"
 #include "CppSockets/TlsSocket.hpp"
 
-#ifdef OS_WINDOWS
-// TODO Currently disabling TlsSocket for windows
-#else
-
 #include <openssl/err.h>
 #include <openssl/ssl.h>
 
@@ -255,4 +251,3 @@ namespace CppSockets {
  }
  }
 }
-#endif