[trafficserver] branch master updated: Use string copy for the SNI server name. (#9931)

[jpeach]

This is an automated email from the ASF dual-hosted git repository.

jpeach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new 07535b07ee Use string copy for the SNI server name. (#9931)
07535b07ee is described below

commit 07535b07eeb8f4be74d40078d80f56e42869d59c
Author: James Peach <jpe...@apache.org>
AuthorDate: Fri Jun 30 12:30:48 2023 +1000

    Use string copy for the SNI server name. (#9931)
    
    Since the server name is a string, we don't need to manually copy,
    we can just copy it into a std::string.
    
    Signed-off-by: James Peach <jpe...@apache.org>
---
 proxy/private/SSLProxySession.cc | 11 +++--------
 proxy/private/SSLProxySession.h  |  7 +++----
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/proxy/private/SSLProxySession.cc b/proxy/private/SSLProxySession.cc
index 6d5796d0dc..32da935cf6 100644
--- a/proxy/private/SSLProxySession.cc
+++ b/proxy/private/SSLProxySession.cc
@@ -21,8 +21,6 @@
   limitations under the License.
  */
 
-#include <cstring>
-
 #include "SSLProxySession.h"
 #include "I_EventSystem.h"
 #include "I_NetVConnection.h"
@@ -32,13 +30,10 @@ void
 SSLProxySession::init(NetVConnection const &new_vc)
 {
   if (dynamic_cast<const TLSSNISupport *>(&new_vc) != nullptr) {
-    char const *name = new_vc.get_server_name();
-    int length       = std::strlen(name) + 1;
-    if (length > 1) {
-      char *n = new char[length];
-      std::memcpy(n, name, length);
-      _client_sni_server_name.reset(n);
+    if (char const *name = new_vc.get_server_name()) {
+      _client_sni_server_name.assign(name);
     }
   }
+
   _client_provided_cert = new_vc.peer_provided_cert();
 }
diff --git a/proxy/private/SSLProxySession.h b/proxy/private/SSLProxySession.h
index 4fd9e44c5e..0bf948a642 100644
--- a/proxy/private/SSLProxySession.h
+++ b/proxy/private/SSLProxySession.h
@@ -23,8 +23,7 @@
 
 #pragma once
 
-#include <memory>
-#include <string_view>
+#include <string>
 
 class NetVConnection;
 
@@ -36,7 +35,7 @@ public:
   char const *
   client_sni_server_name() const
   {
-    return _client_sni_server_name.get();
+    return _client_sni_server_name.empty() ? nullptr : 
_client_sni_server_name.c_str();
   }
 
   bool
@@ -48,6 +47,6 @@ public:
   void init(NetVConnection const &new_vc);
 
 private:
-  std::unique_ptr<char[]> _client_sni_server_name;
+  std::string _client_sni_server_name;
   bool _client_provided_cert = false;
 };