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

Rework shell license check

Browse source
This commit is contained in:
crschnick 2024-11-21 11:23:36 +00:00
parent 3211896045
commit 66b6fae017
7 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/io/xpipe/app/ext/ShellStore.java
View file

@ -32,9 +32,6 @@ public interface ShellStore extends DataStore, FileSystemStore, ValidatableStore
default ShellSession newSession() throws Exception {
var func = shellFunction();
var c = func.control();
if (!isInStorage()) {
c.withoutLicenseCheck();
}
return new ShellSession(this, () -> c);
}

2
app/src/main/java/io/xpipe/app/storage/DataStorage.java
View file

@ -974,6 +974,6 @@ public abstract class DataStorage {
}
public DataStoreEntry local() {
return getStoreEntryIfPresent(LOCAL_ID).orElse(null);
return getStoreEntryIfPresent(LOCAL_ID).orElseThrow(() -> new IllegalStateException("Missing local machine connection"));
}
}

1
app/src/main/java/io/xpipe/app/util/LocalShell.java
View file

@ -43,7 +43,6 @@ public class LocalShell {
localPowershell = ProcessControlProvider.get()
.createLocalProcessControl(false)
.subShell(ShellDialects.POWERSHELL)
.withoutLicenseCheck()
.start();
} catch (ProcessOutputException ex) {
throw ProcessOutputException.withPrefix("Failed to start local powershell process", ex);

2
app/src/main/java/io/xpipe/app/util/ScanDialog.java
View file

@ -143,7 +143,7 @@ class ScanDialog extends DialogComp {
ThreadHelper.runFailableAsync(() -> {
BooleanScope.executeExclusive(busy, () -> {
var sc = entry.get().getStore().getOrStartSession().withoutLicenseCheck();
var sc = entry.get().getStore().getOrStartSession();
var a = applicable.apply(entry.get().get(), sc);
Platform.runLater(() -> {
if (a == null) {

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

@ -54,8 +54,6 @@ public interface ShellControl extends ProcessControl {
ShellControl getMachineRootSession();
ShellControl withoutLicenseCheck();
String getOsName();
boolean isLicenseCheck();
@ -106,6 +104,8 @@ public interface ShellControl extends ProcessControl {
ShellControl withErrorFormatter(Function<String, String> formatter);
void checkLicenseOrThrow();
String prepareIntermediateTerminalOpen(
TerminalInitFunction content, TerminalInitScriptConfig config, WorkingDirectoryFunction workingDirectory)
throws Exception;

10
core/src/main/java/io/xpipe/core/process/WrapperShellControl.java
View file

@ -106,11 +106,6 @@ public class WrapperShellControl implements ShellControl {
return parent.getMachineRootSession();
}
@Override
public ShellControl withoutLicenseCheck() {
return parent.withoutLicenseCheck();
}
@Override
public String getOsName() {
return parent.getOsName();
@ -262,6 +257,11 @@ public class WrapperShellControl implements ShellControl {
return parent.withErrorFormatter(formatter);
}
@Override
public void checkLicenseOrThrow() {
parent.checkLicenseOrThrow();
}
@Override
public String prepareIntermediateTerminalOpen(
TerminalInitFunction content, TerminalInitScriptConfig config, WorkingDirectoryFunction workingDirectory)

2
core/src/main/java/io/xpipe/core/store/ConnectionFileSystem.java
View file

@ -50,6 +50,8 @@ public class ConnectionFileSystem implements FileSystem {
"Shell has a PTY allocated and as a result does not support file system operations");
}
shellControl.checkLicenseOrThrow();
return this;
}