Use CbDataList to implement Ssl::Errors list

Convert type of Ssl::Errors from std::vector<ssl_error_t> to
CbDataList<Ssl::ssl_error_t>

diff --git a/include/CbDataList.h b/include/CbDataList.h
index f11105b80cec51ca07b7064411dffff5eee534b0..cdb6e2bfdaf9e3e798c00de235e2ac11460b340a 100644 (file)
--- a/include/CbDataList.h
+++ b/include/CbDataList.h
@@ -44,6 +44,7 @@ public:
     CbDataList (C const &);
     ~CbDataList();
 
+    bool push_back_unique(C const &);
     bool find(C const &)const;
     bool findAndTune(C const &);
     CbDataList *next;
@@ -125,6 +126,20 @@ CbDataList<C>::~CbDataList()
         delete next;
 }
 
+template <class C>
+bool
+CbDataList<C>::push_back_unique(C const &toAdd)
+{
+    CbDataList<C> *last;
+    for (last = this; last->next; last = last->next) {
+        if (last->element == toAdd)
+            return false;
+    }
+
+    last->next = new CbDataList<C> (toAdd);
+    return true;
+}
+
 template <class C>
 bool
 CbDataList<C>::find (C const &toFind) const

diff --git a/src/AclRegs.cc b/src/AclRegs.cc
index 6a03e6baaa59836854ffd2db80992440ddbdbd6e..f8d314f13e26e1d0ca83bea0036c397a9ae31bf3 100644 (file)
--- a/src/AclRegs.cc
+++ b/src/AclRegs.cc
@@ -137,7 +137,7 @@ ACLStrategised<int> ACLUrlPort::RegistryEntry_(new ACLIntRange, ACLUrlPortStrate
 
 #if USE_SSL
 ACL::Prototype ACLSslError::RegistryProtoype(&ACLSslError::RegistryEntry_, "ssl_error");
-ACLStrategised<Ssl::Errors const &> ACLSslError::RegistryEntry_(new ACLSslErrorData, ACLSslErrorStrategy::Instance(), "ssl_error");
+ACLStrategised<const Ssl::Errors *> ACLSslError::RegistryEntry_(new ACLSslErrorData, ACLSslErrorStrategy::Instance(), "ssl_error");
 ACL::Prototype ACLCertificate::UserRegistryProtoype(&ACLCertificate::UserRegistryEntry_, "user_cert");
 ACLStrategised<SSL *> ACLCertificate::UserRegistryEntry_(new ACLCertificateData (sslGetUserAttribute), ACLCertificateStrategy::Instance(), "user_cert");
 ACL::Prototype ACLCertificate::CARegistryProtoype(&ACLCertificate::CARegistryEntry_, "ca_cert");

diff --git a/src/acl/FilledChecklist.cc b/src/acl/FilledChecklist.cc
index 084bcf749b8cd317758e6d83868295613cea6536..e2ccb7af36003a49941baba37ce5f79dfae18e7f 100644 (file)
--- a/src/acl/FilledChecklist.cc
+++ b/src/acl/FilledChecklist.cc
@@ -63,6 +63,7 @@ ACLFilledChecklist::ACLFilledChecklist() :
 #if SQUID_SNMP
         snmp_community(NULL),
 #endif
+        sslErrorList(NULL),
         extacl_entry (NULL),
         conn_(NULL),
         fd_(-1),
@@ -91,6 +92,8 @@ ACLFilledChecklist::~ACLFilledChecklist()
 
     cbdataReferenceDone(conn_);
 
+    cbdataReferenceDone(sslErrorList);
+
     debugs(28, 4, HERE << "ACLFilledChecklist destroyed " << this);
 }
 
