Add connection limits, require Qt 6.12 and update submodules

Author: tomas-soltys

.github/workflows/ci.yml

@@ -20,12 +20,12 @@ jobs:
             arch: x86_64
             qt_host: linux
             qt_arch: linux_gcc_64
-            qt_version: '6.11.1'
+            qt_version: '6.12.0'
           - os: macos-latest
             arch: arm64
             qt_host: mac
             qt_arch: clang_64
-            qt_version: '6.11.1'
+            qt_version: '6.12.0'
 
     runs-on: ${{ matrix.os }}
 

src/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.25)
 project(RangeCloud)
 
 set(CMAKE_CXX_STANDARD 20)
@@ -18,7 +18,7 @@ endif()
 
 set(BUILD_SHARED_LIBS OFF)
 
-find_package(Qt6 6.10 REQUIRED COMPONENTS Core Concurrent HttpServer Network LinguistTools)
+find_package(Qt6 6.12 REQUIRED COMPONENTS Core Concurrent HttpServer Network LinguistTools)
 qt_standard_project_setup()
 
 add_library(common_defines INTERFACE)

src/Config.cmake

@@ -1,4 +1,4 @@
-set(PROJECT_VERSION "1.1.0")
+set(PROJECT_VERSION "1.2.0")
 set(PROJECT_YEAR "2026")
 set(PROJECT_RELEASE_DATE "2026-08-12")
 set(PROJECT_PACKAGE_NAME "range-cloud")

src/cloud/doc/RELEASE_NOTES.md

@@ -1,3 +1,24 @@
+## Version 1.2.0
+
+### Improvements
+
+- New configuration settings: `maxConnections` (default 1000) and `maxConnectionsPerHost` (default 20) limit simultaneous connections to the HTTP servers
+- `maxBodySize`, `maxConnections` and `maxConnectionsPerHost` are now applied to both public and private HTTP servers
+- Qt 6.12 is now the minimum required version (CMake 3.25 minimum); CI builds with Qt 6.12.0
+
+### Bug Fixes
+
+- `maxBodySize` default was read from an uninitialized value when not set in the configuration file
+
+### Submodules
+
+- range-ai-lib @ v1.1.0
+- range-base-lib @ v1.1.0
+- range-build-tools @ v1.0.0
+- range-cloud-lib @ v1.1.1
+
+---
+
 ## Version 1.1.0
 
 ### Improvements

src/cloud/src/application.cpp

@@ -396,6 +396,9 @@ void Application::onStarted()
                                                              configuration.getPrivateKeyPassword()));
         publicHttpServerSettings.setTlsTrustStore(RTlsTrustStore(configuration.getCaPublicKey()));
         publicHttpServerSettings.setRateLimitPerSecond(configuration.getRateLimitPerSecond());
+        publicHttpServerSettings.setMaxBodySize(configuration.getMaxBodySize());
+        publicHttpServerSettings.setMaxConnections(configuration.getMaxConnections());
+        publicHttpServerSettings.setMaxConnectionsPerHost(configuration.getMaxConnectionsPerHost());
 
         this->publicHttpServer = new RHttpServer(RHttpServer::Public,publicHttpServerSettings);
         this->publicHttpServer->setAuthTokenValidator(this->userManager->getAuthTokenValidator());
@@ -416,6 +419,9 @@ void Application::onStarted()
                                                               configuration.getPrivateKeyPassword()));
         privateHttpServerSettings.setTlsTrustStore(RTlsTrustStore(configuration.getCaPublicKey()));
         privateHttpServerSettings.setRateLimitPerSecond(configuration.getRateLimitPerSecond());
+        privateHttpServerSettings.setMaxBodySize(configuration.getMaxBodySize());
+        privateHttpServerSettings.setMaxConnections(configuration.getMaxConnections());
+        privateHttpServerSettings.setMaxConnectionsPerHost(configuration.getMaxConnectionsPerHost());
 
         this->privateHttpServer = new RHttpServer(RHttpServer::Private,privateHttpServerSettings);
 

src/cloud/src/configuration.cpp

@@ -43,6 +43,8 @@ void Configuration::_init(const Configuration *pConfiguration)
         this->privateHttpPort = pConfiguration->privateHttpPort;
         this->rateLimitPerSecond = pConfiguration->rateLimitPerSecond;
         this->maxBodySize = pConfiguration->maxBodySize;
+        this->maxConnections = pConfiguration->maxConnections;
+        this->maxConnectionsPerHost = pConfiguration->maxConnectionsPerHost;
         this->publicKey = pConfiguration->publicKey;
         this->privateKey = pConfiguration->privateKey;
         this->privateKeyPassword = pConfiguration->privateKeyPassword;
@@ -69,7 +71,9 @@ Configuration::Configuration(const QString &cloudDirectory)
     , publicHttpPort{Configuration::getDefaultPublicHttpPort()}
     , privateHttpPort{Configuration::getDefaultPrivateHttpPort()}
     , rateLimitPerSecond{Configuration::getDefaultRateLimitPerSecond()}
