1997-03-11
1997-03-11 04:25:03 by Henrik Grubbström (Grubba) <grubba@grubba.org>
-
bb79bf9d641035101c295ba414170d80b12a8f54
(34 lines)
(+19/-15)
[
Show
| Annotate
]
Branch: devel-1-1-1
Some module-level security tests enabled
Rev: server/base_server/roxen.pike:1.31.2.5
1:
- string cvs_version = "$Id: roxen.pike,v 1.31.2.4 1997/03/09 13:36:34 grubba Exp $";
+ string cvs_version = "$Id: roxen.pike,v 1.31.2.5 1997/03/11 04:25:03 grubba Exp $";
#define IN_ROXEN
#include <module.h>
1012: Inside #if defined(MODULE_LEVEL_SECURITY)
continue;
case MOD_USER: // allow user=...
+ // perror("Allow user: "+id->auth[0]+" && "+id->auth[1]+"\n");
if(id->auth && id->auth[0] && level[1](id->auth[1])) return 0;
need_auth = 1;
continue;
1267: Inside #if defined(MODULE_LEVEL_SECURITY)
if(!search(file, loc))
{
- //#ifdef MODULE_LEVEL_SECURITY
- // if(check_security(tmp[1], id)) continue;
- //#endif
+ #ifdef MODULE_LEVEL_SECURITY
+ if(check_security(tmp[1], id)) continue;
+ #endif
if(d=function_object(tmp[1])->find_dir(file[strlen(loc)..1000000], id))
dir |= d;
} else {
1282: Inside #if defined(MODULE_LEVEL_SECURITY)
}
}
}
+
if(sizeof(dir))
return dir;
}
1305: Inside #if defined(MODULE_LEVEL_SECURITY)
return ({ 0, -3, 0, 0, 0, 0, 0, 0, 0, 0, 0 });
if(!search(file, loc))
{
- //#ifdef MODULE_LEVEL_SECURITY
- // if(check_security(tmp[1], id)) continue;
- //#endif
+ #ifdef MODULE_LEVEL_SECURITY
+ if(check_security(tmp[1], id)) continue;
+ #endif
if(s=function_object(tmp[1])->stat_file(file[strlen(loc)..], id))
return s;
}
1409: Inside #if defined(MODULE_LEVEL_SECURITY)
fake_id->not_query=s;
fake_id->misc->internal_get=1;
- if(!(m = get_file(fake_id)))
+ if(!(m = get_file(fake_id)) || (m->error && (m->error/100 != 2)))
{
fake_id->end();
return 0;
1714: Inside #if defined(MODULE_LEVEL_SECURITY) and #if defined(DEBUG)
#ifdef DEBUG
perror("Opening port:%s...\n",
map(port, lambda(mixed x){ return(x+""); } )*",");
- array(mixed) port_error =
+ array port_error;
+ port_error =
#endif /* DEBUG */
catch {
array tmp;
1740: Inside #if defined(MODULE_LEVEL_SECURITY) and #if defined(DEBUG)
#ifdef DEBUG
if (port_error) {
perror("Failed to open port %s at %s\n%s\n", port[0], port[2],
- master()->describe_backtrace(port_error));
+ describe_backtrace(port_error));
}
#endif /* DEBUG */
}
3421:
}
- string checkfd()
+ string checkfd(object|void id)
{
// perror(sprintf("%O\n", get_all_active_fd()));