mirror of https://github.com/sonertari/SSLproxy
Update lp with sslproxy changes and clean up
Soner Tari
4 years ago
parent
d3c3059c26
commit
6c5165fa6e
@ -0,0 +1,177 @@
|
||||
/*-
|
||||
* SSLsplit - transparent SSL/TLS interception
|
||||
* https://www.roe.ch/SSLsplit
|
||||
*
|
||||
* Copyright (c) 2017-2020, Soner Tari <sonertari@gmail.com>.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
* 1. Redistributions of source code must retain the above copyright 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.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS''
|
||||
* AND ANY EXPRESS 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 COPYRIGHT HOLDER OR 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.
|
||||
*/
|
||||
|
||||
#include "pxythr.h"
|
||||
|
||||
#include "log.h"
|
||||
#include "pxyconn.h"
|
||||
|
||||
#include <assert.h>
|
||||
#include <sys/param.h>
|
||||
|
||||
/*
|
||||
* Detach a connection from a thread by index.
|
||||
* This function cannot fail.
|
||||
*/
|
||||
void
|
||||
pxy_thr_detach(pxy_conn_ctx_t *ctx)
|
||||
{
|
||||
assert(ctx != NULL);
|
||||
// If this function is called, the thr conns list cannot be empty
|
||||
assert(ctx->thr->conns != NULL);
|
||||
|
||||
log_finest("Removing conn");
|
||||
|
||||
ctx->thr->load--;
|
||||
|
||||
if (ctx->prev) {
|
||||
ctx->prev->next = ctx->next;
|
||||
} else {
|
||||
ctx->thr->conns = ctx->next;
|
||||
}
|
||||
if (ctx->next)
|
||||
ctx->next->prev = ctx->prev;
|
||||
}
|
||||
|
||||
/*
|
||||
* Proxy thread manager: manages the connection handling worker threads
|
||||
* and the per-thread resources (i.e. event bases). The load is shared
|
||||
* across num_cpu * 2 connection handling threads, using the number of
|
||||
* currently assigned connections as the sole metric.
|
||||
*
|
||||
* The attach and detach functions are thread-safe.
|
||||
*/
|
||||
|
||||
static void
|
||||
pxy_thr_print_thr_info(pxy_thr_ctx_t *tctx)
|
||||
{
|
||||
log_finest_main_va("thr=%d, load=%lu", tctx->thridx, tctx->load);
|
||||
|
||||
unsigned int idx = 1;
|
||||
evutil_socket_t max_fd = 0;
|
||||
time_t max_atime = 0;
|
||||
time_t max_ctime = 0;
|
||||
|
||||
char *smsg = NULL;
|
||||
|
||||
if (tctx->conns) {
|
||||
time_t now = time(NULL);
|
||||
|
||||
pxy_conn_ctx_t *ctx = tctx->conns;
|
||||
while (ctx) {
|
||||
time_t atime = now - ctx->atime;
|
||||
time_t ctime = now - ctx->ctime;
|
||||
|
||||
log_finest_main_va("CONN: thr=%d, id=%u, fd=%d, dst=%d, p=%d-%d, at=%lld ct=%lld, src_addr=%s:%s, dst_addr=%s:%s",
|
||||
tctx->thridx, idx, ctx->fd, ctx->dst_fd, ctx->src.closed, ctx->dst.closed, (long long)atime, (long long)ctime,
|
||||
STRORDASH(ctx->srchost_str), STRORDASH(ctx->srcport_str), STRORDASH(ctx->dsthost_str), STRORDASH(ctx->dstport_str));
|
||||
|
||||
max_fd = MAX(max_fd, MAX(ctx->fd, ctx->dst_fd));
|
||||
max_atime = MAX(max_atime, atime);
|
||||
max_ctime = MAX(max_ctime, ctime);
|
||||
|
||||
idx++;
|
||||
ctx = ctx->next;
|
||||
}
|
||||
}
|
||||
|
||||
log_finest_main_va("STATS: thr=%d, mld=%zu, mfd=%d, mat=%lld, mct=%lld, iib=%llu, iob=%llu, eib=%llu, eob=%llu, swm=%zu, uwm=%zu, err=%zu, si=%u",
|
||||
tctx->thridx, tctx->max_load, tctx->max_fd, (long long)max_atime, (long long)max_ctime, tctx->intif_in_bytes, tctx->intif_out_bytes, tctx->extif_in_bytes, tctx->extif_out_bytes,
|
||||
tctx->set_watermarks, tctx->unset_watermarks, tctx->errors, tctx->stats_id);
|
||||
|
||||
if (asprintf(&smsg, "STATS: thr=%d, mld=%zu, mfd=%d, mat=%lld, mct=%lld, iib=%llu, iob=%llu, eib=%llu, eob=%llu, swm=%zu, uwm=%zu, err=%zu, si=%u\n",
|
||||
tctx->thridx, tctx->max_load, tctx->max_fd, (long long)max_atime, (long long)max_ctime, tctx->intif_in_bytes, tctx->intif_out_bytes, tctx->extif_in_bytes, tctx->extif_out_bytes,
|
||||
tctx->set_watermarks, tctx->unset_watermarks, tctx->errors, tctx->stats_id) < 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (log_stats(smsg) == -1) {
|
||||
log_err_level_printf(LOG_WARNING, "Stats logging failed\n");
|
||||
}
|
||||
free(smsg);
|
||||
|
||||
tctx->stats_id++;
|
||||
|
||||
tctx->errors = 0;
|
||||
tctx->set_watermarks = 0;
|
||||
tctx->unset_watermarks = 0;
|
||||
|
||||
tctx->intif_in_bytes = 0;
|
||||
tctx->intif_out_bytes = 0;
|
||||
tctx->extif_in_bytes = 0;
|
||||
tctx->extif_out_bytes = 0;
|
||||
|
||||
// Reset these stats with the current values (do not reset to 0 directly, there may be active conns)
|
||||
tctx->max_fd = max_fd;
|
||||
tctx->max_load = tctx->load;
|
||||
}
|
||||
|
||||
/*
|
||||
* Recurring timer event to prevent the event loops from exiting when
|
||||
* they run out of events.
|
||||
*/
|
||||
static void
|
||||
pxy_thr_timer_cb(UNUSED evutil_socket_t fd, UNUSED short what, UNUSED void *arg)
|
||||
{
|
||||
pxy_thr_ctx_t *ctx = arg;
|
||||
|
||||
log_finest_main_va("thr=%d, load=%lu, to=%u", ctx->thridx, ctx->load, ctx->timeout_count);
|
||||
|
||||
// @attention Print thread info only if stats logging is enabled, if disabled debug logs are not printed either
|
||||
if (ctx->thrmgr->opts->statslog) {
|
||||
ctx->timeout_count++;
|
||||
if (ctx->timeout_count >= ctx->thrmgr->opts->stats_period) {
|
||||
ctx->timeout_count = 0;
|
||||
pxy_thr_print_thr_info(ctx);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Thread entry point; runs the event loop of the event base.
|
||||
* Does not exit until the libevent loop is broken explicitly.
|
||||
*/
|
||||
void *
|
||||
pxy_thr(void *arg)
|
||||
{
|
||||
pxy_thr_ctx_t *ctx = arg;
|
||||
struct timeval timer_delay = {10, 0};
|
||||
struct event *ev;
|
||||
|
||||
ev = event_new(ctx->evbase, -1, EV_PERSIST, pxy_thr_timer_cb, ctx);
|
||||
if (!ev)
|
||||
return NULL;
|
||||
evtimer_add(ev, &timer_delay);
|
||||
ctx->running = 1;
|
||||
event_base_dispatch(ctx->evbase);
|
||||
event_free(ev);
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* vim: set noet ft=c: */
|
||||
@ -0,0 +1,76 @@
|
||||
/*-
|
||||
* SSLsplit - transparent SSL/TLS interception
|
||||
* https://www.roe.ch/SSLsplit
|
||||
*
|
||||
* Copyright (c) 2017-2020, Soner Tari <sonertari@gmail.com>.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
* 1. Redistributions of source code must retain the above copyright 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.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS''
|
||||
* AND ANY EXPRESS 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 COPYRIGHT HOLDER OR 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.
|
||||
*/
|
||||
|
||||
#ifndef PXYTHR_H
|
||||
#define PXYTHR_H
|
||||
|
||||
#include "attrib.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
#include <event2/event.h>
|
||||
#include <event2/dns.h>
|
||||
#include <pthread.h>
|
||||
|
||||
typedef struct pxy_conn_ctx pxy_conn_ctx_t;
|
||||
typedef struct pxy_thrmgr_ctx pxy_thrmgr_ctx_t;
|
||||
|
||||
typedef struct pxy_thr_ctx {
|
||||
pthread_t thr;
|
||||
int thridx;
|
||||
pxy_thrmgr_ctx_t *thrmgr;
|
||||
size_t load;
|
||||
struct event_base *evbase;
|
||||
int running;
|
||||
|
||||
// Statistics
|
||||
evutil_socket_t max_fd;
|
||||
size_t max_load;
|
||||
size_t errors;
|
||||
size_t set_watermarks;
|
||||
size_t unset_watermarks;
|
||||
long long unsigned int intif_in_bytes;
|
||||
long long unsigned int intif_out_bytes;
|
||||
long long unsigned int extif_in_bytes;
|
||||
long long unsigned int extif_out_bytes;
|
||||
// Each stats has an id, incremented on each stats print
|
||||
unsigned short stats_id;
|
||||
// Used to print statistics, compared against stats_period
|
||||
unsigned int timeout_count;
|
||||
|
||||
// List of active connections on the thread
|
||||
pxy_conn_ctx_t *conns;
|
||||
} pxy_thr_ctx_t;
|
||||
|
||||
void pxy_thr_detach(pxy_conn_ctx_t *) NONNULL(1);
|
||||
void *pxy_thr(void *);
|
||||
|
||||
#endif /* !PXYTHR_H */
|
||||
|
||||
/* vim: set noet ft=c: */
|
||||
Loading…
Reference in New Issue