-/*
- * Copyright 1999-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
+/* 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
+ * 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.
+ * 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.
*/
#include "ajp_header.h"
#include "ajp.h"
+APLOG_USE_MODULE(proxy_ajp);
+
static const char *response_trans_headers[] = {
- "Content-Type",
- "Content-Language",
- "Content-Length",
- "Date",
- "Last-Modified",
- "Location",
- "Set-Cookie",
- "Set-Cookie2",
- "Servlet-Engine",
- "Status",
+ "Content-Type",
+ "Content-Language",
+ "Content-Length",
+ "Date",
+ "Last-Modified",
+ "Location",
+ "Set-Cookie",
+ "Set-Cookie2",
+ "Servlet-Engine",
+ "Status",
"WWW-Authenticate"
};
-static const char *long_res_header_for_sc(int sc)
+static const char *long_res_header_for_sc(int sc)
{
const char *rc = NULL;
sc = sc & 0X00FF;
- if(sc <= SC_RES_HEADERS_NUM && sc > 0) {
+ if (sc <= SC_RES_HEADERS_NUM && sc > 0) {
rc = response_trans_headers[sc - 1];
}
const char *p = header_name;
int i = 0;
- /* ACCEPT-LANGUAGE is the longest headeer
+ /* ACCEPT-LANGUAGE is the longest header
* that is of interest.
*/
if (len < 4 || len > 15)
return UNKNOWN_METHOD;
-
+
while (*p)
header[i++] = apr_toupper(*p++);
header[i] = '\0';
return SC_ACCEPT;
else if (header[6] == '-') {
p += 6;
- if (memcmp(p, "CHARSET", 7) == 0)
+ if (strcmp(p, "CHARSET") == 0)
return SC_ACCEPT_CHARSET;
- else if (memcmp(p, "ENCODING", 8) == 0)
+ else if (strcmp(p, "ENCODING") == 0)
return SC_ACCEPT_ENCODING;
- else if (memcmp(p, "LANGUAGE", 8) == 0)
+ else if (strcmp(p, "LANGUAGE") == 0)
return SC_ACCEPT_LANGUAGE;
else
return UNKNOWN_METHOD;
else
return UNKNOWN_METHOD;
}
- else if (memcmp(p, "UTHORIZATION", 12) == 0)
+ else if (strcmp(p, "UTHORIZATION") == 0)
return SC_AUTHORIZATION;
else
return UNKNOWN_METHOD;
break;
case 'C':
- if (memcmp(p, "OOKIE", 5) == 0)
+ if (strcmp(p, "OOKIE2") == 0)
+ return SC_COOKIE2;
+ else if (strcmp(p, "OOKIE") == 0)
return SC_COOKIE;
- else if(memcmp(p, "ONNECTION", 9) == 0)
+ else if (strcmp(p, "ONNECTION") == 0)
return SC_CONNECTION;
- else if(memcmp(p, "ONTENT-TYPE", 11) == 0)
+ else if (strcmp(p, "ONTENT-TYPE") == 0)
return SC_CONTENT_TYPE;
- else if(memcmp(p, "ONTENT-LENGTH", 13) == 0)
+ else if (strcmp(p, "ONTENT-LENGTH") == 0)
return SC_CONTENT_LENGTH;
- else if(memcmp(p, "OOKIE2", 6) == 0)
- return SC_COOKIE2;
else
return UNKNOWN_METHOD;
break;
case 'H':
- if(memcmp(p, "OST", 3) == 0)
+ if (strcmp(p, "OST") == 0)
return SC_HOST;
else
return UNKNOWN_METHOD;
break;
case 'P':
- if(memcmp(p, "RAGMA", 5) == 0)
+ if (strcmp(p, "RAGMA") == 0)
return SC_PRAGMA;
else
return UNKNOWN_METHOD;
break;
case 'R':
- if(memcmp(p, "EFERER", 6) == 0)
+ if (strcmp(p, "EFERER") == 0)
return SC_REFERER;
else
return UNKNOWN_METHOD;
break;
case 'U':
- if(memcmp(p, "SER-AGENT", 9) == 0)
+ if (strcmp(p, "SER-AGENT") == 0)
return SC_USER_AGENT;
else
return UNKNOWN_METHOD;
SC_M_PUT,
SC_M_POST,
SC_M_DELETE,
- 0, /* M_DELETE */
+ 0, /* M_CONNECT */
SC_M_OPTIONS,
SC_M_TRACE,
0, /* M_PATCH */
SC_M_MKWORKSPACE,
SC_M_MKACTIVITY,
SC_M_BASELINE_CONTROL,
- SC_M_MERGE,
+ SC_M_MERGE,
0 /* M_INVALID */
};
-static int sc_for_req_method_by_id(int method_id)
+static int sc_for_req_method_by_id(request_rec *r)
{
- if (method_id < 0 || method_id > M_INVALID)
+ int method_id = r->method_number;
+ if (method_id < 0 || method_id > M_INVALID) {
return UNKNOWN_METHOD;
- else
+ }
+ else if (r->header_only) {
+ return SC_M_HEAD;
+ }
+ else {
return sc_for_req_method_table[method_id] ?
sc_for_req_method_table[method_id] : UNKNOWN_METHOD;
+ }
}
/*
*/
-static apr_status_t ajp_marshal_into_msgb(ajp_msg_t *msg,
- request_rec *r)
+static apr_status_t ajp_marshal_into_msgb(ajp_msg_t *msg,
+ request_rec *r,
+ apr_uri_t *uri)
{
int method;
apr_uint32_t i, num_headers = 0;
apr_byte_t is_ssl;
char *remote_host;
- char *uri;
- const char *session_route;
+ const char *session_route, *envvar;
const apr_array_header_t *arr = apr_table_elts(r->subprocess_env);
const apr_table_entry_t *elts = (const apr_table_entry_t *)arr->elts;
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
- "Into ajp_marshal_into_msgb");
+ ap_log_rerror(APLOG_MARK, APLOG_TRACE8, 0, r, "Into ajp_marshal_into_msgb");
- if ((method = sc_for_req_method_by_id(r->method_number)) == UNKNOWN_METHOD) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
- "Error ajp_marshal_into_msgb - No such method %s",
+ if ((method = sc_for_req_method_by_id(r)) == UNKNOWN_METHOD) {
+ ap_log_rerror(APLOG_MARK, APLOG_TRACE8, 0, r, APLOGNO(02437)
+ "ajp_marshal_into_msgb - Sending unknown method %s as request attribute",
r->method);
- return APR_EGENERAL;
+ method = SC_M_JK_STORED;
}
- /* XXXX need something */
- is_ssl = (apr_byte_t) 0; /* s->is_ssl */
+ is_ssl = (apr_byte_t) ap_proxy_conn_is_https(r->connection);
if (r->headers_in && apr_table_elts(r->headers_in)) {
const apr_array_header_t *t = apr_table_elts(r->headers_in);
num_headers = t->nelts;
}
- remote_host = (char *)ap_get_remote_host(r->connection, r->per_dir_config, REMOTE_HOST, NULL);
-
- uri = apr_pstrdup(r->pool, r->uri);
- if (uri != NULL) {
- char *query_str = strchr(uri, '?');
- if (query_str != NULL) {
- *query_str = 0;
- }
- }
-
+ remote_host = (char *)ap_get_useragent_host(r, REMOTE_HOST, NULL);
ajp_msg_reset(msg);
if (ajp_msg_append_uint8(msg, CMD_AJP13_FORWARD_REQUEST) ||
- ajp_msg_append_uint8(msg, method) ||
+ ajp_msg_append_uint8(msg, (apr_byte_t) method) ||
ajp_msg_append_string(msg, r->protocol) ||
- ajp_msg_append_string(msg, uri) ||
- ajp_msg_append_string(msg, r->connection->remote_ip) ||
+ ajp_msg_append_string(msg, uri->path) ||
+ ajp_msg_append_string(msg, r->useragent_ip) ||
ajp_msg_append_string(msg, remote_host) ||
ajp_msg_append_string(msg, ap_get_server_name(r)) ||
ajp_msg_append_uint16(msg, (apr_uint16_t)r->connection->local_addr->port) ||
ajp_msg_append_uint8(msg, is_ssl) ||
ajp_msg_append_uint16(msg, (apr_uint16_t) num_headers)) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
- "Error ajp_marshal_into_msgb - "
- "Error appending the message begining");
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00968)
+ "ajp_marshal_into_msgb: "
+ "Error appending the message beginning");
return APR_EGENERAL;
}
if ((sc = sc_for_req_header(elts[i].key)) != UNKNOWN_METHOD) {
if (ajp_msg_append_uint16(msg, (apr_uint16_t)sc)) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
- "Error ajp_marshal_into_msgb - "
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00969)
+ "ajp_marshal_into_msgb: "
"Error appending the header name");
- return APR_EGENERAL;
+ return AJP_EOVERFLOW;
}
}
else {
if (ajp_msg_append_string(msg, elts[i].key)) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
- "Error ajp_marshal_into_msgb - "
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00970)
+ "ajp_marshal_into_msgb: "
"Error appending the header name");
- return APR_EGENERAL;
+ return AJP_EOVERFLOW;
}
}
-
+
if (ajp_msg_append_string(msg, elts[i].val)) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
- "Error ajp_marshal_into_msgb - "
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00971)
+ "ajp_marshal_into_msgb: "
"Error appending the header value");
- return APR_EGENERAL;
+ return AJP_EOVERFLOW;
}
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+ ap_log_rerror(APLOG_MARK, APLOG_TRACE5, 0, r,
"ajp_marshal_into_msgb: Header[%d] [%s] = [%s]",
i, elts[i].key, elts[i].val);
}
if (s->secret) {
if (ajp_msg_append_uint8(msg, SC_A_SECRET) ||
ajp_msg_append_string(msg, s->secret)) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(03228)
"Error ajp_marshal_into_msgb - "
"Error appending secret");
return APR_EGENERAL;
}
}
*/
-
+
if (r->user) {
if (ajp_msg_append_uint8(msg, SC_A_REMOTE_USER) ||
ajp_msg_append_string(msg, r->user)) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
- "Error ajp_marshal_into_msgb - "
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00972)
+ "ajp_marshal_into_msgb: "
"Error appending the remote user");
- return APR_EGENERAL;
+ return AJP_EOVERFLOW;
}
}
if (r->ap_auth_type) {
if (ajp_msg_append_uint8(msg, SC_A_AUTH_TYPE) ||
ajp_msg_append_string(msg, r->ap_auth_type)) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
- "Error ajp_marshal_into_msgb - "
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00973)
+ "ajp_marshal_into_msgb: "
"Error appending the auth type");
- return APR_EGENERAL;
+ return AJP_EOVERFLOW;
}
}
/* XXXX ebcdic (args converted?) */
- if (r->args) {
+ if (uri->query) {
if (ajp_msg_append_uint8(msg, SC_A_QUERY_STRING) ||
- ajp_msg_append_string(msg, r->args)) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
- "Error ajp_marshal_into_msgb - "
+ ajp_msg_append_string(msg, uri->query)) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00974)
+ "ajp_marshal_into_msgb: "
"Error appending the query string");
- return APR_EGENERAL;
+ return AJP_EOVERFLOW;
}
}
if ((session_route = apr_table_get(r->notes, "session-route"))) {
if (ajp_msg_append_uint8(msg, SC_A_JVM_ROUTE) ||
ajp_msg_append_string(msg, session_route)) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
- "Error ajp_marshal_into_msgb - "
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00975)
+ "ajp_marshal_into_msgb: "
"Error appending the jvm route");
- return APR_EGENERAL;
+ return AJP_EOVERFLOW;
}
}
-/* XXXX ignored for the moment
- if (s->ssl_cert_len) {
- if (ajp_msg_append_uint8(msg, SC_A_SSL_CERT) ||
- ajp_msg_append_string(msg, s->ssl_cert)) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
- "Error ajp_marshal_into_msgb - "
- "Error appending the SSL certificates");
- return APR_EGENERAL;
+/* XXX: Is the subprocess_env a right place?
+ * <Location /examples>
+ * ProxyPass ajp://remote:8009/servlets-examples
+ * SetEnv SSL_SESSION_ID CUSTOM_SSL_SESSION_ID
+ * </Location>
+ */
+ /*
+ * Only lookup SSL variables if we are currently running HTTPS.
+ * Furthermore ensure that only variables get set in the AJP message
+ * that are not NULL and not empty.
+ */
+ if (is_ssl) {
+ if ((envvar = ap_proxy_ssl_val(r->pool, r->server, r->connection, r,
+ AJP13_SSL_CLIENT_CERT_INDICATOR))
+ && envvar[0]) {
+ if (ajp_msg_append_uint8(msg, SC_A_SSL_CERT)
+ || ajp_msg_append_string(msg, envvar)) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00976)
+ "ajp_marshal_into_msgb: "
+ "Error appending the SSL certificates");
+ return AJP_EOVERFLOW;
+ }
}
- }
- if (s->ssl_cipher) {
- if (ajp_msg_append_uint8(msg, SC_A_SSL_CIPHER) ||
- ajp_msg_append_string(msg, s->ssl_cipher)) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
- "Error ajp_marshal_into_msgb - "
- "Error appending the SSL ciphers");
- return APR_EGENERAL;
+ if ((envvar = ap_proxy_ssl_val(r->pool, r->server, r->connection, r,
+ AJP13_SSL_CIPHER_INDICATOR))
+ && envvar[0]) {
+ if (ajp_msg_append_uint8(msg, SC_A_SSL_CIPHER)
+ || ajp_msg_append_string(msg, envvar)) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00977)
+ "ajp_marshal_into_msgb: "
+ "Error appending the SSL ciphers");
+ return AJP_EOVERFLOW;
+ }
+ }
+
+ if ((envvar = ap_proxy_ssl_val(r->pool, r->server, r->connection, r,
+ AJP13_SSL_SESSION_INDICATOR))
+ && envvar[0]) {
+ if (ajp_msg_append_uint8(msg, SC_A_SSL_SESSION)
+ || ajp_msg_append_string(msg, envvar)) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00978)
+ "ajp_marshal_into_msgb: "
+ "Error appending the SSL session");
+ return AJP_EOVERFLOW;
+ }
+ }
+
+ /* ssl_key_size is required by Servlet 2.3 API */
+ if ((envvar = ap_proxy_ssl_val(r->pool, r->server, r->connection, r,
+ AJP13_SSL_KEY_SIZE_INDICATOR))
+ && envvar[0]) {
+
+ if (ajp_msg_append_uint8(msg, SC_A_SSL_KEY_SIZE)
+ || ajp_msg_append_uint16(msg, (unsigned short) atoi(envvar))) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00979)
+ "ajp_marshal_into_msgb: "
+ "Error appending the SSL key size");
+ return APR_EGENERAL;
+ }
}
}
- if (s->ssl_session) {
- if (ajp_msg_append_uint8(msg, SC_A_SSL_SESSION) ||
- ajp_msg_append_string(msg, s->ssl_session)) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
- "Error ajp_marshal_into_msgb - "
- "Error appending the SSL session");
- return APR_EGENERAL;
+ /* If the method was unrecognized, encode it as an attribute */
+ if (method == SC_M_JK_STORED) {
+ if (ajp_msg_append_uint8(msg, SC_A_STORED_METHOD)
+ || ajp_msg_append_string(msg, r->method)) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02438)
+ "ajp_marshal_into_msgb: "
+ "Error appending the method '%s' as request attribute",
+ r->method);
+ return AJP_EOVERFLOW;
}
}
- */
-
- /*
- * ssl_key_size is required by Servlet 2.3 API
- * added support only in ajp14 mode
- * JFC removed: ae->proto == AJP14_PROTO
+ /* Forward the SSL protocol name.
+ * Modern Tomcat versions know how to retrieve
+ * the protocol name from this attribute.
*/
- /* XXXX ignored for the moment
- if (s->ssl_key_size != -1) {
- if (ajp_msg_append_uint8(msg, SC_A_SSL_KEY_SIZE) ||
- ajp_msg_append_uint16(msg, (unsigned short) s->ssl_key_size)) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
- "Error ajp_marshal_into_msgb - "
- "Error appending the SSL key size");
- return APR_EGENERAL;
+ if (is_ssl) {
+ if ((envvar = ap_proxy_ssl_val(r->pool, r->server, r->connection, r,
+ AJP13_SSL_PROTOCOL_INDICATOR))
+ && envvar[0]) {
+ const char *key = SC_A_SSL_PROTOCOL;
+ if (ajp_msg_append_uint8(msg, SC_A_REQ_ATTRIBUTE) ||
+ ajp_msg_append_string(msg, key) ||
+ ajp_msg_append_string(msg, envvar)) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02830)
+ "ajp_marshal_into_msgb: "
+ "Error appending attribute %s=%s",
+ key, envvar);
+ return AJP_EOVERFLOW;
+ }
+ }
+ }
+ /* Forward the remote port information, which was forgotten
+ * from the builtin data of the AJP 13 protocol.
+ * Since the servlet spec allows to retrieve it via getRemotePort(),
+ * we provide the port to the Tomcat connector as a request
+ * attribute. Modern Tomcat versions know how to retrieve
+ * the remote port from this attribute.
+ */
+ {
+ const char *key = SC_A_REQ_REMOTE_PORT;
+ char *val = apr_itoa(r->pool, r->useragent_addr->port);
+ if (ajp_msg_append_uint8(msg, SC_A_REQ_ATTRIBUTE) ||
+ ajp_msg_append_string(msg, key) ||
+ ajp_msg_append_string(msg, val)) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00980)
+ "ajp_marshal_into_msgb: "
+ "Error appending attribute %s=%s",
+ key, val);
+ return AJP_EOVERFLOW;
+ }
+ }
+ /* Forward the local ip address information, which was forgotten
+ * from the builtin data of the AJP 13 protocol.
+ * Since the servlet spec allows to retrieve it via getLocalAddr(),
+ * we provide the address to the Tomcat connector as a request
+ * attribute. Modern Tomcat versions know how to retrieve
+ * the local address from this attribute.
+ */
+ {
+ const char *key = SC_A_REQ_LOCAL_ADDR;
+ char *val = r->connection->local_ip;
+ if (ajp_msg_append_uint8(msg, SC_A_REQ_ATTRIBUTE) ||
+ ajp_msg_append_string(msg, key) ||
+ ajp_msg_append_string(msg, val)) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02646)
+ "ajp_marshal_into_msgb: "
+ "Error appending attribute %s=%s",
+ key, val);
+ return AJP_EOVERFLOW;
}
}
- */
/* Use the environment vars prefixed with AJP_
* and pass it to the header striping that prefix.
*/
if (ajp_msg_append_uint8(msg, SC_A_REQ_ATTRIBUTE) ||
ajp_msg_append_string(msg, elts[i].key + 4) ||
ajp_msg_append_string(msg, elts[i].val)) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
- "Error ajp_marshal_into_msgb - "
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00981)
+ "ajp_marshal_into_msgb: "
"Error appending attribute %s=%s",
elts[i].key, elts[i].val);
- return APR_EGENERAL;
+ return AJP_EOVERFLOW;
}
}
}
if (ajp_msg_append_uint8(msg, SC_A_ARE_DONE)) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
- "Error ajp_marshal_into_msgb - "
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00982)
+ "ajp_marshal_into_msgb: "
"Error appending the message end");
- return APR_EGENERAL;
+ return AJP_EOVERFLOW;
}
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
- "ajp_marshal_into_msgb - Done");
+ ap_log_rerror(APLOG_MARK, APLOG_TRACE8, 0, r,
+ "ajp_marshal_into_msgb: Done");
return APR_SUCCESS;
}
*body_chunk
terminator boolean <! -- recycle connection or not -->
-req_header_name :=
+req_header_name :=
sc_req_header_name | (string)
-res_header_name :=
+res_header_name :=
sc_res_header_name | (string)
header_value :=
*/
+static int addit_dammit(void *v, const char *key, const char *val)
+{
+ apr_table_addn(v, key, val);
+ return 1;
+}
-static apr_status_t ajp_unmarshal_response(ajp_msg_t *msg,
- request_rec *r)
+static apr_status_t ajp_unmarshal_response(ajp_msg_t *msg,
+ request_rec *r,
+ proxy_dir_conf *dconf)
{
apr_uint16_t status;
apr_status_t rc;
- char *ptr;
+ const char *ptr;
apr_uint16_t num_headers;
int i;
rc = ajp_msg_get_uint16(msg, &status);
if (rc != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
- "Error ajp_unmarshal_response - Null status");
- return APR_EGENERAL;
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00983)
+ "ajp_unmarshal_response: Null status");
+ return rc;
}
r->status = status;
rc = ajp_msg_get_string(msg, &ptr);
if (rc == APR_SUCCESS) {
- r->status_line = apr_psprintf(r->pool, "%d %s", status, ptr);
-#if defined(AS400) || defined(_OSD_POSIX)
- ap_xlate_proto_from_ascii(r->status_line, strlen(r->status_line));
+#if APR_CHARSET_EBCDIC /* copy only if we have to */
+ ptr = apr_pstrdup(r->pool, ptr);
+ ap_xlate_proto_from_ascii(ptr, strlen(ptr));
#endif
- } else {
+ r->status_line = apr_psprintf(r->pool, "%d %s", status, ptr);
+ }
+ else {
r->status_line = NULL;
}
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+ ap_log_rerror(APLOG_MARK, APLOG_TRACE4, 0, r,
"ajp_unmarshal_response: status = %d", status);
rc = ajp_msg_get_uint16(msg, &num_headers);
if (rc == APR_SUCCESS) {
- r->headers_out = apr_table_make(r->pool, num_headers);
- } else {
+ apr_table_t *save_table;
+
+ /* First, tuck away all already existing cookies */
+ /*
+ * Could optimize here, but just in case we want to
+ * also save other headers, keep this logic.
+ */
+ save_table = apr_table_make(r->pool, num_headers + 2);
+ apr_table_do(addit_dammit, save_table, r->headers_out,
+ "Set-Cookie", NULL);
+ r->headers_out = save_table;
+ }
+ else {
r->headers_out = NULL;
num_headers = 0;
}
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+ ap_log_rerror(APLOG_MARK, APLOG_TRACE4, 0, r,
"ajp_unmarshal_response: Number of headers is = %d",
num_headers);
- for(i = 0 ; i < (int) num_headers ; i++) {
+ for (i = 0; i < (int)num_headers; i++) {
apr_uint16_t name;
- char *stringname;
- char *value;
+ const char *stringname;
+ const char *value;
rc = ajp_msg_peek_uint16(msg, &name);
if (rc != APR_SUCCESS) {
- return APR_EGENERAL;
+ return rc;
}
-
+
if ((name & 0XFF00) == 0XA000) {
- ajp_msg_peek_uint16(msg, &name);
- stringname = (char *)long_res_header_for_sc(name);
+ ajp_msg_get_uint16(msg, &name);
+ stringname = long_res_header_for_sc(name);
if (stringname == NULL) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
- "Error ajp_unmarshal_response - "
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00984)
+ "ajp_unmarshal_response: "
"No such sc (%08x)",
name);
- return APR_EGENERAL;
+ return AJP_EBAD_HEADER;
}
- } else {
+ }
+ else {
name = 0;
rc = ajp_msg_get_string(msg, &stringname);
if (rc != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
- "Error ajp_unmarshal_response - "
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00985)
+ "ajp_unmarshal_response: "
"Null header name");
- return APR_EGENERAL;
+ return rc;
}
-#if defined(AS400) || defined(_OSD_POSIX)
ap_xlate_proto_from_ascii(stringname, strlen(stringname));
-#endif
}
rc = ajp_msg_get_string(msg, &value);
if (rc != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
- "Error ajp_unmarshal_response - "
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00986)
+ "ajp_unmarshal_response: "
"Null header value");
- return APR_EGENERAL;
+ return rc;
+ }
+
+ /* Set-Cookie need additional processing */
+ if (!ap_casecmpstr(stringname, "Set-Cookie")) {
+ value = ap_proxy_cookie_reverse_map(r, dconf, value);
+ }
+ /* Location, Content-Location, URI and Destination need additional
+ * processing */
+ else if (!ap_casecmpstr(stringname, "Location")
+ || !ap_casecmpstr(stringname, "Content-Location")
+ || !ap_casecmpstr(stringname, "URI")
+ || !ap_casecmpstr(stringname, "Destination"))
+ {
+ value = ap_proxy_location_reverse_map(r, dconf, value);
}
-#if defined(AS400) || defined(_OSD_POSIX)
ap_xlate_proto_from_ascii(value, strlen(value));
-#endif
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
- "ajp_unmarshal_response: Header[%d] [%s] = [%s]",
+ ap_log_rerror(APLOG_MARK, APLOG_TRACE5, 0, r,
+ "ajp_unmarshal_response: Header[%d] [%s] = [%s]",
i, stringname, value);
+
apr_table_add(r->headers_out, stringname, value);
/* Content-type needs an additional handling */
- if (memcmp(stringname, "Content-Type", 12) == 0) {
+ if (ap_casecmpstr(stringname, "Content-Type") == 0) {
/* add corresponding filter */
ap_set_content_type(r, apr_pstrdup(r->pool, value));
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
- "ajp_unmarshal_response: ap_set_content_type done");
+ ap_log_rerror(APLOG_MARK, APLOG_TRACE5, 0, r,
+ "ajp_unmarshal_response: ap_set_content_type to '%s'", value);
}
}
* Build the ajp header message and send it
*/
apr_status_t ajp_send_header(apr_socket_t *sock,
- request_rec *r)
+ request_rec *r,
+ apr_size_t buffsize,
+ apr_uri_t *uri)
{
ajp_msg_t *msg;
apr_status_t rc;
- rc = ajp_msg_create(r->pool, &msg);
+ rc = ajp_msg_create(r->pool, buffsize, &msg);
if (rc != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00987)
"ajp_send_header: ajp_msg_create failed");
return rc;
}
- rc = ajp_marshal_into_msgb(msg, r);
+ rc = ajp_marshal_into_msgb(msg, r, uri);
if (rc != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00988)
"ajp_send_header: ajp_marshal_into_msgb failed");
return rc;
}
rc = ajp_ilink_send(sock, msg);
+ ajp_msg_log(r, msg, "ajp_send_header: ajp_ilink_send packet dump");
if (rc != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00989)
"ajp_send_header: ajp_ilink_send failed");
return rc;
}
*/
apr_status_t ajp_read_header(apr_socket_t *sock,
request_rec *r,
+ apr_size_t buffsize,
ajp_msg_t **msg)
{
apr_byte_t result;
apr_status_t rc;
-
- rc = ajp_msg_create(r->pool, msg);
- if (rc != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
- "ajp_read_header: ajp_msg_create failed");
- return rc;
+
+ if (*msg) {
+ rc = ajp_msg_reuse(*msg);
+ if (rc != APR_SUCCESS) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00990)
+ "ajp_read_header: ajp_msg_reuse failed");
+ return rc;
+ }
+ }
+ else {
+ rc = ajp_msg_create(r->pool, buffsize, msg);
+ if (rc != APR_SUCCESS) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00991)
+ "ajp_read_header: ajp_msg_create failed");
+ return rc;
+ }
}
ajp_msg_reset(*msg);
rc = ajp_ilink_receive(sock, *msg);
if (rc != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00992)
"ajp_read_header: ajp_ilink_receive failed");
return rc;
}
+ ajp_msg_log(r, *msg, "ajp_read_header: ajp_ilink_receive packet dump");
rc = ajp_msg_peek_uint8(*msg, &result);
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
- "ajp_read_header: ajp_ilink_received %02x", result);
+ if (rc != APR_SUCCESS) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00993)
+ "ajp_read_header: ajp_msg_peek_uint8 failed");
+ return rc;
+ }
+ ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r,
+ "ajp_read_header: ajp_ilink_received %s (0x%02x)",
+ ajp_type_str(result), result);
return APR_SUCCESS;
}
{
apr_byte_t result;
ajp_msg_peek_uint8(msg, &result);
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
- "ajp_parse_type: got %02x", result);
+ ap_log_rerror(APLOG_MARK, APLOG_TRACE6, 0, r,
+ "ajp_parse_type: got %s (0x%02x)",
+ ajp_type_str(result), result);
return (int) result;
}
/* parse the header */
-apr_status_t ajp_parse_header(request_rec *r, ajp_msg_t *msg)
+apr_status_t ajp_parse_header(request_rec *r, proxy_dir_conf *conf,
+ ajp_msg_t *msg)
{
apr_byte_t result;
apr_status_t rc;
rc = ajp_msg_get_uint8(msg, &result);
if (rc != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00994)
"ajp_parse_headers: ajp_msg_get_byte failed");
return rc;
}
if (result != CMD_AJP13_SEND_HEADERS) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
- "ajp_parse_headers: wrong type %02x expecting 0x04", result);
- return APR_EGENERAL;
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00995)
+ "ajp_parse_headers: wrong type %s (0x%02x) expecting %s (0x%02x)",
+ ajp_type_str(result), result,
+ ajp_type_str(CMD_AJP13_SEND_HEADERS), CMD_AJP13_SEND_HEADERS);
+ return AJP_EBAD_HEADER;
}
- return ajp_unmarshal_response(msg, r);
+ return ajp_unmarshal_response(msg, r, conf);
}
/* parse the body and return data address and length */
{
apr_byte_t result;
apr_status_t rc;
+ apr_uint16_t expected_len;
rc = ajp_msg_get_uint8(msg, &result);
if (rc != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00996)
"ajp_parse_data: ajp_msg_get_byte failed");
return rc;
}
if (result != CMD_AJP13_SEND_BODY_CHUNK) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
- "ajp_parse_data: wrong type %02x expecting 0x03", result);
- return APR_EGENERAL;
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00997)
+ "ajp_parse_data: wrong type %s (0x%02x) expecting %s (0x%02x)",
+ ajp_type_str(result), result,
+ ajp_type_str(CMD_AJP13_SEND_BODY_CHUNK), CMD_AJP13_SEND_BODY_CHUNK);
+ return AJP_EBAD_HEADER;
}
rc = ajp_msg_get_uint16(msg, len);
if (rc != APR_SUCCESS) {
- return APR_EGENERAL;
+ return rc;
+ }
+ /*
+ * msg->len contains the complete length of the message including all
+ * headers. So the expected length for a CMD_AJP13_SEND_BODY_CHUNK is
+ * msg->len minus the sum of
+ * AJP_HEADER_LEN : The length of the header to every AJP message.
+ * AJP_HEADER_SZ_LEN : The header giving the size of the chunk.
+ * 1 : The CMD_AJP13_SEND_BODY_CHUNK indicator byte (0x03).
+ * 1 : The last byte of this message always seems to be
+ * 0x00 and is not part of the chunk.
+ */
+ expected_len = msg->len - (AJP_HEADER_LEN + AJP_HEADER_SZ_LEN + 1 + 1);
+ if (*len != expected_len) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00998)
+ "ajp_parse_data: Wrong chunk length. Length of chunk is %i,"
+ " expected length is %i.", *len, expected_len);
+ return AJP_EBAD_HEADER;
}
*ptr = (char *)&(msg->buf[msg->pos]);
return APR_SUCCESS;
}
+/* Check the reuse flag in CMD_AJP13_END_RESPONSE */
+apr_status_t ajp_parse_reuse(request_rec *r, ajp_msg_t *msg,
+ apr_byte_t *reuse)
+{
+ apr_byte_t result;
+ apr_status_t rc;
+
+ rc = ajp_msg_get_uint8(msg, &result);
+ if (rc != APR_SUCCESS) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00999)
+ "ajp_parse_reuse: ajp_msg_get_byte failed");
+ return rc;
+ }
+ if (result != CMD_AJP13_END_RESPONSE) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01000)
+ "ajp_parse_reuse: wrong type %s (0x%02x) expecting %s (0x%02x)",
+ ajp_type_str(result), result,
+ ajp_type_str(CMD_AJP13_END_RESPONSE), CMD_AJP13_END_RESPONSE);
+ return AJP_EBAD_HEADER;
+ }
+ return ajp_msg_get_uint8(msg, reuse);
+}
+
/*
* Allocate a msg to send data
*/
-apr_status_t ajp_alloc_data_msg(request_rec *r, char **ptr, apr_size_t *len,
+apr_status_t ajp_alloc_data_msg(apr_pool_t *pool, char **ptr, apr_size_t *len,
ajp_msg_t **msg)
{
apr_status_t rc;
- rc = ajp_msg_create(r->pool, msg);
- if (rc != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
- "ajp_alloc_data_msg: ajp_msg_create failed");
+ if ((rc = ajp_msg_create(pool, *len, msg)) != APR_SUCCESS)
return rc;
- }
ajp_msg_reset(*msg);
*ptr = (char *)&((*msg)->buf[6]);
- *len = AJP_MSG_BUFFER_SZ-6;
+ *len = *len - 6;
return APR_SUCCESS;
}
/*
* Send the data message
*/
-apr_status_t ajp_send_data_msg(apr_socket_t *sock, request_rec *r,
+apr_status_t ajp_send_data_msg(apr_socket_t *sock,
ajp_msg_t *msg, apr_size_t len)
{
- apr_status_t rc;
msg->buf[4] = (apr_byte_t)((len >> 8) & 0xFF);
msg->buf[5] = (apr_byte_t)(len & 0xFF);
msg->len += len + 2; /* + 1 XXXX where is '\0' */
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
- "ajp_send_data_msg: sending %d", len);
+ return ajp_ilink_send(sock, msg);
- rc = ajp_ilink_send(sock, msg);
- if (rc != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
- "ajp_send_data_msg: ajp_ilink_send failed");
- return rc;
- }
-
- return APR_SUCCESS;
}
projects / apache / blobdiff