diff --git a/enterprise_gateway/services/kernels/handlers.py b/enterprise_gateway/services/kernels/handlers.py index aa9df51e..15af66e5 100644 --- a/enterprise_gateway/services/kernels/handlers.py +++ b/enterprise_gateway/services/kernels/handlers.py @@ -63,12 +63,27 @@ async def post(self): # Users can use inherited_envs to add custom envrioment variables, # and we ensure PATH, SYSTEMROOT, TEMP, USERPROFILE, WINDIR, COMSPEC, APPDATA, LOCALAPPDATA, PROGRAMDATA and PROGRAMFILES are included # this allows a more out-of-the-box experience for users - required_envs: set[str] = {"PATH", "SYSTEMROOT", "TEMP", "USERPROFILE", "WINDIR", "COMSPEC", - "APPDATA", "LOCALAPPDATA", "PROGRAMDATA", "PROGRAMFILES"} - env = {key: value for key, value in os.environ.items() if - key in self.inherited_envs or key in required_envs} + required_envs: set[str] = { + "PATH", + "SYSTEMROOT", + "TEMP", + "USERPROFILE", + "WINDIR", + "COMSPEC", + "APPDATA", + "LOCALAPPDATA", + "PROGRAMDATA", + "PROGRAMFILES", + } + env = { + key: value + for key, value in os.environ.items() + if key in self.inherited_envs or key in required_envs + } else: - env = {key: value for key, value in os.environ.items() if key in self.inherited_envs} + env = { + key: value for key, value in os.environ.items() if key in self.inherited_envs + } # Allow all KERNEL_* envs and those specified in client_envs and set from client. If this EG # instance is configured to accept all envs in the payload (i.e., client_envs == '*'), go ahead diff --git a/enterprise_gateway/services/processproxies/processproxy.py b/enterprise_gateway/services/processproxies/processproxy.py index fe49be0e..eb62f83c 100644 --- a/enterprise_gateway/services/processproxies/processproxy.py +++ b/enterprise_gateway/services/processproxies/processproxy.py @@ -1061,7 +1061,9 @@ async def launch_process( except OSError: pass self.ip = local_ip - if os.name == "nt": # if operating system is Windows then link the win32_interrupt_event from the kernel + if ( + os.name == "nt" + ): # if operating system is Windows then link the win32_interrupt_event from the kernel self.win32_interrupt_event = self.local_proc.win32_interrupt_event self.log.info( "Local kernel launched on '{}', pid: {}, pgid: {}, KernelID: {}, cmd: '{}'".format(