cleanup

userver-framework · Jan 5, 2025 · 0b6e98c · 0b6e98c
1 parent f02597d
commit 0b6e98c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/core/include/userver/server/component.hpp b/core/include/userver/server/component.hpp
@@ -63,8 +63,7 @@ namespace components {
 /// task_processor | task processor to process incoming requests | -
 /// backlog | max count of new connections pending acceptance | 1024
 /// tls.ca | paths to TLS CAs for client authentication | -
-/// tls.cert-chain | path to TLS server certificate chain | -
-/// tls.cert | path to TLS server certificate | -
+/// tls.cert | path to TLS server certificate chain | -
 /// tls.private-key | path to TLS server certificate private key | -
 /// tls.private-key-passphrase-name | passphrase name located in secdist's "passphrases" section | -
 /// handler-defaults.max_url_size | max path/URL size or empty to not limit | 8192

diff --git a/core/src/engine/io/tls_wrapper.cpp b/core/src/engine/io/tls_wrapper.cpp
@@ -3,7 +3,6 @@
 #include <boost/stacktrace/stacktrace.hpp>
 #include <exception>
 #include <memory>
-#include <ranges>
 
 #include <fmt/format.h>
 #include <openssl/bio.h>
@@ -514,18 +513,18 @@ TlsWrapper TlsWrapper::StartTlsServer(
         LOG_INFO() << "Client SSL cert will not be verified";
     }
 
-    if(cert_chain.empty())
-	  {
+    if(cert_chain.empty()) {
         throw TlsException(crypto::FormatSslError("Empty certificate chain provided"));
-	  }
+	}
 
     if (1 != SSL_CTX_use_certificate(ssl_ctx.get(), cert_chain.begin()->GetNative())) {
         throw TlsException(crypto::FormatSslError("Failed to set up server TLS wrapper: SSL_CTX_use_certificate"));
     }
 
     if(cert_chain.size() > 1) {
-        for(const auto& cert : cert_chain | std::ranges::views::drop(1)) {
-            if (SSL_CTX_add_extra_chain_cert(ssl_ctx.get(), cert.GetNative()) <= 0) {
+        auto certIt = std::next(cert_chain.begin());
+        for (; certIt != cert_chain.end(); ++certIt) {
+            if (SSL_CTX_add_extra_chain_cert(ssl_ctx.get(), certIt->GetNative()) <= 0) {
                 throw TlsException(crypto::FormatSslError("Failed to set up server TLS wrapper: SSL_CTX_add_extra_chain_cert"));
             }
         }

diff --git a/core/src/server/component.cpp b/core/src/server/component.cpp
@@ -125,11 +125,7 @@ additionalProperties: false
                             description: path to TLS CA
                     cert:
                         type: string
-                        description: path to TLS certificate
-                    cert-chain:
-                        type: string
-                        description: path to TLS certificates chain
-                        defaultDescription: empty string
+                        description: path to TLS certificate chain
                     private-key:
                         type: string
                         description: path to TLS certificate private key