mirror of
https://github.com/3proxy/3proxy.git
synced 2026-10-17 08:55:49 +08:00
Only the -ol options which act when a socket is bound (SO_REUSEADDR, SO_REUSEPORT, SO_EXCLUSIVEADDRUSE, SO_PORT_SCALABILITY, SO_REUSE_UNICASTPORT, IP_TRANSPARENT, TCP_FASTOPEN) must be the same for a socket to be taken over. The others are set on the socket taken over, those no longer given turned off; TCP_MAXSEG, whose default is not 0, still needs a new socket when it is dropped. Several services may still share an address, in one configuration or across reloads: each new one takes over a listener of its own, one of an old service of its type first, or opens another. A service connecting back (-r) has no socket to share, but now a listener without one for the place it connects to: on a reload the new service connecting to the same place takes it over, and the old service's clients are re-authenticated as its clients, as a listening service's are. Nothing moves from srvparam to the listener: its socket is what accept and UDP sessions use, and the rest is the service's configuration, which the listener only copies to compare. Tests: a live option changed keeps the socket, a bind-time one makes another, two services on one address are both taken over, and a download through a connect-back service goes on or is cut as its user is kept or removed. 3proxy(8) describes the takeover and re-authentication. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
141 lines
5.3 KiB
Python
141 lines
5.3 KiB
Python
"""Connections of old services after a reload (unless noforce): each goes by
|
|
the rules of the newest service on its listener, taking one of its maxconn
|
|
slots, and is dropped where that cannot be."""
|
|
|
|
import base64
|
|
import socket
|
|
import threading
|
|
import time
|
|
|
|
|
|
def run(t):
|
|
origin = t.free_port()
|
|
proxy = t.free_port()
|
|
adm = t.free_port()
|
|
|
|
def config(service_line, maxconn=50):
|
|
return f"""
|
|
log
|
|
auth iponly
|
|
allow *
|
|
http data * /data
|
|
httpsrv -p{origin}
|
|
|
|
flush
|
|
maxconn {maxconn}
|
|
auth iponly
|
|
allow *
|
|
{service_line}
|
|
|
|
flush
|
|
maxconn 50
|
|
auth iponly
|
|
allow *
|
|
admin -p{adm}
|
|
"""
|
|
|
|
server = t.start("reattach", config(f"proxy -p{proxy}"), ports=[origin, proxy, adm])
|
|
|
|
def reload(conf):
|
|
before = server.output().count("Accepting connections")
|
|
t.write_config("reattach", conf)
|
|
t.http(f"http://127.0.0.1:{adm}/R")
|
|
deadline = time.time() + 10
|
|
while time.time() < deadline and server.output().count("Accepting connections") < before + 3:
|
|
time.sleep(0.05)
|
|
|
|
def downloads(n):
|
|
"""n downloads of about two seconds each through the proxy, started
|
|
now; the results fill in as they finish."""
|
|
results = [{} for _ in range(n)]
|
|
|
|
def one(r):
|
|
got = t.http(f"http://127.0.0.1:{origin}/data?size=2000000&block=65536&delay=60",
|
|
proxy=f"127.0.0.1:{proxy}")
|
|
r["length"] = got.length
|
|
|
|
threads = [threading.Thread(target=one, args=(r,)) for r in results]
|
|
for th in threads:
|
|
th.start()
|
|
time.sleep(0.4)
|
|
return threads, results
|
|
|
|
# --- the newest service has one slot free: one connection moves, one is
|
|
# cut. A service holds one of its maxconn slots for the next connection
|
|
# it accepts, so maxconn 2 leaves one.
|
|
threads, results = downloads(2)
|
|
reload(config(f"proxy -p{proxy}", maxconn=2))
|
|
for th in threads:
|
|
th.join(20)
|
|
whole = sum(1 for r in results if r.get("length") == 2000000)
|
|
t.eq(1, whole, "with one slot free in the new service one download goes on")
|
|
t.contains(server.output(), " 00027 ",
|
|
"the other is cut for want of a slot (27)")
|
|
|
|
# --- the service on the port is of another type now: cut (26)
|
|
reload(config(f"proxy -p{proxy}"))
|
|
threads, results = downloads(1)
|
|
reload(config(f"socks -p{proxy}"))
|
|
for th in threads:
|
|
th.join(20)
|
|
t.ok("a proxy download is cut when a socks service takes the port") \
|
|
if results[0].get("length", 0) < 2000000 else \
|
|
t.fail("a proxy download is cut when a socks service takes the port",
|
|
"less than 2000000 bytes", results[0].get("length"))
|
|
t.contains(server.output(), " 00026 ", "as its service is another one now (26)")
|
|
|
|
# --- a service connecting back (-r) has no socket, but a listener for the
|
|
# place it connects to: its clients are re-authenticated all the same ---
|
|
peer = socket.socket()
|
|
peer.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
|
|
peer.bind(("127.0.0.1", 0))
|
|
peer.listen(16)
|
|
peer.settimeout(10)
|
|
cb = peer.getsockname()[1]
|
|
|
|
def cbconfig(users):
|
|
return config(f"proxy -p{proxy}").replace(
|
|
"flush\n maxconn 50\n auth iponly\n allow *\n admin",
|
|
f"flush\n users {users}\n auth strong\n allow *\n"
|
|
f" proxy -r127.0.0.1:{cb}\n\n flush\n maxconn 50\n"
|
|
" auth iponly\n allow *\n admin")
|
|
|
|
def cb_download(result):
|
|
"""A request over a connection the -r service made: the peer is its
|
|
client once it has sent C."""
|
|
try:
|
|
c, _ = peer.accept()
|
|
c.settimeout(20)
|
|
c.sendall(b"C")
|
|
auth = base64.b64encode(b"alice:one").decode()
|
|
c.sendall((f"GET http://127.0.0.1:{origin}/data?size=2000000&block=65536&delay=60 HTTP/1.1\r\n"
|
|
f"Host: 127.0.0.1:{origin}\r\nProxy-Authorization: Basic {auth}\r\n"
|
|
"Connection: close\r\n\r\n").encode())
|
|
got = b""
|
|
while True:
|
|
b = c.recv(65536)
|
|
if not b:
|
|
break
|
|
got += b
|
|
c.close()
|
|
result["body"] = len(got.split(b"\r\n\r\n", 1)[1]) if b"\r\n\r\n" in got else 0
|
|
except OSError as e:
|
|
result["error"] = str(e)
|
|
|
|
reload(cbconfig("alice:CL:one"))
|
|
for keep, users, want in ((True, "alice:CL:one bob:CL:two", "finishes whole"),
|
|
(False, "bob:CL:two", "is cut")):
|
|
result = {}
|
|
th = threading.Thread(target=cb_download, args=(result,))
|
|
th.start()
|
|
time.sleep(0.5)
|
|
reload(cbconfig(users))
|
|
th.join(25)
|
|
whole = result.get("body") == 2000000
|
|
name = f"a download through a connect-back service {want} when alice is " + \
|
|
("kept" if keep else "removed")
|
|
t.ok(name) if whole == keep else t.fail(name, "whole" if keep else "cut", result)
|
|
if keep:
|
|
reload(cbconfig("alice:CL:one"))
|
|
peer.close()
|