mirror of
https://github.com/3proxy/3proxy.git
synced 2026-11-22 23:59:41 +08:00
Build the mail proxies and FTP only when they are asked for
pop3p, imapp and smtpp are built with MAILPROXY=true, and ftppr and the ftp:// scheme of the HTTP proxy with FTP=true; with CMake the switches are 3PROXY_USE_MAILPROXY and 3PROXY_USE_FTP. Neither is in a default build, and the standalone binaries follow what was built. A configuration naming one of them is still read either way. The three mail protocols amount to a STARTTLS negotiation now that mail is carried over TLS, so without a proxy of their own those names are tlspr speaking the protocol: the file holds a stand-in which sets the protocol for the connection and returns tlspr for the caller to run, which serves the service name and a parent chain alike and leaves conf.c and the redirect table untouched. FTP has no such fallback, so the service is known, answers nothing and logs the refusal. The Linux workflow builds both, so all of it is still compiled and run.
This commit is contained in:
1 parent
d3b23ee1d9
commit
f2ae920db2
17 files changed
+171
-11
No files matched your search
+1
-1
@@ -2,7 +2,7 @@
|
||||
# 3 proxy common Makefile
|
||||
#
|
||||
|
||||
all: $(BUILDDIR)3proxy$(EXESUFFICS) $(BUILDDIR)$(CRYPT_PREFIX)crypt$(EXESUFFICS) $(BUILDDIR)$(PREFIX)pop3p$(EXESUFFICS) $(BUILDDIR)$(PREFIX)imapp$(EXESUFFICS) $(BUILDDIR)$(PREFIX)smtpp$(EXESUFFICS) $(BUILDDIR)$(PREFIX)ftppr$(EXESUFFICS) $(BUILDDIR)$(PREFIX)tcppm$(EXESUFFICS) $(BUILDDIR)$(PREFIX)udppm$(EXESUFFICS) $(BUILDDIR)$(PREFIX)tlspr$(EXESUFFICS) $(BUILDDIR)$(PREFIX)socks$(EXESUFFICS) $(BUILDDIR)$(PREFIX)proxy$(EXESUFFICS) allplugins
|
||||
all: $(BUILDDIR)3proxy$(EXESUFFICS) $(BUILDDIR)$(CRYPT_PREFIX)crypt$(EXESUFFICS) $(MAIL_EXES) $(FTP_EXES) $(BUILDDIR)$(PREFIX)tcppm$(EXESUFFICS) $(BUILDDIR)$(PREFIX)udppm$(EXESUFFICS) $(BUILDDIR)$(PREFIX)tlspr$(EXESUFFICS) $(BUILDDIR)$(PREFIX)socks$(EXESUFFICS) $(BUILDDIR)$(PREFIX)proxy$(EXESUFFICS) allplugins
|
||||
|
||||
sockmap$(OBJSUFFICS): sockmap.c proxy.h structures.h
|
||||
$(CC) $(CFLAGS) sockmap.c
|
||||
|
||||
@@ -7,6 +7,8 @@
|
||||
|
||||
#include "proxy.h"
|
||||
|
||||
#ifdef WITH_FTP
|
||||
|
||||
/*
|
||||
* Read one FTP server response, skipping continuation lines (lines whose
|
||||
* 4th character is '-' per RFC 959). Returns the line length on success,
|
||||
@@ -249,3 +251,5 @@ SOCKET ftpcommand(struct clientparam *param, unsigned char * command, unsigned c
|
||||
}
|
||||
return s;
|
||||
}
|
||||
|
||||
#endif
|
||||
+15
@@ -8,6 +8,8 @@
|
||||
|
||||
#include "proxy.h"
|
||||
|
||||
#ifdef WITH_FTP
|
||||
|
||||
#define RETURN(xxx) { param->res = xxx; goto CLEANRET; }
|
||||
#define BUFSIZE 2048
|
||||
|
||||
@@ -345,3 +347,16 @@ struct proxydef childdef = {
|
||||
};
|
||||
#include "proxymain.c"
|
||||
#endif
|
||||
|
||||
#else
|
||||
|
||||
/* Built without FTP support. The service and the redirect naming it are
|
||||
still known, so a configuration carrying them is read rather than
|
||||
refused, and a client reaching one is turned away. */
|
||||
void * ftpprchild(struct clientparam * param){
|
||||
param->res = 878;
|
||||
dolog(param, (unsigned char *)"ftp support is not built in");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
#endif
|
||||
+14
@@ -8,6 +8,8 @@
|
||||
|
||||
#include "proxy.h"
|
||||
|
||||
#ifdef WITH_IMAPP
|
||||
|
||||
#define RETURN(xxx) { param->res = xxx; goto CLEANRET; }
|
||||
|
||||
#define CL_LOGINCMD 0
|
||||
@@ -250,3 +252,15 @@ struct proxydef childdef = {
|
||||
};
|
||||
#include "proxymain.c"
|
||||
#endif
|
||||
#else
|
||||
|
||||
/* Built without this proxy of its own. The command and the redirect
|
||||
naming it are the STARTTLS proxy speaking that protocol, which
|
||||
negotiates the same way and passes the session on: what "tlspr -Ximap"
|
||||
does, under the name a configuration already uses. */
|
||||
void * imappchild(struct clientparam * param){
|
||||
param->starttls = S_IMAPP;
|
||||
return (void *)tlsprchild;
|
||||
}
|
||||
|
||||
#endif
|
||||
+14
@@ -8,6 +8,8 @@
|
||||
|
||||
#include "proxy.h"
|
||||
|
||||
#ifdef WITH_POP3P
|
||||
|
||||
#define RETURN(xxx) { param->res = xxx; goto CLEANRET; }
|
||||
|
||||
#ifdef WITHMAIN
|
||||
@@ -88,3 +90,15 @@ struct proxydef childdef = {
|
||||
};
|
||||
#include "proxymain.c"
|
||||
#endif
|
||||
#else
|
||||
|
||||
/* Built without this proxy of its own. The command and the redirect
|
||||
naming it are the STARTTLS proxy speaking that protocol, which
|
||||
negotiates the same way and passes the session on: what "tlspr -Xpop3"
|
||||
does, under the name a configuration already uses. */
|
||||
void * pop3pchild(struct clientparam * param){
|
||||
param->starttls = S_POP3P;
|
||||
return (void *)tlsprchild;
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -385,10 +385,12 @@ for(;;){
|
||||
if (!strncasecmp((char *)sb, "http://", 7)) {
|
||||
sb += 7;
|
||||
}
|
||||
#ifdef WITH_FTP
|
||||
else if (!strncasecmp((char *)sb, "ftp://", 6)) {
|
||||
ftp = 1;
|
||||
sb += 6;
|
||||
}
|
||||
#endif
|
||||
else if(*sb == '/') {
|
||||
param->transparent = 1;
|
||||
}
|
||||
@@ -712,6 +714,7 @@ for(;;){
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef WITH_FTP
|
||||
if(ftp && param->redirtype != R_HTTP){
|
||||
SOCKET s;
|
||||
int mode = 0;
|
||||
@@ -963,6 +966,7 @@ for(;;){
|
||||
}
|
||||
RETURN(res);
|
||||
}
|
||||
#endif
|
||||
|
||||
if(isconnect && param->redirtype != R_HTTP) {
|
||||
if(param->redirectfunc) {
|
||||
|
||||
+14
@@ -8,6 +8,8 @@
|
||||
|
||||
#include "proxy.h"
|
||||
|
||||
#ifdef WITH_SMTPP
|
||||
|
||||
#define RETURN(xxx) { param->res = xxx; goto CLEANRET; }
|
||||
|
||||
#ifdef WITHMAIN
|
||||
@@ -342,3 +344,15 @@ struct proxydef childdef = {
|
||||
};
|
||||
#include "proxymain.c"
|
||||
#endif
|
||||
#else
|
||||
|
||||
/* Built without this proxy of its own. The command and the redirect
|
||||
naming it are the STARTTLS proxy speaking that protocol, which
|
||||
negotiates the same way and passes the session on: what "tlspr -Xsmtp"
|
||||
does, under the name a configuration already uses. */
|
||||
void * smtppchild(struct clientparam * param){
|
||||
param->starttls = S_SMTPP;
|
||||
return (void *)tlsprchild;
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -759,6 +759,10 @@ struct clientparam {
|
||||
that a plugin built against an older header still finds the fields it
|
||||
knows where they were. */
|
||||
int onerequest;
|
||||
/* A STARTTLS protocol to speak before the session is wrapped, set for
|
||||
one connection rather than for the service, which is how a redirect
|
||||
and a service name standing in for a mail proxy reach tlspr. */
|
||||
PROXYSERVICE starttls;
|
||||
};
|
||||
|
||||
struct filemon {
|
||||
|
||||
+2
-1
@@ -334,7 +334,8 @@ void * tlsprchild(struct clientparam* param) {
|
||||
int lv=-1;
|
||||
char proto[PROTOLEN]="-";
|
||||
int snipos = 0;
|
||||
PROXYSERVICE stlsproto = param->clientstarttls? param->clientstarttls : param->srv->srvstarttls;
|
||||
PROXYSERVICE stlsproto = param->clientstarttls? param->clientstarttls :
|
||||
(param->starttls? param->starttls : param->srv->srvstarttls);
|
||||
|
||||
if(!param->clientstarttls && stlsproto){
|
||||
res = clistarttls(param, stlsproto);
|
||||
|
||||
Reference in new issue
Block a user