beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-11-22 07:30:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix NPEs for shell elevation

Browse source
This commit is contained in:
crschnick 2024-02-18 11:27:06 +00:00
parent 7bf5ef8afa
commit 86ab003913
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/io/xpipe/app/util/SecretQueryProgress.java
View file

@ -5,6 +5,7 @@ import io.xpipe.core.process.CountDown;
import io.xpipe.core.util.SecretReference; import io.xpipe.core.util.SecretReference;
import io.xpipe.core.util.SecretValue; import io.xpipe.core.util.SecretValue;
import lombok.Getter; import lombok.Getter;
import lombok.NonNull;
import java.util.*; import java.util.*;
@ -19,7 +20,7 @@ public class SecretQueryProgress {
private final CountDown countDown; private final CountDown countDown;
private boolean requestCancelled; private boolean requestCancelled;
public SecretQueryProgress(UUID requestId, UUID storeId, List<SecretQuery> suppliers, SecretQuery fallback, CountDown countDown) { public SecretQueryProgress(@NonNull UUID requestId, @NonNull UUID storeId, @NonNull List<SecretQuery> suppliers, @NonNull SecretQuery fallback, @NonNull CountDown countDown) {
this.requestId = requestId; this.requestId = requestId;
this.storeId = storeId; this.storeId = storeId;
this.suppliers = new ArrayList<>(suppliers); this.suppliers = new ArrayList<>(suppliers);

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

@ -146,7 +146,7 @@ public interface ShellControl extends ProcessControl {
ShellSecurityPolicy getEffectiveSecurityPolicy(); ShellSecurityPolicy getEffectiveSecurityPolicy();
String buildElevatedCommand(CommandConfiguration input, String prefix, CountDown countDown) throws Exception; String buildElevatedCommand(CommandConfiguration input, String prefix, UUID requestId, CountDown countDown) throws Exception;
void restart() throws Exception; void restart() throws Exception;