From 512e3fbcfd89736e6503b31c83a5d1f95f06a68de4cb0ffa8064630e83e74d89 Mon Sep 17 00:00:00 2001
From: ADAM David Alan Martin <adam@recursive.engineer>
Date: Thu, 24 Apr 2025 09:05:17 -0400
Subject: [PATCH] Hsts domain list is now a vector...

I still have to test this.
---
 src/hsts.cc | 56 ++++++++++++++++++++---------------------------------
 1 file changed, 21 insertions(+), 35 deletions(-)

diff --git a/src/hsts.cc b/src/hsts.cc
index 57d4c89..75e2357 100644
--- a/src/hsts.cc
+++ b/src/hsts.cc
@@ -35,6 +35,8 @@
 #include "IO/tls.hh"
 
 #include <string>
+#include <memory>
+#include <vector>
 
 struct HstsData_t {
    std::string host;
@@ -46,44 +48,37 @@ struct HstsData_t {
  * most likely latest representable time of January 19, 2038.
  */
 static time_t hsts_latest_representable_time;
-static Dlist *domains;
+static std::vector< std::unique_ptr< HstsData_t > > domains;
 
 void a_Hsts_freeall(void)
 {
    if (prefs.http_strict_transport_security) {
-      HstsData_t *policy;
-      int i, n = dList_length(domains);
-
-      for (i = 0; i < n; i++) {
-         policy = reinterpret_cast< HstsData_t * >( dList_nth_data(domains, i) );
-         delete policy;
-      }
-      dList_free(domains);
+      domains.clear();
    }
 }
 
-/**
- * Compare function for searching a domain node by domain string
- */
-static int Domain_node_domain_str_cmp(const void *v1, const void *v2)
-{
-   const HstsData_t *node = reinterpret_cast< const HstsData_t * >( v1 );
-   const char *host = reinterpret_cast< const char * >( v2 );
-
-   return dStrAsciiCasecmp(node->host.c_str(), host);
-}
-
 static HstsData_t *Hsts_get_policy(const char *host)
 {
-   return reinterpret_cast< HstsData_t * >( dList_find_sorted(domains, host, Domain_node_domain_str_cmp) );
+   auto found= std::find_if( begin( domains ), end( domains ),
+         [&]( const auto &domain )
+         {
+            return not dStrAsciiCasecmp( domain->host.c_str(), host );
+         } );
+
+   if( found != end( domains ) ) return found->get();
+   return nullptr;
 }
 
 static void Hsts_remove_policy(HstsData_t *policy)
 {
    if (policy) {
       _MSG("HSTS: removed policy for %s\n", policy->host);
-      delete policy;
-      dList_remove(domains, policy);
+      auto found= std::find_if( begin( domains ), end( domains ), 
+         [&]( const auto &domain )
+         {
+            return domain.get() == policy;
+         } );
+      if( found != end( domains ) ) domains.erase( found );
    }
 }
 
@@ -107,16 +102,6 @@ static time_t Hsts_future_time(long seconds_from_now)
    return ret;
 }
 
-/**
- * Compare function for searching domains.
- */
-static int Domain_node_cmp(const void *v1, const void *v2)
-{
-   const HstsData_t *node1 = reinterpret_cast< const HstsData_t * >( v1 ), *node2 = reinterpret_cast< const HstsData_t * >( v2 );
-
-   return dStrAsciiCasecmp(node1->host.c_str(), node2->host.c_str());
-}
-
 static void Hsts_set_policy(const char *host, long max_age, bool_t subdomains)
 {
    time_t exp = Hsts_future_time(max_age);
@@ -128,7 +113,9 @@ static void Hsts_set_policy(const char *host, long max_age, bool_t subdomains)
    if (policy == NULL) {
       policy = new HstsData_t;
       policy->host = host;
-      dList_insert_sorted(domains, policy, Domain_node_cmp);
+      std::unique_ptr< HstsData_t > policy_unique;
+      policy_unique.reset( policy );
+      domains.push_back( std::move( policy_unique ) );
    }
    policy->subdomains = subdomains;
    policy->expires_at = exp;
@@ -354,7 +341,6 @@ void a_Hsts_init(FILE *preload_file)
       struct tm future_tm = {7, 14, 3, 19, 0, 138, 0, 0, 0, 0, 0};
 
       hsts_latest_representable_time = mktime(&future_tm);
-      domains = dList_new(32);
 
       if (preload_file) {
          Hsts_preload(preload_file);