0ct0pu5/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-12-04 05:20:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add enable api setting

Browse source
This commit is contained in:
crschnick 2024-09-06 12:40:32 +00:00
parent 44ba765e30
commit a8e8c13f18
15 changed files with 71 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/io/xpipe/app/beacon/BeaconRequestHandler.java
View file

@ -39,6 +39,10 @@ public class BeaconRequestHandler<T> implements HttpHandler {
}
}
if (beaconInterface.requiresEnabledApi() && !AppPrefs.get().enableHttpApi().get()) {
throw ErrorEvent.expected(new IllegalStateException("HTTP API is not enabled in the settings menu"));
}
if (!AppPrefs.get().disableApiAuthentication().get() && beaconInterface.requiresAuthentication()) {
var auth = exchange.getRequestHeaders().getFirst("Authorization");
if (auth == null) {

5
app/src/main/java/io/xpipe/app/beacon/impl/AskpassExchangeImpl.java
View file

@ -36,4 +36,9 @@ public class AskpassExchangeImpl extends AskpassExchange {
}
return Response.builder().value(secret.inPlace()).build();
}
@Override
public boolean requiresEnabledApi() {
return false;
}
}

5
app/src/main/java/io/xpipe/app/beacon/impl/DaemonFocusExchangeImpl.java
View file

@ -12,4 +12,9 @@ public class DaemonFocusExchangeImpl extends DaemonFocusExchange {
OperationMode.switchUp(OperationMode.map(msg.getMode()));
return Response.builder().build();
}
@Override
public boolean requiresEnabledApi() {
return false;
}
}

5
app/src/main/java/io/xpipe/app/beacon/impl/DaemonModeExchangeImpl.java
View file

@ -25,4 +25,9 @@ public class DaemonModeExchangeImpl extends DaemonModeExchange {
.usedMode(OperationMode.map(OperationMode.get()))
.build();
}
@Override
public boolean requiresEnabledApi() {
return false;
}
}

5
app/src/main/java/io/xpipe/app/beacon/impl/DaemonOpenExchangeImpl.java
View file

@ -21,4 +21,9 @@ public class DaemonOpenExchangeImpl extends DaemonOpenExchange {
LauncherInput.handle(msg.getArguments());
return Response.builder().build();
}
@Override
public boolean requiresEnabledApi() {
return false;
}
}

5
app/src/main/java/io/xpipe/app/beacon/impl/DaemonStatusExchangeImpl.java
View file

@ -23,4 +23,9 @@ public class DaemonStatusExchangeImpl extends DaemonStatusExchange {
return Response.builder().mode(mode).build();
}
@Override
public boolean requiresEnabledApi() {
return false;
}
}

5
app/src/main/java/io/xpipe/app/beacon/impl/DaemonStopExchangeImpl.java
View file

@ -21,4 +21,9 @@ public class DaemonStopExchangeImpl extends DaemonStopExchange {
});
return Response.builder().success(true).build();
}
@Override
public boolean requiresEnabledApi() {
return false;
}
}

5
app/src/main/java/io/xpipe/app/beacon/impl/DaemonVersionExchangeImpl.java
View file

@ -31,4 +31,9 @@ public class DaemonVersionExchangeImpl extends DaemonVersionExchange {
.pro(pro)
.build();
}
@Override
public boolean requiresEnabledApi() {
return false;
}
}

5
app/src/main/java/io/xpipe/app/beacon/impl/HandshakeExchangeImpl.java
View file

@ -42,4 +42,9 @@ public class HandshakeExchangeImpl extends HandshakeExchange {
return false;
}
@Override
public boolean requiresEnabledApi() {
return false;
}
}

6
app/src/main/java/io/xpipe/app/beacon/impl/SshLaunchExchangeImpl.java
View file

@ -2,7 +2,6 @@ package io.xpipe.app.beacon.impl;
import com.sun.net.httpserver.HttpExchange;
import io.xpipe.app.util.TerminalLauncherManager;
import io.xpipe.beacon.BeaconClientException;
import io.xpipe.beacon.api.SshLaunchExchange;
import io.xpipe.core.process.ProcessControlProvider;
import io.xpipe.core.process.ShellDialects;
@ -35,4 +34,9 @@ public class SshLaunchExchangeImpl extends SshLaunchExchange {
.buildBaseParts(null);
return Response.builder().command(c).build();
}
@Override
public boolean requiresEnabledApi() {
return false;
}
}

5
app/src/main/java/io/xpipe/app/beacon/impl/TerminalLaunchExchangeImpl.java
View file

@ -12,4 +12,9 @@ public class TerminalLaunchExchangeImpl extends TerminalLaunchExchange {
var r = TerminalLauncherManager.performLaunch(msg.getRequest());
return Response.builder().targetFile(r).build();
}
@Override
public boolean requiresEnabledApi() {
return false;
}
}

5
app/src/main/java/io/xpipe/app/beacon/impl/TerminalWaitExchangeImpl.java
View file

@ -13,4 +13,9 @@ public class TerminalWaitExchangeImpl extends TerminalWaitExchange {
TerminalLauncherManager.waitForCompletion(msg.getRequest());
return Response.builder().build();
}
@Override
public boolean requiresEnabledApi() {
return false;
}
}

6
app/src/main/java/io/xpipe/app/prefs/AppPrefs.java
View file

@ -38,6 +38,8 @@ public class AppPrefs {
private static AppPrefs INSTANCE;
private final List<Mapping<?>> mapping = new ArrayList<>();
final BooleanProperty enableHttpApi =
mapVaultSpecific(new SimpleBooleanProperty(false), "enableHttpApi", Boolean.class);
final BooleanProperty dontAutomaticallyStartVmSshServer =
mapVaultSpecific(new SimpleBooleanProperty(false), "dontAutomaticallyStartVmSshServer", Boolean.class);
final BooleanProperty dontAcceptNewHostKeys =
@ -144,6 +146,10 @@ public class AppPrefs {
return disableApiAuthentication;
}
public ObservableBooleanValue enableHttpApi() {
return enableHttpApi;
}
private final IntegerProperty editorReloadTimeout =
map(new SimpleIntegerProperty(1000), "editorReloadTimeout", Integer.class);
private final BooleanProperty confirmDeletions =

2
app/src/main/java/io/xpipe/app/prefs/HttpApiCategory.java
View file

@ -16,6 +16,8 @@ public class HttpApiCategory extends AppPrefsCategory {
return new OptionsBuilder()
.addTitle("httpServerConfiguration")
.sub(new OptionsBuilder()
.nameAndDescription("enableHttpApi")
.addToggle(prefs.enableHttpApi)
.nameAndDescription("apiKey")
.addString(prefs.apiKey)
.nameAndDescription("disableApiAuthentication")

4
beacon/src/main/java/io/xpipe/beacon/BeaconInterface.java
View file

@ -83,4 +83,8 @@ public abstract class BeaconInterface<T> {
public boolean readRawRequestBody() {
return false;
}
public boolean requiresEnabledApi() {
return true;
}
}