-    , maxBodySize{Configuration::getMaxBodySize()}
+    , maxBodySize{Configuration::getDefaultMaxBodySize()}
+    , maxConnections{Configuration::getDefaultMaxConnections()}
+    , maxConnectionsPerHost{Configuration::getDefaultMaxConnectionsPerHost()}
     , publicKey{Configuration::getDefaultPublicKeyPath(this->cloudDirectory)}
     , privateKey{Configuration::getDefaultPrivateKeyPath(this->cloudDirectory)}
     , privateKeyPassword{QString()}
@@ -161,6 +165,26 @@ void Configuration::setMaxBodySize(qint64 maxBodySize)
     this->maxBodySize = maxBodySize;
 }
 
+quint32 Configuration::getMaxConnections() const
+{
+    return this->maxConnections;
+}
+
+void Configuration::setMaxConnections(quint32 maxConnections)
+{
+    this->maxConnections = maxConnections;
+}
+
+quint32 Configuration::getMaxConnectionsPerHost() const
+{
+    return this->maxConnectionsPerHost;
+}
+
+void Configuration::setMaxConnectionsPerHost(quint32 maxConnectionsPerHost)
+{
+    this->maxConnectionsPerHost = maxConnectionsPerHost;
+}
+
 const QString &Configuration::getPublicKey() const
 {
     return this->publicKey;
@@ -437,6 +461,14 @@ void Configuration::fromJson(const QJsonObject &json)
     {
         this->maxBodySize = v.toString().toLongLong();
     }
+    if (const QJsonValue &v = json["maxConnections"]; v.isString())
+    {
+        this->maxConnections = v.toString().toUInt();
+    }
+    if (const QJsonValue &v = json["maxConnectionsPerHost"]; v.isString())
+    {
+        this->maxConnectionsPerHost = v.toString().toUInt();
+    }
     if (const QJsonValue &v = json["publicKey"]; v.isString())
     {
         this->publicKey = v.toString();
@@ -517,6 +549,8 @@ QJsonObject Configuration::toJson() const
     json["privateHttpPort"] = QString::number(this->privateHttpPort);
     json["rateLimitPerSecond"] = QString::number(this->rateLimitPerSecond);
     json["maxBodySize"] = QString::number(this->maxBodySize);
+    json["maxConnections"] = QString::number(this->maxConnections);
+    json["maxConnectionsPerHost"] = QString::number(this->maxConnectionsPerHost);
     json["publicKey"] = this->publicKey;
     json["privateKey"] = this->privateKey;
     json["privateKeyPassword"] = this->privateKeyPassword;
@@ -716,6 +750,16 @@ qint64 Configuration::getDefaultMaxBodySize()
     return RHttpServerSettings::defaultMaxBodySize;
 }
 
+quint32 Configuration::getDefaultMaxConnections()
+{
+    return RHttpServerSettings::defaultMaxConnections;
+}
+
+quint32 Configuration::getDefaultMaxConnectionsPerHost()
+{
+    return RHttpServerSettings::defaultMaxConnectionsPerHost;
+}
+
 QString Configuration::getDefaultPrivateKeyPath(const QString &cloudDirectoryPath)
 {
     return QDir(Configuration::buildServerCertificateDirectoryPath(cloudDirectoryPath)).absoluteFilePath("server.key.pem");

src/cloud/src/configuration.h

@@ -43,6 +43,8 @@ class Configuration
 
         quint32 rateLimitPerSecond;
         qint64 maxBodySize;
+        quint32 maxConnections;
+        quint32 maxConnectionsPerHost;
 
         QString publicKey;
         QString privateKey;
@@ -95,6 +97,12 @@ class Configuration
         qint64 getMaxBodySize() const;
         void setMaxBodySize(qint64 maxBodySize);
 
+        quint32 getMaxConnections() const;
+        void setMaxConnections(quint32 maxConnections);
+
+        quint32 getMaxConnectionsPerHost() const;
+        void setMaxConnectionsPerHost(quint32 maxConnectionsPerHost);
+
         const QString &getPublicKey() const;
         void setPublicKey(const QString &publicKey);
 
@@ -288,6 +296,12 @@ class Configuration
         //! Get default maximum maximum body size accepted by the server.
         static qint64 getDefaultMaxBodySize();
 
+        //! Get default maximum number of simultaneous connections accepted by the server.
+        static quint32 getDefaultMaxConnections();
+
+        //! Get default maximum number of simultaneous connections per host (IP) accepted by the server.
+        static quint32 getDefaultMaxConnectionsPerHost();
+
         //! Get default private key file path.
         static QString getDefaultPrivateKeyPath(const QString &cloudDirectoryPath = Configuration::getDefaultCloudDirectoryPath());