/*
- * $Id$
+ * Copyright (C) 1996-2021 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"
+/* DEBUG: section 28 Access Control */
+
+#include "squid.h"
#if USE_IDENT
#include "acl/UserData.h"
#include "client_side.h"
#include "comm/Connection.h"
+#include "globals.h"
+#include "http/Stream.h"
#include "ident/AclIdent.h"
#include "ident/Ident.h"
return type_;
}
+void
+ACLIdent::parseFlags()
+{
+ ParseFlags(Acl::NoOptions(), data->supportedFlags());
+}
+
void
ACLIdent::parse()
{
} else if (checklist->conn() != NULL && checklist->conn()->clientConnection != NULL && checklist->conn()->clientConnection->rfc931[0]) {
return data->match(checklist->conn()->clientConnection->rfc931);
} else if (checklist->conn() != NULL && Comm::IsConnOpen(checklist->conn()->clientConnection)) {
- debugs(28, 3, HERE << "switching to ident lookup state");
- checklist->changeState(IdentLookup::Instance());
- return 0;
+ if (checklist->goAsync(IdentLookup::Instance())) {
+ debugs(28, 3, "switching to ident lookup state");
+ return -1;
+ }
+ // else fall through to ACCESS_DUNNO failure below
} else {
debugs(28, DBG_IMPORTANT, HERE << "Can't start ident lookup. No client connection" );
- checklist->markFinished(ACCESS_DUNNO, "cannot start ident lookup");
- return -1;
+ // fall through to ACCESS_DUNNO failure below
}
+
+ checklist->markFinished(ACCESS_DUNNO, "cannot start ident lookup");
+ return -1;
}
-wordlist *
+SBufList
ACLIdent::dump() const
{
return data->dump();
return new ACLIdent(*this);
}
-
IdentLookup IdentLookup::instance_;
IdentLookup *
const ConnStateData *conn = checklist->conn();
// check that ACLIdent::match() tested this lookup precondition
assert(conn && Comm::IsConnOpen(conn->clientConnection));
- debugs(28, 3, HERE << "Doing ident lookup" );
- checklist->asyncInProgress(true);
- Ident::Start(checklist->conn()->clientConnection, LookupDone, checklist);
+ debugs(28, 3, HERE << "Doing ident lookup" );
+ Ident::Start(checklist->conn()->clientConnection, LookupDone, checklist);
}
void
IdentLookup::LookupDone(const char *ident, void *data)
{
ACLFilledChecklist *checklist = Filled(static_cast<ACLChecklist*>(data));
- assert(checklist->asyncState() == IdentLookup::Instance());
if (ident) {
xstrncpy(checklist->rfc931, ident, USER_IDENT_SZ);
if (checklist->conn() != NULL && checklist->conn()->clientConnection != NULL && !checklist->conn()->clientConnection->rfc931[0])
xstrncpy(checklist->conn()->clientConnection->rfc931, checklist->rfc931, USER_IDENT_SZ);
- checklist->asyncInProgress(false);
- checklist->changeState(ACLChecklist::NullState::Instance());
- checklist->matchNonBlocking();
+ checklist->resumeNonBlockingCheck(IdentLookup::Instance());
}
#endif /* USE_IDENT */
+