From: Henrik Nordstrom Date: Mon, 2 Feb 2009 20:45:40 +0000 (+0100) Subject: Add tag acl type for matching external acl tag X-Git-Tag: SQUID_3_2_0_1~995^2~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ab50441a3a44f2b43e3e94407f77ef772f32097;p=thirdparty%2Fsquid.git Add tag acl type for matching external acl tag --- diff --git a/src/ACLTag.cc b/src/ACLTag.cc new file mode 100644 index 0000000000..54c1953d01 --- /dev/null +++ b/src/ACLTag.cc @@ -0,0 +1,63 @@ + +/* + * $Id: ACLTag.cc,v 1.2 2008/02/11 22:44:50 rousskov Exp $ + * + * + * 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 + * Copyright (c) 2009, Henrik Nordstrom + */ + +#include "squid.h" +#include "ACLTag.h" +#include "ACLStringData.h" +#include "ACLChecklist.h" +#include "HttpRequest.h" + +/* explicit template instantiation required for some systems */ + +ACL::Prototype ACLTag::RegistryProtoype(&ACLTag::RegistryEntry_, "myportname"); + +ACLStrategised ACLTag::RegistryEntry_(new ACLStringData, ACLTagStrategy::Instance(), "myportname"); + +int +ACLTagStrategy::match (ACLData * &data, ACLChecklist *checklist) +{ + if (checklist->conn() != NULL) + return data->match (checklist->request->tag.buf()); + return 0; +} + +ACLTagStrategy * +ACLTagStrategy::Instance() +{ + return &Instance_; +} + +ACLTagStrategy ACLTagStrategy::Instance_; diff --git a/src/ACLTag.h b/src/ACLTag.h new file mode 100644 index 0000000000..bce969aac4 --- /dev/null +++ b/src/ACLTag.h @@ -0,0 +1,68 @@ + +/* + * $Id: ACLTag.h,v 1.1.2.1 2008/02/27 10:06:42 amosjeffries Exp $ + * + * + * 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 + * Copyright (c) 2009, Henrik Nordstrom + */ + +#ifndef SQUID_ACLMYPORTNAME_H +#define SQUID_ACLMYPORTNAME_H +#include "ACLStrategy.h" +#include "ACLStrategised.h" + +class ACLTagStrategy : public ACLStrategy +{ + +public: + virtual int match (ACLData * &, ACLChecklist *); + static ACLTagStrategy *Instance(); + /* Not implemented to prevent copies of the instance. */ + /* Not private to prevent brain dead g+++ warnings about + * private constructors with no friends */ + ACLTagStrategy(ACLTagStrategy const &); + +private: + static ACLTagStrategy Instance_; + ACLTagStrategy(){} + + ACLTagStrategy&operator=(ACLTagStrategy const &); +}; + +class ACLTag +{ + +private: + static ACL::Prototype RegistryProtoype; + static ACLStrategised RegistryEntry_; +}; + +#endif /* SQUID_ACLMYPORTNAME_H */ diff --git a/src/Makefile.am b/src/Makefile.am index 45e247e4ec..c3d13abc30 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -391,6 +391,8 @@ squid_ACLSOURCES = \ ACLStrategy.h \ ACLStringData.cc \ ACLStringData.h \ + ACLTag.cc \ + ACLTag.h \ ACLTime.cc \ ACLTime.h \ ACLTimeData.cc \ diff --git a/src/cf.data.pre b/src/cf.data.pre index 134b5ba064..bb89752728 100644 --- a/src/cf.data.pre +++ b/src/cf.data.pre @@ -640,6 +640,9 @@ DOC_START acl aclname ext_user_regex [-i] pattern ... # string match on username returned by external acl helper # use REQUIRED to accept any non-null user name. + # + acl aclname tag tagvalue ... + # string match on tag returned by external acl helper Examples: acl macaddress arp 09:00:2b:23:45:67