prehistoric-systems/CLIte
1
0
Fork 0
mirror of https://codeberg.org/TicklishHoneyBee/CLIte.git synced 2026-03-11 09:04:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add support for setuid/setguid on executable files

Browse source
This commit is contained in:
Lisa Milne 2023-12-16 14:30:29 +10:00
parent 46af70187d
commit a7f5087c7c
4 changed files with 95 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
clite/commands.js
View file

@ -1744,10 +1744,17 @@ Options:
// -primary_operator primary_operand
if (uargs.length == 2) {
switch (uargs[0]) {
case '-b': // test for a block file (don't exist, always false)
case '-b': // test for a block file
var p = clite.resolvePath(uargs[1]);
var st = stdio.stat(p);
if (!st || (st.st_mode&stdio.modes.S_IFBLK) != stdio.modes.S_IFBLK) {
if (negate)
return 0;
return 1;
}
if (negate)
return 0;
return 1;
return 1;
return 0;
break;
case '-c':
var p = clite.resolvePath(uargs[1]);
@ -1797,10 +1804,17 @@ Options:
return 1;
return 0;
break;
case '-g': // test for set-groud-id (doesn't exist, always false)
case '-g': // test for set-groud-id
var p = clite.resolvePath(uargs[1]);
var st = stdio.stat(p);
if (!st || (st.st_mode&stdio.modes.S_ISGID) != stdio.modes.S_ISGID) {
if (negate)
return 0;
return 1;
}
if (negate)
return 0;
return 1;
return 1;
return 0;
break;
case '-h':
case '-L':
@ -1825,10 +1839,17 @@ Options:
return 1;
return 0;
break;
case '-p': // test for FIFO/pipe (doesn't exist, always false)
case '-p': // test for FIFO/pipe
var p = clite.resolvePath(uargs[1]);
var st = stdio.stat(p);
if (!st || (st.st_mode&stdio.modes.S_IFIFO) != stdio.modes.S_IFIFO) {
if (negate)
return 0;
return 1;
}
if (negate)
return 0;
return 1;
return 1;
return 0;
break;
case '-r':
var p = clite.resolvePath(uargs[1]);
@ -1846,10 +1867,17 @@ Options:
return 1;
return 0;
break;
case '-S': // test for socket (doesn't exist, always false)
case '-S': // test for socket
var p = clite.resolvePath(uargs[1]);
var st = stdio.stat(p);
if (!st || (st.st_mode&stdio.modes.S_IFSOCK) != stdio.modes.S_IFSOCK) {
if (negate)
return 0;
return 1;
}
if (negate)
return 0;
return 1;
return 1;
return 0;
break;
case '-s':
var p = clite.resolvePath(uargs[1]);
@ -1898,10 +1926,17 @@ Options:
return 0;
return 1;
break;
case '-u': // test for set-user-id (doesn't exist, always false)
case '-u': // test for set-user-id
var p = clite.resolvePath(uargs[1]);
var st = stdio.stat(p);
if (!st || (st.st_mode&stdio.modes.S_ISUID) != stdio.modes.S_ISUID) {
if (negate)
return 0;
return 1;
}
if (negate)
return 0;
return 1;
return 1;
return 0;
break;
case '-w':
var p = clite.resolvePath(uargs[1]);

34
clite/core.js
View file

@ -744,6 +744,28 @@ clite.proc = {
return 0;
return proc.gid;
}
clite.proc.setUID = function(pid,uid,force) {
var proc = getProc(pid);
if (!proc)
return false;
if (!clite.user.getPWData(uid))
return false;
if (!force && proc.uid != 0)
return false;
proc.uid = uid;
return true;
}
clite.proc.setGID = function(pid,gid,force) {
var proc = getProc(pid);
if (!proc)
return false;
if (!clite.user.getGRData(gid))
return false;
if (!force && gid == 0)
return false;
proc.gid = gid;
return true;
}
clite.proc.getTTY = function(pid) {
var proc = getProc(pid);
if (!proc)
@ -1394,7 +1416,7 @@ clite.io = {
if (typeof mode != 'number')
return false;
var uid = clite.proc.getUID(pid);
if (fd.node.uid != uid)
if (fd.node.uid != uid && uid != 0)
return false;
mode &= ~clite.io.modes.S_IFMT;
@ -2942,6 +2964,16 @@ clite.lib = {
return -4;
}
if ((fd.node.mode&clite.io.modes.S_ISGID) == clite.io.modes.S_ISGID) {
if (!clite.proc.setGID(io.pid,fd.node.gid,true))
return -7;
}
if ((fd.node.mode&clite.io.modes.S_ISUID) == clite.io.modes.S_ISUID) {
if (!clite.proc.setUID(io.pid,fd.node.uid,true))
return -8;
}
clite.proc.update(args.join(' '));
var r = clite.core.execSafe(function() {

6
clite/libstd.js
View file

@ -47,6 +47,9 @@ return Object.create({
getuid:function() {
return clite.proc.getUID(io.pid);
},
setuid:function(id) {
return clite.proc.setUID(io.pid,id,false);
},
// gets the passwd file data for a user based on their uid
getpwuid:function(uid) {
@ -64,6 +67,9 @@ return Object.create({
getgid:function() {
return clite.proc.getGID(io.pid);
},
setgid:function(id) {
return clite.proc.setGID(io.pid,id,false);
},
// gets teh group file data for a group based on their gid
getgrgid:function(gid) {

6
clite/shell.js
View file

@ -421,6 +421,12 @@ clite.commands.load('sh',function(args,env,io) {
return;
}
if (r == -7 || r == -8) {
stdio.fprintf(io.stderr,'Shell: failed to set uid/gid for: %s\n',exec.active.args[0]);
io.exit(-3);
return;
}
if (r<0) {
stdio.fprintf(io.stderr,'Shell: could not exec file: %s\n',exec.active.args[0]);
io.exit(-3);