From 37dfb863fbacd6e165630c7a20767b4f1115ba91 Mon Sep 17 00:00:00 2001 From: Vladimir Dubrovin <3proxy@3proxy.ru> Date: Sat, 21 Nov 2026 14:42:59 +0300 Subject: [PATCH] radius: a server may be a name, and the port is taken as written (#1027) The port was promised by the man page but never parsed: a server address with a port was refused, and only the default 1812 could be used. The address is parsed with parsehost() now, as nserver and authnserver are, so a name is resolved when the configuration is read, an IPv6 address may be written in brackets, and the port is the one authentication is asked on, the accounting of the same server going to the port after it. The man page says which name servers resolve the name. --- man/3proxy.cfg.5 | 5 ++++- src/conf.c | 4 ++-- tests/cases/radius.py | 42 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 tests/cases/radius.py diff --git a/man/3proxy.cfg.5 b/man/3proxy.cfg.5 index aad28b8..dba4d6a 100644 --- a/man/3proxy.cfg.5 +++ b/man/3proxy.cfg.5 @@ -588,7 +588,10 @@ network conditions. Applies to the services started after it. \fI\fR \fInradservers + 2], (struct sockaddr *)&conf->radiuslist[conf->nradservers].authaddr)) return 1; - if( s && !getip46(46, (unsigned char *)s, (struct sockaddr *)&conf->radiuslist[conf->nradservers].localaddr)) return 2; + if(parsehost(46, argv[conf->nradservers + 2], (struct sockaddr *)&conf->radiuslist[conf->nradservers].authaddr)) return 1; + if(s && parsehost(46, (unsigned char *)s, (struct sockaddr *)&conf->radiuslist[conf->nradservers].localaddr)) return 2; if(!*SAPORT(&conf->radiuslist[conf->nradservers].authaddr))*SAPORT(&conf->radiuslist[conf->nradservers].authaddr) = htons(1812); port = ntohs(*SAPORT(&conf->radiuslist[conf->nradservers].authaddr)); conf->radiuslist[conf->nradservers].logaddr = conf->radiuslist[conf->nradservers].authaddr; diff --git a/tests/cases/radius.py b/tests/cases/radius.py new file mode 100644 index 0000000..df288df --- /dev/null +++ b/tests/cases/radius.py @@ -0,0 +1,42 @@ +"""The radius command: a server may be a name, an address, and carry a +port, with an IPv6 address in brackets. + +The port was in the man page but not in the code before: a server with a +port was simply refused. A name is resolved when the configuration is +read, with the name servers in force or the system's. +""" + + +def run(t): + def accepted(config): + out = t.run_config("radius_cmd", config + "\nnot_a_command\n") + return "'radius' failed" not in out, out + + ok, out = accepted("log\nradius s3cret 127.0.0.1:18120") + if ok: + t.ok("a server address with a port is accepted") + else: + t.fail("a server address with a port is accepted", + "'radius' not refused", out) + + ok, out = accepted("log\nradius s3cret localhost") + if ok: + t.ok("a server name is accepted, resolved when the file is read") + else: + t.fail("a server name is accepted, resolved when the file is read", + "'radius' not refused", out) + + if t.has_ipv6(): + ok, out = accepted("log\nradius s3cret [::1]:18120") + if ok: + t.ok("an IPv6 server address in brackets, with a port, is accepted") + else: + t.fail("an IPv6 server address in brackets, with a port, is accepted", + "'radius' not refused", out) + + out = t.run_config("radius_bad", + "log\nradius s3cret 999.999.999.999\nnot_a_command\n") + t.contains(out, "'radius' failed", + "an address that is none is refused") + t.not_contains(out, "'not_a_command'", + "and the file stops at the refused line")