Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package 3proxy for openSUSE:Factory checked in at 2026-11-07 23:34:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/3proxy (Old) and /work/SRC/openSUSE:Factory/.3proxy.new.3759290 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "3proxy" Sat Nov 7 23:34:01 2026 rev:9 rq:1396040 version:1.0.3 Changes: -------- --- /work/SRC/openSUSE:Factory/3proxy/3proxy.changes 2026-10-24 22:07:35.030050470 +0200 +++ /work/SRC/openSUSE:Factory/.3proxy.new.3759290/3proxy.changes 2026-11-07 23:34:54.549239480 +0100 @@ -1,0 +2,6 @@ +Sat Nov 7 14:37:06 UTC 2026 - Илья Индиго <[email protected]> + +- Updated to 1.0.3 + * https://github.com/3proxy/3proxy/releases/tag/1.0.3 + +------------------------------------------------------------------- Old: ---- 3proxy-1.0.2.tar.gz New: ---- 3proxy-1.0.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ 3proxy.spec ++++++ --- /var/tmp/diff_new_pack.bwxwjG/_old 2026-11-07 23:34:55.224267371 +0100 +++ /var/tmp/diff_new_pack.bwxwjG/_new 2026-11-07 23:34:55.226267454 +0100 @@ -21,7 +21,7 @@ %define _group proxy %define _home %{_localstatedir}/lib/%{name} Name: 3proxy -Version: 1.0.2 +Version: 1.0.3 Release: 0 Summary: Tiny proxy servers set License: Apache-2.0 OR BSD-3-Clause OR GPL-2.0-or-later OR LGPL-2.1-or-later ++++++ 3proxy-1.0.2.tar.gz -> 3proxy-1.0.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/CHANGELOG new/3proxy-1.0.3/CHANGELOG --- old/3proxy-1.0.2/CHANGELOG 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/CHANGELOG 2026-11-07 09:50:16.000000000 +0100 @@ -1,25 +1,13 @@ -3proxy-1.0.2 Released October, 24 2026 +3proxy-1.0.3 Released November, 7 2026 -! Fix: dnspr relayed to the client whatever came first to the socket it asked the name server from, from any address and under any id, so a forged answer could be passed on; the query now goes out under a random id, and only an answer from the name server asked, with that id and the same question, is relayed -! Fix: a client sending a part of a TLS record and then nothing kept a thread taking all of a CPU, and the read never timed out -! Fix: without -Ne, the reply to SOCKS CONNECT and BIND gave the address of the client's connection to the proxy instead of the socket towards the destination: a BIND client was told the proxy's own port and the peer could never reach it (since 0.9.6) -! Fix: a client which shut down its sending side (half-close) could get the answer cut short, megabytes short with large answers; likewise an upload after the server half-closed -! Fix: with chroot every local time was UTC and every syslog message was lost: the time zone is loaded and syslog connected before chroot; the chroot entry of 3proxy.cfg(5) lists what PAM, LDAP and ODBC still need inside the chroot -! Fix: the HTTP proxy closed the server connection of a kept-alive client and opened another one when only the request method changed (a POST after a GET to the same host) -! Fix: the last ssl_client_mode in the configuration applied to every service, and a reload changed it for the services still running -! Fix: memory leaks: on every refused configuration reload, on every failed TLS handshake, the server CA paths of every TLS service, compiled pcre: / regex: host names of access rules and patterns of httpsrv rules -! Fix: Unix sockets: on Linux a proxy listening on a Unix socket relayed only the first bytes of an answer (result 95); an abstract socket (unix:@NAME) was bound under a name padded with zeros, which clients did not reach; tcppm refused port 0 for a unix: target, as given in the manual's example; on a reload the socket file of a listening service was removed -! Fix: SIGPIPE could kill 3proxy when a client was gone while services were starting, and standalone services (proxy, socks, ...) at any time; sends use MSG_NOSIGNAL where the system has it -! Fix: TLS MitM failed for every connection with wolfSSL built with WOLFSSL_QT (wolfSSL 5.9.1 of Ubuntu 26.04): the source certificate's serial number could not be copied; a serial number made from the hash of the source certificate is used then -! Fix: Windows: closing a connection could leave its socket open (SO_LINGER on a non-blocking socket) or reset it while the peer still sent, so the end of an answer could be lost -! Fix: httpsrv: the body of a request answered without being read (for example when authentication is required) was read as the next request; a client still sending when a connection without keep-alive closed could get a reset instead of the answer -! Fix: httpsrv on Windows: UNC paths (\\server\share) did not work -! Fix: httpsrv and admin services and their clients were named ZOMBIE on the admin services page, in %N of logs and in RADIUS -! Fix: the Watcom (lite) build did not compile, 1.0.1 had no binaries for it -+ -s (splice) per direction: -s1 splices what the server sends (downloads), -s2 what the client sends (uploads), -s3 both; -s alone splices only where it pays (large bodies, long streams); pipes are kept with the connection for its next requests. splice() is built by default on Linux again and is used only by services given -s -+ Socket options (-oc, -os, -ol, -or, -oR) take NAME=VALUE; NAME=0 turns an option off, also one set by default; an unknown name or a value which is not a number is an error -+ The HTTP proxy frees its 64 KB request buffer while a CONNECT tunnel relays data and while a kept-alive connection waits for its next request: 2000 tunnels take 213 MB instead of 339 MB -+ TLS records are read ahead with OpenSSL 1.1.0 and later: decrypting takes 9-14% less CPU -+ Faster service stop and configuration reload, no fixed delays; a connection waiting for a free maxconn slot gets it at once -- TCP_NODELAY is set by default on proxy-to-client and proxy-to-server sockets; -ocTCP_NODELAY=0 / -osTCP_NODELAY=0 turns it off -- The HTTP proxy fetches ftp:// URLs only when the service is given the new -Xftp option (in a build with FTP=true) +! Fix: RADIUS authentication: the reply digest copied the shared secret right after the received bytes, so a reply of 4100 bytes with a secret of 17 or more characters wrote up to 47 bytes of it past the reply buffer on the stack, before the reply was authenticated; the digest is hashed over the reply and the secret in place now, with nothing written past the reply, and a reply is taken only from the address and port of the server the request went to, with the request's identifier and length, which was never checked before +! Fix: the PTR answer of a name server could write past the answer buffer on the stack: the label walk ran to the end of the whole message instead of the end of the record's data and could take a compression pointer for a label length (an answer of 3841 bytes or more reached past the buffer itself); the walk now stops at the end of the record's data, and a compressed, empty or truncated name is not accepted +! Fix: every connection matching a pcre: (or regex:) rule matched on the one match data block of the rule, which pcre2_match() writes into: two connections matching at the same time raced and corrupted memory, bringing the process down under load; a connection now makes a match data block of its own +! Fix: TLS: a read which could only be done once a write was, or a write once a read was (a TLS 1.3 key update answered while the socket cannot take more, for example), ended the connection with an error; each TLS socket remembers now what its pending read and write wait for, and the poll of the TLS layer waits for that +! Fix: Windows: a TLS read or write which wanted the socket again was not seen as one and dropped the connection with an unrelated error: the C library's errno was set where the socket error is read +! Fix: a client of a connect back (-R) service stayed in accept() for the connection another client of the same service took, until the next one came, past its time out and through a configuration reload; the connect back socket is non-blocking now, and an accept() with nothing to take does not count as one of the client's tries +! Fix: ftppr: the answer of a server which logs in on USER alone (230, as anonymous FTP often does) or refuses the login was read but never handed to the client, which was left waiting for the answer to its PASS until the time out (#1284) +! Fix: plugins: StringsPlugin, cutting a string table line at its end, wrote NULs past the line, into what the buffer kept of longer lines read before or past its end; FilePlugin passed the TLS state of the connection where the client's parameters were expected, so sending a string table over a TLS connection read a TLS state as a clientparam ++ -B (for TCP services) splits the TLS ClientHello passed through tlspr in the middle of the server name (SNI), so DPI systems which do not reassemble it do not see the host name; TCP_NODELAY, set by default, must not be turned off, or the kernel may join the segments again; -s keeps the same effect where -s is not splice (#1283) ++ 3proxy --help (and the usage message of a bad invocation) lists what the build was made with: TLS and its backend, RADIUS, PCRE, IPv6, UNIX sockets, the built-in HTTP server, transparency, ODBC and the optional proxy services ++ An outgoing connection bound to an external address is bound with IP_BIND_ADDRESS_NO_PORT on Linux 4.2 and later: the port is chosen by connect() for the pair with the destination, so ports in use towards other destinations or closing in TIME_WAIT do not run the ephemeral range out; bind() no longer failed with result 12 or searched long for a port under many connections diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/CHANGELOG.rus new/3proxy-1.0.3/CHANGELOG.rus --- old/3proxy-1.0.2/CHANGELOG.rus 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/CHANGELOG.rus 2026-11-07 09:50:16.000000000 +0100 @@ -1,25 +1,13 @@ -3proxy-1.0.2 Вышел 24 Октября 2026 +3proxy-1.0.3 Вышел 7 Ноября 2026 -! Исправление: dnspr передавал клиенту то, что первым пришло на сокет, с которого он обращался к серверу имён, с любого адреса и с любым id, так что поддельный ответ мог быть передан клиенту; теперь запрос отправляется со случайным id, и передаётся только ответ от того сервера имён, к которому обращались, с этим id и тем же вопросом -! Исправление: клиент, отправивший часть записи TLS и затем ничего, занимал поток на всё процессорное время, и чтение не завершалось по таймауту -! Исправление: без -Ne ответ на SOCKS CONNECT и BIND содержал адрес соединения клиента с прокси вместо адреса сокета в сторону назначения: клиенту BIND сообщался собственный порт прокси, и удалённая сторона не могла к нему подключиться (с 0.9.6) -! Исправление: клиент, закрывший свою сторону передачи (half-close), мог получить ответ не полностью, на больших ответах без нескольких мегабайт; так же обрезалась загрузка на сервер после того, как сервер закрыл свою сторону -! Исправление: при chroot всё местное время становилось UTC и все сообщения syslog терялись: часовой пояс теперь загружается, а syslog подключается до chroot; в описании chroot в 3proxy.cfg(5) перечислено, что ещё нужно внутри chroot для PAM, LDAP и ODBC -! Исправление: HTTP прокси закрывал соединение с сервером для клиента с keep-alive и открывал новое, когда менялся только метод запроса (POST после GET к тому же хосту) -! Исправление: последний ssl_client_mode в конфигурации действовал для всех служб, а перезагрузка конфигурации меняла его для уже работающих служб -! Исправление: утечки памяти: при каждой отвергнутой перезагрузке конфигурации, при каждом неудачном согласовании TLS, пути CA сервера каждой службы с TLS, скомпилированные имена хостов pcre: / regex: в правилах доступа и шаблоны правил httpsrv -! Исправление: сокеты Unix: в Linux прокси, слушающий на сокете Unix, передавал только первые байты ответа (результат 95); абстрактный сокет (unix:@NAME) привязывался к имени, дополненному нулями, до которого клиенты не доходили; tcppm отвергал порт 0 для цели unix:, как в примере из документации; при перезагрузке конфигурации файл сокета слушающей службы удалялся -! Исправление: SIGPIPE мог завершить 3proxy, если клиент отключался во время запуска служб, а отдельные службы (proxy, socks, ...) — в любой момент; отправка данных использует MSG_NOSIGNAL там, где система его поддерживает -! Исправление: TLS MitM не работал ни для одного соединения с wolfSSL, собранным с WOLFSSL_QT (wolfSSL 5.9.1 в Ubuntu 26.04): не удавалось скопировать серийный номер исходного сертификата; в этом случае используется серийный номер, полученный из хеша исходного сертификата -! Исправление: Windows: при закрытии соединения сокет мог остаться открытым (SO_LINGER на неблокирующем сокете) или соединение сбрасывалось, пока другая сторона ещё передавала данные, так что конец ответа мог потеряться -! Исправление: httpsrv: тело запроса, на который ответ дан без его чтения (например, когда требуется аутентификация), читалось как следующий запрос; клиент, ещё передающий данные при закрытии соединения без keep-alive, мог получить сброс соединения вместо ответа -! Исправление: httpsrv в Windows: не работали пути UNC (\\server\share) -! Исправление: службы httpsrv и admin и их клиенты назывались ZOMBIE на странице служб admin, в %N журнала и в RADIUS -! Исправление: сборка Watcom (lite) не компилировалась, в 1.0.1 для неё не было двоичных файлов -+ -s (splice) по направлениям: -s1 — то, что передаёт сервер (скачивание), -s2 — то, что передаёт клиент (загрузка), -s3 — оба; -s без числа использует splice только там, где это выгодно (большие тела, длинные потоки); каналы (pipe) сохраняются с соединением для следующих запросов. splice() снова собирается по умолчанию в Linux и используется только службами с -s -+ Опции сокетов (-oc, -os, -ol, -or, -oR) принимают ИМЯ=ЗНАЧЕНИЕ; ИМЯ=0 выключает опцию, в том числе установленную по умолчанию; неизвестное имя или значение, не являющееся числом, — ошибка -+ HTTP прокси освобождает буфер запроса размером 64 КБ, пока туннель CONNECT передаёт данные и пока соединение с keep-alive ждёт следующего запроса: 2000 туннелей занимают 213 МБ вместо 339 МБ -+ Записи TLS читаются с упреждением (read-ahead) с OpenSSL 1.1.0 и новее: расшифровка занимает на 9-14% меньше процессорного времени -+ Более быстрая остановка служб и перезагрузка конфигурации, без фиксированных задержек; соединение, ожидающее свободного места в maxconn, получает его сразу -- TCP_NODELAY устанавливается по умолчанию на сокетах прокси-клиент и прокси-сервер; -ocTCP_NODELAY=0 / -osTCP_NODELAY=0 выключает его -- HTTP прокси обрабатывает адреса ftp:// только если службе задана новая опция -Xftp (в сборке с FTP=true) +! Исправление: аутентификация RADIUS: дайджест ответа копировал общий секрет сразу за принятыми байтами, так что ответ размером 4100 байт с секретом в 17 и более символов записывал до 47 байт секрета за буфер ответа на стеке, ещё до проверки подлинности ответа; дайджест теперь вычисляется по ответу и секрету на месте, ничего не записывая за буфер, а ответ принимается только с адреса и порта сервера, которому был адресован запрос, с совпадающими с запросом идентификатором и длиной: раньше отправитель ответа не проверялся вовсе +! Исправление: ответ PTR от сервера имён мог записать данные за буфер ответа на стеке: обход имён шёл до конца всего сообщения вместо конца данных записи и мог принять байт-указатель сжатия за длину метки (ответ размером 3841 байт и более выходил за сам буфер); теперь обход останавливается в конце данных записи, а сжатое, пустое или обрезанное имя не принимается +! Исправление: каждое соединение, проверяемое правилом pcre: (или regex:), сопоставлялось с единственным блоком данных сопоставления правила, в который пишет pcre2_match(): два соединения, сопоставляемые одновременно, конкурировали за него и портили память, приводя процесс к падению под нагрузкой; теперь каждое соединение получает собственный блок данных сопоставления +! Исправление: TLS: чтение, возможное только после записи, или запись только после чтения (например, когда TLS 1.3 отвечает на обновление ключей, а сокет больше не принимает данные) завершало соединение с ошибкой; каждый TLS-сокет теперь помнит, чего ждут его незавершённые чтение и запись, и poll() TLS-уровня ждёт именно этого +! Исправление: Windows: чтение или запись TLS, требующая повторного обращения к сокету, не распознавалась, и соединение завершалось с посторонней ошибкой: в месте чтения ошибки сокета устанавливалась ошибка libc (errno) +! Исправление: клиент обратного соединения (connect back, -R) оставался в accept() в ожидании соединения, которое забрал другой клиент той же службы, до следующего соединения, переживая свой тайм-аут и перезагрузку конфигурации; сокет обратного соединения теперь неблокирующий, и accept() без соединения не считается попыткой клиента +! Исправление: ftppr: ответ сервера, входящего по одному USER (230, как часто бывает у анонимного FTP) или отказывающего во входе, прочитывался, но не передавался клиенту, который оставался ждать ответа на свой PASS до тайм-аута (#1284) +! Исправление: плагины: StringsPlugin, обрезая строку таблицы строк на её конце, записывал NUL за строкой, в остатки в буфере от прочитанных раньше более длинных строк или за его конец; FilePlugin передавал в socksend() состояние TLS соединения вместо параметров клиента, и отправка таблицы строк по TLS-соединению читала состояние TLS как clientparam ++ -B (для TCP-служб) разбивает проходящий через tlspr ClientHello TLS посередине имени сервера (SNI), чтобы системы DPI, не собирающие его заново, не видели имя хоста; TCP_NODELAY, устанавливаемый по умолчанию, выключать нельзя, иначе ядро может снова склеить сегменты; -s сохраняет тот же эффект там, где -s не означает splice (#1283) ++ 3proxy --help (и сообщение об использовании при неверном запуске) перечисляет, с чем собран бинарник: TLS и его серверная библиотека, RADIUS, PCRE, IPv6, сокеты Unix, встроенный HTTP-сервер, прозрачное проксирование, ODBC и необязательные прокси-службы ++ Исходящее соединение, привязываемое к внешнему адресу, на Linux 4.2 и новее привязывается с IP_BIND_ADDRESS_NO_PORT: порт выбирает connect() для пары с адресом назначения, поэтому порты, занятые соединениями к другим адресам или закрывающиеся в TIME_WAIT, больше не исчерпывают эфемерный диапазон; bind() больше не завершался с результатом 12 при большом числе соединений и не тратил миллисекунды на поиск порта diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/README.md new/3proxy-1.0.3/README.md --- old/3proxy-1.0.2/README.md 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/README.md 2026-11-07 09:50:16.000000000 +0100 @@ -8,7 +8,8 @@ - **Master** (current/latest) branch - 3proxy 1.0 - **0.9** (LTS) branch - 3proxy 0.9.9.x -- **Devel** branch - 3proxy 2.0-devel (don't use it) +- **Devel** branch - 3proxy 1.1 (development, don't use it in production) +- **Experimental** branch - 3proxy 2.0 (experimental, don't use it) ### Binaries (deb / rpm / Windows zip) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/RELEASE new/3proxy-1.0.3/RELEASE --- old/3proxy-1.0.2/RELEASE 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/RELEASE 2026-11-07 09:50:16.000000000 +0100 @@ -1 +1 @@ -1.0.2 \ No newline at end of file +1.0.3 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/debian/changelog new/3proxy-1.0.3/debian/changelog --- old/3proxy-1.0.2/debian/changelog 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/debian/changelog 2026-11-07 09:50:16.000000000 +0100 @@ -1,3 +1,9 @@ +3proxy (1.0.3-1) buster; urgency=medium + + *3proxy 1.0.3 initial build + + -- z3APA3A <[email protected]> Sat, 07 Nov 2026 08:50:16 +0000 + 3proxy (1.0.2-1) buster; urgency=medium *3proxy 1.0.2 initial build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/doc/changelog/1/0/3 new/3proxy-1.0.3/doc/changelog/1/0/3 --- old/3proxy-1.0.2/doc/changelog/1/0/3 1970-01-01 01:00:00.000000000 +0100 +++ new/3proxy-1.0.3/doc/changelog/1/0/3 2026-11-07 09:50:16.000000000 +0100 @@ -0,0 +1,11 @@ +! Fix: RADIUS authentication: the reply digest copied the shared secret right after the received bytes, so a reply of 4100 bytes with a secret of 17 or more characters wrote up to 47 bytes of it past the reply buffer on the stack, before the reply was authenticated; the digest is hashed over the reply and the secret in place now, with nothing written past the reply, and a reply is taken only from the address and port of the server the request went to, with the request's identifier and length, which was never checked before +! Fix: the PTR answer of a name server could write past the answer buffer on the stack: the label walk ran to the end of the whole message instead of the end of the record's data and could take a compression pointer for a label length (an answer of 3841 bytes or more reached past the buffer itself); the walk now stops at the end of the record's data, and a compressed, empty or truncated name is not accepted +! Fix: every connection matching a pcre: (or regex:) rule matched on the one match data block of the rule, which pcre2_match() writes into: two connections matching at the same time raced and corrupted memory, bringing the process down under load; a connection now makes a match data block of its own +! Fix: TLS: a read which could only be done once a write was, or a write once a read was (a TLS 1.3 key update answered while the socket cannot take more, for example), ended the connection with an error; each TLS socket remembers now what its pending read and write wait for, and the poll of the TLS layer waits for that +! Fix: Windows: a TLS read or write which wanted the socket again was not seen as one and dropped the connection with an unrelated error: the C library's errno was set where the socket error is read +! Fix: a client of a connect back (-R) service stayed in accept() for the connection another client of the same service took, until the next one came, past its time out and through a configuration reload; the connect back socket is non-blocking now, and an accept() with nothing to take does not count as one of the client's tries +! Fix: ftppr: the answer of a server which logs in on USER alone (230, as anonymous FTP often does) or refuses the login was read but never handed to the client, which was left waiting for the answer to its PASS until the time out (#1284) +! Fix: plugins: StringsPlugin, cutting a string table line at its end, wrote NULs past the line, into what the buffer kept of longer lines read before or past its end; FilePlugin passed the TLS state of the connection where the client's parameters were expected, so sending a string table over a TLS connection read a TLS state as a clientparam ++ -B (for TCP services) splits the TLS ClientHello passed through tlspr in the middle of the server name (SNI), so DPI systems which do not reassemble it do not see the host name; TCP_NODELAY, set by default, must not be turned off, or the kernel may join the segments again; -s keeps the same effect where -s is not splice (#1283) ++ 3proxy --help (and the usage message of a bad invocation) lists what the build was made with: TLS and its backend, RADIUS, PCRE, IPv6, UNIX sockets, the built-in HTTP server, transparency, ODBC and the optional proxy services ++ An outgoing connection bound to an external address is bound with IP_BIND_ADDRESS_NO_PORT on Linux 4.2 and later: the port is chosen by connect() for the pair with the destination, so ports in use towards other destinations or closing in TIME_WAIT do not run the ephemeral range out; bind() no longer failed with result 12 or searched long for a port under many connections diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/doc/html/howtoe.html new/3proxy-1.0.3/doc/html/howtoe.html --- old/3proxy-1.0.2/doc/html/howtoe.html 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/doc/html/howtoe.html 2026-11-07 09:50:16.000000000 +0100 @@ -648,16 +648,16 @@ <br>tlspr can be used as a parent with the "tls" type to implement SNI splitting for DPI bypass (similar to NoDPI/GoodByeDPI). The client sends the first part of the TLS ClientHello, tlspr splits it at the SNI extension and sends it in two TCP packets, which can bypass some DPI systems that look for blocked hostnames in TLS handshakes. -<br>To enable SNI break, use <code>parent ... tls 0.0.0.0 0</code> and the <code>-s</code> option on the listening service with TCP_NODELAY: +<br>To enable SNI break, use <code>parent ... tls 0.0.0.0 0</code> and the <code>-B</code> option on the listening service: </p><pre> auth iponly allow * parent 1000 tls 0.0.0.0 0 allow * -proxy -s -i127.0.0.1 -ocTCP_NODELAY -osTCP_NODELAY -p1443 +proxy -B -i127.0.0.1 -p1443 </pre> <p> -TCP_NODELAY is required to prevent the kernel from merging the split packets. +TCP_NODELAY, set by default, is required to prevent the kernel from merging the split packets: do not turn it off with -ocTCP_NODELAY=0 or -osTCP_NODELAY=0. </p> <p> <b>Configuration examples:</b> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/doc/html/howtor.html new/3proxy-1.0.3/doc/html/howtor.html --- old/3proxy-1.0.2/doc/html/howtor.html 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/doc/html/howtor.html 2026-11-07 09:50:16.000000000 +0100 @@ -656,16 +656,16 @@ <br>tlspr может использоваться как родительский прокси типа "tls" для реализации SNI-фрагментации (аналог NoDPI/GoodByeDPI). Клиент отправляет первую часть TLS ClientHello, tlspr разбивает его на расширении SNI и отправляет двумя TCP-пакетами, что позволяет обойти некоторые DPI-системы, ищущие заблокированные имена хостов в TLS-рукопожатиях. -<br>Для включения SNI break используйте <code>parent ... tls 0.0.0.0 0</code> и опцию <code>-s</code> на слушающем сервисе с TCP_NODELAY: +<br>Для включения SNI break используйте <code>parent ... tls 0.0.0.0 0</code> и опцию <code>-B</code> на слушающем сервисе: </p><pre> auth iponly allow * parent 1000 tls 0.0.0.0 0 allow * -proxy -s -i127.0.0.1 -ocTCP_NODELAY -osTCP_NODELAY -p1443 +proxy -B -i127.0.0.1 -p1443 </pre> <p> -TCP_NODELAY необходим, чтобы ядро не объединяло разделенные пакеты. +TCP_NODELAY, установленный по умолчанию, необходим, чтобы ядро не объединяло разделенные пакеты: не отключайте его опциями -ocTCP_NODELAY=0 или -osTCP_NODELAY=0. </p> <p> <b>Примеры конфигурации:</b> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/doc/html/man5/3proxy.cfg.5.html new/3proxy-1.0.3/doc/html/man5/3proxy.cfg.5.html --- old/3proxy-1.0.2/doc/html/man5/3proxy.cfg.5.html 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/doc/html/man5/3proxy.cfg.5.html 2026-11-07 09:50:16.000000000 +0100 @@ -245,6 +245,14 @@ polling size is below GRACE_TRAFF bytes and GRACE_NUM read operations in a single direction are detected within 1 second. Useful to minimize polling <b><br> +-B</b> (for TCP services) split the TLS ClientHello across +two TCP segments in the middle of the server name (SNI) when +it is passed through tlspr, as with <b>parent ... tls +0.0.0.0 0</b>: some DPI systems looking for blocked host +names do not reassemble it. TCP_NODELAY, set by default, +must not be turned off, or the kernel may join the segments +again. In builds without splice() <b>-s</b> does the same. +<b><br> -s</b> <br> (for admin) secure, allow only secure operations, currently only traffic counters view without ability to reset. <br> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/doc/html/man8/tlspr.8.html new/3proxy-1.0.3/doc/html/man8/tlspr.8.html --- old/3proxy-1.0.2/doc/html/man8/tlspr.8.html 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/doc/html/man8/tlspr.8.html 2026-11-07 09:50:16.000000000 +0100 @@ -230,15 +230,16 @@ <td width="4%"> -<p><b>-s</b></p></td> +<p><b>-B</b></p></td> <td width="5%"></td> <td width="82%"> -<p>Split the TLS Client HELLO packet across multiple TCP -segments to make SNI-based DPI detection harder. An optional -numeric value can follow (e.g. <b>-s1</b>) to control the -splitting behaviour.</p></td></tr> +<p>Split the TLS Client HELLO packet across two TCP +segments, in the middle of the SNI, to make SNI-based DPI +detection harder. In builds without splice() <b>-s</b> does +the same; with splice() (Linux) <b>-s</b> is splice, see +<b>3proxy.cfg</b>(5).</p> </td></tr> </table> <p style="margin-left:9%;"><b>-Ximap | -Xpop3 | diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/man/3proxy.cfg.5 new/3proxy-1.0.3/man/3proxy.cfg.5 --- old/3proxy-1.0.2/man/3proxy.cfg.5 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/man/3proxy.cfg.5 2026-11-07 09:50:16.000000000 +0100 @@ -198,6 +198,13 @@ .B -g(\fIGRACE_TRAFF\fB,\fIGRACE_NUM\fB,\fIGRACE_DELAY\fR) delay GRACE_DELAY milliseconds before polling if average polling size is below GRACE_TRAFF bytes and GRACE_NUM read operations in a single direction are detected within 1 second. Useful to minimize polling .br +.B -B +(for TCP services) split the TLS ClientHello across two TCP segments in the +middle of the server name (SNI) when it is passed through tlspr, as with +\fBparent ... tls 0.0.0.0 0\fR: some DPI systems looking for blocked host names +do not reassemble it. TCP_NODELAY, set by default, must not be turned off, or the +kernel may join the segments again. In builds without splice() \fB-s\fR does the same. +.br .B -s (for admin) secure, allow only secure operations, currently only traffic counters view without ability to reset. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/man/tlspr.8 new/3proxy-1.0.3/man/tlspr.8 --- old/3proxy-1.0.2/man/tlspr.8 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/man/tlspr.8 2026-11-07 09:50:16.000000000 +0100 @@ -76,8 +76,8 @@ .B -c TLS_CHECK_LEVEL. 0 (default) - allow non-TLS traffic to pass, 1 - require TLS, only check client HELLO packet, 2 - require TLS, check both client and server HELLO, 3 - require TLS, check that the server sends a certificate (not compatible with TLS 1.3), 4 - require mutual TLS, check that the server sends a certificate request and the client sends a certificate (not compatible with TLS 1.3) .TP -.B -s -Split the TLS Client HELLO packet across multiple TCP segments to make SNI-based DPI detection harder. An optional numeric value can follow (e.g. \fB-s1\fR) to control the splitting behaviour. +.B -B +Split the TLS Client HELLO packet across two TCP segments, in the middle of the SNI, to make SNI-based DPI detection harder. In builds without splice() \fB-s\fR does the same; with splice() (Linux) \fB-s\fR is splice, see \fB3proxy.cfg\fR(5). .TP .B -Ximap | -Xpop3 | -Xsmtp STARTTLS mode for the given protocol. The proxy speaks the plaintext protocol diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/scripts/rh/3proxy.spec new/3proxy-1.0.3/scripts/rh/3proxy.spec --- old/3proxy-1.0.2/scripts/rh/3proxy.spec 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/scripts/rh/3proxy.spec 2026-11-07 09:50:16.000000000 +0100 @@ -1,5 +1,5 @@ Name: 3proxy -Version: 1.0.2 +Version: 1.0.3 Release: 1%{?dist} Summary: 3proxy tiny proxy server License: GPL/LGPL/Apache/BSD diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/src/3proxy.c new/3proxy-1.0.3/src/3proxy.c --- old/3proxy-1.0.2/src/3proxy.c 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/src/3proxy.c 2026-11-07 09:50:16.000000000 +0100 @@ -382,6 +382,21 @@ #define RETURN(x) {res = x; goto CLEARRETURN;} +static void printusage(struct extparam *cconf, int argc, char * argv[]){ + + fprintf(stderr, "Usage: %s [conffile]\n", argv[0]); +#ifdef _WIN32 + fprintf(stderr, "\n\t%s --install [conffile]\n\tto install as service\n" + "\n\t%s --remove\n\tto remove service\n", argv[0], argv[0]); +#else + fprintf(stderr, "\n if conffile is missing, configuration is expected from stdin\n"); +#endif + fprintf(stderr, "\n\t%s --help\n\tthis message\n", argv[0]); + fprintf(stderr, "available socket options:\n\t%s\n", printopts("\n\t")); + fprintf(stderr, "built with:\n\t%s\n", printfeatures("\n\t")); + fprintf(stderr, "\n%s %s\n%s\n", cconf->stringtable[2], cconf->stringtable[3], copyright); +} + #ifndef _WINCE int main(int argc, char * argv[]) { @@ -424,6 +439,10 @@ #endif conf.stringtable = strings; + if(argc == 2 && (!strcmp((char *)argv[1], "--help") || !strcmp((char *)argv[1], "-h"))) { + printusage(&conf, argc, argv); + return 0; + } #ifdef _WIN32 #ifndef _WINCE if((argc == 2 || argc == 3)&& !strcmp((char *)argv[1], "--install")) { @@ -536,18 +555,9 @@ } if(argc > 2 || !(fp)) { - fprintf(stderr, "Usage: %s [conffile]\n", argv[0]); -#ifdef _WIN32 - fprintf(stderr, "\n\t%s --install [conffile]\n\tto install as service\n" - "\n\t%s --remove\n\tto remove service\n", argv[0], argv[0]); -#else - fprintf(stderr, "\n if conffile is missing, configuration is expected from stdin\n"); -#endif - fprintf(stderr, "available socket options:\n\t%s\n", printopts("\n\t")); - fprintf(stderr, "\n%s %s\n%s\n", conf.stringtable[2], conf.stringtable[3], copyright); - + printusage(&conf, argc, argv); return 1; - } + } #ifndef _WIN32 /* before readconfig() starts the services: a client gone while it is diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/src/authradius.c new/3proxy-1.0.3/src/authradius.c --- old/3proxy-1.0.2/src/authradius.c 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/src/authradius.c 2026-11-07 09:50:16.000000000 +0100 @@ -198,12 +198,20 @@ int secretlen; uint8_t calc_digest[AUTH_VECTOR_LEN]; uint8_t calc_vector[AUTH_VECTOR_LEN]; + unsigned int dlen = AUTH_VECTOR_LEN; + mdh_ctx *ctx; memcpy(calc_vector, packet + 4, AUTH_VECTOR_LEN); memcpy(packet + 4, original, AUTH_VECTOR_LEN); secretlen = strlen(secret); - memcpy(packet + len, secret, secretlen); - md5_calc(calc_digest, (u_char *)packet, len + secretlen); + /* hash the reply, then the secret: nothing is written past the reply */ + if(!(ctx = mdh_init(MDH_MD5, 16))) return 2; + if(!mdh_update(ctx, packet, len) || !mdh_update(ctx, secret, secretlen) || + !mdh_final(ctx, calc_digest, &dlen)) { + mdh_free(ctx); + return 2; + } + mdh_free(ctx); /* * Return 0 if OK, 2 if not OK. @@ -298,6 +306,7 @@ int total_length; int len; PROXYSOCKADDRTYPE saremote; + PROXYSOCKADDRTYPE safrom; struct pollfd fds[1]; char vector[AUTH_VECTOR_LEN]; radius_packet_t packet, rpacket; @@ -568,15 +577,25 @@ continue; } - salen = sizeof(saremote); - + salen = sizeof(safrom); + data_len = so._recvfrom(so.state, remsock, (char *)&rpacket, sizeof(packet)-16, - 0, (struct sockaddr *)&saremote, &salen); + 0, (struct sockaddr *)&safrom, &salen); if (data_len < 20) { continue; } + /* the reply must come from the server we asked */ + if(*SAFAMILY(&safrom) != *SAFAMILY(&saremote) || + memcmp(SAADDR(&safrom), SAADDR(&saremote), SAADDRLEN(&saremote)) || + *SAPORT(&safrom) != *SAPORT(&saremote)) { + continue; + } + /* and answer this request, and be of its own length */ + if(data_len != ntohs(rpacket.length) || rpacket.id != packet.id) { + continue; + } if( auth && rpacket.code != PW_AUTHENTICATION_ACK && rpacket.code != PW_AUTHENTICATION_REJECT ){ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/src/common.c new/3proxy-1.0.3/src/common.c --- old/3proxy-1.0.2/src/common.c 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/src/common.c 2026-11-07 09:50:16.000000000 +0100 @@ -634,6 +634,26 @@ } +/* What waits for a socket waits in poll(): a call on it never does. */ +void nonblock(SOCKET sock){ +#ifdef _WIN32 + unsigned long ul = 1; + ioctlsocket(sock, FIONBIO, &ul); +#else + fcntl(sock, F_SETFL, O_NONBLOCK | fcntl(sock, F_GETFL)); +#endif +} + +/* accept() with nothing to accept: another took it, or it was gone */ +int acceptagain(void){ +#ifdef _WIN32 + int err = WSAGetLastError(); + return err == WSAEWOULDBLOCK || err == WSAECONNRESET || err == WSAEINTR; +#else + return errno == EAGAIN || errno == EWOULDBLOCK || errno == ECONNABORTED || errno == EINTR; +#endif +} + int connectwithpoll(struct clientparam *param, SOCKET sock, struct sockaddr *sa, SASIZETYPE size, int to){ struct pollfd fds[1]; #ifdef _WIN32 @@ -760,6 +780,22 @@ param->srv->so._setsockopt(param->sostate, param->remsock, SOL_SOCKET, SO_LINGER, (char *)&lg, sizeof(lg)); #endif if(extbindtodevice(param, param->remsock)) return 12; +#ifdef IP_BIND_ADDRESS_NO_PORT + /* A port the kernel chooses is chosen by connect(), for the pair with + the destination: one in use towards another destination, or closing + from an earlier connection, does as well. bind() would take one of + its own, and with many connections find none left, or search long + for it. */ + if((param->operation >= 256 || (param->operation & CONNECT) || param->redirected) +# ifdef WITH_UN + && *SAFAMILY(¶m->sinsl) != AF_UNIX +# endif + ){ + int one = 1; + + param->srv->so._setsockopt(param->sostate, param->remsock, IPPROTO_IP, IP_BIND_ADDRESS_NO_PORT, (char *)&one, sizeof(one)); + } +#endif #ifdef WITH_UN if(*SAFAMILY(¶m->sinsl) != AF_UNIX) #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/src/ftp.c new/3proxy-1.0.3/src/ftp.c --- old/3proxy-1.0.2/src/ftp.c 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/src/ftp.c 2026-11-07 09:50:16.000000000 +0100 @@ -38,7 +38,7 @@ if(i < 3) return 706; buf[i] = 0; if(atoi(buf)/100 != 2) { - *innbuf = i; + if(innbuf)*innbuf = i; return 702; } sprintf(buf, "USER %.128s\r\n", param->extusername?param->extusername:(unsigned char *)"anonymous"); @@ -77,6 +77,9 @@ return 701; } } + /* USER answered at once, logged in (230) or refused: that answer is + the client's, waiting for one to its PASS */ + else if(innbuf)*innbuf = i; if(res != 2) { return 700; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/src/ftppr.c new/3proxy-1.0.3/src/ftppr.c --- old/3proxy-1.0.2/src/ftppr.c 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/src/ftppr.c 2026-11-07 09:50:16.000000000 +0100 @@ -132,7 +132,7 @@ param->srv->so._closesocket(param->sostate, clidatasock); clidatasock = INVALID_SOCKET; } - if ((clidatasock=socket(SASOCK(¶m->sincl), SOCK_STREAM, IPPROTO_TCP)) == INVALID_SOCKET) {RETURN(821);} + if ((clidatasock=param->srv->so._socket(param->sostate, SASOCK(¶m->sincl), SOCK_STREAM, IPPROTO_TCP)) == INVALID_SOCKET) {RETURN(821);} if(intbindtodevice(param, clidatasock)){RETURN(822);} *SAPORT(¶m->sincl) = 0; if(bindwithrange(param, clidatasock, ¶m->sincl, param->intport)){RETURN(822);} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/src/pcre.c new/3proxy-1.0.3/src/pcre.c --- old/3proxy-1.0.2/src/pcre.c 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/src/pcre.c 2026-11-07 09:50:16.000000000 +0100 @@ -220,6 +220,14 @@ struct ace *acl; }; +/* What a connection matches with: pcre2_match() writes into its match + data, so a thread matching on the rule's own one would race every + other thread doing the same. */ +struct pcre_client_data { + struct pcre_filter_data *pcrefd; + pcre2_match_data * match_data; +}; + static void pcre_data_free(struct pcre_filter_data *pcrefd){ _3proxy_mutex_lock(&pcre_mutex); pcrefd->users--; @@ -253,16 +261,30 @@ static FILTER_ACTION pcre_filter_client(void *fo, struct clientparam * param, void** fc){ int res; struct ace tmpace; + struct pcre_filter_data *rule = (struct pcre_filter_data *)fo; + struct pcre_client_data *pcd; *fc = fo; if(!fo) return PASS; -#define pcrefd ((struct pcre_filter_data *)fo) - if(!pcrefd->acl) return CONTINUE; + if(!rule->acl) return CONTINUE; memset (&tmpace, 0, sizeof(struct ace)); - tmpace.src = pcrefd->acl->src; + tmpace.src = rule->acl->src; res = pl->ACLMatches(&tmpace, param); -#undef pcrefd - return (res)? CONTINUE:PASS; + if(!res) return PASS; + /* the connection goes on with a match data of its own */ + if(!(pcd = pl->mallocfunc(sizeof(struct pcre_client_data)))){ + *fc = NULL; + return rule->action; + } + pcd->pcrefd = rule; + pcd->match_data = NULL; + if(rule->re && !(pcd->match_data = pcre2_match_data_create_from_pattern(rule->re, NULL))){ + pl->freefunc(pcd); + *fc = NULL; + return rule->action; + } + *fc = pcd; + return CONTINUE; } /* What a rewritten buffer keeps free for its caller to append to. */ @@ -277,7 +299,8 @@ char * replace; char * tmpbuf, *target, *newbuf; int nreplaces=0; -#define pcrefd ((struct pcre_filter_data *)fc) + struct pcre_client_data *pcd = (struct pcre_client_data *)fc; +#define pcrefd (pcd->pcrefd) for(acl = pcrefd->acl; acl; acl=acl->next){ if(pl->ACLMatches(acl, param)){ @@ -290,9 +313,9 @@ for(; offset < *length_p; nreplaces++){ int repsz; - count = pcre2_match(pcrefd->re, (PCRE2_SPTR)*buf_p, *length_p, offset, 0, pcrefd->match_data, pcrefd->match_context); + count = pcre2_match(pcrefd->re, (PCRE2_SPTR)*buf_p, *length_p, offset, 0, pcd->match_data, pcrefd->match_context); if(count <= 0) break; - ovector = pcre2_get_ovector_pointer(pcrefd->match_data); + ovector = pcre2_get_ovector_pointer(pcd->match_data); if(ovector[0] > (PCRE2_SIZE)*length_p || ovector[1] > (PCRE2_SIZE)*length_p || ovector[1] < ovector[0]) break; if(!(replace = pcrefd->replace) || param->nooverwritefilter) return pcrefd->action; @@ -376,7 +399,13 @@ #undef pcrefd } -static void pcre_filter_clear(void *fo){ +static void pcre_filter_clear(void *fc){ + struct pcre_client_data *pcd = (struct pcre_client_data *)fc; + + if(pcd){ + if(pcd->match_data) pcre2_match_data_free(pcd->match_data); + pl->freefunc(pcd); + } } static void pcre_filter_close(void *fo){ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/src/plugins/FilePlugin/FilePlugin.c new/3proxy-1.0.3/src/plugins/FilePlugin/FilePlugin.c --- old/3proxy-1.0.2/src/plugins/FilePlugin/FilePlugin.c 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/src/plugins/FilePlugin/FilePlugin.c 2026-11-07 09:50:16.000000000 +0100 @@ -286,7 +286,7 @@ case GOT_SMTP_REQ: case GOT_SMTP_DATA: fps->state = FLUSH_DATA; - pl->socksend(fps->fpd.cp->sostate,fps->fpd.cp->clisock, (unsigned char *)fp_stringtable[1], (int)strlen((char *)fp_stringtable[1]), pl->conf->timeouts[STRING_S]); + pl->socksend(NULL, fps->fpd.cp->clisock, (unsigned char *)fp_stringtable[1], (int)strlen((char *)fp_stringtable[1]), pl->conf->timeouts[STRING_S]); fps->state = state; break; case GOT_HTTP_REQUEST: @@ -298,7 +298,7 @@ case GOT_HTTP_SRVDATA: if(!fps->serversent){ fps->state = FLUSH_DATA; - pl->socksend(fps->fpd.cp->sostate, fps->fpd.cp->clisock, (unsigned char *)fp_stringtable[0], (int)strlen((char *)fp_stringtable[0]), pl->conf->timeouts[STRING_S]); + pl->socksend(NULL, fps->fpd.cp->clisock, (unsigned char *)fp_stringtable[0], (int)strlen((char *)fp_stringtable[0]), pl->conf->timeouts[STRING_S]); fps->state = state; } break; @@ -306,7 +306,7 @@ case GOT_FTP_REQ: case GOT_FTP_SRVDATA: fps->state = FLUSH_DATA; - pl->socksend(fps->fpd.cp->sostate, fps->fpd.cp->ctrlsock, (unsigned char *)fp_stringtable[1], (int)strlen((char *)fp_stringtable[1]), pl->conf->timeouts[STRING_S]); + pl->socksend(NULL, fps->fpd.cp->ctrlsock, (unsigned char *)fp_stringtable[1], (int)strlen((char *)fp_stringtable[1]), pl->conf->timeouts[STRING_S]); fps->state = state; break; default: @@ -358,7 +358,7 @@ if(fps->serversent >= fps->srvhdrwritten){ sprintf(fps->buf, "%lx\r\n", len); sendchunk = (int)strlen(fps->buf); - if(pl->socksend(fps->fpd.cp->sostate, fps->fpd.cp->clisock, (unsigned char *)fps->buf, sendchunk, pl->conf->timeouts[STRING_S]) != sendchunk){ + if(pl->socksend(NULL, fps->fpd.cp->clisock, (unsigned char *)fps->buf, sendchunk, pl->conf->timeouts[STRING_S]) != sendchunk){ return -4; } } @@ -397,13 +397,13 @@ #endif return -3; } - if(pl->socksend(fps->fpd.cp->sostate, sock, (unsigned char *)fps->buf, res, pl->conf->timeouts[STRING_S]) != res) { + if(pl->socksend(NULL, sock, (unsigned char *)fps->buf, res, pl->conf->timeouts[STRING_S]) != res) { return -4; } len -= res; } if(sendchunk){ - if(pl->socksend(fps->fpd.cp->sostate, sock, (unsigned char *)"\r\n", 2, pl->conf->timeouts[STRING_S]) != 2) + if(pl->socksend(NULL, sock, (unsigned char *)"\r\n", 2, pl->conf->timeouts[STRING_S]) != 2) return -4; } fps->state = state; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/src/plugins/StringsPlugin/StringsPlugin.c new/3proxy-1.0.3/src/plugins/StringsPlugin/StringsPlugin.c --- old/3proxy-1.0.2/src/plugins/StringsPlugin/StringsPlugin.c 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/src/plugins/StringsPlugin/StringsPlugin.c 2026-11-07 09:50:16.000000000 +0100 @@ -61,14 +61,9 @@ if (strstr(tmpbuf1,"[end]")==NULL) { - /* find and replace \n \r*/ - rstr = tmpbuf1; - while (*rstr!='\0') - { - if (*rstr=='\r' || *rstr=='\n' ) - { *rstr='\0'; rstr++; } - rstr++; - } + /* the line's end cut off: what the file says with \n is what is + sent */ + tmpbuf1[strcspn(tmpbuf1, "\r\n")] = '\0'; while ((rstr=strstr(tmpbuf1,"\\n"))) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/src/proxy.h new/3proxy-1.0.3/src/proxy.h --- old/3proxy-1.0.2/src/proxy.h 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/src/proxy.h 2026-11-07 09:50:16.000000000 +0100 @@ -191,7 +191,8 @@ #ifndef strncasecmp #define strncasecmp strnicmp #endif -#define seterrno3(x) _set_errno(x) +/* errno is WSAGetLastError() here */ +#define seterrno3(x) WSASetLastError(x) #else #define seterrno3(x) (errno = x) #endif @@ -405,6 +406,8 @@ int readconfig(FILE * fp); void initcommands(void); int connectwithpoll(struct clientparam *param, SOCKET sock, struct sockaddr *sa, SASIZETYPE size, int to); +void nonblock(SOCKET sock); +int acceptagain(void); int bindwithrange(struct clientparam *param, SOCKET sock, PROXYSOCKADDRTYPE *sa, uint32_t range); int bindtodevice(struct sockfuncs *sf, void *state, SOCKET sock, const char *device, int family); int extbindtodevice(struct clientparam *param, SOCKET sock); @@ -509,6 +512,7 @@ int getopts(const char *s, struct sockoptset *opts); void setopts(SOCKET s, const struct sockoptset *opts); char * printopts(char *sep); +char * printfeatures(char *sep); #ifdef _WINCE char * CEToUnicode (const char *str); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/src/proxymain.c new/3proxy-1.0.3/src/proxymain.c --- old/3proxy-1.0.2/src/proxymain.c 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/src/proxymain.c 2026-11-07 09:50:16.000000000 +0100 @@ -63,6 +63,8 @@ } param->remsock = param->srv->so._accept(param->sostate, param->srv->cbsock, (struct sockaddr*)¶m->sinsr, &size); if(param->remsock == INVALID_SOCKET) { + /* another client of the service took it: not a try */ + if(acceptagain()) { i++; continue; } dolog(param, (unsigned char *)"Connect back accept() failed"); continue; } @@ -224,6 +226,69 @@ } +char featsbuf[1024]; + +/* The features of this build, by the names the manual and the test suite + know them, so a user can see what a binary was made with. */ +char * printfeatures(char *sep){ + int pos=0; + +#define ADDFEATURE(x) pos += sprintf(featsbuf+pos,"%s%s",pos?sep:"",x) +#ifdef WITH_SSL + ADDFEATURE("ssl"); +#ifdef WITH_WOLFSSL + ADDFEATURE("wolfssl"); +#else + ADDFEATURE("openssl"); +#endif +#endif +#ifndef NORADIUS + ADDFEATURE("radius"); +#endif +#ifdef WITH_PCRE + ADDFEATURE("pcre"); +#endif +#ifndef NOIPV6 + ADDFEATURE("ipv6"); +#endif +#ifdef WITH_UN + ADDFEATURE("unix"); +#endif +#ifdef WITH_HTTPSRV + ADDFEATURE("httpsrv"); +#endif +#ifdef WITH_TRANSPARENT + ADDFEATURE("transparent"); +#endif +#ifdef WITH_NETFILTER + ADDFEATURE("netfilter"); +#endif +#ifdef WITH_PF + ADDFEATURE("pf"); +#endif +#ifdef WITH_ODBC + ADDFEATURE("odbc"); +#endif +#ifdef WITH_FTP + ADDFEATURE("ftppr"); +#endif +#ifdef WITH_POP3P + ADDFEATURE("pop3p"); +#endif +#ifdef WITH_SMTPP + ADDFEATURE("smtpp"); +#endif +#ifdef WITH_IMAPP + ADDFEATURE("imapp"); +#endif +#ifndef NOPLUGINS + ADDFEATURE("plugins"); +#endif +#undef ADDFEATURE + return featsbuf; +} + + /* A comma separated list of options, each NAME or NAME=VALUE; a name alone stands for 1, or for TCP_MAXSEG for the value of maxseg. Options are added to what is already set, so a default is changed only by naming it, and @@ -364,6 +429,7 @@ " association: 1 - log, 2 - authorize, 3 - both (default), 0 (same as -U) -\n" " neither. The first destination is always authorized and logged\n" #endif + " -B split the TLS ClientHello passed through tlspr at the SNI (DPI bypass)\n" "-g(GRACE_TRAFF,GRACE_NUM,GRACE_DELAY) - delay GRACE_DELAY milliseconds before polling if average polling size below GRACE_TRAFF bytes and GRACE_NUM read operations in single directions are detected within 1 second to minimize polling\n" " -fFORMAT logging format (see documentation)\n" " -l log to stderr\n" @@ -631,6 +697,13 @@ case 'U': srv->udpauth = *(argv[i]+2)? atoi(argv[i]+2) : 0; break; + case 'B': + /* the TLS ClientHello split at the SNI (tlspr), which -s is + where -s is not splice; s_option means something else + for these */ + if(!s->isudp && srv->service != S_ADMIN && srv->service != S_HTTPSRV) + srv->s_option = 1 + atoi(argv[i]+2); + break; case 's': #ifdef WITHSPLICE /* admin is an httpsrv, where -s is the limited mode */ @@ -864,6 +937,8 @@ return -6; } setopts(srv->cbsock, &srv->cbssockopts); + /* the clients of the service all wait for it: one accepts what comes */ + nonblock(srv->cbsock); if(srv->so._bind(srv->so.state, srv->cbsock, (struct sockaddr*)&cbsa, SASIZE(&cbsa))==-1) { dolog(defparam, (unsigned char *)"Failed to bind connect back socket"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/src/resolve.c new/3proxy-1.0.3/src/resolve.c --- old/3proxy-1.0.2/src/resolve.c 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/src/resolve.c 2026-11-07 09:50:16.000000000 +0100 @@ -167,6 +167,7 @@ k += 4; if(na > 255) na = 255; /* somebody is very evil */ for (j = 0; j < na; j++) { /* now there should be answers */ + if(k >= len) break; while(buf[k] < 192 && buf[k] !=0 && (k+buf[k]+14) < len) k+= (buf[k] + 1); if(!buf[k]) k--; if((k+(af == AF_INET6?28:16)) > len) { @@ -195,15 +196,17 @@ k+= (12 + flen); continue; /* we need A PTR */ } - for (s2 = buf + k + 12; s2 < (buf + k + 12 + len) && *s2; ){ - s1 = s2 + ((unsigned)*s2) + 1; + s1 = buf + k + 12 + flen; /* the end of this record's data, inside the answer */ + for (s2 = buf + k + 12; s2 < s1 && *s2 && *s2 < 64; ){ + unsigned char *next = s2 + ((unsigned)*s2) + 1; *s2 = '.'; - s2 = s1; + s2 = next; } - *s2 = 0; + if(s2 >= s1 || *s2 || s2 == buf + k + 12) + break; /* the name runs past its data, is compressed or empty */ if(param->username)free(param->username); param->username = (unsigned char *)strdup ((char *)buf + k + 13); - + return udpresolve(af,param->username, value, NULL, NULL, 2); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/src/ssl.c new/3proxy-1.0.3/src/ssl.c --- old/3proxy-1.0.2/src/ssl.c 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/src/ssl.c 2026-11-07 09:50:16.000000000 +0100 @@ -74,6 +74,9 @@ struct SSLsock { SOCKET s; SSL_CONN conn; + /* what a read and a write which could not be done wait for, POLLIN + or POLLOUT, 0 once one is: TLS may have to write to read */ + short rwant, wwant; }; struct SSLstate { @@ -102,10 +105,12 @@ if (cli_s != INVALID_SOCKET){ SOSTATE->cli.s = cli_s; SOSTATE->cli.conn = cli_conn; + SOSTATE->cli.rwant = SOSTATE->cli.wwant = 0; } if (srv_s != INVALID_SOCKET){ SOSTATE->srv.s = srv_s; SOSTATE->srv.conn = srv_conn; + SOSTATE->srv.rwant = SOSTATE->srv.wwant = 0; } } @@ -136,12 +141,14 @@ int res, err; if((res = ssl_write(sslq->conn, (void *)msg, len)) <= 0){ err = SSL_get_error((SSL *)((ssl_conn*)sslq->conn)->ssl, res); - if (err == SSL_ERROR_WANT_WRITE){ + if (err == SSL_ERROR_WANT_WRITE || err == SSL_ERROR_WANT_READ){ + sslq->wwant = (err == SSL_ERROR_WANT_READ)? POLLIN : POLLOUT; seterrno3(EAGAIN); return -1; } else seterrno3(err); } + else sslq->wwant = 0; return res; } @@ -158,14 +165,16 @@ if ((sslq = searchSSL(state, s))){ int res, err; - if((res = ssl_write(sslq->conn, (void *)msg, len)) <= 0) { + if((res = ssl_write(sslq->conn, (void *)msg, len)) <= 0){ err = SSL_get_error((SSL *)((ssl_conn*)sslq->conn)->ssl, res); - if (err == SSL_ERROR_WANT_WRITE){ + if (err == SSL_ERROR_WANT_WRITE || err == SSL_ERROR_WANT_READ){ + sslq->wwant = (err == SSL_ERROR_WANT_READ)? POLLIN : POLLOUT; seterrno3(EAGAIN); return -1; } else seterrno3(err); } + else sslq->wwant = 0; return res; } @@ -183,12 +192,14 @@ int res, err; if((res = ssl_read(sslq->conn, (void *)msg, len)) <= 0) { err = SSL_get_error((SSL *)((ssl_conn*)sslq->conn)->ssl, res); - if (err == SSL_ERROR_WANT_READ) { + if (err == SSL_ERROR_WANT_READ || err == SSL_ERROR_WANT_WRITE) { + sslq->rwant = (err == SSL_ERROR_WANT_WRITE)? POLLOUT : POLLIN; seterrno3(EAGAIN); return -1; } else seterrno3(err); } + else sslq->rwant = 0; return res; } return sso._recvfrom(sso.state, s, msg, len, flags, from, fromlen); @@ -205,12 +216,14 @@ int res, err; if((res = ssl_read(sslq->conn, (void *)msg, len)) <= 0) { err = SSL_get_error((SSL *)((ssl_conn*)sslq->conn)->ssl, res); - if (err == SSL_ERROR_WANT_READ) { + if (err == SSL_ERROR_WANT_READ || err == SSL_ERROR_WANT_WRITE) { + sslq->rwant = (err == SSL_ERROR_WANT_WRITE)? POLLOUT : POLLIN; seterrno3(EAGAIN); return -1; } else seterrno3(err); } + else sslq->rwant = 0; return res; } @@ -235,6 +248,8 @@ struct SSLsock *sslq = NULL; unsigned int i; int ret = 0; + short own[64], *events = own, ev; + for(i = 0; i < nfds; i++){ if((fds[i].events & POLLIN) && (sslq = searchSSL(state, fds[i].fd)) && ssl_pending(sslq->conn)){ fds[i].revents = POLLIN; @@ -243,8 +258,29 @@ else fds[i].revents = 0; } if(ret) return ret; + for(i = 0; i < nfds; i++) if((sslq = searchSSL(state, fds[i].fd)) && (sslq->rwant || sslq->wwant)) break; + if(i == nfds) return sso._poll(state, fds, nfds, timeout); + /* A read or a write TLS could not do waits for what TLS needs, a read + for the socket to be writable: whatever that gets is the caller's + chance to try again, revents what it asked for, and its events are + given back as they were. */ + if(nfds > sizeof(own)/sizeof(own[0]) && !(events = malloc(nfds * sizeof(*events)))) return -1; + for(i = 0; i < nfds; i++){ + events[i] = fds[i].events; + if(!(sslq = searchSSL(state, fds[i].fd))) continue; + ev = fds[i].events & ~(POLLIN|POLLOUT); + if(fds[i].events & POLLIN) ev |= sslq->rwant? sslq->rwant : POLLIN; + if(fds[i].events & POLLOUT) ev |= sslq->wwant? sslq->wwant : POLLOUT; + fds[i].events = ev; + } ret = sso._poll(state, fds, nfds, timeout); + for(i = 0; i < nfds; i++){ + if(ret > 0 && fds[i].events != events[i] && (fds[i].revents & ~(POLLERR|POLLHUP|POLLNVAL))) + fds[i].revents = events[i] | (fds[i].revents & (POLLERR|POLLHUP|POLLNVAL)); + fds[i].events = events[i]; + } + if(events != own) free(events); return ret; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/src/version.h new/3proxy-1.0.3/src/version.h --- old/3proxy-1.0.2/src/version.h 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/src/version.h 2026-11-07 09:50:16.000000000 +0100 @@ -1,14 +1,14 @@ #ifndef VERSION -#define VERSION "3proxy-1.0.2" +#define VERSION "3proxy-1.0.3" #endif #ifndef BUILDDATE -#define BUILDDATE "261024112140" +#define BUILDDATE "261107085016" #endif #define MAJOR3PROXY 1 #define SUBMAJOR3PROXY 0 -#define MINOR3PROXY 2 +#define MINOR3PROXY 3 #define SUBMINOR3PROXY 0 -#define RELEASE3PROXY "3proxy-1.0.2(" BUILDDATE ")\0" +#define RELEASE3PROXY "3proxy-1.0.3(" BUILDDATE ")\0" #ifndef YEAR3PROXY #define YEAR3PROXY "2026" #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/tests/README.md new/3proxy-1.0.3/tests/README.md --- old/3proxy-1.0.2/tests/README.md 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/tests/README.md 2026-11-07 09:50:16.000000000 +0100 @@ -13,6 +13,14 @@ `--bin` it looks in `bin/`, then `build/bin/`, then the per-configuration directories a multi-configuration CMake generator uses. +The binary reports what it was built with in `3proxy --help` (a `built +with:` list), and the runner reads that before the first case: a case names +the features it needs with `if not t.skip_unless("ssl"): return`, and +skips on a build without them instead of failing. A binary too old to +report its features skips every case that needs one, and the cases with no +feature needs still run; some cases also probe at runtime, as a build can +leave a feature compiled in but unusable. + The proxy under test is also the origin server the tests talk to: the `http` command's `echo` operation reports back how a request arrived - method, path, query, host, and the source port it came from - and `data` generates a body diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/tests/cases/admin.py new/3proxy-1.0.3/tests/cases/admin.py --- old/3proxy-1.0.2/tests/cases/admin.py 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/tests/cases/admin.py 2026-11-07 09:50:16.000000000 +0100 @@ -4,6 +4,8 @@ def run(t): + if not t.skip_unless("httpsrv"): + return adm = t.free_port() lim = t.free_port() server = t.start("admin", f""" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/tests/cases/auto.py new/3proxy-1.0.3/tests/cases/auto.py --- old/3proxy-1.0.2/tests/cases/auto.py 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/tests/cases/auto.py 2026-11-07 09:50:16.000000000 +0100 @@ -7,7 +7,9 @@ def run(t): - certs = t.certs() + if not t.skip_unless("httpsrv"): + return + certs = t.certs() if t.has("ssl") else None plain = t.free_port() port = t.free_port() secure = t.free_port() if certs else None diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/tests/cases/ftppr.py new/3proxy-1.0.3/tests/cases/ftppr.py --- old/3proxy-1.0.2/tests/cases/ftppr.py 1970-01-01 01:00:00.000000000 +0100 +++ new/3proxy-1.0.3/tests/cases/ftppr.py 2026-11-07 09:50:16.000000000 +0100 @@ -0,0 +1,108 @@ +"""The FTP proxy logging in to its server: whatever the server answers the +login with reaches the client, which waits for the answer to its PASS.""" + +import socket +import threading + +# what the server answers USER with, and PASS if it asks for one +LOGINS = { + "230 to USER": ([b"230 Anonymous user logged in"], None), + "multiline 230 to USER": ([b"230-Welcome", b"230-to the server", b"230 Login successful."], None), + "331 to USER, 230 to PASS": ([b"331 Please specify the password."], [b"230 Login successful."]), + "530 to USER": ([b"530 Not allowed here"], None), + "331 to USER, 530 to PASS": ([b"331 Please specify the password."], [b"530 Login incorrect."]), +} + + +def ftp_server(listener, user, password): + """Greets, answers the login as told, then NOOP and QUIT.""" + while True: + try: + c, _ = listener.accept() + except OSError: + return + try: + f = c.makefile("rb") + c.sendall(b"220 Fake FTP\r\n") + if not f.readline().upper().startswith(b"USER "): + continue + c.sendall(b"".join(line + b"\r\n" for line in user)) + if password is not None: + if not f.readline().upper().startswith(b"PASS "): + continue + c.sendall(b"".join(line + b"\r\n" for line in password)) + for line in f: + if line.upper().startswith(b"NOOP"): + c.sendall(b"200 NOOP ok\r\n") + elif line.upper().startswith(b"QUIT"): + c.sendall(b"221 Bye\r\n") + break + else: + c.sendall(b"502 Not implemented\r\n") + except OSError: + pass + finally: + c.close() + + +def reply(f): + """The last line of a reply, multiline or not; empty at the end or on a + time out.""" + while True: + try: + line = f.readline() + except OSError: + return b"" + if not line: + return b"" + if len(line) < 4 or line[3:4] != b"-": + return line.rstrip() + + +def run(t): + if not t.skip_unless("ftppr"): + return + servers = {} + for name, (user, password) in LOGINS.items(): + listener = socket.socket() + listener.bind(("127.0.0.1", 0)) + listener.listen(5) + threading.Thread(target=ftp_server, args=(listener, user, password), daemon=True).start() + servers[name] = listener + + port = t.free_port() + t.start("ftppr", f""" + log + auth none + ftppr -p{port} + """, ports=[port]) + + # without WITH_FTP the service closes the connection at once + s = socket.create_connection(("127.0.0.1", port), timeout=5) + built = reply(s.makefile("rb")) + s.close() + if not built: + t.skip("the FTP proxy (not built in this configuration)") + for listener in servers.values(): + listener.close() + t.stop_all() + return + + for name, listener in servers.items(): + s = socket.create_connection(("127.0.0.1", port), timeout=5) + f = s.makefile("rb") + reply(f) + s.sendall(b"USER [email protected]:%d\r\n" % listener.getsockname()[1]) + reply(f) + s.sendall(b"PASS [email protected]\r\n") + got = reply(f) + ok = LOGINS[name][1] if LOGINS[name][1] is not None else LOGINS[name][0] + t.eq(ok[-1][:3], got[:3], f"{name}: the client gets the server's answer") + if got.startswith(b"230"): + s.sendall(b"NOOP\r\n") + t.eq(b"200", reply(f)[:3], f"{name}: and the session goes on") + s.close() + + for listener in servers.values(): + listener.close() + t.stop_all() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/tests/cases/httpsrv_auth.py new/3proxy-1.0.3/tests/cases/httpsrv_auth.py --- old/3proxy-1.0.2/tests/cases/httpsrv_auth.py 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/tests/cases/httpsrv_auth.py 2026-11-07 09:50:16.000000000 +0100 @@ -2,6 +2,8 @@ def run(t): + if not t.skip_unless("httpsrv"): + return srv = t.free_port() openport = t.free_port() t.start("httpsrv_auth", f""" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/tests/cases/httpsrv_files.py new/3proxy-1.0.3/tests/cases/httpsrv_files.py --- old/3proxy-1.0.2/tests/cases/httpsrv_files.py 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/tests/cases/httpsrv_files.py 2026-11-07 09:50:16.000000000 +0100 @@ -8,6 +8,8 @@ def run(t): + if not t.skip_unless("httpsrv"): + return root = os.path.join(t.tmpdir, "web") os.makedirs(os.path.join(root, "picts", "set"), exist_ok=True) with open(os.path.join(root, "a.html"), "w") as fp: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/tests/cases/httpsrv_keepalive.py new/3proxy-1.0.3/tests/cases/httpsrv_keepalive.py --- old/3proxy-1.0.2/tests/cases/httpsrv_keepalive.py 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/tests/cases/httpsrv_keepalive.py 2026-11-07 09:50:16.000000000 +0100 @@ -10,6 +10,8 @@ def run(t): + if not t.skip_unless("httpsrv"): + return root = os.path.join(t.tmpdir, "ka") os.makedirs(root, exist_ok=True) with open(os.path.join(root, "a.html"), "w") as fp: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/tests/cases/httpsrv_ops.py new/3proxy-1.0.3/tests/cases/httpsrv_ops.py --- old/3proxy-1.0.2/tests/cases/httpsrv_ops.py 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/tests/cases/httpsrv_ops.py 2026-11-07 09:50:16.000000000 +0100 @@ -4,6 +4,8 @@ def run(t): + if not t.skip_unless("httpsrv"): + return srv = t.free_port() t.start("httpsrv_ops", f""" log diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/tests/cases/httpsrv_parsing.py new/3proxy-1.0.3/tests/cases/httpsrv_parsing.py --- old/3proxy-1.0.2/tests/cases/httpsrv_parsing.py 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/tests/cases/httpsrv_parsing.py 2026-11-07 09:50:16.000000000 +0100 @@ -6,6 +6,8 @@ def run(t): + if not t.skip_unless("httpsrv"): + return srv = t.free_port() t.start("httpsrv_parsing", f""" log diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/tests/cases/httpsrv_proxypass.py new/3proxy-1.0.3/tests/cases/httpsrv_proxypass.py --- old/3proxy-1.0.2/tests/cases/httpsrv_proxypass.py 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/tests/cases/httpsrv_proxypass.py 2026-11-07 09:50:16.000000000 +0100 @@ -9,6 +9,8 @@ def run(t): + if not t.skip_unless("httpsrv"): + return root = os.path.join(t.tmpdir, "pp") os.makedirs(root, exist_ok=True) with open(os.path.join(root, "a.html"), "w") as fp: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/tests/cases/httpsrv_rules.py new/3proxy-1.0.3/tests/cases/httpsrv_rules.py --- old/3proxy-1.0.2/tests/cases/httpsrv_rules.py 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/tests/cases/httpsrv_rules.py 2026-11-07 09:50:16.000000000 +0100 @@ -2,6 +2,8 @@ def run(t): + if not t.skip_unless("httpsrv"): + return srv = t.free_port() srv2 = t.free_port() t.start("httpsrv_rules", f""" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/tests/cases/ipv6.py new/3proxy-1.0.3/tests/cases/ipv6.py --- old/3proxy-1.0.2/tests/cases/ipv6.py 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/tests/cases/ipv6.py 2026-11-07 09:50:16.000000000 +0100 @@ -7,6 +7,8 @@ def run(t): + if not t.skip_unless("httpsrv", "ipv6"): + return if not t.has_ipv6(): t.skip("IPv6 (this machine has no IPv6 loopback)") return diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/tests/cases/maxconn.py new/3proxy-1.0.3/tests/cases/maxconn.py --- old/3proxy-1.0.2/tests/cases/maxconn.py 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/tests/cases/maxconn.py 2026-11-07 09:50:16.000000000 +0100 @@ -8,6 +8,8 @@ def run(t): + if not t.skip_unless("httpsrv"): + return # The origin runs in a process of its own, so the limit only applies to # the mapper in front of it. origin = t.free_port() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/tests/cases/parent_failover.py new/3proxy-1.0.3/tests/cases/parent_failover.py --- old/3proxy-1.0.2/tests/cases/parent_failover.py 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/tests/cases/parent_failover.py 2026-11-07 09:50:16.000000000 +0100 @@ -30,6 +30,8 @@ def run(t): + if not t.skip_unless("httpsrv"): + return srv = t.free_port() good = t.free_port() spare = t.free_port() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/tests/cases/parent_ports.py new/3proxy-1.0.3/tests/cases/parent_ports.py --- old/3proxy-1.0.2/tests/cases/parent_ports.py 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/tests/cases/parent_ports.py 2026-11-07 09:50:16.000000000 +0100 @@ -46,6 +46,8 @@ def run(t): + if not t.skip_unless("httpsrv"): + return srv = t.free_port() prx = t.free_port() sks = t.free_port() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/tests/cases/parent_weights.py new/3proxy-1.0.3/tests/cases/parent_weights.py --- old/3proxy-1.0.2/tests/cases/parent_weights.py 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/tests/cases/parent_weights.py 2026-11-07 09:50:16.000000000 +0100 @@ -37,6 +37,8 @@ def run(t): + if not t.skip_unless("httpsrv"): + return adm = t.free_port() prx = t.free_port() dummy = t.free_port() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/tests/cases/pcre.py new/3proxy-1.0.3/tests/cases/pcre.py --- old/3proxy-1.0.2/tests/cases/pcre.py 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/tests/cases/pcre.py 2026-11-07 09:50:16.000000000 +0100 @@ -20,6 +20,8 @@ def run(t): + if not t.skip_unless("httpsrv", "pcre"): + return if not _has_pcre(t): t.skip("PCRE (this build has no PCRE support)") return diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/tests/cases/portmap.py new/3proxy-1.0.3/tests/cases/portmap.py --- old/3proxy-1.0.2/tests/cases/portmap.py 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/tests/cases/portmap.py 2026-11-07 09:50:16.000000000 +0100 @@ -26,6 +26,8 @@ def run(t): + if not t.skip_unless("httpsrv"): + return # --- tcppm --------------------------------------------------------- origin = t.free_port() mapped = t.free_port() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/tests/cases/proxy_http.py new/3proxy-1.0.3/tests/cases/proxy_http.py --- old/3proxy-1.0.2/tests/cases/proxy_http.py 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/tests/cases/proxy_http.py 2026-11-07 09:50:16.000000000 +0100 @@ -6,6 +6,8 @@ def run(t): + if not t.skip_unless("httpsrv"): + return srv = t.free_port() other = t.free_port() prx = t.free_port() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/tests/cases/socks.py new/3proxy-1.0.3/tests/cases/socks.py --- old/3proxy-1.0.2/tests/cases/socks.py 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/tests/cases/socks.py 2026-11-07 09:50:16.000000000 +0100 @@ -2,6 +2,8 @@ def run(t): + if not t.skip_unless("httpsrv"): + return srv = t.free_port() sks = t.free_port() sauth = t.free_port() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/tests/cases/ssl.py new/3proxy-1.0.3/tests/cases/ssl.py --- old/3proxy-1.0.2/tests/cases/ssl.py 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/tests/cases/ssl.py 2026-11-07 09:50:16.000000000 +0100 @@ -11,6 +11,8 @@ def run(t): + if not t.skip_unless("httpsrv", "ssl"): + return certs = t.certs() if not certs: t.skip("TLS (openssl is not available to generate certificates)") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/tests/cases/tlspr.py new/3proxy-1.0.3/tests/cases/tlspr.py --- old/3proxy-1.0.2/tests/cases/tlspr.py 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/tests/cases/tlspr.py 2026-11-07 09:50:16.000000000 +0100 @@ -2,6 +2,8 @@ def run(t): + if not t.skip_unless("httpsrv", "ssl"): + return certs = t.certs() if not certs: t.skip("tlspr (openssl is not available to generate certificates)") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/tests/cases/transparent.py new/3proxy-1.0.3/tests/cases/transparent.py --- old/3proxy-1.0.2/tests/cases/transparent.py 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/tests/cases/transparent.py 2026-11-07 09:50:16.000000000 +0100 @@ -39,6 +39,8 @@ def run(t): + if not t.skip_unless("httpsrv"): + return # --- the command and its modes ------------------------------------ # These need no redirection, so they run wherever the feature is built. out = _config(t, "transparent_probe", "log\ntransparent") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/tests/cases/unixsock.py new/3proxy-1.0.3/tests/cases/unixsock.py --- old/3proxy-1.0.2/tests/cases/unixsock.py 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/tests/cases/unixsock.py 2026-11-07 09:50:16.000000000 +0100 @@ -36,6 +36,8 @@ def run(t): + if not t.skip_unless("httpsrv", "unix"): + return if not hasattr(socket, "AF_UNIX") or sys.platform.startswith("win"): t.skip("Unix domain sockets (not on this platform)") return diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/tests/harness.py new/3proxy-1.0.3/tests/harness.py --- old/3proxy-1.0.2/tests/harness.py 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/tests/harness.py 2026-11-07 09:50:16.000000000 +0100 @@ -122,10 +122,11 @@ class Tester: """The API a case runs against: start servers, make requests, assert.""" - def __init__(self, binary, tmpdir, case): + def __init__(self, binary, tmpdir, case, features=None): self.binary = binary self.tmpdir = tmpdir self.case = case + self.features = features if features is not None else frozenset() self.servers = [] self.checks = [] self.timeout = 10 @@ -135,6 +136,25 @@ self.logs = [] self.udp_servers = [] + # ---- build features ---------------------------------------------- + + def has(self, *names): + """Whether the binary reports every named feature.""" + return all(name in self.features for name in names) + + def skip_unless(self, *names): + """Skip what needs a feature the binary was built without. + + Returns False after recording the skip, so a case says + `if not t.skip_unless("ssl"): return` and keeps its checks out of + the failed count on a build that cannot pass them. + """ + missing = [name for name in names if name not in self.features] + if not missing: + return True + self.skip("built without: " + ", ".join(missing)) + return False + # ---- servers ----------------------------------------------------- def has_ipv6(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/3proxy-1.0.2/tests/run.py new/3proxy-1.0.3/tests/run.py --- old/3proxy-1.0.2/tests/run.py 2026-10-24 13:45:26.000000000 +0200 +++ new/3proxy-1.0.3/tests/run.py 2026-11-07 09:50:16.000000000 +0100 @@ -47,6 +47,37 @@ return name, module +def built_features(binary): + """The features the binary reports in `3proxy --help`, as a set. + + A binary too old to have the list, or one that cannot be run at all, + reports nothing: every case that needs a feature then skips, and the + ones that need none still run. + """ + import subprocess + try: + done = subprocess.run([binary, "--help"], stdout=subprocess.PIPE, + stderr=subprocess.STDOUT, timeout=15) + text = done.stdout.decode("utf-8", "replace") + except (OSError, subprocess.SubprocessError): + return frozenset() + features = set() + collecting = False + for line in text.splitlines(): + stripped = line.strip() + if line.startswith("built with:"): + collecting = True + rest = stripped[len("built with:"):].strip() + if rest: + features.update(rest.split()) + continue + if collecting: + if not line[:1].isspace() or not stripped: + break + features.update(stripped.split()) + return frozenset(features) + + def main(): parser = argparse.ArgumentParser() parser.add_argument("pattern", nargs="?", default="", @@ -75,7 +106,9 @@ return 2 tmpdir = tempfile.mkdtemp(prefix="3proxy-tests.") + features = built_features(binary) print(f"3proxy tests: {binary}") + print(f"built with: {' '.join(sorted(features)) or '(nothing reported)'}") print(f"working in: {tmpdir}\n") passed = failed = skipped = 0 @@ -85,7 +118,7 @@ for path in paths: name, module = load_case(path) print(f" {name}") - tester = Tester(binary, tmpdir, name) + tester = Tester(binary, tmpdir, name, features) error = None try: module.run(tester)
