/*
- * $Id$
+ * Copyright (C) 1996-2017 The Squid Software Foundation and contributors
*
- * DEBUG: section 28 Access Control
- * AUTHOR: Duane Wessels
- *
- * SQUID Web Proxy Cache http://www.squid-cache.org/
- * ----------------------------------------------------------
- *
- * Squid is the result of efforts by numerous individuals from
- * the Internet community; see the CONTRIBUTORS file for full
- * details. Many organizations have provided support for Squid's
- * development; see the SPONSORS file for full details. Squid is
- * Copyrighted (C) 2001 by the Regents of the University of
- * California; see the COPYRIGHT file for full details. Squid
- * incorporates software developed and/or copyrighted by other
- * sources; see the CREDITS file for full details.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
- *
- *
- * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
*/
-#include "squid-old.h"
-#include "auth/AclProxyAuth.h"
-#include "auth/Gadgets.h"
+/* DEBUG: section 28 Access Control */
+
+#include "squid.h"
#include "acl/FilledChecklist.h"
-#include "acl/UserData.h"
#include "acl/RegexData.h"
-#include "client_side.h"
-#include "HttpRequest.h"
+#include "acl/UserData.h"
#include "auth/Acl.h"
+#include "auth/AclProxyAuth.h"
+#include "auth/Gadgets.h"
#include "auth/User.h"
#include "auth/UserRequest.h"
+#include "client_side.h"
+#include "http/Stream.h"
+#include "HttpRequest.h"
ACLProxyAuth::~ACLProxyAuth()
{
delete data;
}
-ACLProxyAuth::ACLProxyAuth(ACLData<char const *> *newData, char const *theType) : data (newData), type_(theType) {}
+ACLProxyAuth::ACLProxyAuth(ACLData<char const *> *newData, char const *theType) :
+ data(newData),
+ type_(theType)
+{}
-ACLProxyAuth::ACLProxyAuth (ACLProxyAuth const &old) : data (old.data->clone()), type_(old.type_)
+ACLProxyAuth::ACLProxyAuth(ACLProxyAuth const &old) :
+ data(old.data->clone()),
+ type_(old.type_)
{}
ACLProxyAuth &
-ACLProxyAuth::operator= (ACLProxyAuth const &rhs)
+ACLProxyAuth::operator=(ACLProxyAuth const &rhs)
{
data = rhs.data->clone();
type_ = rhs.type_;
ACLProxyAuth::match(ACLChecklist *checklist)
{
allow_t answer = AuthenticateAcl(checklist);
- if (answer != ACCESS_DENIED && answer != ACCESS_ALLOWED) {
- // If the answer is not allowed or denied (matches/not matches), requires
- // authentication (ACCESS_AUTH_*) or the authentication is in progress (ACCESS_DUNNO)
- // so change the state in the related checklist.
- checklist->currentAnswer(answer);
- }
// convert to tri-state ACL match 1,0,-1
switch (answer) {
case ACCESS_ALLOWED:
- case ACCESS_AUTH_EXPIRED_OK:
// check for a match
return matchProxyAuth(checklist);
case ACCESS_DENIED:
- case ACCESS_AUTH_EXPIRED_BAD:
return 0; // non-match
case ACCESS_DUNNO:
case ACCESS_AUTH_REQUIRED:
default:
+ // If the answer is not allowed or denied (matches/not matches) and
+ // async authentication is not in progress, then we are done.
+ if (checklist->keepMatching())
+ checklist->markFinished(answer, "AuthenticateAcl exception");
return -1; // other
}
}
-wordlist *
+SBufList
ACLProxyAuth::dump() const
{
return data->dump();
}
bool
-ACLProxyAuth::empty () const
+ACLProxyAuth::empty() const
{
return data->empty();
}
bool
-ACLProxyAuth::valid () const
+ACLProxyAuth::valid() const
{
if (authenticateSchemeCount() == 0) {
- debugs(28, 0, "Can't use proxy auth because no authentication schemes were compiled.");
+ debugs(28, DBG_CRITICAL, "Can't use proxy auth because no authentication schemes were compiled.");
return false;
}
if (authenticateActiveSchemeCount() == 0) {
- debugs(28, 0, "Can't use proxy auth because no authentication schemes are fully configured.");
+ debugs(28, DBG_CRITICAL, "Can't use proxy auth because no authentication schemes are fully configured.");
return false;
}
return true;
}
-ProxyAuthNeeded ProxyAuthNeeded::instance_;
-
-ProxyAuthNeeded *
-ProxyAuthNeeded::Instance()
-{
- return &instance_;
-}
-
ProxyAuthLookup ProxyAuthLookup::instance_;
ProxyAuthLookup *
}
void
-ProxyAuthLookup::checkForAsync(ACLChecklist *cl)const
+ProxyAuthLookup::checkForAsync(ACLChecklist *cl) const
{
ACLFilledChecklist *checklist = Filled(cl);
- checklist->asyncInProgress(true);
debugs(28, 3, HERE << "checking password via authenticator");
/* make sure someone created auth_user_request for us */
assert(checklist->auth_user_request != NULL);
assert(checklist->auth_user_request->valid());
- checklist->auth_user_request->start(LookupDone, checklist);
+ checklist->auth_user_request->start(checklist->request, checklist->al, LookupDone, checklist);
}
void
-ProxyAuthLookup::LookupDone(void *data, char *result)
+ProxyAuthLookup::LookupDone(void *data)
{
ACLFilledChecklist *checklist = Filled(static_cast<ACLChecklist*>(data));
- assert (checklist->asyncState() == ProxyAuthLookup::Instance());
-
- if (result != NULL)
- fatal("AclLookupProxyAuthDone: Old code floating around somewhere.\nMake clean and if that doesn't work, report a bug to the squid developers.\n");
-
if (checklist->auth_user_request == NULL || !checklist->auth_user_request->valid() || checklist->conn() == NULL) {
/* credentials could not be checked either way
* restart the whole process */
checklist->auth_user_request = NULL;
if (checklist->conn() != NULL) {
- checklist->conn()->auth_user_request = NULL;
+ checklist->conn()->setAuth(NULL, "proxy_auth ACL failure");
}
}
- checklist->asyncInProgress(false);
- checklist->changeState (ACLChecklist::NullState::Instance());
- checklist->matchNonBlocking();
-}
-
-void
-ProxyAuthNeeded::checkForAsync(ACLChecklist *checklist) const
-{
- /* Client is required to resend the request with correct authentication
- * credentials. (This may be part of a stateful auth protocol.)
- * The request is denied.
- */
- debugs(28, 6, "ACLChecklist::checkForAsync: requiring Proxy Auth header.");
- checklist->currentAnswer(ACCESS_AUTH_REQUIRED);
- checklist->changeState (ACLChecklist::NullState::Instance());
- checklist->markFinished();
+ checklist->resumeNonBlockingCheck(ProxyAuthLookup::Instance());
}
ACL *
ACLProxyAuth::matchProxyAuth(ACLChecklist *cl)
{
ACLFilledChecklist *checklist = Filled(cl);
+ if (checklist->request->flags.sslBumped)
+ return 1; // AuthenticateAcl() already handled this bumped request
if (!authenticateUserAuthenticated(Filled(checklist)->auth_user_request)) {
return 0;
}
checklist->auth_user_request = NULL;
return result;
}
+
projects / thirdparty / squid.git / blobdiff