Archives
/
SSLproxy
mirror of https://github.com/sonertari/SSLproxy
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add local process information to connect log

Browse Source
pull/13/head
Daniel Roethlisberger 10 years ago
parent 08ca5b2891
commit e022b2af26
1 changed files with 85 additions and 8 deletions
Show Stats Download Patch File Download Diff File

93
pxyconn.c
Unescape Escape View File

@ -338,25 +338,58 @@ static void
pxy_log_connect_nonhttp(pxy_conn_ctx_t *ctx) pxy_log_connect_nonhttp(pxy_conn_ctx_t *ctx)
{ {
char *msg; char *msg;
#ifdef HAVE_LOCAL_PROCINFO
char *lpi = NULL;
#endif /* HAVE_LOCAL_PROCINFO */
int rv; int rv;
#ifdef HAVE_LOCAL_PROCINFO
if (ctx->opts->lprocinfo) {
rv = asprintf(&lpi, "pid:%i powner:%s:%s pexecpath:%s",
ctx->lproc.pid,
STRORDASH(ctx->lproc.user),
STRORDASH(ctx->lproc.group),
STRORDASH(ctx->lproc.exec_path));
if ((rv == -1) || !lpi) {
ctx->enomem = 1;
goto out;
}
}
#endif /* HAVE_LOCAL_PROCINFO */
if (!ctx->spec->ssl || ctx->passthrough) { if (!ctx->spec->ssl || ctx->passthrough) {
rv = asprintf(&msg, "%s %s %s\n", rv = asprintf(&msg, "%s %s %s"
#ifdef HAVE_LOCAL_PROCINFO
" %s"
#endif /* HAVE_LOCAL_PROCINFO */
"\n",
ctx->passthrough ? "passthrough" : "tcp", ctx->passthrough ? "passthrough" : "tcp",
STRORDASH(ctx->src_str), STRORDASH(ctx->src_str),
STRORDASH(ctx->dst_str)); STRORDASH(ctx->dst_str)
#ifdef HAVE_LOCAL_PROCINFO
, lpi
#endif /* HAVE_LOCAL_PROCINFO */
);
} else { } else {
rv = asprintf(&msg, "ssl %s %s " rv = asprintf(&msg, "ssl %s %s "
"sni:%s crt:%s origcrt:%s\n", "sni:%s crt:%s origcrt:%s"
#ifdef HAVE_LOCAL_PROCINFO
" %s"
#endif /* HAVE_LOCAL_PROCINFO */
"\n",
STRORDASH(ctx->src_str), STRORDASH(ctx->src_str),
STRORDASH(ctx->dst_str), STRORDASH(ctx->dst_str),
STRORDASH(ctx->sni), STRORDASH(ctx->sni),
STRORDASH(ctx->ssl_names), STRORDASH(ctx->ssl_names),
STRORDASH(ctx->ssl_orignames)); STRORDASH(ctx->ssl_orignames)
#ifdef HAVE_LOCAL_PROCINFO
, lpi
#endif /* HAVE_LOCAL_PROCINFO */
);
} }
if ((rv == -1) || !msg) { if ((rv == -1) || !msg) {
ctx->enomem = 1; ctx->enomem = 1;
return; goto out;
} }
if (!ctx->opts->detach) { if (!ctx->opts->detach) {
log_err_printf("%s", msg); log_err_printf("%s", msg);
@ -366,12 +399,21 @@ pxy_log_connect_nonhttp(pxy_conn_ctx_t *ctx)
} else { } else {
free(msg); free(msg);
} }
out:
#ifdef HAVE_LOCAL_PROCINFO
if (lpi) {
free(lpi);
}
#endif /* HAVE_LOCAL_PROCINFO */
} }
static void static void
pxy_log_connect_http(pxy_conn_ctx_t *ctx) pxy_log_connect_http(pxy_conn_ctx_t *ctx)
{ {
char *msg; char *msg;
#ifdef HAVE_LOCAL_PROCINFO
char *lpi = NULL;
#endif /* HAVE_LOCAL_PROCINFO */
int rv; int rv;
#ifdef DEBUG_PROXY #ifdef DEBUG_PROXY
@ -382,8 +424,26 @@ pxy_log_connect_http(pxy_conn_ctx_t *ctx)
} }
#endif #endif
#ifdef HAVE_LOCAL_PROCINFO
if (ctx->opts->lprocinfo) {
rv = asprintf(&lpi, "pid:%i powner:%s:%s pexecpath:%s",
ctx->lproc.pid,
STRORDASH(ctx->lproc.user),
STRORDASH(ctx->lproc.group),
STRORDASH(ctx->lproc.exec_path));
if ((rv == -1) || !lpi) {
ctx->enomem = 1;
goto out;
}
}
#endif /* HAVE_LOCAL_PROCINFO */
if (!ctx->spec->ssl) { if (!ctx->spec->ssl) {
rv = asprintf(&msg, "http %s %s %s %s %s %s %s%s\n", rv = asprintf(&msg, "http %s %s %s %s %s %s %s"
#ifdef HAVE_LOCAL_PROCINFO
" %s"
#endif /* HAVE_LOCAL_PROCINFO */
"%s\n",
STRORDASH(ctx->src_str), STRORDASH(ctx->src_str),
STRORDASH(ctx->dst_str), STRORDASH(ctx->dst_str),
STRORDASH(ctx->http_host), STRORDASH(ctx->http_host),
@ -391,10 +451,17 @@ pxy_log_connect_http(pxy_conn_ctx_t *ctx)
STRORDASH(ctx->http_uri), STRORDASH(ctx->http_uri),
STRORDASH(ctx->http_status_code), STRORDASH(ctx->http_status_code),
STRORDASH(ctx->http_content_length), STRORDASH(ctx->http_content_length),
#ifdef HAVE_LOCAL_PROCINFO
lpi,
#endif /* HAVE_LOCAL_PROCINFO */
ctx->ocsp_denied ? " ocsp:denied" : ""); ctx->ocsp_denied ? " ocsp:denied" : "");
} else { } else {
rv = asprintf(&msg, "https %s %s %s %s %s %s %s " rv = asprintf(&msg, "https %s %s %s %s %s %s %s "
"sni:%s crt:%s origcrt:%s%s\n", "sni:%s crt:%s origcrt:%s"
#ifdef HAVE_LOCAL_PROCINFO
" %s"
#endif /* HAVE_LOCAL_PROCINFO */
"%s\n",
STRORDASH(ctx->src_str), STRORDASH(ctx->src_str),
STRORDASH(ctx->dst_str), STRORDASH(ctx->dst_str),
STRORDASH(ctx->http_host), STRORDASH(ctx->http_host),
@ -405,11 +472,14 @@ pxy_log_connect_http(pxy_conn_ctx_t *ctx)
STRORDASH(ctx->sni), STRORDASH(ctx->sni),
STRORDASH(ctx->ssl_names), STRORDASH(ctx->ssl_names),
STRORDASH(ctx->ssl_orignames), STRORDASH(ctx->ssl_orignames),
#ifdef HAVE_LOCAL_PROCINFO
lpi,
#endif /* HAVE_LOCAL_PROCINFO */
ctx->ocsp_denied ? " ocsp:denied" : ""); ctx->ocsp_denied ? " ocsp:denied" : "");
} }
if ((rv == -1) || !msg) { if ((rv == -1) || !msg) {
ctx->enomem = 1; ctx->enomem = 1;
return; goto out;
} }
if (!ctx->opts->detach) { if (!ctx->opts->detach) {
log_err_printf("%s", msg); log_err_printf("%s", msg);
@ -419,6 +489,13 @@ pxy_log_connect_http(pxy_conn_ctx_t *ctx)
} else { } else {
free(msg); free(msg);
} }
out:
#ifdef HAVE_LOCAL_PROCINFO
if (lpi) {
free(lpi);
}
#endif /* HAVE_LOCAL_PROCINFO */
return;
} }
/* /*

Write Preview
Loading…
Cancel
Save