shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2025-08-25 13:49:59 +03:00
Code Issues Releases Wiki Activity

Merged 2.2

Browse Source
This commit is contained in:
Adolfo Gómez García
2017-10-19 14:31:16 +02:00
parent 6b88209a93 815de57b86
commit 3f1f2066b4
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
actors/src/udsactor/__init__.py
View File

@ -38,10 +38,10 @@ VERSION = '2.5.0'
__title__ = 'udsactor'
__version__ = VERSION
__build__ = 0x010750
__build__ = 0x010756
__author__ = 'Adolfo Gómez <dkmaster@dkmon.com>'
__license__ = "BSD 3-clause"
__copyright__ = "Copyright 2014-2016 VirtualCable S.L.U."
__copyright__ = "Copyright 2014-2017 VirtualCable S.L.U."
if not hasattr(six, 'byte2int'):

29
actors/src/udsactor/service.py
View File

@ -44,7 +44,10 @@ from .utils import exceptionToMessage
import socket
import time
import random
import json
import os
import subprocess
import shlex
import stat
IPC_PORT = 39188
@ -87,19 +90,22 @@ class CommonService(object):
def reboot(self):
self.rebootRequested = True
def execute(self, cmd, section):
import os
import subprocess
import stat
def execute(self, cmdLine, section):
cmd = shlex.split(cmdLine, posix=False)
if os.path.isfile(cmd):
if (os.stat(cmd).st_mode & stat.S_IXUSR) != 0:
subprocess.call([cmd, ])
if os.path.isfile(cmd[0]):
if (os.stat(cmd[0]).st_mode & stat.S_IXUSR) != 0:
try:
res = subprocess.check_call(cmd)
except Exception as e:
logger.error('Got exception executing: {} - {}'.format(cmdLine, e))
return False
logger.info('Result of executing cmd was {}'.format(res))
return True
else:
logger.info('{} file exists but it it is not executable (needs execution permission by admin/root)'.format(section))
logger.error('{} file exists but it it is not executable (needs execution permission by admin/root)'.format(section))
else:
logger.info('{} file not found & not executed'.format(section))
logger.error('{} file not found & not executed'.format(section))
return False
@ -197,9 +203,6 @@ class CommonService(object):
return False # Stop running service
self.joinDomain(params[0], params[1], params[2], params[3], params[4])
break
elif data[0] == 'notify': # Broker is just requesting local information, no rename nor domain is requested
self.notifyLocalInfo()
break
else:
logger.error('Unrecognized action sent from broker: {}'.format(data[0]))
return False # Stop running service