@@ -172,6 +175,7 @@ ACLFilledChecklist::ACLFilledChecklist(const acl_access *A, HttpRequest *http_re
 #if SQUID_SNMP
         snmp_community(NULL),
 #endif
+        sslErrorList(NULL),
         extacl_entry (NULL),
         conn_(NULL),
         fd_(-1),

diff --git a/src/acl/FilledChecklist.h b/src/acl/FilledChecklist.h
index 3ec833128b3ec5d6bf52882d5f7f3eaca8941e3d..c86281d6c4936fb7b332821edd3b20ff8fbf93f8 100644 (file)
--- a/src/acl/FilledChecklist.h
+++ b/src/acl/FilledChecklist.h
@@ -66,7 +66,7 @@ public:
 #endif
 
 #if USE_SSL
-    Ssl::Errors sslErrorList;
+    Ssl::Errors *sslErrorList;
 #endif
 
     ExternalACLEntry *extacl_entry;

diff --git a/src/acl/SslError.h b/src/acl/SslError.h
index 0fff38076bcfaf9384e3303dd9f0e948ebe897ae..8a357c23ff95ba5f8450ffa4bd8a5585723b1535 100644 (file)
--- a/src/acl/SslError.h
+++ b/src/acl/SslError.h
@@ -9,7 +9,7 @@
 #include "acl/Strategised.h"
 #include "ssl/support.h"
 
-class ACLSslErrorStrategy : public ACLStrategy<Ssl::Errors const&>
+class ACLSslErrorStrategy : public ACLStrategy<const Ssl::Errors *>
 {
 
 public:
@@ -32,7 +32,7 @@ class ACLSslError
 
 private:
     static ACL::Prototype RegistryProtoype;
-    static ACLStrategised<Ssl::Errors const&> RegistryEntry_;
+    static ACLStrategised<const Ssl::Errors *> RegistryEntry_;
 };
 
 #endif /* SQUID_ACLSSL_ERROR_H */

diff --git a/src/acl/SslErrorData.cc b/src/acl/SslErrorData.cc
index ad2a0043f7d56b8e4126eadb98cc00cad088975c..0abeb2daa25cdbe23511134f9fbc536b453eddbf 100644 (file)
--- a/src/acl/SslErrorData.cc
+++ b/src/acl/SslErrorData.cc
@@ -22,11 +22,11 @@ ACLSslErrorData::~ACLSslErrorData()
 }
 
 bool
