From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 31 May 2017 03:03:31 +0000 (+1200)
Subject: Cleanup: remove some unnecessary wrapper code in libauth.la
X-Git-Tag: M-staged-PR71~150
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=923a8d892c70cd95e6cff2eb2b71a503b57cf9dc;p=thirdparty%2Fsquid.git

Cleanup: remove some unnecessary wrapper code in libauth.la

Resolves two outstanding "TODO: remove wrapper" items.

* authenticateAddTrailer was completely unused.

* authenticateFixHeader was used but needless.

Also, makes the addReplyAuthHeader static start with upper-case
to comply with Squid coding guidelines.
---

diff --git a/src/auth/UserRequest.cc b/src/auth/UserRequest.cc
index 52d75e4ec0..9f6970a79e 100644
--- a/src/auth/UserRequest.cc
+++ b/src/auth/UserRequest.cc
@@ -476,7 +476,7 @@ schemesConfig(HttpRequest *request, HttpReply *rep)
 }
 
 void
-Auth::UserRequest::addReplyAuthHeader(HttpReply * rep, Auth::UserRequest::Pointer auth_user_request, HttpRequest * request, int accelerated, int internal)
+Auth::UserRequest::AddReplyAuthHeader(HttpReply * rep, Auth::UserRequest::Pointer auth_user_request, HttpRequest * request, int accelerated, int internal)
 /* send the auth types we are configured to support (and have compiled in!) */
 {
     Http::HdrType type;
@@ -537,22 +537,6 @@ Auth::UserRequest::addReplyAuthHeader(HttpReply * rep, Auth::UserRequest::Pointe
     }
 }
 
-// TODO remove wrapper.
-void
-authenticateFixHeader(HttpReply * rep, Auth::UserRequest::Pointer auth_user_request, HttpRequest * request, int accelerated, int internal)
-{
-    Auth::UserRequest::addReplyAuthHeader(rep, auth_user_request, request, accelerated, internal);
-}
-
-/* call the active auth module and allow it to add a trailer to the request */
-// TODO remove wrapper
-void
-authenticateAddTrailer(HttpReply * rep, Auth::UserRequest::Pointer auth_user_request, HttpRequest *, int accelerated)
-{
-    if (auth_user_request != NULL)
-        auth_user_request->addAuthenticationInfoTrailer(rep, accelerated);
-}
-
 Auth::Scheme::Pointer
 Auth::UserRequest::scheme() const
 {
diff --git a/src/auth/UserRequest.h b/src/auth/UserRequest.h
index eafda066ed..a2f89d318a 100644
--- a/src/auth/UserRequest.h
+++ b/src/auth/UserRequest.h
@@ -165,7 +165,7 @@ public:
     static AuthAclState tryToAuthenticateAndSetAuthUser(UserRequest::Pointer *aUR, Http::HdrType, HttpRequest *, ConnStateData *, Ip::Address &, AccessLogEntry::Pointer &);
 
     /// Add the appropriate [Proxy-]Authenticate header to the given reply
-    static void addReplyAuthHeader(HttpReply * rep, UserRequest::Pointer auth_user_request, HttpRequest * request, int accelerated, int internal);
+    static void AddReplyAuthHeader(HttpReply * rep, UserRequest::Pointer auth_user_request, HttpRequest * request, int accelerated, int internal);
 
     /** Start an asynchronous helper lookup to verify the user credentials
      *
@@ -238,11 +238,6 @@ private:
 
 /* AuthUserRequest */
 
-/// \ingroup AuthAPI
-void authenticateFixHeader(HttpReply *, Auth::UserRequest::Pointer, HttpRequest *, int, int);
-/// \ingroup AuthAPI
-void authenticateAddTrailer(HttpReply *, Auth::UserRequest::Pointer, HttpRequest *, int);
-
 /// \ingroup AuthAPI
 void authenticateAuthUserRequestRemoveIp(Auth::UserRequest::Pointer, Ip::Address const &);
 /// \ingroup AuthAPI
diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc
index 459a177f2a..395b366950 100644
--- a/src/client_side_reply.cc
+++ b/src/client_side_reply.cc
@@ -1531,9 +1531,9 @@ clientReplyContext::buildReplyHeader()
          * data on 407/401 responses, and do not check the accel state on 401/407
          * responses
          */
-        authenticateFixHeader(reply, request->auth_user_request, request, 0, 1);
+        Auth::UserRequest::AddReplyAuthHeader(reply, request->auth_user_request, request, 0, 1);
     } else if (request->auth_user_request != NULL)
-        authenticateFixHeader(reply, request->auth_user_request, request, http->flags.accel, 0);
+        Auth::UserRequest::AddReplyAuthHeader(reply, request->auth_user_request, request, http->flags.accel, 0);
 #endif
 
     /* Append X-Cache */
diff --git a/src/tests/stub_libauth.cc b/src/tests/stub_libauth.cc
index 0ee6c1c236..ee4e2172bf 100644
--- a/src/tests/stub_libauth.cc
+++ b/src/tests/stub_libauth.cc
@@ -72,9 +72,7 @@ void Auth::UserRequest::releaseAuthServer() STUB
 const char * Auth::UserRequest::connLastHeader() STUB_RETVAL("stub")
 AuthAclState Auth::UserRequest::authenticate(Auth::UserRequest::Pointer *, Http::HdrType, HttpRequest *, ConnStateData *, Ip::Address &, AccessLogEntry::Pointer &) STUB_RETVAL(AUTH_AUTHENTICATED)
 AuthAclState Auth::UserRequest::tryToAuthenticateAndSetAuthUser(Auth::UserRequest::Pointer *, Http::HdrType, HttpRequest *, ConnStateData *, Ip::Address &, AccessLogEntry::Pointer &) STUB_RETVAL(AUTH_AUTHENTICATED)
-void Auth::UserRequest::addReplyAuthHeader(HttpReply *, Auth::UserRequest::Pointer, HttpRequest *, int, int) STUB
-void authenticateFixHeader(HttpReply *, Auth::UserRequest::Pointer, HttpRequest *, int, int) STUB
-void authenticateAddTrailer(HttpReply *, Auth::UserRequest::Pointer, HttpRequest *, int) STUB
+void Auth::UserRequest::AddReplyAuthHeader(HttpReply *, Auth::UserRequest::Pointer, HttpRequest *, int, int) STUB
 Auth::Scheme::Pointer Auth::UserRequest::scheme() const STUB_RETVAL(NULL)
 
 #include "AuthReg.h"