CodeMirror/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-06-28 11:00:28 +12:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for subshell elevation

Browse source
This commit is contained in:
crschnick 2024-05-16 13:56:41 +00:00
parent b36ca8f557
commit 856322e052
2 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
core/src/main/java/io/xpipe/core/process/ElevationFunction.java
View file

@ -4,6 +4,34 @@ import io.xpipe.core.util.FailableFunction;
public interface ElevationFunction {
static ElevationFunction ifNotRoot(ElevationFunction function) {
return new ElevationFunction() {
@Override
public String getPrefix() {
return function.getPrefix();
}
@Override
public boolean isSpecified() {
return true;
}
@Override
public boolean apply(ShellControl shellControl) throws Exception {
if (shellControl.getOsType() == OsType.WINDOWS) {
return false;
}
var isRoot = shellControl.executeSimpleBooleanCommand("test \"${EUID:-$(id -u)}\" -eq 0");
if (isRoot) {
return false;
}
return function.apply(shellControl);
}
};
}
static ElevationFunction of(String prefix, FailableFunction<ShellControl, Boolean, Exception> f) {
return new ElevationFunction() {
@Override

5
core/src/main/java/io/xpipe/core/process/ShellControl.java
View file

@ -207,7 +207,10 @@ public interface ShellControl extends ProcessControl {
return CommandBuilder.ofString(command);
}
};
return singularSubShell(o);
var sc = singularSubShell(o);
sc.withSourceStore(getSourceStore().orElse(null));
sc.setParentSystemAccess(ParentSystemAccess.identity());
return sc;
}
default <T> T enforceDialect(@NonNull ShellDialect type, FailableFunction<ShellControl, T, Exception> sc)