mirror of
https://github.com/apache/httpd.git
synced 2025-06-04 21:42:15 +03:00
to be included even when mod_ssl is not enabled. * Makefile.in (install-include): Only install mod_ssl.h. * modules/ssl/ssl_private.h: New file. * modules/ssl/mod_ssl.h: Move everything apart from than the optional hook definitions into ssl_private.h. * modules/ssl/*.c: Include ssl_private.h not mod_ssl.h * modules/ssl/config.m4: Always add the mod_ssl directory to the include path so other modules can find mod_ssl.h. * modules/proxy/mod_proxy.c: Include mod_ssl.h to pick up the optional hook definitions rather than copy'n'pasting them. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102803 13f79535-47bb-0310-9956-ffa450edef68
187 lines
6.0 KiB
C
187 lines
6.0 KiB
C
/* Copyright 2001-2004 The Apache Software Foundation
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
/* _ _
|
|
* _ __ ___ ___ __| | ___ ___| | mod_ssl
|
|
* | '_ ` _ \ / _ \ / _` | / __/ __| | Apache Interface to OpenSSL
|
|
* | | | | | | (_) | (_| | \__ \__ \ |
|
|
* |_| |_| |_|\___/ \__,_|___|___/___/_|
|
|
* |_____|
|
|
* ssl_scache.c
|
|
* Session Cache Abstraction
|
|
*/
|
|
/* ``Open-Source Software: generous
|
|
programmers from around the world all
|
|
join forces to help you shoot
|
|
yourself in the foot for free.''
|
|
-- Unknown */
|
|
#include "ssl_private.h"
|
|
#include "mod_status.h"
|
|
|
|
/* _________________________________________________________________
|
|
**
|
|
** Session Cache: Common Abstraction Layer
|
|
** _________________________________________________________________
|
|
*/
|
|
|
|
void ssl_scache_init(server_rec *s, apr_pool_t *p)
|
|
{
|
|
SSLModConfigRec *mc = myModConfig(s);
|
|
|
|
/*
|
|
* Warn the user that he should use the session cache.
|
|
* But we can operate without it, of course.
|
|
*/
|
|
if (mc->nSessionCacheMode == SSL_SCMODE_UNSET) {
|
|
ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s,
|
|
"Init: Session Cache is not configured "
|
|
"[hint: SSLSessionCache]");
|
|
mc->nSessionCacheMode = SSL_SCMODE_NONE;
|
|
return;
|
|
}
|
|
|
|
if (mc->nSessionCacheMode == SSL_SCMODE_DBM)
|
|
ssl_scache_dbm_init(s, p);
|
|
#ifdef HAVE_DISTCACHE
|
|
else if (mc->nSessionCacheMode == SSL_SCMODE_DC)
|
|
ssl_scache_dc_init(s, p);
|
|
#endif
|
|
else if (mc->nSessionCacheMode == SSL_SCMODE_SHMCB) {
|
|
void *data;
|
|
const char *userdata_key = "ssl_scache_init";
|
|
|
|
apr_pool_userdata_get(&data, userdata_key, s->process->pool);
|
|
if (!data) {
|
|
apr_pool_userdata_set((const void *)1, userdata_key,
|
|
apr_pool_cleanup_null, s->process->pool);
|
|
return;
|
|
}
|
|
ssl_scache_shmcb_init(s, p);
|
|
}
|
|
}
|
|
|
|
void ssl_scache_kill(server_rec *s)
|
|
{
|
|
SSLModConfigRec *mc = myModConfig(s);
|
|
|
|
if (mc->nSessionCacheMode == SSL_SCMODE_DBM)
|
|
ssl_scache_dbm_kill(s);
|
|
else if (mc->nSessionCacheMode == SSL_SCMODE_SHMCB)
|
|
ssl_scache_shmcb_kill(s);
|
|
#ifdef HAVE_DISTCACHE
|
|
else if (mc->nSessionCacheMode == SSL_SCMODE_DC)
|
|
ssl_scache_dc_kill(s);
|
|
#endif
|
|
return;
|
|
}
|
|
|
|
BOOL ssl_scache_store(server_rec *s, UCHAR *id, int idlen, time_t expiry, SSL_SESSION *sess)
|
|
{
|
|
SSLModConfigRec *mc = myModConfig(s);
|
|
BOOL rv = FALSE;
|
|
|
|
if (mc->nSessionCacheMode == SSL_SCMODE_DBM)
|
|
rv = ssl_scache_dbm_store(s, id, idlen, expiry, sess);
|
|
else if (mc->nSessionCacheMode == SSL_SCMODE_SHMCB)
|
|
rv = ssl_scache_shmcb_store(s, id, idlen, expiry, sess);
|
|
#ifdef HAVE_DISTCACHE
|
|
else if (mc->nSessionCacheMode == SSL_SCMODE_DC)
|
|
rv = ssl_scache_dc_store(s, id, idlen, expiry, sess);
|
|
#endif
|
|
return rv;
|
|
}
|
|
|
|
SSL_SESSION *ssl_scache_retrieve(server_rec *s, UCHAR *id, int idlen)
|
|
{
|
|
SSLModConfigRec *mc = myModConfig(s);
|
|
SSL_SESSION *sess = NULL;
|
|
|
|
if (mc->nSessionCacheMode == SSL_SCMODE_DBM)
|
|
sess = ssl_scache_dbm_retrieve(s, id, idlen);
|
|
else if (mc->nSessionCacheMode == SSL_SCMODE_SHMCB)
|
|
sess = ssl_scache_shmcb_retrieve(s, id, idlen);
|
|
#ifdef HAVE_DISTCACHE
|
|
else if (mc->nSessionCacheMode == SSL_SCMODE_DC)
|
|
sess = ssl_scache_dc_retrieve(s, id, idlen);
|
|
#endif
|
|
return sess;
|
|
}
|
|
|
|
void ssl_scache_remove(server_rec *s, UCHAR *id, int idlen)
|
|
{
|
|
SSLModConfigRec *mc = myModConfig(s);
|
|
|
|
if (mc->nSessionCacheMode == SSL_SCMODE_DBM)
|
|
ssl_scache_dbm_remove(s, id, idlen);
|
|
else if (mc->nSessionCacheMode == SSL_SCMODE_SHMCB)
|
|
ssl_scache_shmcb_remove(s, id, idlen);
|
|
#ifdef HAVE_DISTCACHE
|
|
else if (mc->nSessionCacheMode == SSL_SCMODE_DC)
|
|
ssl_scache_dc_remove(s, id, idlen);
|
|
#endif
|
|
return;
|
|
}
|
|
|
|
void ssl_scache_expire(server_rec *s)
|
|
{
|
|
SSLModConfigRec *mc = myModConfig(s);
|
|
|
|
if (mc->nSessionCacheMode == SSL_SCMODE_DBM)
|
|
ssl_scache_dbm_expire(s);
|
|
else if (mc->nSessionCacheMode == SSL_SCMODE_SHMCB)
|
|
ssl_scache_shmcb_expire(s);
|
|
return;
|
|
}
|
|
|
|
/* _________________________________________________________________
|
|
**
|
|
** SSL Extension to mod_status
|
|
** _________________________________________________________________
|
|
*/
|
|
static int ssl_ext_status_hook(request_rec *r, int flags)
|
|
{
|
|
SSLSrvConfigRec *sc = mySrvConfig(r->server);
|
|
|
|
if (sc == NULL || flags & AP_STATUS_SHORT)
|
|
return OK;
|
|
|
|
ap_rputs("<hr>\n", r);
|
|
ap_rputs("<table cellspacing=0 cellpadding=0>\n", r);
|
|
ap_rputs("<tr><td bgcolor=\"#000000\">\n", r);
|
|
ap_rputs("<b><font color=\"#ffffff\" face=\"Arial,Helvetica\">SSL/TLS Session Cache Status:</font></b>\r", r);
|
|
ap_rputs("</td></tr>\n", r);
|
|
ap_rputs("<tr><td bgcolor=\"#ffffff\">\n", r);
|
|
|
|
if (sc->mc->nSessionCacheMode == SSL_SCMODE_DBM)
|
|
ssl_scache_dbm_status(r, flags, r->pool);
|
|
else if (sc->mc->nSessionCacheMode == SSL_SCMODE_SHMCB)
|
|
ssl_scache_shmcb_status(r, flags, r->pool);
|
|
#ifdef HAVE_DISTCACHE
|
|
else if (sc->mc->nSessionCacheMode == SSL_SCMODE_DC)
|
|
ssl_scache_dc_status(r, flags, r->pool);
|
|
#endif
|
|
|
|
ap_rputs("</td></tr>\n", r);
|
|
ap_rputs("</table>\n", r);
|
|
return OK;
|
|
}
|
|
|
|
void ssl_scache_status_register(apr_pool_t *p)
|
|
{
|
|
APR_OPTIONAL_HOOK(ap, status_hook, ssl_ext_status_hook, NULL, NULL,
|
|
APR_HOOK_MIDDLE);
|
|
}
|
|
|