mirror of
https://github.com/apache/httpd.git
synced 2025-08-13 14:40:20 +00:00
fb38ad47ec
step towards use of the ap_provider interface: * modules/ssl/ssl_private.h (modssl_sesscache_provider): Add new vtable type. (SSLModConfigRec): Reference the vtable here. Replace all the ssl_scache_* prototypes with provider vtable objects. * modules/ssl/ssl_scache.c (ssl_scache_init, ssl_scache_kill, ssl_scache_retrieve, ssl_scache_store, ssl_scache_remove, ssl_ext_status_hook): Use callbacks from vtable rather than ifdef spaghetti. * modules/ssl/ssl_engine_init.c (ssl_init_ctx_session_cache): Only install the OpenSSL callbacks if a vtable is configured. * modules/ssl/ssl_engine_config.c (ssl_cmd_SSLSessionCache): Set up vtable pointer. * modules/ssl/ssl_scache_dc.c, modules/ssl_scache_mc.c: Adjust to make implementations static, and add vtable definition. * modules/ssl_scache_shmcb.c: Likewise; also move the init one-per-process requirement down here. * modules/ssl_scache_dbm.c: Likewise; also (temporarily) use a local subpool in the store callback. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@630163 13f79535-47bb-0310-9956-ffa450edef68
124 lines
3.9 KiB
C
124 lines
3.9 KiB
C
/* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed with
|
|
* this work for additional information regarding copyright ownership.
|
|
* The ASF licenses this file to You 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->sesscache == NULL) {
|
|
ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s,
|
|
"Init: Session Cache is not configured "
|
|
"[hint: SSLSessionCache]");
|
|
return;
|
|
}
|
|
|
|
mc->sesscache->init(s, p);
|
|
}
|
|
|
|
void ssl_scache_kill(server_rec *s)
|
|
{
|
|
SSLModConfigRec *mc = myModConfig(s);
|
|
|
|
mc->sesscache->destroy(s);
|
|
}
|
|
|
|
BOOL ssl_scache_store(server_rec *s, UCHAR *id, int idlen,
|
|
time_t expiry, SSL_SESSION *sess,
|
|
apr_pool_t *p)
|
|
{
|
|
SSLModConfigRec *mc = myModConfig(s);
|
|
|
|
return mc->sesscache->store(s, id, idlen, expiry, sess);
|
|
}
|
|
|
|
SSL_SESSION *ssl_scache_retrieve(server_rec *s, UCHAR *id, int idlen,
|
|
apr_pool_t *p)
|
|
{
|
|
SSLModConfigRec *mc = myModConfig(s);
|
|
|
|
return mc->sesscache->retrieve(s, id, idlen, p);
|
|
}
|
|
|
|
void ssl_scache_remove(server_rec *s, UCHAR *id, int idlen,
|
|
apr_pool_t *p)
|
|
{
|
|
SSLModConfigRec *mc = myModConfig(s);
|
|
|
|
mc->sesscache->delete(s, id, idlen, p);
|
|
|
|
return;
|
|
}
|
|
|
|
/* _________________________________________________________________
|
|
**
|
|
** SSL Extension to mod_status
|
|
** _________________________________________________________________
|
|
*/
|
|
static int ssl_ext_status_hook(request_rec *r, int flags)
|
|
{
|
|
SSLModConfigRec *mc = myModConfig(r->server);
|
|
|
|
if (mc == 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);
|
|
|
|
mc->sesscache->status(r, flags, r->pool);
|
|
|
|
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);
|
|
}
|
|
|