MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[eel] IJPL-213853 Minimal environment variables on local Eel must not include login-interactive variables

Browse Source 
GitOrigin-RevId: 10134ef0c5214b43fc7e6988ba841d91f3e2fc1e
This commit is contained in:
Vladimir Lagunov
2025-10-20 19:22:40 +00:00
committed by intellij-monorepo-bot
parent 557227bfb9
commit 589309f4ae
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/eel-impl/src/com/intellij/platform/eel/impl/local/EelLocalExecApi.kt
+2 -6
View File
@@ -64,9 +64,7 @@ class EelLocalExecPosixApi(
val (cache, interactive) = when (opts.mode) {
EelExecPosixApi.PosixEnvironmentVariablesOptions.Mode.MINIMAL -> {
return service<CoroutineScopeService>().coroutineScope.async {
EnvironmentUtil.getEnvironmentMap()
}
return CompletableDeferred(EnvironmentUtil.getSystemEnv())
}
EelExecPosixApi.PosixEnvironmentVariablesOptions.Mode.LOGIN_NON_INTERACTIVE -> {
@@ -200,9 +198,7 @@ class EelLocalExecWindowsApi : EelExecWindowsApi, LocalEelExecApi {
override val descriptor: EelDescriptor = LocalEelDescriptor
override fun environmentVariables(opts: EelExecApi.EnvironmentVariablesOptions): Deferred<Map<String, String>> =
service<CoroutineScopeService>().coroutineScope.async {
EnvironmentUtil.getEnvironmentMap()
}
CompletableDeferred(EnvironmentUtil.getEnvironmentMap())
override suspend fun findExeFilesInPath(binaryName: String): List<EelPath> =
findExeFilesInPath(binaryName, LOG)
platform/util/src/com/intellij/util/EnvironmentUtil.java
+2 -1
View File
@@ -112,7 +112,8 @@ public final class EnvironmentUtil {
ourEnvGetter.set(loader);
}
private static Map<String, String> getSystemEnv() {
@ApiStatus.Internal
public static Map<String, String> getSystemEnv() {
if (OS.CURRENT == OS.Windows) {
return Collections.unmodifiableMap(CollectionFactory.createCaseInsensitiveStringMap(System.getenv()));
}