Rework shell license check

xpipe-io · Nov 21, 2024 · 66b6fae · 66b6fae
1 parent 3211896
commit 66b6fae
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 13 deletions.
diff --git a/app/src/main/java/io/xpipe/app/ext/ShellStore.java b/app/src/main/java/io/xpipe/app/ext/ShellStore.java
@@ -32,9 +32,6 @@ default ShellControl getOrStartSession() throws Exception {
     default ShellSession newSession() throws Exception {
         var func = shellFunction();
         var c = func.control();
-        if (!isInStorage()) {
-            c.withoutLicenseCheck();
-        }
         return new ShellSession(this, () -> c);
     }
 

diff --git a/app/src/main/java/io/xpipe/app/storage/DataStorage.java b/app/src/main/java/io/xpipe/app/storage/DataStorage.java
@@ -974,6 +974,6 @@ public DataStoreEntry getStoreEntry(UUID id) {
     }
 
     public DataStoreEntry local() {
-        return getStoreEntryIfPresent(LOCAL_ID).orElse(null);
+        return getStoreEntryIfPresent(LOCAL_ID).orElseThrow(() -> new IllegalStateException("Missing local machine connection"));
     }
 }
diff --git a/app/src/main/java/io/xpipe/app/util/LocalShell.java b/app/src/main/java/io/xpipe/app/util/LocalShell.java
@@ -43,7 +43,6 @@ public static ShellControl getLocalPowershell() throws Exception {
                 localPowershell = ProcessControlProvider.get()
                         .createLocalProcessControl(false)
                         .subShell(ShellDialects.POWERSHELL)
-                        .withoutLicenseCheck()
                         .start();
             } catch (ProcessOutputException ex) {
                 throw ProcessOutputException.withPrefix("Failed to start local powershell process", ex);

diff --git a/app/src/main/java/io/xpipe/app/util/ScanDialog.java b/app/src/main/java/io/xpipe/app/util/ScanDialog.java
@@ -143,7 +143,7 @@ private void onUpdate(DataStoreEntryRef<ShellStore> newValue, StackPane stackPan
 
         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) {

diff --git a/core/src/main/java/io/xpipe/core/process/ShellControl.java b/core/src/main/java/io/xpipe/core/process/ShellControl.java
@@ -54,8 +54,6 @@ default boolean canHaveSubshells() {
 
     ShellControl getMachineRootSession();
 
-    ShellControl withoutLicenseCheck();
-
     String getOsName();
 
     boolean isLicenseCheck();
@@ -106,6 +104,8 @@ default <T extends ShellStoreState> ShellControl withShellStateFail(StatefulData
 
     ShellControl withErrorFormatter(Function<String, String> formatter);
 
+    void checkLicenseOrThrow();
+
     String prepareIntermediateTerminalOpen(
             TerminalInitFunction content, TerminalInitScriptConfig config, WorkingDirectoryFunction workingDirectory)
             throws Exception;

diff --git a/core/src/main/java/io/xpipe/core/process/WrapperShellControl.java b/core/src/main/java/io/xpipe/core/process/WrapperShellControl.java
@@ -106,11 +106,6 @@ public ShellControl getMachineRootSession() {
         return parent.getMachineRootSession();
     }
 
-    @Override
-    public ShellControl withoutLicenseCheck() {
-        return parent.withoutLicenseCheck();
-    }
-
     @Override
     public String getOsName() {
         return parent.getOsName();
@@ -262,6 +257,11 @@ public ShellControl withErrorFormatter(Function<String, String> formatter) {
         return parent.withErrorFormatter(formatter);
     }
 
+    @Override
+    public void checkLicenseOrThrow() {
+        parent.checkLicenseOrThrow();
+    }
+
     @Override
     public String prepareIntermediateTerminalOpen(
             TerminalInitFunction content, TerminalInitScriptConfig config, WorkingDirectoryFunction workingDirectory)

diff --git a/core/src/main/java/io/xpipe/core/store/ConnectionFileSystem.java b/core/src/main/java/io/xpipe/core/store/ConnectionFileSystem.java
@@ -50,6 +50,8 @@ public FileSystem open() throws Exception {
                     "Shell has a PTY allocated and as a result does not support file system operations");
         }
 
+        shellControl.checkLicenseOrThrow();
+
         return this;
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -50,6 +50,8 @@ public FileSystem open() throws Exception { @@
                         "Shell has a PTY allocated and as a result does not support file system operations");
             }
+            shellControl.checkLicenseOrThrow();
             return this;
         }
@@ Expand Down @@