costin 01/11/26 09:03:25
Modified: jk/native/common jk_ajp14.c
Added: jk/native/common jk_handler_discovery.c jk_handler_logon.c
Log:
Moved the discovery and logon code in separate file. This simplifies Ajp14.c - it'll
just
contain ajp-related code - and prepares for a more flexible message handling
mechansim.
Another benefit ( after abstraction of marshalling ) is that the code will be
reusable with
different other wire protocols.
Revision Changes Path
1.15 +1 -471 jakarta-tomcat-connectors/jk/native/common/jk_ajp14.c
Index: jk_ajp14.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp14.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jk_ajp14.c 2001/10/13 18:42:51 1.14
+++ jk_ajp14.c 2001/11/26 17:03:25 1.15
@@ -59,7 +59,7 @@
/***************************************************************************
* Description: Next generation bi-directional protocol handler. *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.14 $ *
+ * Version: $Revision: 1.15 $ *
***************************************************************************/
@@ -70,191 +70,7 @@
#include "jk_ajp14.h"
#include "jk_md5.h"
-/*
- * Compute the MD5 with ENTROPY / SECRET KEY
- */
-
-void ajp14_compute_md5(jk_login_service_t *s,
- jk_logger_t *l)
-{
- jk_md5((const unsigned char *)s->entropy, (const unsigned char
*)s->secret_key, s->computed_key);
-
- jk_log(l, JK_LOG_DEBUG, "Into ajp14_compute_md5 (%s/%s) -> (%s)\n",
s->entropy, s->secret_key, s->computed_key);
-}
-
-
-/*
- * Build the Login Init Command
- *
- *
+-------------------------+---------------------------+---------------------------+
- * | LOGIN INIT CMD (1 byte) | NEGOCIATION DATA (32bits) | WEB SERVER INFO
(CString) |
- *
+-------------------------+---------------------------+---------------------------+
- *
- */
-
-int ajp14_marshal_login_init_into_msgb(jk_msg_buf_t *msg,
- jk_login_service_t *s,
- jk_logger_t *l)
-{
- jk_log(l, JK_LOG_DEBUG, "Into ajp14_marshal_login_init_into_msgb\n");
-
- /* To be on the safe side */
- jk_b_reset(msg);
-
- /*
- * LOGIN
- */
- if (jk_b_append_byte(msg, AJP14_LOGINIT_CMD))
- return JK_FALSE;
-
- /*
- * NEGOCIATION FLAGS
- */
- if (jk_b_append_long(msg, s->negociation))
- return JK_FALSE;
-
- /*
- * WEB-SERVER NAME
- */
- if (jk_b_append_string(msg, s->web_server_name)) {
- jk_log(l, JK_LOG_ERROR, "Error ajp14_marshal_login_init_into_msgb - Error
appending the web_server_name string\n");
- return JK_FALSE;
- }
-
- return JK_TRUE;
-}
-
-
-/*
- * Decode the Login Seed Command
- *
- * +-------------------------+---------------------------+
- * | LOGIN SEED CMD (1 byte) | MD5 of entropy (32 chars) |
- * +-------------------------+---------------------------+
- *
- */
-
-int ajp14_unmarshal_login_seed(jk_msg_buf_t *msg,
- jk_login_service_t *s,
- jk_logger_t *l)
-{
- if (jk_b_get_bytes(msg, (unsigned char *)s->entropy, AJP14_ENTROPY_SEED_LEN) <
0) {
- jk_log(l, JK_LOG_ERROR, "Error ajp14_unmarshal_login_seed - can't get
seed\n");
- return JK_FALSE;
- }
- s->entropy[AJP14_ENTROPY_SEED_LEN] = 0; /* Just to have a CString */
- return JK_TRUE;
-}
-
-/*
- * Build the Login Computed Command
- *
- * +-------------------------+---------------------------------------+
- * | LOGIN COMP CMD (1 byte) | MD5 of RANDOM + SECRET KEY (32 chars) |
- * +-------------------------+---------------------------------------+
- *
- */
-
-int ajp14_marshal_login_comp_into_msgb(jk_msg_buf_t *msg,
- jk_login_service_t *s,
- jk_logger_t *l)
-{
- jk_log(l, JK_LOG_DEBUG, "Into ajp14_marshal_login_comp_into_msgb\n");
-
- /* To be on the safe side */
- jk_b_reset(msg);
-
- /*
- * LOGIN
- */
- if (jk_b_append_byte(msg, AJP14_LOGCOMP_CMD))
- return JK_FALSE;
-
- /*
- * COMPUTED-SEED
- */
- if (jk_b_append_bytes(msg, (const unsigned char *)s->computed_key,
AJP14_COMPUTED_KEY_LEN)) {
- jk_log(l, JK_LOG_ERROR, "Error ajp14_marshal_login_comp_into_msgb - Error
appending the COMPUTED MD5 bytes\n");
- return JK_FALSE;
- }
-
- return JK_TRUE;
-}
-
-
-/*
- * Decode the LogOk Command
- *
- * +--------------------+------------------------+-------------------------------+
- * | LOGOK CMD (1 byte) | NEGOCIED DATA (32bits) | SERVLET ENGINE INFO (CString) |
- * +--------------------+------------------------+-------------------------------+
- *
- */
-
-int ajp14_unmarshal_log_ok(jk_msg_buf_t *msg,
- jk_login_service_t *s,
- jk_logger_t *l)
-{
- unsigned long nego;
- char * sname;
-
- nego = jk_b_get_long(msg);
-
- if (nego == 0xFFFFFFFF) {
- jk_log(l, JK_LOG_ERROR, "Error ajp14_unmarshal_log_ok - can't get
negociated data\n");
- return JK_FALSE;
- }
-
- sname = (char *)jk_b_get_string(msg);
-
- if (! sname) {
- jk_log(l, JK_LOG_ERROR, "Error ajp14_unmarshal_log_ok - can't get
servlet engine name\n");
- return JK_FALSE;
- }
-
- if (s->servlet_engine_name) /* take care of removing
previously allocated data */
- free(s->servlet_engine_name);
-
- s->servlet_engine_name = strdup(sname);
-
- if (! s->servlet_engine_name) {
- jk_log(l, JK_LOG_ERROR, "Error ajp14_unmarshal_log_ok - can't malloc
servlet engine name\n");
- return JK_FALSE;
- }
-
- return JK_TRUE;
-}
-
-
-/*
- * Decode the Log Nok Command
- *
- * +---------------------+-----------------------+
- * | LOGNOK CMD (1 byte) | FAILURE CODE (32bits) |
- * +---------------------+-----------------------+
- *
- */
-
-int ajp14_unmarshal_log_nok(jk_msg_buf_t *msg,
- jk_logger_t *l)
-{
- unsigned long status;
-
- jk_log(l, JK_LOG_DEBUG, "Into ajp14_unmarshal_log_nok\n");
-
- status = jk_b_get_long(msg);
-
- if (status == 0xFFFFFFFF) {
- jk_log(l, JK_LOG_ERROR, "Error ajp14_unmarshal_log_nok - can't get failure
code\n");
- return JK_FALSE;
- }
-
- jk_log(l, JK_LOG_INFO, "Can't Log with servlet engine - code %08lx", status);
- return JK_TRUE;
-}
-
-
/*
* Build the Shutdown Cmd
*
@@ -356,291 +172,5 @@
}
return JK_TRUE;
-}
-
-/*
- * Build the Context Query Cmd (autoconf)
- *
- * +--------------------------+---------------------------------+
- * | CONTEXT QRY CMD (1 byte) | VIRTUAL HOST NAME (CString (*)) |
- * +--------------------------+---------------------------------+
- *
- */
-
-int ajp14_marshal_context_query_into_msgb(jk_msg_buf_t *msg,
- char
*virtual,
-
jk_logger_t *l)
-{
- jk_log(l, JK_LOG_DEBUG, "Into ajp14_marshal_context_query_into_msgb\n");
-
- /* To be on the safe side */
- jk_b_reset(msg);
-
- /*
- * CONTEXT QUERY CMD
- */
- if (jk_b_append_byte(msg, AJP14_CONTEXT_QRY_CMD))
- return JK_FALSE;
-
- /*
- * VIRTUAL HOST CSTRING
- */
- if (jk_b_append_string(msg, virtual)) {
- jk_log(l, JK_LOG_ERROR, "Error ajp14_marshal_context_query_into_msgb -
Error appending the virtual host string\n");
- return JK_FALSE;
- }
-
- return JK_TRUE;
-}
-
-
-/*
- * Decode the Context Info Cmd (Autoconf)
- *
- * The Autoconf feature of AJP14, let us know which URL/URI could
- * be handled by the servlet-engine
- *
- *
+---------------------------+---------------------------------+----------------------------+-------------------------------+-----------+
- * | CONTEXT INFO CMD (1 byte) | VIRTUAL HOST NAME (CString (*)) | CONTEXT NAME
(CString (*)) | URL1 [\n] URL2 [\n] URL3 [\n] | NEXT CTX. |
- *
+---------------------------+---------------------------------+----------------------------+-------------------------------+-----------+
- */
-
-int ajp14_unmarshal_context_info(jk_msg_buf_t *msg,
- jk_context_t *c,
- jk_logger_t *l)
-{
- char *vname;
- char *cname;
- char *uri;
-
- vname = (char *)jk_b_get_string(msg);
-
- jk_log(l, JK_LOG_DEBUG, "ajp14_unmarshal_context_info - get virtual %s for
virtual %s\n", vname, c->virtual);
-
- if (! vname) {
- jk_log(l, JK_LOG_ERROR, "Error ajp14_unmarshal_context_info - can't get
virtual hostname\n");
- return JK_FALSE;
- }
-
- /* Check if we get the correct virtual host */
- if (c->virtual != NULL &&
- vname != NULL &&
- strcmp(c->virtual, vname)) {
- /* set the virtual name, better to add to a virtual list ? */
-
- if (context_set_virtual(c, vname) == JK_FALSE) {
- jk_log(l, JK_LOG_ERROR, "Error ajp14_unmarshal_context_info - can't
malloc virtual hostname\n");
- return JK_FALSE;
- }
- }
-
- for (;;) {
-
- cname = (char *)jk_b_get_string(msg);
-
- if (! cname) {
- jk_log(l, JK_LOG_ERROR, "Error ajp14_unmarshal_context_info - can't get
context\n");
- return JK_FALSE;
- }
-
- jk_log(l, JK_LOG_DEBUG, "ajp14_unmarshal_context_info - get context %s for
virtual %s\n", cname, vname);
-
- /* grab all contexts up to empty one which indicate end of contexts */
- if (! strlen(cname))
- break;
-
- /* create new context base (if needed) */
-
- if (context_add_base(c, cname) == JK_FALSE) {
- jk_log(l, JK_LOG_ERROR, "Error ajp14_unmarshal_context_info - can't
add/set context %s\n", cname);
- return JK_FALSE;
- }
-
- for (;;) {
-
- uri = (char *)jk_b_get_string(msg);
-
- if (!uri) {
- jk_log(l, JK_LOG_ERROR, "Error ajp14_unmarshal_context_info - can't
get URI\n");
- return JK_FALSE;
- }
-
- if (! strlen(uri)) {
- jk_log(l, JK_LOG_DEBUG, "No more URI for context %s",
cname);
- break;
- }
-
- jk_log(l, JK_LOG_INFO, "Got URI (%s) for virtualhost %s and
context %s\n", uri, vname, cname);
-
- if (context_add_uri(c, cname, uri) == JK_FALSE) {
- jk_log(l, JK_LOG_ERROR, "Error ajp14_unmarshal_context_info - can't
add/set uri (%s) for context %s\n", uri, cname);
- return JK_FALSE;
- }
- }
- }
-
- return JK_TRUE;
-}
-
-
-/*
- * Build the Context State Query Cmd
- *
- * We send the list of contexts where we want to know state, empty string end
context list*
- * If cname is set, only ask about THIS context
- *
- *
+----------------------------+----------------------------------+----------------------------+----+
- * | CONTEXT STATE CMD (1 byte) | VIRTUAL HOST NAME (CString (*)) | CONTEXT NAME
(CString (*)) | .. |
- *
+----------------------------+----------------------------------+----------------------------+----+
- *
- */
-
-int ajp14_marshal_context_state_into_msgb(jk_msg_buf_t *msg,
- jk_context_t *c,
- char *cname,
- jk_logger_t *l)
-{
- jk_context_item_t *ci;
- int i;
-
- jk_log(l, JK_LOG_DEBUG, "Into ajp14_marshal_context_state_into_msgb\n");
-
- /* To be on the safe side */
- jk_b_reset(msg);
-
- /*
- * CONTEXT STATE CMD
- */
- if (jk_b_append_byte(msg, AJP14_CONTEXT_STATE_CMD))
- return JK_FALSE;
-
- /*
- * VIRTUAL HOST CSTRING
- */
- if (jk_b_append_string(msg, c->virtual)) {
- jk_log(l, JK_LOG_ERROR, "Error ajp14_marshal_context_state_into_msgb -
Error appending the virtual host string\n");
- return JK_FALSE;
- }
-
- if (cname) {
-
- ci = context_find_base(c, cname);
-
- if (! ci) {
- jk_log(l, JK_LOG_ERROR, "Warning ajp14_marshal_context_state_into_msgb
- unknown context %s\n", cname);
- return JK_FALSE;
- }
-
- /*
- * CONTEXT CSTRING
- */
-
- if (jk_b_append_string(msg, cname )) {
- jk_log(l, JK_LOG_ERROR, "Error ajp14_marshal_context_state_into_msgb -
Error appending the context string %s\n", cname);
- return JK_FALSE;
- }
- }
- else { /* Grab all contexts name */
-
- for (i = 0; i < c->size; i++) {
-
- /*
- * CONTEXT CSTRING
- */
- if (jk_b_append_string(msg, c->contexts[i]->cbase )) {
- jk_log(l, JK_LOG_ERROR, "Error
ajp14_marshal_context_state_into_msgb - Error appending the context string\n");
- return JK_FALSE;
- }
- }
- }
-
- /* End of context list, an empty string */
-
- if (jk_b_append_string(msg, "")) {
- jk_log(l, JK_LOG_ERROR, "Error ajp14_marshal_context_state_into_msgb -
Error appending end of contexts\n");
- return JK_FALSE;
- }
-
- return JK_TRUE;
-}
-
-
-/*
- * Decode the Context State Reply Cmd
- *
- * We get update of contexts list, empty string end context list*
- *
- *
+----------------------------------+---------------------------------+----------------------------+------------------+----+
- * | CONTEXT STATE REPLY CMD (1 byte) | VIRTUAL HOST NAME (CString (*)) | CONTEXT
NAME (CString (*)) | UP/DOWN (1 byte) | .. |
- *
+----------------------------------+---------------------------------+----------------------------+------------------+----+
- *
- */
-
-int ajp14_unmarshal_context_state_reply(jk_msg_buf_t *msg,
-
jk_context_t *c,
- jk_logger_t *l)
-{
- char *vname;
- char *cname;
- jk_context_item_t *ci;
-
- /* get virtual name */
- vname = (char *)jk_b_get_string(msg);
-
- if (! vname) {
- jk_log(l, JK_LOG_ERROR, "Error ajp14_unmarshal_context_state_reply - can't
get virtual hostname\n");
- return JK_FALSE;
- }
-
- /* Check if we speak about the correct virtual */
- if (strcmp(c->virtual, vname)) {
- jk_log(l, JK_LOG_ERROR, "Error ajp14_unmarshal_context_state_reply -
incorrect virtual %s instead of %s\n",
- vname, c->virtual);
- return JK_FALSE;
- }
-
- for (;;) {
-
- /* get context name */
- cname = (char *)jk_b_get_string(msg);
-
- if (! cname) {
- jk_log(l, JK_LOG_ERROR, "Error ajp14_unmarshal_context_state_reply
- can't get context\n");
- return JK_FALSE;
- }
-
- if (! strlen(cname))
- break;
-
- ci = context_find_base(c, cname);
-
- if (! ci) {
- jk_log(l, JK_LOG_ERROR, "Error ajp14_unmarshal_context_state_reply -
unknow context %s for virtual %s\n",
- cname, vname);
- return JK_FALSE;
- }
-
- ci->status = jk_b_get_int(msg);
-
- jk_log(l, JK_LOG_DEBUG, "ajp14_unmarshal_context_state_reply - updated
context %s to state %d\n", cname, ci->status);
- }
-
- return JK_TRUE;
-}
-
-/*
- * Decode the Context Update Cmd
- *
- *
+-----------------------------+---------------------------------+----------------------------+------------------+
- * | CONTEXT UPDATE CMD (1 byte) | VIRTUAL HOST NAME (CString (*)) | CONTEXT NAME
(CString (*)) | UP/DOWN (1 byte) |
- *
+-----------------------------+---------------------------------+----------------------------+------------------+
- *
- */
-
-int ajp14_unmarshal_context_update_cmd(jk_msg_buf_t *msg,
- jk_context_t *c,
- jk_logger_t *l)
-{
- return (ajp14_unmarshal_context_state_reply(msg, c, l));
}
1.1
jakarta-tomcat-connectors/jk/native/common/jk_handler_discovery.c
Index: jk_handler_discovery.c
===================================================================
/* ========================================================================= *
* *
* The Apache Software License, Version 1.1 *
* *
* Copyright (c) 1999-2001 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
* *
* Redistribution and use in source and binary forms, with or without modi- *
* fication, are permitted provided that the following conditions are met: *
* *
* 1. Redistributions of source code must retain the above copyright notice *
* notice, this list of conditions and the following disclaimer. *
* *
* 2. Redistributions in binary form must reproduce the above copyright *
* notice, this list of conditions and the following disclaimer in the *
* documentation and/or other materials provided with the distribution. *
* *
* 3. The end-user documentation included with the redistribution, if any, *
* must include the following acknowlegement: *
* *
* "This product includes software developed by the Apache Software *
* Foundation <http://www.apache.org/>." *
* *
* Alternately, this acknowlegement may appear in the software itself, if *
* and wherever such third-party acknowlegements normally appear. *
* *
* 4. The names "The Jakarta Project", "Jk", and "Apache Software *
* Foundation" must not be used to endorse or promote products derived *
* from this software without prior written permission. For written *
* permission, please contact <[EMAIL PROTECTED]>. *
* *
* 5. Products derived from this software may not be called "Apache" nor may *
* "Apache" appear in their names without prior written permission of the *
* Apache Software Foundation. *
* *
* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES *
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY *
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL *
* THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY *
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL *
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS *
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) *
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, *
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN *
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE *
* POSSIBILITY OF SUCH DAMAGE. *
* *
* ========================================================================= *
* *
* This software consists of voluntary contributions made by many indivi- *
* duals on behalf of the Apache Software Foundation. For more information *
* on the Apache Software Foundation, please see <http://www.apache.org/>. *
* *
* ========================================================================= */
/**
* Description: AJP14 Discovery handler
* Author: Henri Gomez <[EMAIL PROTECTED]>
* Version: $Revision: 1.1 $
*/
#include "jk_global.h"
#include "jk_context.h"
#include "jk_pool.h"
#include "jk_util.h"
#include "jk_msg_buff.h"
#include "jk_ajp_common.h"
#include "jk_ajp14.h"
#include "jk_logger.h"
#include "jk_service.h"
/*
* AJP14 Autoconf Phase
*
* CONTEXT QUERY / REPLY
*/
#define MAX_URI_SIZE 512
static int handle_discovery(ajp_endpoint_t *ae,
jk_worker_env_t *we,
jk_msg_buf_t *msg,
jk_logger_t *l)
{
int cmd;
int i,j;
jk_login_service_t *jl = ae->worker->login;
jk_context_item_t *ci;
jk_context_t *c;
char *buf;
#ifndef TESTME
ajp14_marshal_context_query_into_msgb(msg, we->virtual, l);
jk_log(l, JK_LOG_DEBUG, "Into ajp14:discovery - send query\n");
if (ajp_connection_tcp_send_message(ae, msg, l) != JK_TRUE)
return JK_FALSE;
jk_log(l, JK_LOG_DEBUG, "Into ajp14:discovery - wait context reply\n");
jk_b_reset(msg);
if (ajp_connection_tcp_get_message(ae, msg, l) != JK_TRUE)
return JK_FALSE;
if ((cmd = jk_b_get_byte(msg)) != AJP14_CONTEXT_INFO_CMD) {
jk_log(l, JK_LOG_ERROR,
"Error ajp14:discovery - awaited command %d, received %d\n",
AJP14_CONTEXT_INFO_CMD, cmd);
return JK_FALSE;
}
if (context_alloc(&c, we->virtual) != JK_TRUE) {
jk_log(l, JK_LOG_ERROR,
"Error ajp14:discovery - can't allocate context room\n");
return JK_FALSE;
}
if (ajp14_unmarshal_context_info(msg, c, l) != JK_TRUE) {
jk_log(l, JK_LOG_ERROR,
"Error ajp14:discovery - can't get context reply\n");
return JK_FALSE;
}
jk_log(l, JK_LOG_DEBUG, "Into ajp14:discovery - received context\n");
buf = malloc(MAX_URI_SIZE); /* Really a very long URI */
if (! buf) {
jk_log(l, JK_LOG_ERROR, "Error ajp14:discovery - can't alloc buf\n");
return JK_FALSE;
}
for (i = 0; i < c->size; i++) {
ci = c->contexts[i];
for (j = 0; j < ci->size; j++) {
#ifndef USE_SPRINTF
snprintf(buf, MAX_URI_SIZE - 1, "/%s/%s", ci->cbase, ci->uris[j]);
#else
sprintf(buf, "/%s/%s", ci->cbase, ci->uris[j]);
#endif
jk_log(l, JK_LOG_INFO,
"Into ajp14:discovery "
"- worker %s will handle uri %s in context %s [%s]\n",
ae->worker->name, ci->uris[j], ci->cbase, buf);
uri_worker_map_add(we->uri_to_worker, buf, ae->worker->name, l);
}
}
free(buf);
context_free(&c);
#else
uri_worker_map_add(we->uri_to_worker,
"/examples/servlet/*",
ae->worker->name, l);
uri_worker_map_add(we->uri_to_worker,
"/examples/*.jsp",
ae->worker->name, l);
uri_worker_map_add(we->uri_to_worker,
"/examples/*.gif",
ae->worker->name, l);
#endif
return JK_TRUE;
}
int discovery(ajp_endpoint_t *ae,
jk_worker_env_t *we,
jk_logger_t *l)
{
jk_pool_t *p = &ae->pool;
jk_msg_buf_t *msg;
int rc;
jk_log(l, JK_LOG_DEBUG, "Into ajp14:discovery\n");
msg = jk_b_new(p);
jk_b_set_buffer_size(msg, DEF_BUFFER_SZ);
if ((rc = handle_discovery(ae, we, msg, l)) == JK_FALSE)
ajp_close_endpoint(ae, l);
return rc;
}
/* -------------------- private utils/marshaling -------------------- */
/*
* Build the Context Query Cmd (autoconf)
*
* +--------------------------+---------------------------------+
* | CONTEXT QRY CMD (1 byte) | VIRTUAL HOST NAME (CString (*)) |
* +--------------------------+---------------------------------+
*
*/
int ajp14_marshal_context_query_into_msgb(jk_msg_buf_t *msg,
char *virtual,
jk_logger_t *l)
{
jk_log(l, JK_LOG_DEBUG, "Into ajp14_marshal_context_query_into_msgb\n");
/* To be on the safe side */
jk_b_reset(msg);
/*
* CONTEXT QUERY CMD
*/
if (jk_b_append_byte(msg, AJP14_CONTEXT_QRY_CMD))
return JK_FALSE;
/*
* VIRTUAL HOST CSTRING
*/
if (jk_b_append_string(msg, virtual)) {
jk_log(l, JK_LOG_ERROR,
"Error ajp14_marshal_context_query_into_msgb "
"- Error appending the virtual host string\n");
return JK_FALSE;
}
return JK_TRUE;
}
/*
* Decode the Context Info Cmd (Autoconf)
*
* The Autoconf feature of AJP14, let us know which URL/URI could
* be handled by the servlet-engine
*
* +---------------------------+---------------------------------+---------
* | CONTEXT INFO CMD (1 byte) | VIRTUAL HOST NAME (CString (*)) |
* +---------------------------+---------------------------------+---------
*
*-------------------+-------------------------------+-----------+
*CONTEXT NAME (CString (*)) | URL1 [\n] URL2 [\n] URL3 [\n] | NEXT CTX. |
*-------------------+-------------------------------+-----------+
*/
int ajp14_unmarshal_context_info(jk_msg_buf_t *msg,
jk_context_t *c,
jk_logger_t *l)
{
char *vname;
char *cname;
char *uri;
vname = (char *)jk_b_get_string(msg);
jk_log(l, JK_LOG_DEBUG,
"ajp14_unmarshal_context_info - get virtual %s for virtual %s\n",
vname, c->virtual);
if (! vname) {
jk_log(l, JK_LOG_ERROR,
"Error ajp14_unmarshal_context_info "
"- can't get virtual hostname\n");
return JK_FALSE;
}
/* Check if we get the correct virtual host */
if (c->virtual != NULL &&
vname != NULL &&
strcmp(c->virtual, vname)) {
/* set the virtual name, better to add to a virtual list ? */
if (context_set_virtual(c, vname) == JK_FALSE) {
jk_log(l, JK_LOG_ERROR,
"Error ajp14_unmarshal_context_info "
"- can't malloc virtual hostname\n");
return JK_FALSE;
}
}
for (;;) {
cname = (char *)jk_b_get_string(msg);
if (! cname) {
jk_log(l, JK_LOG_ERROR,
"Error ajp14_unmarshal_context_info - can't get context\n");
return JK_FALSE;
}
jk_log(l, JK_LOG_DEBUG, "ajp14_unmarshal_context_info "
"- get context %s for virtual %s\n", cname, vname);
/* grab all contexts up to empty one which indicate end of contexts */
if (! strlen(cname))
break;
/* create new context base (if needed) */
if (context_add_base(c, cname) == JK_FALSE) {
jk_log(l, JK_LOG_ERROR, "Error ajp14_unmarshal_context_info"
"- can't add/set context %s\n", cname);
return JK_FALSE;
}
for (;;) {
uri = (char *)jk_b_get_string(msg);
if (!uri) {
jk_log(l, JK_LOG_ERROR,
"Error ajp14_unmarshal_context_info - can't get URI\n");
return JK_FALSE;
}
if (! strlen(uri)) {
jk_log(l, JK_LOG_DEBUG, "No more URI for context %s", cname);
break;
}
jk_log(l, JK_LOG_INFO,
"Got URI (%s) for virtualhost %s and context %s\n",
uri, vname, cname);
if (context_add_uri(c, cname, uri) == JK_FALSE) {
jk_log(l, JK_LOG_ERROR,
"Error ajp14_unmarshal_context_info - "
"can't add/set uri (%s) for context %s\n", uri, cname);
return JK_FALSE;
}
}
}
return JK_TRUE;
}
/*
* Build the Context State Query Cmd
*
* We send the list of contexts where we want to know state,
* empty string end context list*
* If cname is set, only ask about THIS context
*
* +----------------------------+----------------------------------+----------
* | CONTEXT STATE CMD (1 byte) | VIRTUAL HOST NAME | CONTEXT NAME
* | (CString (*)) | (CString (*))
* +----------------------------+----------------------------------+----------
*
*/
int ajp14_marshal_context_state_into_msgb(jk_msg_buf_t *msg,
jk_context_t *c,
char *cname,
jk_logger_t *l)
{
jk_context_item_t *ci;
int i;
jk_log(l, JK_LOG_DEBUG, "Into ajp14_marshal_context_state_into_msgb\n");
/* To be on the safe side */
jk_b_reset(msg);
/*
* CONTEXT STATE CMD
*/
if (jk_b_append_byte(msg, AJP14_CONTEXT_STATE_CMD))
return JK_FALSE;
/*
* VIRTUAL HOST CSTRING
*/
if (jk_b_append_string(msg, c->virtual)) {
jk_log(l, JK_LOG_ERROR, "Error ajp14_marshal_context_state_into_msgb"
"- Error appending the virtual host string\n");
return JK_FALSE;
}
if (cname) {
ci = context_find_base(c, cname);
if (! ci) {
jk_log(l, JK_LOG_ERROR,
"Warning ajp14_marshal_context_state_into_msgb"
"- unknown context %s\n", cname);
return JK_FALSE;
}
/*
* CONTEXT CSTRING
*/
if (jk_b_append_string(msg, cname )) {
jk_log(l, JK_LOG_ERROR,
"Error ajp14_marshal_context_state_into_msgb"
"- Error appending the context string %s\n", cname);
return JK_FALSE;
}
} else { /* Grab all contexts name */
for (i = 0; i < c->size; i++) {
/*
* CONTEXT CSTRING
*/
if (jk_b_append_string(msg, c->contexts[i]->cbase )) {
jk_log(l, JK_LOG_ERROR,
"Error ajp14_marshal_context_state_into_msgb "
"- Error appending the context string\n");
return JK_FALSE;
}
}
}
/* End of context list, an empty string */
if (jk_b_append_string(msg, "")) {
jk_log(l, JK_LOG_ERROR,
"Error ajp14_marshal_context_state_into_msgb "
"- Error appending end of contexts\n");
return JK_FALSE;
}
return JK_TRUE;
}
/*
* Decode the Context State Reply Cmd
*
* We get update of contexts list, empty string end context list*
*
* +----------------------------------+---------------------------------+----
* | CONTEXT STATE REPLY CMD (1 byte) | VIRTUAL HOST NAME (CString (*)) |
* +----------------------------------+---------------------------------+----
*
*------------------------+------------------+----+
*CONTEXT NAME (CString (*)) | UP/DOWN (1 byte) | .. |
* ------------------------+------------------+----+
*/
int ajp14_unmarshal_context_state_reply(jk_msg_buf_t *msg,
jk_context_t *c,
jk_logger_t *l)
{
char *vname;
char *cname;
jk_context_item_t *ci;
/* get virtual name */
vname = (char *)jk_b_get_string(msg);
if (! vname) {
jk_log(l, JK_LOG_ERROR,
"Error ajp14_unmarshal_context_state_reply "
"- can't get virtual hostname\n");
return JK_FALSE;
}
/* Check if we speak about the correct virtual */
if (strcmp(c->virtual, vname)) {
jk_log(l, JK_LOG_ERROR,
"Error ajp14_unmarshal_context_state_reply"
"- incorrect virtual %s instead of %s\n",
vname, c->virtual);
return JK_FALSE;
}
for (;;) {
/* get context name */
cname = (char *)jk_b_get_string(msg);
if (! cname) {
jk_log(l, JK_LOG_ERROR,
"Error ajp14_unmarshal_context_state_reply"
"- can't get context\n");
return JK_FALSE;
}
if (! strlen(cname))
break;
ci = context_find_base(c, cname);
if (! ci) {
jk_log(l, JK_LOG_ERROR,
"Error ajp14_unmarshal_context_state_reply "
"- unknow context %s for virtual %s\n",
cname, vname);
return JK_FALSE;
}
ci->status = jk_b_get_int(msg);
jk_log(l, JK_LOG_DEBUG, "ajp14_unmarshal_context_state_reply "
"- updated context %s to state %d\n", cname, ci->status);
}
return JK_TRUE;
}
/*
* Decode the Context Update Cmd
*
* +-----------------------------+---------------------------------+------
* | CONTEXT UPDATE CMD (1 byte) | VIRTUAL HOST NAME (CString (*)) |
* +-----------------------------+---------------------------------+------
*
* ----------------------+------------------+
* CONTEXT NAME (CString (*)) | UP/DOWN (1 byte) |
* ----------------------+------------------+
*
*/
int ajp14_unmarshal_context_update_cmd(jk_msg_buf_t *msg,
jk_context_t *c,
jk_logger_t *l)
{
return (ajp14_unmarshal_context_state_reply(msg, c, l));
}
1.1 jakarta-tomcat-connectors/jk/native/common/jk_handler_logon.c
Index: jk_handler_logon.c
===================================================================
/* ========================================================================= *
* *
* The Apache Software License, Version 1.1 *
* *
* Copyright (c) 1999-2001 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
* *
* Redistribution and use in source and binary forms, with or without modi- *
* fication, are permitted provided that the following conditions are met: *
* *
* 1. Redistributions of source code must retain the above copyright notice *
* notice, this list of conditions and the following disclaimer. *
* *
* 2. Redistributions in binary form must reproduce the above copyright *
* notice, this list of conditions and the following disclaimer in the *
* documentation and/or other materials provided with the distribution. *
* *
* 3. The end-user documentation included with the redistribution, if any, *
* must include the following acknowlegement: *
* *
* "This product includes software developed by the Apache Software *
* Foundation <http://www.apache.org/>." *
* *
* Alternately, this acknowlegement may appear in the software itself, if *
* and wherever such third-party acknowlegements normally appear. *
* *
* 4. The names "The Jakarta Project", "Jk", and "Apache Software *
* Foundation" must not be used to endorse or promote products derived *
* from this software without prior written permission. For written *
* permission, please contact <[EMAIL PROTECTED]>. *
* *
* 5. Products derived from this software may not be called "Apache" nor may *
* "Apache" appear in their names without prior written permission of the *
* Apache Software Foundation. *
* *
* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES *
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY *
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL *
* THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY *
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL *
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS *
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) *
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, *
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN *
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE *
* POSSIBILITY OF SUCH DAMAGE. *
* *
* ========================================================================= *
* *
* This software consists of voluntary contributions made by many indivi- *
* duals on behalf of the Apache Software Foundation. For more information *
* on the Apache Software Foundation, please see <http://www.apache.org/>. *
* *
* ========================================================================= */
/**
* Description: AJP14 Login handler
* Author: Henri Gomez <[EMAIL PROTECTED]>
* Version: $Revision: 1.1 $
*/
#include "jk_global.h"
#include "jk_context.h"
#include "jk_pool.h"
#include "jk_util.h"
#include "jk_msg_buff.h"
#include "jk_ajp_common.h"
#include "jk_ajp14.h"
#include "jk_logger.h"
#include "jk_service.h"
/* Private definitions */
/*
* Initial Login Phase (web server -> servlet engine)
*/
#define AJP14_LOGINIT_CMD (unsigned char)0x10
/*
* Second Login Phase (servlet engine -> web server), md5 seed is received
*/
#define AJP14_LOGSEED_CMD (unsigned char)0x11
/*
* Third Login Phase (web server -> servlet engine), md5 of seed + secret is sent
*/
#define AJP14_LOGCOMP_CMD (unsigned char)0x12
/*
* Login Accepted (servlet engine -> web server)
*/
#define AJP14_LOGOK_CMD (unsigned char)0x13
/*
* Login Rejected (servlet engine -> web server), will be logged
*/
#define AJP14_LOGNOK_CMD (unsigned char)0x14
/* Private functions */
static void ajp14_compute_md5(jk_login_service_t *s,
jk_logger_t *l);
static int ajp14_marshal_login_init_into_msgb(jk_msg_buf_t *msg,
jk_login_service_t *s,
jk_logger_t *l);
static int ajp14_unmarshal_login_seed(jk_msg_buf_t *msg,
jk_login_service_t *s,
jk_logger_t *l);
static int ajp14_marshal_login_comp_into_msgb(jk_msg_buf_t *msg,
jk_login_service_t *s,
jk_logger_t *l);
static int ajp14_unmarshal_log_ok(jk_msg_buf_t *msg,
jk_login_service_t *s,
jk_logger_t *l);
static int ajp14_unmarshal_log_nok(jk_msg_buf_t *msg,
jk_logger_t *l);
/*
* AJP14 Logon Phase
*
* INIT + REPLY / NEGO + REPLY
*/
static int handle_logon(ajp_endpoint_t *ae,
jk_msg_buf_t *msg,
jk_logger_t *l)
{
int cmd;
jk_login_service_t *jl = ae->worker->login;
ajp14_marshal_login_init_into_msgb(msg, jl, l);
jk_log(l, JK_LOG_DEBUG, "Into ajp14:logon - send init\n");
if (ajp_connection_tcp_send_message(ae, msg, l) != JK_TRUE)
return JK_FALSE;
jk_log(l, JK_LOG_DEBUG, "Into ajp14:logon - wait init reply\n");
jk_b_reset(msg);
if (ajp_connection_tcp_get_message(ae, msg, l) != JK_TRUE)
return JK_FALSE;
if ((cmd = jk_b_get_byte(msg)) != AJP14_LOGSEED_CMD) {
jk_log(l, JK_LOG_ERROR,
"Error ajp14:logon: awaited command %d, received %d\n",
AJP14_LOGSEED_CMD, cmd);
return JK_FALSE;
}
if (ajp14_unmarshal_login_seed(msg, jl, l) != JK_TRUE)
return JK_FALSE;
jk_log(l, JK_LOG_DEBUG,
"Into ajp14:logon - received entropy %s\n", jl->entropy);
ajp14_compute_md5(jl, l);
if (ajp14_marshal_login_comp_into_msgb(msg, jl, l) != JK_TRUE)
return JK_FALSE;
if (ajp_connection_tcp_send_message(ae, msg, l) != JK_TRUE)
return JK_FALSE;
jk_b_reset(msg);
if (ajp_connection_tcp_get_message(ae, msg, l) != JK_TRUE)
return JK_FALSE;
switch (jk_b_get_byte(msg)) {
case AJP14_LOGOK_CMD :
if (ajp14_unmarshal_log_ok(msg, jl, l) == JK_TRUE) {
jk_log(l, JK_LOG_DEBUG,
"Successfully connected to servlet-engine %s\n",
jl->servlet_engine_name);
return JK_TRUE;
}
break;
case AJP14_LOGNOK_CMD :
ajp14_unmarshal_log_nok(msg, l);
break;
}
return JK_FALSE;
}
int logon(ajp_endpoint_t *ae,
jk_logger_t *l)
{
jk_pool_t *p = &ae->pool;
jk_msg_buf_t *msg;
int rc;
jk_log(l, JK_LOG_DEBUG, "Into ajp14:logon\n");
msg = jk_b_new(p);
jk_b_set_buffer_size(msg, DEF_BUFFER_SZ);
if ((rc = handle_logon(ae, msg, l)) == JK_FALSE)
ajp_close_endpoint(ae, l);
return rc;
}
/* -------------------- private utils/marshaling -------------------- */
/*
* Compute the MD5 with ENTROPY / SECRET KEY
*/
static void ajp14_compute_md5(jk_login_service_t *s,
jk_logger_t *l)
{
jk_md5((const unsigned char *)s->entropy,
(const unsigned char *)s->secret_key, s->computed_key);
jk_log(l, JK_LOG_DEBUG,
"Into ajp14_compute_md5 (%s/%s) -> (%s)\n",
s->entropy, s->secret_key, s->computed_key);
}
/*
* Build the Login Init Command
*
* +-------------------------+---------------------------+-------------------
* | LOGIN INIT CMD (1 byte) | NEGOCIATION DATA (32bits) | WEB SERVER INFO
* | | | (CString)
* +-------------------------+---------------------------+-------------------
*
*/
static int ajp14_marshal_login_init_into_msgb(jk_msg_buf_t *msg,
jk_login_service_t *s,
jk_logger_t *l)
{
jk_log(l, JK_LOG_DEBUG, "Into ajp14_marshal_login_init_into_msgb\n");
/* To be on the safe side */
jk_b_reset(msg);
/*
* LOGIN
*/
if (jk_b_append_byte(msg, AJP14_LOGINIT_CMD))
return JK_FALSE;
/*
* NEGOCIATION FLAGS
*/
if (jk_b_append_long(msg, s->negociation))
return JK_FALSE;
/*
* WEB-SERVER NAME
*/
if (jk_b_append_string(msg, s->web_server_name)) {
jk_log(l, JK_LOG_ERROR,
"Error ajp14_marshal_login_init_into_msgb "
"- Error appending the web_server_name string\n");
return JK_FALSE;
}
return JK_TRUE;
}
/*
* Decode the Login Seed Command
*
* +-------------------------+---------------------------+
* | LOGIN SEED CMD (1 byte) | MD5 of entropy (32 chars) |
* +-------------------------+---------------------------+
*
*/
static int ajp14_unmarshal_login_seed(jk_msg_buf_t *msg,
jk_login_service_t *s,
jk_logger_t *l)
{
if (jk_b_get_bytes(msg, (unsigned char *)s->entropy,
AJP14_ENTROPY_SEED_LEN) < 0) {
jk_log(l, JK_LOG_ERROR,
"Error ajp14_unmarshal_login_seed - can't get seed\n");
return JK_FALSE;
}
s->entropy[AJP14_ENTROPY_SEED_LEN] = 0; /* Just to have a CString */
return JK_TRUE;
}
/*
* Build the Login Computed Command
*
* +-------------------------+---------------------------------------+
* | LOGIN COMP CMD (1 byte) | MD5 of RANDOM + SECRET KEY (32 chars) |
* +-------------------------+---------------------------------------+
*
*/
static int ajp14_marshal_login_comp_into_msgb(jk_msg_buf_t *msg,
jk_login_service_t *s,
jk_logger_t *l)
{
jk_log(l, JK_LOG_DEBUG, "Into ajp14_marshal_login_comp_into_msgb\n");
/* To be on the safe side */
jk_b_reset(msg);
/*
* LOGIN
*/
if (jk_b_append_byte(msg, AJP14_LOGCOMP_CMD))
return JK_FALSE;
/*
* COMPUTED-SEED
*/
if (jk_b_append_bytes(msg, (const unsigned char *)s->computed_key,
AJP14_COMPUTED_KEY_LEN)) {
jk_log(l, JK_LOG_ERROR,
"Error ajp14_marshal_login_comp_into_msgb "
" - Error appending the COMPUTED MD5 bytes\n");
return JK_FALSE;
}
return JK_TRUE;
}
/*
* Decode the LogOk Command
*
* +--------------------+------------------------+---------------------------
* | LOGOK CMD (1 byte) | NEGOCIED DATA (32bits) | SERVLET ENGINE INFO(CString)
* +--------------------+------------------------+---------------------------
*
*/
static int ajp14_unmarshal_log_ok(jk_msg_buf_t *msg,
jk_login_service_t *s,
jk_logger_t *l)
{
unsigned long nego;
char * sname;
nego = jk_b_get_long(msg);
if (nego == 0xFFFFFFFF) {
jk_log(l, JK_LOG_ERROR,
"Error ajp14_unmarshal_log_ok - can't get negociated data\n");
return JK_FALSE;
}
sname = (char *)jk_b_get_string(msg);
if (! sname) {
jk_log(l, JK_LOG_ERROR,
"Error ajp14_unmarshal_log_ok - "
"can't get servlet engine name\n");
return JK_FALSE;
}
/* take care of removing previously allocated data */
if (s->servlet_engine_name)
free(s->servlet_engine_name);
s->servlet_engine_name = strdup(sname);
if (! s->servlet_engine_name) {
jk_log(l, JK_LOG_ERROR,
"Error ajp14_unmarshal_log_ok - "
" can't malloc servlet engine name\n");
return JK_FALSE;
}
return JK_TRUE;
}
/*
* Decode the Log Nok Command
*
* +---------------------+-----------------------+
* | LOGNOK CMD (1 byte) | FAILURE CODE (32bits) |
* +---------------------+-----------------------+
*
*/
static int ajp14_unmarshal_log_nok(jk_msg_buf_t *msg,
jk_logger_t *l)
{
unsigned long status;
jk_log(l, JK_LOG_DEBUG, "Into ajp14_unmarshal_log_nok\n");
status = jk_b_get_long(msg);
if (status == 0xFFFFFFFF) {
jk_log(l, JK_LOG_ERROR,
"Error ajp14_unmarshal_log_nok - can't get failure code\n");
return JK_FALSE;
}
jk_log(l, JK_LOG_INFO,
"Can't Log with servlet engine - code %08lx", status);
return JK_TRUE;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
