Vladimir Dubrovin
bf1930789d
parent: support fraction and % syntaxis for weight; support fallbacks with 0 weight
C/C++ CI Linux / ubuntu-24.04-arm (push) Has been cancelled
C/C++ CI Linux / ubuntu-latest (push) Has been cancelled
C/C++ CI MacOS / macos-15 (push) Has been cancelled
C/C++ CI Windows / windows-2022 (push) Has been cancelled
C/C++ CI cmake / macos-15 (push) Has been cancelled
C/C++ CI cmake / ubuntu-24.04-arm (push) Has been cancelled
C/C++ CI cmake / ubuntu-latest (push) Has been cancelled
C/C++ CI cmake / windows-2022 (push) Has been cancelled
C/C++ CI cmake / ubuntu-latest (wolfSSL) (push) Has been cancelled
2026-09-16 20:04:10 +03:00
Vladimir Dubrovin
5af6147a41
-Xftp flag for http proxy
C/C++ CI Linux / ubuntu-24.04-arm (push) Has been cancelled
C/C++ CI Linux / ubuntu-latest (push) Has been cancelled
C/C++ CI MacOS / macos-15 (push) Has been cancelled
C/C++ CI Windows / windows-2022 (push) Has been cancelled
C/C++ CI cmake / macos-15 (push) Has been cancelled
C/C++ CI cmake / ubuntu-24.04-arm (push) Has been cancelled
C/C++ CI cmake / ubuntu-latest (push) Has been cancelled
C/C++ CI cmake / windows-2022 (push) Has been cancelled
C/C++ CI cmake / ubuntu-latest (wolfSSL) (push) Has been cancelled
2026-08-29 23:53:59 +03:00
Vladimir Dubrovin
f2ae920db2
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.
2026-08-29 23:39:07 +03:00
Vladimir Dubrovin
5be794dfd2
support proxypass in web server
C/C++ CI Linux / ubuntu-24.04-arm (push) Has been cancelled
C/C++ CI Linux / ubuntu-latest (push) Has been cancelled
C/C++ CI MacOS / macos-15 (push) Has been cancelled
C/C++ CI Windows / windows-2022 (push) Has been cancelled
C/C++ CI cmake / macos-15 (push) Has been cancelled
C/C++ CI cmake / ubuntu-24.04-arm (push) Has been cancelled
C/C++ CI cmake / ubuntu-latest (push) Has been cancelled
C/C++ CI cmake / windows-2022 (push) Has been cancelled
C/C++ CI cmake / ubuntu-latest (wolfSSL) (push) Has been cancelled
2026-08-27 17:57:51 +03:00
Vladimir Dubrovin
927b011bd4
http server implemented, pcre support for hostnames in acls implemented
C/C++ CI Linux / ubuntu-24.04-arm (push) Waiting to run
C/C++ CI Linux / ubuntu-latest (push) Waiting to run
C/C++ CI MacOS / macos-15 (push) Waiting to run
C/C++ CI Windows / windows-2022 (push) Waiting to run
C/C++ CI cmake / macos-15 (push) Waiting to run
C/C++ CI cmake / ubuntu-24.04-arm (push) Waiting to run
C/C++ CI cmake / ubuntu-latest (push) Waiting to run
C/C++ CI cmake / windows-2022 (push) Waiting to run
C/C++ CI cmake / ubuntu-latest (wolfSSL) (push) Waiting to run
2026-08-27 14:34:27 +03:00
Vladimir Dubrovin
3526759e59
implement small http server for admin and testing
2026-08-25 17:21:33 +03:00
Vladimir Dubrovin
6ca4a2686d
port range support (parent extport / intport)
2026-08-25 14:23:33 +03:00
Vladimir Dubrovin
bebc3894e2
Support acls for UDP ASSOC, fix udppm via SOCKSv5
2026-08-11 19:02:54 +03:00
Vladimir Dubrovin
8c2ad56665
Use memmove for overlapping region
2026-08-08 20:46:52 +03:00
Vladimir Dubrovin
a986ed7a07
Add linger timeout
2026-08-08 19:13:02 +03:00
Vladimir Dubrovin
eceb5a22df
Add outsize parameter to en64
2026-08-08 17:58:49 +03:00
Vladimir Dubrovin
4877b39f2c
Fix deadcode / warnings / minor bugs
2026-07-31 18:55:59 +03:00
Vladimir Dubrovin
5f1ed7363b
Fix: race conditions / stack overflow on FreeBSD / minor bugs
2026-07-31 13:27:33 +03:00
Vladimir Dubrovin
c94766dff7
Fix: dnspr was broken since udppm rewrite. -F (fake resolve to redirect traffic) option added to dnspr
2026-07-22 17:34:51 +03:00
Vladimir Dubrovin
9ab2e820b5
Added imapp, starttls support for smtpp, pop3p, tlspr
2026-07-22 16:15:50 +03:00
Vladimir Dubrovin
aaa04116a8
Fix issues with -s
2026-05-08 20:43:02 +03:00
Vladimir Dubrovin
7871279fae
Support namespaces for UDP in socks
2026-05-08 20:21:04 +03:00
Vladimir Dubrovin
b1d21cbdca
Copyright update
2026-05-08 18:07:08 +03:00
Vladimir Dubrovin
0e13f57139
Allocate udp buffer dynamically
2026-05-06 22:45:00 +03:00
Vladimir Dubrovin
334de0658c
update datatypes
2026-05-05 15:27:55 +03:00
Vladimir Dubrovin
ec469fa2a6
Fix: buffer size in hash
2026-05-04 21:55:20 +03:00
Vladimir Dubrovin
a338a0c689
Speedup passwords lists
2026-05-04 18:37:18 +03:00
Vladimir Dubrovin
af8a6e0b91
minimize blake2 usage for hashing
2026-05-04 16:48:07 +03:00
Vladimir Dubrovin
5f06879843
Fix: crash on standalone services
2026-05-04 12:03:02 +03:00
Vladimir Dubrovin
51a82613a6
Allow to set internal / external namespace on linux
2026-05-02 14:49:35 +03:00
Vladimir Dubrovin
b87e998e4d
remove 'usentlm' option
2026-05-02 13:58:56 +03:00
Vladimir Dubrovin
4068a6955f
Fix UDP parent for SOCKSv5
2026-05-02 00:00:45 +03:00
Vladimir Dubrovin
8107f03062
Move PCRE/SSL to main code
2026-05-01 15:11:08 +03:00
Vladimir Dubrovin
b1ac46da79
Remove linux futext implementation
2026-04-28 18:06:54 +03:00
Vladimir Dubrovin
ada24a98ec
Use semaphore/mutex insted of pipe for threads sync
2026-04-28 14:00:15 +03:00
Vladimir Dubrovin
d52701518d
udppm switched to hashtable and supports multiple connections; no standalone udppm
2026-04-27 15:12:39 +03:00
Vladimir Dubrovin
62ceb36157
Use hashtables for password lists
2026-04-26 20:38:58 +03:00
Vladimir Dubrovin
62be3c7b5b
cash the hash for auth cache
2026-04-26 19:56:38 +03:00
Vladimir Dubrovin
4f0f3c81e1
add 'cacheacl' auth type, dstaddr, dstport, dsthost, dstoper, srvaddr and srvport authcache types; allow to configure authcache by service
...
'auth cacheacl ...' is identical to 'auth cache ...' except ACL is not checked for cached authentication. dstaddr, dstport, dsthost and dstoper (operation) are intended to be used with cacheacl. For example
authcache user,ip,password,dstaddr 600
auth cacheacl iponly strong
allows user to access destination ip without ACL/password revalidation if he has cached attempt to the same ip from the same ip with the same username and password.
srvaddr, srvport are useful to only match with cached attempts to the same `internal` address / service port.
2026-04-21 21:49:52 +03:00
Vladimir Dubrovin
68ef9dcc59
Fix Windows compilation
2026-04-21 16:10:17 +03:00
Vladimir Dubrovin
3957210609
Allow different hash lengths; fix bug on hashtable grow
2026-04-20 18:49:53 +03:00
Vladimir Dubrovin
083a70393f
Minor hashtable refactor
2026-04-20 10:40:38 +03:00
Vladimir Dubrovin
7102afe856
authcache switched to hashtables, overflow fixed
...
- authcache switched to use hashtables, size parameter added
- overflow fixed on hashinit
- hashtable prefers new values on insert if table is full
- hashtable is able to compact/grow
2026-04-19 19:16:33 +03:00
Vladimir Dubrovin
a3729354b8
Allow hashtable to grow
2026-04-18 17:24:01 +03:00
Vladimir Dubrovin
260cbf7a3d
Use uint32_t for hashtable indicies
2026-04-18 15:36:14 +03:00
Vladimir Dubrovin
f1af44f3a9
Refactor hashtables to use indices instead of pointers, use blake2 as a hash, mycrypt renamed to 3proxy_crypt
2026-04-18 15:12:43 +03:00
Vladimir Dubrovin
4ee7f71fb9
Использовать tablesize в хештаблице
2026-04-17 21:15:21 +03:00
Vladimir Dubrovin
98604b5421
Add hashcompact
2026-04-17 20:40:27 +03:00
Vladimir Dubrovin
a0d580b36d
move hashtable/resolve/sql functions to separate files
2026-04-17 19:29:50 +03:00
Vladimir Dubrovin
a1a65c3fd5
ssl_client_mode = 3 added, allow 'secure' parent types ending with 's': https, tcps, socks5s, connect+s, etc.
...
example:
plugin SSLPlugin.ld.so ssl_plugin
allow user1
parent 1000 http 1.1.1.1 1111
allow user2
parent 1000 https 2.2.2.2 2222
ssl_client_mode 3
ssl_client
proxy
With ssl_client_mode 3 TLS is only handshaked for https parent type and is not handshaked for http parent.
2026-04-13 20:53:38 +03:00
Vladimir Dubrovin
878a432481
Support unix socket for parent and tcppm; abstract (fileless) unix sockets for linux support
...
Use unix:/path/to/socket, e.g.
tcppm 1234 unix:/path/to/socket 1234
Under linux abstract sockets are supported with '@' prefix, e.g.
parent 1000 http unix:@virtual.3proxy.socket 1111
Destination port numbers are not used in tcppm/parent, but you must specify any positive value to match the syntaxis.
2026-04-12 19:18:15 +03:00
Vladimir Dubrovin
2d6eeff5f3
FIx typos, update documentation
2026-04-12 13:58:42 +03:00
Vladimir Dubrovin
c206349ee2
Support unix sockets for internal and -i
...
Example configuration:
log
auto -iunix:/path/to/3proxy.sock
test with
curl --unix-socket /path/to/3proxy.sock https://3proxy.ru
2026-04-12 00:30:35 +03:00
Vladimir Dubrovin
0c8be907e9
-Ne / -Ni options added to specify external / internal NAT address
2026-04-10 15:01:43 +03:00
Vladimir Dubrovin
0381461495
Use PRI/SCN modifiers where possible
2026-04-08 21:13:31 +03:00