From: Amos Jeffries <yadij@users.noreply.github.com>
Date: Mon, 23 Jun 2025 23:11:47 +0000 (+0000)
Subject: Maintenance: remove some duplicate auth code (#2097)
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4eb8ece19d9acbda5649bae4924849211228de5b;p=thirdparty%2Fsquid.git

Maintenance: remove some duplicate auth code (#2097)
---

diff --git a/src/auth/SchemeConfig.cc b/src/auth/SchemeConfig.cc
index 99ce31a451..f0be38378f 100644
--- a/src/auth/SchemeConfig.cc
+++ b/src/auth/SchemeConfig.cc
@@ -179,6 +179,12 @@ Auth::SchemeConfig::done()
     keyExtrasLine.clean();
 }
 
+bool
+Auth::SchemeConfig::configured() const
+{
+    return (authenticateProgram && authenticateChildren.n_max != 0);
+}
+
 bool
 Auth::SchemeConfig::isCP1251EncodingAllowed(const HttpRequest *request)
 {
diff --git a/src/auth/SchemeConfig.h b/src/auth/SchemeConfig.h
index 028ef034df..c07b381e44 100644
--- a/src/auth/SchemeConfig.h
+++ b/src/auth/SchemeConfig.h
@@ -94,7 +94,7 @@ public:
      \retval false  Not configured or Configuration Error.
      *          No other module functions except Shutdown/Dump/Parse/FreeConfig will be called by Squid.
      */
-    virtual bool configured() const = 0;
+    virtual bool configured() const;
 
     /**
      * Shutdown just the auth helpers.
diff --git a/src/auth/basic/Config.cc b/src/auth/basic/Config.cc
index d3ebd5855b..2b9f7c28f2 100644
--- a/src/auth/basic/Config.cc
+++ b/src/auth/basic/Config.cc
@@ -57,13 +57,7 @@ Auth::Basic::Config::active() const
 bool
 Auth::Basic::Config::configured() const
 {
-    if ((authenticateProgram != nullptr) && (authenticateChildren.n_max != 0) && !realm.isEmpty()) {
-        debugs(29, 9, "returning configured");
-        return true;
-    }
-
-    debugs(29, 9, "returning unconfigured");
-    return false;
+    return (SchemeConfig::configured() && !realm.isEmpty());
 }
 
 const char *
diff --git a/src/auth/digest/Config.cc b/src/auth/digest/Config.cc
index f397208414..bcd6e84b50 100644
--- a/src/auth/digest/Config.cc
+++ b/src/auth/digest/Config.cc
@@ -474,12 +474,7 @@ Auth::Digest::Config::active() const
 bool
 Auth::Digest::Config::configured() const
 {
-    if ((authenticateProgram != nullptr) &&
-            (authenticateChildren.n_max != 0) &&
-            !realm.isEmpty() && (noncemaxduration > -1))
-        return true;
-
-    return false;
+    return (SchemeConfig::configured() && !realm.isEmpty() && noncemaxduration > -1);
 }
 
 /* add the [www-|Proxy-]authenticate header on a 407 or 401 reply */
diff --git a/src/auth/negotiate/Config.cc b/src/auth/negotiate/Config.cc
index 34329f2fd2..8644d23e92 100644
--- a/src/auth/negotiate/Config.cc
+++ b/src/auth/negotiate/Config.cc
@@ -120,18 +120,6 @@ Auth::Negotiate::Config::active() const
     return authnegotiate_initialised == 1;
 }
 
-bool
-Auth::Negotiate::Config::configured() const
-{
-    if (authenticateProgram && (authenticateChildren.n_max != 0)) {
-        debugs(29, 9, "returning configured");
-        return true;
-    }
-
-    debugs(29, 9, "returning unconfigured");
-    return false;
-}
-
 void
 Auth::Negotiate::Config::fixHeader(Auth::UserRequest::Pointer auth_user_request, HttpReply *rep, Http::HdrType reqType, HttpRequest * request)
 {
diff --git a/src/auth/negotiate/Config.h b/src/auth/negotiate/Config.h
index 825dc7b5ef..88991f2d99 100644
--- a/src/auth/negotiate/Config.h
+++ b/src/auth/negotiate/Config.h
@@ -26,7 +26,6 @@ class Config : public Auth::SchemeConfig
 {
 public:
     bool active() const override;
-    bool configured() const override;
     Auth::UserRequest::Pointer decode(char const *proxy_auth, const HttpRequest *request, const char *requestRealm) override;
     void done() override;
     void rotateHelpers() override;
diff --git a/src/auth/ntlm/Config.cc b/src/auth/ntlm/Config.cc
index b577c66a8a..2af76b9d49 100644
--- a/src/auth/ntlm/Config.cc
+++ b/src/auth/ntlm/Config.cc
@@ -119,18 +119,6 @@ Auth::Ntlm::Config::active() const
     return authntlm_initialised == 1;
 }
 
-bool
-Auth::Ntlm::Config::configured() const
-{
-    if ((authenticateProgram != nullptr) && (authenticateChildren.n_max != 0)) {
-        debugs(29, 9, "returning configured");
-        return true;
-    }
-
-    debugs(29, 9, "returning unconfigured");
-    return false;
-}
-
 /* NTLM Scheme */
 
 void
diff --git a/src/auth/ntlm/Config.h b/src/auth/ntlm/Config.h
index 4b216bf5d2..4cd493497a 100644
--- a/src/auth/ntlm/Config.h
+++ b/src/auth/ntlm/Config.h
@@ -29,7 +29,6 @@ class Config : public Auth::SchemeConfig
 {
 public:
     bool active() const override;
-    bool configured() const override;
     Auth::UserRequest::Pointer decode(char const *proxy_auth, const HttpRequest *request, const char *requestRealm) override;
     void done() override;
     void rotateHelpers() override;