mirror of
https://github.com/3proxy/3proxy.git
synced 2026-11-22 15:59:41 +08:00
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.
This commit is contained in:
1 parent
ab78b0bf69
commit
44b9e344e1
3 files changed
+48
-3
No files matched your search
+4
-1
@@ -607,7 +607,10 @@ network conditions. Applies to the services started after it.
|
||||
\fI<NAS_SECRET>\fR \fI<radius_server_1\fR[:\fIport\fR][/\fIlocal_address_1\fR]\fR \fI<radius_server_2\fR[:\fIport\fR][/\fIlocal_address_2\fR]\fR
|
||||
.br
|
||||
Configures RADIUS servers to be used for logging and authentication (log and auth types
|
||||
must be set to radius). port and local address to use with given server may be specified.
|
||||
must be set to radius). A server is a name or an address, resolved when the
|
||||
configuration is read. port and local address to use with given server may be specified:
|
||||
the port named is the one authentication is asked on, and the accounting requests of
|
||||
the same server go to the port after it (1812 and 1813 by default).
|
||||
.br
|
||||
Attributes within request: User-Name, Password: (username and password if presented by client),
|
||||
Service Type: Authenticate-Only,
|
||||
|
||||
+2
-2
@@ -1821,8 +1821,8 @@ static int h_radius(int argc, unsigned char **argv){
|
||||
*s = 0;
|
||||
s++;
|
||||
}
|
||||
if( !getip46(46, argv[conf->nradservers + 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;
|
||||
|
||||
@@ -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")
|
||||
Reference in new issue
Block a user