-ACLSslErrorData::match(Ssl::Errors const &toFind)
+ACLSslErrorData::match(const Ssl::Errors *toFind)
 {
-    typedef std::vector<Ssl::ssl_error_t>::const_iterator SEsI;
-    for (SEsI it = toFind.begin() ; it != toFind.end(); it++ ) {
-        if (values->findAndTune (*it))
+    const Ssl::Errors * err;
+    for (err = toFind ; err != NULL; err = err->next ) {
+        if (values->findAndTune (err->element))
             return true;
     }
     return false;
@@ -35,14 +35,14 @@ ACLSslErrorData::match(Ssl::Errors const &toFind)
 /* explicit instantiation required for some systems */
 /** \cond AUTODOCS-IGNORE */
 // AYJ: 2009-05-20 : Removing. clashes with template <int> instantiation for other ACLs.
-// template cbdata_type CbDataList<Ssl::ssl_error_t>::CBDATA_CbDataList;
+// template cbdata_type Ssl::Errors::CBDATA_CbDataList;
 /** \endcond */
 
 wordlist *
 ACLSslErrorData::dump()
 {
     wordlist *W = NULL;
-    CbDataList<Ssl::ssl_error_t> *data = values;
+    Ssl::Errors *data = values;
 
     while (data != NULL) {
         wordlistAdd(&W, Ssl::GetErrorName(data->element));
@@ -55,12 +55,12 @@ ACLSslErrorData::dump()
 void
 ACLSslErrorData::parse()
 {
-    CbDataList<Ssl::ssl_error_t> **Tail;
+    Ssl::Errors **Tail;
     char *t = NULL;
 
     for (Tail = &values; *Tail; Tail = &((*Tail)->next));
     while ((t = strtokFile())) {
-        CbDataList<Ssl::ssl_error_t> *q = new CbDataList<Ssl::ssl_error_t>(Ssl::ParseErrorString(t));
+        Ssl::Errors *q = new Ssl::Errors(Ssl::ParseErrorString(t));
         *(Tail) = q;
         Tail = &q->next;
     }

diff --git a/src/acl/SslErrorData.h b/src/acl/SslErrorData.h
index 0673049d3a8fe646450f637da81d60e25e9bc1b0..f886f0c2e74937e05c09f87c2af821f6e730c125 100644 (file)
--- a/src/acl/SslErrorData.h
+++ b/src/acl/SslErrorData.h
@@ -12,7 +12,7 @@
 #include "ssl/ErrorDetail.h"
 #include <vector>
 
-class ACLSslErrorData : public ACLData<Ssl::Errors const&>
+class ACLSslErrorData : public ACLData<const Ssl::Errors *>
 {
 
 public:
@@ -22,13 +22,13 @@ public:
     ACLSslErrorData(ACLSslErrorData const &);
     ACLSslErrorData &operator= (ACLSslErrorData const &);
     virtual ~ACLSslErrorData();
-    bool match(Ssl::Errors const &);
+    bool match(const Ssl::Errors *);
     wordlist *dump();
     void parse();
     bool empty() const;
     virtual  ACLSslErrorData *clone() const;
 
-    CbDataList<Ssl::ssl_error_t> *values;
+    Ssl::Errors *values;
 };
 
 MEMPROXY_CLASS_INLINE(ACLSslErrorData);

diff --git a/src/client_side.cc b/src/client_side.cc
index 35f33e3bfc4a069c619e0439b61260f3e0aa4ff1..99355d28c7602b3b7aa23ecfb23bbe91ae19cb01 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -816,6 +816,8 @@ ConnStateData::~ConnStateData()
     if (bumpErrorEntry)
         bumpErrorEntry->unlock();
 #endif
+
+    cbdataReferenceDone(bumpSslErrorNoList);
 }
 
 /**
@@ -3649,7 +3651,7 @@ void ConnStateData::buildSslCertAdaptParams(Ssl::CrtdMessage::BodyParams &certAd
     checklist.conn(this);
     checklist.src_addr = clientConnection->remote;
     checklist.my_addr = clientConnection->local;
-    checklist.sslErrorList = bumpSslErrorNoList;
+    checklist.sslErrorList = cbdataReference(bumpSslErrorNoList);
 
     for (sslproxy_cert_adapt *ca = Config.ssl_client.cert_adapt; ca != NULL; ca = ca->next) {
         if (ca->aclList && checklist.fastCheck(ca->aclList) == ACCESS_ALLOWED) {

diff --git a/src/client_side.h b/src/client_side.h
index b0d4591dadb36aefb849c892dfd59e0463796941..589d818a0bf970740eeea78e798141bc55b34ea2 100644 (file)
--- a/src/client_side.h
+++ b/src/client_side.h
@@ -335,7 +335,7 @@ public:
     StoreEntry *bumpServerFirstErrorEntry() const {return bumpErrorEntry;}
     void setBumpServerCert(X509 *serverCert) {bumpServerCert.reset(serverCert);}
     X509 *getBumpServerCert() {return bumpServerCert.get();}
-    void setBumpSslErrorList(Ssl::Errors &errNoList) {bumpSslErrorNoList = errNoList;}
+    void setBumpSslErrorList(Ssl::Errors *errNoList) {bumpSslErrorNoList = cbdataReference(errNoList);}
     /// Fill the certAdaptParams with the required data for certificate adaptation
     /// and create the key for storing/retrieve the certificate to/from the cache
     void buildSslCertAdaptParams(Ssl::CrtdMessage::BodyParams &certAdaptParams);
@@ -373,7 +373,7 @@ private:
     CbcPointer<Ssl::ServerPeeker> httpsPeeker;
     StoreEntry *bumpErrorEntry;
     Ssl::X509_Pointer bumpServerCert;
-    Ssl::Errors bumpSslErrorNoList; ///< The list of SSL certificate errors which ignored
+    Ssl::Errors *bumpSslErrorNoList; ///< The list of SSL certificate errors which ignored
 #endif
 
     AsyncCall::Pointer reader; ///< set when we are reading

diff --git a/src/forward.cc b/src/forward.cc
index d372803a038529ae3dcd2fabb09b1dc8e0a28cbf..b01c209433a3230ef272e331a50c75dff23dbfc3 100644 (file)
--- a/src/forward.cc
+++ b/src/forward.cc
@@ -671,7 +671,7 @@ FwdState::negotiateSSL(int fd)
 
                 // if there is a list of ssl errors, pass it to connection manager
                 if (Ssl::Errors *errNoList = static_cast<Ssl::Errors *>(SSL_get_ex_data(ssl, ssl_ex_index_ssl_error_sslerrno)))
-                    request->clientConnectionManager->setBumpSslErrorList(*errNoList);
+                    request->clientConnectionManager->setBumpSslErrorList(errNoList);
             }
 
             HttpRequest *fakeRequest = NULL;
@@ -704,7 +704,7 @@ FwdState::negotiateSSL(int fd)
     if (request->clientConnectionManager.valid()) {
         request->clientConnectionManager->setBumpServerCert(SSL_get_peer_certificate(ssl));
         if (Ssl::Errors *errNoList = static_cast<Ssl::Errors *>(SSL_get_ex_data(ssl, ssl_ex_index_ssl_error_sslerrno)))
-            request->clientConnectionManager->setBumpSslErrorList(*errNoList);
+            request->clientConnectionManager->setBumpSslErrorList(errNoList);
     }
 
     if (serverConnection()->getPeer() && !SSL_session_reused(ssl)) {

diff --git a/src/ssl/certificate_db.h b/src/ssl/certificate_db.h
index 1d247c9cc9f00f5a89688356ac23052eda028b5a..05841b6f26064b96ef10b5a50013e93685b633ab 100644 (file)
--- a/src/ssl/certificate_db.h
+++ b/src/ssl/certificate_db.h
@@ -6,7 +6,6 @@
 #define SQUID_SSL_CERTIFICATE_DB_H
 
 #include "ssl/gadgets.h"
-#include "ssl/support.h"
 #if HAVE_STRING
 #include <string>
 #endif

diff --git a/src/ssl/support.cc b/src/ssl/support.cc
index f50b9fb0bda47d1ac832c6b50dd1f08eb42e09f5..c6e7f8d58996a6c0ce19b0f58f912c65cc6d2b55 100644 (file)
--- a/src/ssl/support.cc
+++ b/src/ssl/support.cc
@@ -248,16 +248,15 @@ ssl_verify_cb(int ok, X509_STORE_CTX * ctx)
     if (!ok) {
         Ssl::Errors *errNoList = static_cast<Ssl::Errors *>(SSL_get_ex_data(ssl, ssl_ex_index_ssl_error_sslerrno));
         if (!errNoList) {
-            errNoList = new Ssl::Errors;
+            errNoList = new Ssl::Errors(error_no);
             if (!SSL_set_ex_data(ssl, ssl_ex_index_ssl_error_sslerrno,  (void *)errNoList)) {
                 debugs(83, 2, "Failed to set ssl error_no in ssl_verify_cb: Certificate " << buffer);
                 delete errNoList;
                 errNoList = NULL;
             }
         }
-
-        if (errNoList) // Append the err no to the SSL errors lists.
-            errNoList->push_back(error_no);
+        else // Append the err no to the SSL errors lists.
+            errNoList->push_back_unique(error_no);
 
         if (const char *err_descr = Ssl::GetErrorDescr(error_no))
             debugs(83, 5, err_descr << ": " << buffer);
@@ -266,14 +265,17 @@ ssl_verify_cb(int ok, X509_STORE_CTX * ctx)
 
         if (check) {
             ACLFilledChecklist *filledCheck = Filled(check);
-            filledCheck->sslErrorList.clear();
-            filledCheck->sslErrorList.push_back(error_no);
+            assert(filledCheck->sslErrorList == NULL);
+            filledCheck->sslErrorList = new Ssl::Errors(error_no);
             if (check->fastCheck() == ACCESS_ALLOWED) {
                 debugs(83, 3, "bypassing SSL error " << error_no << " in " << buffer);
                 ok = 1;
             } else {
                 debugs(83, 5, "confirming SSL error " << error_no);
             }
+            // Delete the ssl error list
+            delete filledCheck->sslErrorList;
+            filledCheck->sslErrorList = NULL;
         }
     }
 

diff --git a/src/ssl/support.h b/src/ssl/support.h
index 4e368485481786bdd0f6f1dbc663ee805d30b664..0ba49c13765bcba14f705197bd985a8f73f6efc2 100644 (file)
--- a/src/ssl/support.h
+++ b/src/ssl/support.h
@@ -35,6 +35,7 @@
 #ifndef SQUID_SSL_SUPPORT_H
 #define SQUID_SSL_SUPPORT_H
 
+#include "CbDataList.h"
 #include "ssl/gadgets.h"
 
 #if HAVE_OPENSSL_SSL_H
@@ -68,9 +69,8 @@ namespace Ssl
 /// Squid defined error code (<0),  an error code returned by SSL X509 api, or SSL_ERROR_NONE
 typedef int ssl_error_t;
 
-/// \ingroup ServerProtocolSSLAPI
-/// SSL error codes in the order they were encountered
-typedef std::vector<ssl_error_t> Errors;
+typedef CbDataList<Ssl::ssl_error_t> Errors;
+
 } //namespace Ssl
 
 /// \ingroup ServerProtocolSSLAPI