Merge remote-tracking branch 'origin/v3.6'

This commit is contained in:
Adolfo Gómez García 2022-08-17 14:13:17 +02:00
commit 4d3aa1d17c

View File

@ -504,9 +504,9 @@ class CommonService: # pylint: disable=too-many-instance-attributes
self._initialized = (
self.initialize()
) # Maybe it's a local login by an unmanaged host.... On real login, will execute initilize again
if self._initialized:
master_token = self._cfg.master_token
secret = self._secret
# Unamanaged, need the master token
master_token = self._cfg.master_token
secret = self._secret
# Own token will not be set if UDS did not assigned the initialized VM to an user
# In that case, take master token (if machine is Unamanaged version)
@ -526,6 +526,7 @@ class CommonService: # pylint: disable=too-many-instance-attributes
): # If logged in, process it. client_pool will take account of login response to client and session
script = platform.store.invokeScriptOnLogin()
if script:
logger.info('Executing script on login: {}'.format(script))
script += f'{username} {sessionType or "unknown"} {self._cfg.actorType}'
self.execute(script, 'Logon')