xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

aux/listen: remove special cases for depreciated datakit

Browse source 
The getserv function has remained mostly unchanged since
1ed. These checks are for handling string local ports
or lack thereof. This was used by datakit at the time,
where 'ports' were service strings. This made the default
datakit service 'login' when a connector did not give
a specific service. The checks for directory traversal also
seemed specifically to guard against a connector from providing
a malicious service string. With datakit gone all current protocols
use numerics as ports so these checks and defaults become uneeded.

1ed reference:
https://github.com/plan9foundation/plan9/tree/1e-1992-09-21
This commit is contained in:
Jacob Moody 2022-05-17 03:25:30 +00:00
parent 5dd9b370a0
commit fdbe335d3a
1 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
sys/src/cmd/aux/listen.c
View file

@ -481,28 +481,19 @@ getserv(char *proto, char *dir, Service *s)
long n; long n;
readstr(dir, "remote", s->remote, sizeof(s->remote)-1); readstr(dir, "remote", s->remote, sizeof(s->remote)-1);
if(p = utfrune(s->remote, L'\n')) if(p = utfrune(s->remote, '\n'))
*p = '\0'; *p = '\0';
n = readstr(dir, "local", addr, sizeof(addr)-1); n = readstr(dir, "local", addr, sizeof(addr)-1);
if(n <= 0) if(n <= 0)
return 0; return 0;
if(p = utfrune(addr, L'\n')) if(p = utfrune(addr, '\n'))
*p = '\0'; *p = '\0';
serv = utfrune(addr, L'!'); serv = utfrune(addr, '!');
if(!serv) if(!serv)
serv = "login";
else
serv++;
/*
* disallow service names like
* ../../usr/user/bin/rc/su
*/
if(strlen(serv) +strlen(proto) >= NAMELEN || utfrune(serv, L'/') || *serv == '.')
return 0; return 0;
snprint(s->serv, sizeof s->serv, "%s%s", proto, serv);
snprint(s->serv, sizeof s->serv, "%s%s", proto, serv+1);
return 1; return 1;
} }