[#1263] rebased and renamed member variables

diff --git a/src/bin/agent/tests/ca_response_creator_unittests.cc b/src/bin/agent/tests/ca_response_creator_unittests.cc
index 3fd5d3241626d08c242adaee1bba7eecfca2f401..fe3895dd82361f362acfccde6bdc6f7531a65e50 100644 (file)
--- a/src/bin/agent/tests/ca_response_creator_unittests.cc
+++ b/src/bin/agent/tests/ca_response_creator_unittests.cc
@@ -58,7 +58,7 @@ public:
             ADD_FAILURE() << "CtrlAgentResponseCreator::createNewHttpRequest"
                 " returns NULL!";
         }
-        HttpRequest::recordBasicAuth = true;
+        HttpRequest::recordBasicAuth_ = true;
         // Initialize process and cfgmgr.
         try {
             initProcess();
@@ -72,7 +72,7 @@ public:
     ///
     /// Removes registered commands from the command manager.
     virtual ~CtrlAgentResponseCreatorTest() {
-        HttpRequest::recordBasicAuth = false;
+        HttpRequest::recordBasicAuth_ = false;
         CtrlAgentCommandMgr::instance().deregisterAll();
         HooksManager::prepareUnloadLibraries();
         static_cast<void>(HooksManager::unloadLibraries());

diff --git a/src/lib/http/basic_auth_config.cc b/src/lib/http/basic_auth_config.cc
index c7d911ec5acaf05f16f566bd4c47f29c2348dc1a..0c98a4a3c3b386adc938d1b40ecdb5607ae60bbb 100644 (file)
--- a/src/lib/http/basic_auth_config.cc
+++ b/src/lib/http/basic_auth_config.cc
@@ -366,7 +366,7 @@ BasicHttpAuthConfig::checkAuth(const HttpResponseCreator& creator,
         if (it != credentials.end()) {
             LOG_INFO(auth_logger, HTTP_CLIENT_REQUEST_AUTHORIZED)
                 .arg(it->second);
-            if (HttpRequest::recordBasicAuth) {
+            if (HttpRequest::recordBasicAuth_) {
                 request->setBasicAuth(it->second);
             }
             authentic = true;

diff --git a/src/lib/http/connection.cc b/src/lib/http/connection.cc
index aa307929bf9d4c80b27323cd5c5750e755ee9f2c..b1e57bddbebb0ca37f683efedf81c80945fa2304 100644 (file)
--- a/src/lib/http/connection.cc
+++ b/src/lib/http/connection.cc
@@ -112,13 +112,13 @@ HttpConnection::recordParameters(const HttpRequestPtr& request) const {
 
     // Record the first commonName of the subjectName of the client
     // certificate when wanted.
-    if (HttpRequest::recordSubject) {
+    if (HttpRequest::recordSubject_) {
         request->setSubject(tls_socket_->getTlsStream().getSubject());
     }
 
     // Record the first commonName of the issuerName of the client
     // certificate when wanted.
-    if (HttpRequest::recordIssuer) {
+    if (HttpRequest::recordIssuer_) {
         request->setIssuer(tls_socket_->getTlsStream().getIssuer());
     }
 }

diff --git a/src/lib/http/request.cc b/src/lib/http/request.cc
index 391b22113af6a262d0a2d1f41b3171658b4375a8..f753fea5492d7d4db6d4db194b3388e47fc9871a 100644 (file)
--- a/src/lib/http/request.cc
+++ b/src/lib/http/request.cc
@@ -21,11 +21,11 @@ const std::string crlf = "\r\n";
 namespace isc {
 namespace http {
 
-bool HttpRequest::recordSubject = false;
+bool HttpRequest::recordSubject_ = false;
 
-bool HttpRequest::recordIssuer = false;
+bool HttpRequest::recordIssuer_ = false;
 
-bool HttpRequest::recordBasicAuth = false;
+bool HttpRequest::recordBasicAuth_ = false;
 
 HttpRequest::HttpRequest()
     : HttpMessage(INBOUND), required_methods_(),

diff --git a/src/lib/http/request.h b/src/lib/http/request.h
index dfd2c29c05d35bfc08f20be0a5e4f9855e55a1b8..c983d59766dce888ecd6f5cb8f96ca1f5dbddbc5 100644 (file)
--- a/src/lib/http/request.h
+++ b/src/lib/http/request.h
@@ -162,14 +162,14 @@ public:
 
     /// @brief Returns recorded remote address.
     ///
-    /// @return recorded remote address.
+    /// @return recorded remote address in textual form.
     std::string getRemote() const {
         return (remote_);
     }
 
     /// @brief Set (record) remote address.
     ///
-    /// @param remote Remote end-point address in textual form.
+    /// @param remote the remote address in textual form.
     void setRemote(const std::string& remote) {
         remote_ = remote;
     }
@@ -183,7 +183,7 @@ public:
 
     /// @brief Set (record) TLS usage.
     ///
-    /// @param tls TLS usage.
+    /// @param tls the TLS usage.
     void setTls(bool tls) {
         tls_ = tls;
     }
@@ -195,9 +195,9 @@ public:
         return (subject_);
     }
 
-    /// @brief Set (record) subjet name.
+    /// @brief Set (record) subject name.
     ///
-    /// @param subjet Subject name.
+    /// @param subject the subject name.
     void setSubject(const std::string& subject) {
         subject_ = subject;
     }
@@ -211,7 +211,7 @@ public:
 
     /// @brief Set (record) issuer name.
     ///
-    /// @param issuer Issuer name.
+    /// @param issuer the issuer name.
     void setIssuer(const std::string& issuer) {
         issuer_ = issuer;
     }
@@ -225,7 +225,7 @@ public:
 
     /// @brief Set (record) basic auth.
     ///
-    /// @param basic_auth Basic auth.
+    /// @param basic_auth the basic auth.
     void setBasicAuth(const std::string& basic_auth) {
         basic_auth_ = basic_auth;
     }
@@ -239,22 +239,22 @@ public:
 
     /// @brief Set (record) custom name.
     ///
-    /// @param custom Custom name.
+    /// @param custom the custom name.
     void setCustom(const std::string& custom) {
         custom_ = custom;
     }
 
-    /// Access control parameters: want to record flags.
+    /// Access control parameters: Flags which indicate what information to record.
     /// Remote address and TLS usage are always recorded.
 
     /// @brief Record subjet name.
-    static bool recordSubject;
+    static bool recordSubject_;
 
     /// @brief Record issuer name.
-    static bool recordIssuer;
+    static bool recordIssuer_;
 
     /// @brief Record basic auth.
-    static bool recordBasicAuth;
+    static bool recordBasicAuth_;
 
 protected:
 

diff --git a/src/lib/http/tests/response_creator_unittests.cc b/src/lib/http/tests/response_creator_unittests.cc
index 6886d1d77daf16cb9b1555d4ed69029939aef37b..c5370cfcecf29cae21a54a83a4628c53ab577346 100644 (file)
--- a/src/lib/http/tests/response_creator_unittests.cc
+++ b/src/lib/http/tests/response_creator_unittests.cc
@@ -156,7 +156,7 @@ TEST_F(HttpResponseCreatorAuthTest, noAuth) {
     request->context()->method_ = "GET";
     request->context()->uri_ = "/foo";
     ASSERT_NO_THROW(request->finalize());
-    HttpRequest::recordBasicAuth = true;
+    HttpRequest::recordBasicAuth_ = true;
 
     HttpResponsePtr response;
     TestHttpResponseCreatorPtr creator(new TestHttpResponseCreator());;
@@ -197,7 +197,7 @@ TEST_F(HttpResponseCreatorAuthTest, authTooShort) {
     HttpHeaderContext auth("Authorization", "Basic =");
     request->context()->headers_.push_back(auth);
     ASSERT_NO_THROW(request->finalize());
-    HttpRequest::recordBasicAuth = true;
+    HttpRequest::recordBasicAuth_ = true;
 
     HttpResponsePtr response;
     TestHttpResponseCreatorPtr creator(new TestHttpResponseCreator());;
@@ -239,7 +239,7 @@ TEST_F(HttpResponseCreatorAuthTest, badScheme) {
     HttpHeaderContext auth("Authorization", "Basis dGVzdDoxMjPCow==");
     request->context()->headers_.push_back(auth);
     ASSERT_NO_THROW(request->finalize());
-    HttpRequest::recordBasicAuth = true;
+    HttpRequest::recordBasicAuth_ = true;
 
     HttpResponsePtr response;
     TestHttpResponseCreatorPtr creator(new TestHttpResponseCreator());;
@@ -282,7 +282,7 @@ TEST_F(HttpResponseCreatorAuthTest, notMatching) {
     HttpHeaderContext auth("Authorization", "Basic dGvZdDoxMjPcOw==");
     request->context()->headers_.push_back(auth);
     ASSERT_NO_THROW(request->finalize());
-    HttpRequest::recordBasicAuth = true;
+    HttpRequest::recordBasicAuth_ = true;
 
     HttpResponsePtr response;
     TestHttpResponseCreatorPtr creator(new TestHttpResponseCreator());;
@@ -323,7 +323,7 @@ TEST_F(HttpResponseCreatorAuthTest, matching) {
     HttpHeaderContext auth("Authorization", "Basic dGVzdDoxMjPCow==");
     request->context()->headers_.push_back(auth);
     ASSERT_NO_THROW(request->finalize());
-    HttpRequest::recordBasicAuth = true;
+    HttpRequest::recordBasicAuth_ = true;
 
     HttpResponsePtr response;
     TestHttpResponseCreatorPtr creator(new TestHttpResponseCreator());;
@@ -334,7 +334,7 @@ TEST_F(HttpResponseCreatorAuthTest, matching) {
     addString("HTTP_CLIENT_REQUEST_AUTHORIZED received HTTP request "
               "authorized for 'test'");
     EXPECT_TRUE(checkFile());
-    HttpRequest::recordBasicAuth = false;
+    HttpRequest::recordBasicAuth_ = false;
 }
 
 }

diff --git a/src/lib/http/tests/tls_client_unittests.cc b/src/lib/http/tests/tls_client_unittests.cc
index c9a239e7d14fed8f7912742bb6e2233ca9db4e88..afb7dc2da876f5cd9d27856b64684ef85e9a7ed2 100644 (file)
--- a/src/lib/http/tests/tls_client_unittests.cc
+++ b/src/lib/http/tests/tls_client_unittests.cc
@@ -139,11 +139,11 @@ private:
     virtual HttpResponsePtr
     createDynamicHttpResponse(HttpRequestPtr request) {
         // Check access parameters.
-        if (HttpRequest::recordSubject) {
+        if (HttpRequest::recordSubject_) {
             EXPECT_TRUE(request->getTls());
             EXPECT_EQ("kea-client", request->getSubject());
         }
-        if (HttpRequest::recordIssuer) {
+        if (HttpRequest::recordIssuer_) {
             EXPECT_TRUE(request->getTls());
             EXPECT_EQ("kea-ca", request->getIssuer());
         }
@@ -317,8 +317,8 @@ public:
         listener3_->stop();
         io_service_.poll();
         MultiThreadingMgr::instance().setMode(false);
-        HttpRequest::recordSubject = false;
-        HttpRequest::recordIssuer = false;
+        HttpRequest::recordSubject_ = false;
+        HttpRequest::recordIssuer_ = false;
     }
 
     /// @brief Creates HTTP request with JSON body.
@@ -525,8 +525,8 @@ public:
         }));
 
         // Record subjet and issuer: they will be check during response creation.
-        HttpRequest::recordSubject = true;
-        HttpRequest::recordIssuer = true;
+        HttpRequest::recordSubject_ = true;
+        HttpRequest::recordIssuer_ = true;
 
         // Actually trigger the requests.
         ASSERT_NO_THROW(runIOService());