From cba4db87e3890b26c437a50136d55334c374931b Mon Sep 17 00:00:00 2001 From: Evan Broder Date: Tue, 30 Sep 2008 00:40:41 -0400 Subject: [PATCH] Import libapache2-mod-auth-sslcert svn path=/trunk/packages/libapache2-mod-auth-sslcert/; revision=950 --- COPYRIGHT | 358 ++++++++++++++++++++++++++++++++++++++++++++++ Makefile.in | 13 ++ configure.in | 5 + debian/auth_sslcert.load | 1 + debian/changelog | 6 + debian/compat | 1 + debian/control | 15 ++ debian/copyright | 35 +++++ debian/docs | 1 + debian/install | 2 + debian/rules | 9 ++ mod_auth_sslcert.c | 170 ++++++++++++++++++++++ 12 files changed, 616 insertions(+) create mode 100644 COPYRIGHT create mode 100644 Makefile.in create mode 100644 configure.in create mode 100644 debian/auth_sslcert.load create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/docs create mode 100644 debian/install create mode 100644 debian/rules create mode 100644 mod_auth_sslcert.c diff --git a/COPYRIGHT b/COPYRIGHT new file mode 100644 index 0000000..58c2dee --- /dev/null +++ b/COPYRIGHT @@ -0,0 +1,358 @@ +scripts.mit.edu repository +Copyright (C) 2006 Jeff Arnold and Joe Presbrey, + unless noted otherwise + +These programs are free software; you can redistribute them and/or +modify them 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. + +These programs are distributed in the hope that they 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/Makefile.in b/Makefile.in new file mode 100644 index 0000000..bfe0809 --- /dev/null +++ b/Makefile.in @@ -0,0 +1,13 @@ +APXS = apxs + +MODS = mod_auth_sslcert mod_authz_afsgroup mod_auth_optional mod_vhost_ldap + +all-local: $(patsubst %,.libs/%.so,$(MODS)) + +APXSFLAGS_mod_vhost_ldap = -Wc,-DMOD_VHOST_LDAP_VERSION=\\\"mod_vhost_ldap/1.2.0scripts\\\" -lldap_r + +.libs/%.so: %.c + $(APXS) $(APXSFLAGS_$*) -c $< + +clean: + rm -f .libs $(MODS:=.o) $(MODS:=.la) $(MODS:=.lo) $(MODS:=.slo) diff --git a/configure.in b/configure.in new file mode 100644 index 0000000..38bd377 --- /dev/null +++ b/configure.in @@ -0,0 +1,5 @@ +AC_INIT() + +AC_PROG_CC + +AC_OUTPUT(Makefile) diff --git a/debian/auth_sslcert.load b/debian/auth_sslcert.load new file mode 100644 index 0000000..1ef3f22 --- /dev/null +++ b/debian/auth_sslcert.load @@ -0,0 +1 @@ +LoadModule auth_sslcert_module /usr/lib/apache2/modules/mod_auth_sslcert.so diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..6f4524e --- /dev/null +++ b/debian/changelog @@ -0,0 +1,6 @@ +libapache2-mod-auth-sslcert (1.1.1-1) unstable; urgency=low + + * Initial release. + + -- Evan Broder Mon, 14 Jul 2008 21:32:33 -0400 + diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..fbe8142 --- /dev/null +++ b/debian/control @@ -0,0 +1,15 @@ +Source: libapache2-mod-auth-sslcert +Section: web +Priority: extra +Maintainer: Evan Broder +Build-Depends: cdbs, debhelper (>= 5), apache2-threaded-dev +Standards-Version: 3.7.2 + +Package: libapache2-mod-auth-sslcert +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, apache2.2-common +Description: Apache2 module providing authentication with SSL certs + mod_auth_sslcert implements authentication routines using SSL + client-side certs. + . + This package provides the module for Apache 2.0 server. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..a519927 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,35 @@ +This package was debianized by Evan Broder on +Mon, 14 Jul 2008 21:32:33 -0400. + +It was downloaded from + + +Upstream Author: + + Anders Kaseorg + +Copyright: + + Copyright (C) 2007 Anders Kaseorg + +License: + + This package 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 package 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 package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The Debian packaging is (C) 2008, Evan Broder and +is licensed under the GPL, see above. diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..9235801 --- /dev/null +++ b/debian/docs @@ -0,0 +1 @@ +COPYRIGHT diff --git a/debian/install b/debian/install new file mode 100644 index 0000000..af406b9 --- /dev/null +++ b/debian/install @@ -0,0 +1,2 @@ +.libs/mod_auth_sslcert.so usr/lib/apache2/modules +debian/auth_sslcert.load etc/apache2/mods-available diff --git a/debian/rules b/debian/rules new file mode 100644 index 0000000..92675f0 --- /dev/null +++ b/debian/rules @@ -0,0 +1,9 @@ +#!/usr/bin/make -f + +DEB_AUTO_UPDATE_AUTOCONF = 1 + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk + +DEB_MAKE_BUILD_TARGET = .libs/mod_auth_sslcert.so APXS="apxs2" +DEB_MAKE_INSTALL_TARGET = diff --git a/mod_auth_sslcert.c b/mod_auth_sslcert.c new file mode 100644 index 0000000..c393f28 --- /dev/null +++ b/mod_auth_sslcert.c @@ -0,0 +1,170 @@ +/* mod_auth_sslcert + * version 1.1.1, released 2007-10-01 + * Anders Kaseorg + * + * This module does authentication based on SSL client certificates: + * AuthType SSLCert + * AuthSSLCertVar SSL_CLIENT_S_DN_Email + * AuthSSLCertStripSuffix "@MIT.EDU" + */ + +#include "apr_strings.h" +#define APR_WANT_STRFUNC /* for strcasecmp */ +#include "apr_want.h" + +#include "ap_config.h" +#include "httpd.h" +#include "http_config.h" +#include "http_core.h" +#include "http_log.h" +#include "http_request.h" + +#include "mod_auth.h" +#include "mod_ssl.h" + +static APR_OPTIONAL_FN_TYPE(ssl_var_lookup) *ssl_var_lookup; + +typedef struct { + int authoritative; + char *var; + char *strip_suffix; + int strip_suffix_required; +} auth_sslcert_config_rec; + +static void *create_auth_sslcert_dir_config(apr_pool_t *p, char *dirspec) +{ + auth_sslcert_config_rec *conf = apr_pcalloc(p, sizeof(*conf)); + + conf->authoritative = -1; + conf->var = NULL; + conf->strip_suffix = NULL; + conf->strip_suffix_required = -1; + + return conf; +} + +static void *merge_auth_sslcert_dir_config(apr_pool_t *p, void *parent_conf, void *newloc_conf) +{ + auth_sslcert_config_rec *pconf = parent_conf, *nconf = newloc_conf, + *conf = apr_pcalloc(p, sizeof(*conf)); + + conf->authoritative = (nconf->authoritative != -1) ? + nconf->authoritative : pconf->authoritative; + conf->var = (nconf->var != NULL) ? + nconf->var : pconf->var; + conf->strip_suffix = (nconf->var != NULL || nconf->strip_suffix != NULL) ? + nconf->strip_suffix : pconf->strip_suffix; + conf->strip_suffix_required = (nconf->var != NULL || nconf->strip_suffix_required != -1) ? + nconf->authoritative : pconf->authoritative; + + return conf; +} + +static const command_rec auth_sslcert_cmds[] = +{ + AP_INIT_FLAG("AuthSSLCertAuthoritative", ap_set_flag_slot, + (void *)APR_OFFSETOF(auth_sslcert_config_rec, authoritative), + OR_AUTHCFG, + "Set to 'Off' to allow access control to be passed along to " + "lower modules if the UserID is not known to this module"), + AP_INIT_TAKE1("AuthSSLCertVar", ap_set_string_slot, + (void*)APR_OFFSETOF(auth_sslcert_config_rec, var), + OR_AUTHCFG, + "SSL variable to use as the username"), + AP_INIT_TAKE1("AuthSSLCertStripSuffix", ap_set_string_slot, + (void*)APR_OFFSETOF(auth_sslcert_config_rec, strip_suffix), + OR_AUTHCFG, + "An optional suffix to strip from the username"), + AP_INIT_FLAG("AuthSSLCertStripSuffixRequired", ap_set_flag_slot, + (void *)APR_OFFSETOF(auth_sslcert_config_rec, strip_suffix_required), + OR_AUTHCFG, + "Set to 'Off' to allow certs that don't end with a recognized " + "suffix to still authenticate"), + {NULL} +}; + +module AP_MODULE_DECLARE_DATA auth_sslcert_module; + +static int authenticate_sslcert_user(request_rec *r) +{ + auth_sslcert_config_rec *conf = ap_get_module_config(r->per_dir_config, + &auth_sslcert_module); + const char *current_auth; + + /* Are we configured to be SSLCert auth? */ + current_auth = ap_auth_type(r); + if (!current_auth || strcasecmp(current_auth, "SSLCert") != 0) { + return DECLINED; + } + + r->ap_auth_type = "SSLCert"; + + if (strcasecmp((char *)ssl_var_lookup(r->pool, r->server, r->connection, r, + "SSL_CLIENT_VERIFY"), + "SUCCESS") == 0) { + if (conf->var == NULL) { + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, + "AuthSSLCertVar is not set: \"%s\"", r->uri); + return HTTP_INTERNAL_SERVER_ERROR; + } + char *user = (char *)ssl_var_lookup(r->pool, r->server, r->connection, r, + conf->var); + if (user != NULL && user[0] != '\0') { + if (conf->strip_suffix != NULL) { + int i = strlen(user) - strlen(conf->strip_suffix); + if (i >= 0 && strcasecmp(user + i, conf->strip_suffix) == 0) { + r->user = apr_pstrmemdup(r->pool, user, i); + return OK; + } else if (!conf->strip_suffix_required) { + r->user = user; + return OK; + } else { + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, + "SSL username for \"%s\" has wrong suffix: \"%s\"", + r->uri, user); + } + } else { + r->user = user; + return OK; + } + } else { + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, + "no SSL username for \"%s\"", r->uri); + } + } else if (conf->authoritative) { + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, + "SSL client not verified for \"%s\"", r->uri); + } + + /* If we're not authoritative, then any error is ignored. */ + if (!conf->authoritative) { + return DECLINED; + } + + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, + "SSLCert authentication failure for \"%s\"", + r->uri); + return HTTP_UNAUTHORIZED; +} + +static void import_ssl_var_lookup() +{ + ssl_var_lookup = APR_RETRIEVE_OPTIONAL_FN(ssl_var_lookup); +} + +static void register_hooks(apr_pool_t *p) +{ + ap_hook_check_user_id(authenticate_sslcert_user, NULL, NULL, APR_HOOK_MIDDLE); + ap_hook_optional_fn_retrieve(import_ssl_var_lookup, NULL, NULL, APR_HOOK_MIDDLE); +} + +module AP_MODULE_DECLARE_DATA auth_sslcert_module = +{ + STANDARD20_MODULE_STUFF, + create_auth_sslcert_dir_config, /* dir config creater */ + merge_auth_sslcert_dir_config, /* dir merger */ + NULL, /* server config */ + NULL, /* merge server config */ + auth_sslcert_cmds, /* command apr_table_t */ + register_hooks /* register hooks */ +}; -- 1.7.9.5