mirror/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2026-02-19 07:36:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Improve mstsc cert caching

Browse Source
This commit is contained in:
crschnick
2026-01-10 07:59:10 +00:00
parent 4e5220b89f
commit a1fd39ef03
1 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
app/src/main/java/io/xpipe/app/rdp/MstscRdpClient.java
View File

@@ -23,6 +23,7 @@ import java.time.Duration;
import java.util.Map;
import java.util.Optional;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicInteger;
@JsonTypeName("mstsc")
@Value
@@ -59,7 +60,7 @@ public class MstscRdpClient implements ExternalApplicationType.PathApplication,
public void launch(RdpLaunchConfig configuration) throws Exception {
var adaptedRdpConfig = getAdaptedConfig(configuration);
prepareLocalhostRegistryCache(configuration);
var setCache = prepareLocalhostRegistryCache(configuration);
var file = writeRdpConfigFile(configuration.getTitle(), adaptedRdpConfig);
LocalShell.getShell()
@@ -69,16 +70,11 @@ public class MstscRdpClient implements ExternalApplicationType.PathApplication,
FileUtils.deleteQuietly(file.toFile());
}, Duration.ofSeconds(1));
var localhost = configuration.getConfig().get("full address").orElseThrow().getValue().startsWith("localhost");
if (localhost) {
var counter = ++launchCounter;
GlobalTimer.delay(() -> {
if (counter != launchCounter) {
return;
}
if (!setCache) {
var localhost = configuration.getConfig().get("full address").orElseThrow().getValue().startsWith("localhost");
if (localhost) {
saveLocalhostRegistryCache(configuration.getStoreId());
}, Duration.ofSeconds(15));
}
}
}
@@ -110,20 +106,29 @@ public class MstscRdpClient implements ExternalApplicationType.PathApplication,
}
private void saveLocalhostRegistryCache(UUID entry) {
var ex = WindowsRegistry.local().keyExists(WindowsRegistry.HKEY_CURRENT_USER, "Software\\Microsoft\\Terminal Server Client\\Servers\\localhost");
if (!ex) {
return;
}
var counter = ++launchCounter;
var attempts = new AtomicInteger();
GlobalTimer.scheduleUntil(Duration.ofSeconds(1), false, () -> {
if (counter != launchCounter || attempts.getAndIncrement() > 15) {
return true;
}
var user = WindowsRegistry.local().readStringValueIfPresent(WindowsRegistry.HKEY_CURRENT_USER,
"Software\\Microsoft\\Terminal Server Client\\Servers\\localhost", "UsernameHint").orElse(null);
var cert = WindowsRegistry.local().readBinaryValueIfPresent(WindowsRegistry.HKEY_CURRENT_USER,
"Software\\Microsoft\\Terminal Server Client\\Servers\\localhost", "CertHash").orElse(null);
if (user == null && cert == null) {
return;
}
var ex = WindowsRegistry.local().keyExists(WindowsRegistry.HKEY_CURRENT_USER, "Software\\Microsoft\\Terminal Server Client\\Servers\\localhost");
if (!ex) {
return false;
}
AppCache.update("rdp-" + entry, RegistryCache.builder().usernameHint(user).certHash(cert).build());
var user = WindowsRegistry.local().readStringValueIfPresent(WindowsRegistry.HKEY_CURRENT_USER,
"Software\\Microsoft\\Terminal Server Client\\Servers\\localhost", "UsernameHint").orElse(null);
var cert = WindowsRegistry.local().readBinaryValueIfPresent(WindowsRegistry.HKEY_CURRENT_USER,
"Software\\Microsoft\\Terminal Server Client\\Servers\\localhost", "CertHash").orElse(null);
if (user == null && cert == null) {
return true;
}
AppCache.update("rdp-" + entry, RegistryCache.builder().usernameHint(user).certHash(cert).build());
return true;
});
}
private Optional<RegistryCache> getLocalhostRegistryCache(UUID entry) {
@@ -131,7 +136,7 @@ public class MstscRdpClient implements ExternalApplicationType.PathApplication,
return Optional.ofNullable(found);
}
private void prepareLocalhostRegistryCache(RdpLaunchConfig configuration) {
private boolean prepareLocalhostRegistryCache(RdpLaunchConfig configuration) {
WindowsRegistry.local().deleteKey(WindowsRegistry.HKEY_CURRENT_USER,
"Software\\Microsoft\\Terminal Server Client\\Servers\\localhost");
@@ -150,8 +155,12 @@ public class MstscRdpClient implements ExternalApplicationType.PathApplication,
WindowsRegistry.local().setBinaryValue(WindowsRegistry.HKEY_CURRENT_USER,
"Software\\Microsoft\\Terminal Server Client\\Servers\\localhost", "CertHash", cert);
}
return user != null || cert != null;
}
}
return false;
}
private String encrypt(SecretValue password) throws Exception {