Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-12-SP5:Update
apache2.14893
apache2-parameter-secret-proxy-workers.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File apache2-parameter-secret-proxy-workers.patch of Package apache2.14893
Index: httpd-2.4.23/modules/proxy/ajp.h =================================================================== --- httpd-2.4.23.orig/modules/proxy/ajp.h 2015-02-24 19:34:01.000000000 +0100 +++ httpd-2.4.23/modules/proxy/ajp.h 2020-04-14 13:10:48.823382446 +0200 @@ -414,11 +414,13 @@ apr_status_t ajp_ilink_receive(apr_socke * @param r current request * @param buffsize max size of the AJP packet. * @param uri requested uri + * @param secret authentication secret * @return APR_SUCCESS or error */ apr_status_t ajp_send_header(apr_socket_t *sock, request_rec *r, apr_size_t buffsize, - apr_uri_t *uri); + apr_uri_t *uri, + const char *secret); /** * Read the ajp message and return the type of the message. Index: httpd-2.4.23/modules/proxy/ajp_header.c =================================================================== --- httpd-2.4.23.orig/modules/proxy/ajp_header.c 2016-03-02 14:22:07.000000000 +0100 +++ httpd-2.4.23/modules/proxy/ajp_header.c 2020-04-14 13:10:48.827382466 +0200 @@ -213,7 +213,8 @@ AJPV13_REQUEST/AJPV14_REQUEST= static apr_status_t ajp_marshal_into_msgb(ajp_msg_t *msg, request_rec *r, - apr_uri_t *uri) + apr_uri_t *uri, + const char *secret) { int method; apr_uint32_t i, num_headers = 0; @@ -293,17 +294,15 @@ static apr_status_t ajp_marshal_into_msg i, elts[i].key, elts[i].val); } -/* XXXX need to figure out how to do this - if (s->secret) { + if (secret) { if (ajp_msg_append_uint8(msg, SC_A_SECRET) || - ajp_msg_append_string(msg, s->secret)) { + ajp_msg_append_string(msg, secret)) { ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(03228) - "Error ajp_marshal_into_msgb - " + "ajp_marshal_into_msgb: " "Error appending secret"); return APR_EGENERAL; } } - */ if (r->user) { if (ajp_msg_append_uint8(msg, SC_A_REMOTE_USER) || @@ -671,7 +670,8 @@ static apr_status_t ajp_unmarshal_respon apr_status_t ajp_send_header(apr_socket_t *sock, request_rec *r, apr_size_t buffsize, - apr_uri_t *uri) + apr_uri_t *uri, + const char *secret) { ajp_msg_t *msg; apr_status_t rc; @@ -683,7 +683,7 @@ apr_status_t ajp_send_header(apr_socket_ return rc; } - rc = ajp_marshal_into_msgb(msg, r, uri); + rc = ajp_marshal_into_msgb(msg, r, uri, secret); if (rc != APR_SUCCESS) { ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00988) "ajp_send_header: ajp_marshal_into_msgb failed"); Index: httpd-2.4.23/modules/proxy/mod_proxy.c =================================================================== --- httpd-2.4.23.orig/modules/proxy/mod_proxy.c 2016-05-21 17:13:48.000000000 +0200 +++ httpd-2.4.23/modules/proxy/mod_proxy.c 2020-04-14 13:21:13.646583612 +0200 @@ -308,6 +308,12 @@ static const char *set_worker_param(apr_ (int)sizeof(worker->s->flusher)); PROXY_STRNCPY(worker->s->flusher, val); } + else if (!strcasecmp(key, "secret")) { + if (PROXY_STRNCPY(worker->s->secret, val) != APR_SUCCESS) { + return apr_psprintf(p, "Secret length must be < %d characters", + (int)sizeof(worker->s->secret)); + } + } else { if (set_worker_hc_param_f) { return set_worker_hc_param_f(p, s, worker, key, val, NULL); Index: httpd-2.4.23/modules/proxy/mod_proxy.h =================================================================== --- httpd-2.4.23.orig/modules/proxy/mod_proxy.h 2020-04-14 13:10:48.235379434 +0200 +++ httpd-2.4.23/modules/proxy/mod_proxy.h 2020-04-14 13:18:58.717892349 +0200 @@ -348,6 +348,7 @@ PROXY_WORKER_HC_FAIL ) #define PROXY_WORKER_MAX_HOSTNAME_SIZE 64 #define PROXY_BALANCER_MAX_HOSTNAME_SIZE PROXY_WORKER_MAX_HOSTNAME_SIZE #define PROXY_BALANCER_MAX_STICKY_SIZE 64 +#define PROXY_WORKER_MAX_SECRET_SIZE 64 /* RFC-1035 mentions limits of 255 for host-names and 253 for domain-names, * dotted together(?) this would fit the below size (+ trailing NUL). @@ -438,6 +439,7 @@ typedef struct { int fcount; /* current count of failures */ hcmethod_t method; /* method to use for health check */ apr_interval_time_t interval; + char secret[PROXY_WORKER_MAX_SECRET_SIZE]; } proxy_worker_shared; #define ALIGNED_PROXY_WORKER_SHARED_SIZE (APR_ALIGN_DEFAULT(sizeof(proxy_worker_shared))) Index: httpd-2.4.23/modules/proxy/mod_proxy_ajp.c =================================================================== --- httpd-2.4.23.orig/modules/proxy/mod_proxy_ajp.c 2015-06-02 15:39:26.000000000 +0200 +++ httpd-2.4.23/modules/proxy/mod_proxy_ajp.c 2020-04-14 13:10:48.827382466 +0200 @@ -193,6 +193,7 @@ static int ap_proxy_ajp_request(apr_pool apr_off_t content_length = 0; int original_status = r->status; const char *original_status_line = r->status_line; + const char *secret = NULL; if (psf->io_buffer_size_set) maxsize = psf->io_buffer_size; @@ -202,12 +203,15 @@ static int ap_proxy_ajp_request(apr_pool maxsize = AJP_MSG_BUFFER_SZ; maxsize = APR_ALIGN(maxsize, 1024); + if (*conn->worker->s->secret) + secret = conn->worker->s->secret; + /* * Send the AJP request to the remote server */ /* send request headers */ - status = ajp_send_header(conn->sock, r, maxsize, uri); + status = ajp_send_header(conn->sock, r, maxsize, uri, secret); if (status != APR_SUCCESS) { conn->close = 1; ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r, APLOGNO(00868)
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
