Compare revisions

0bfb2f24 · 0bfb2f24 · 0bfb2f24 · 0bfb2f24 · 0bfb2f24 · 0bfb2f24
--- a/src/python/dm/common/service/impl/noOpPrincipalRetriever.py
+++ b/src/python/dm/common/service/impl/noOpPrincipalRetriever.py
+#!/usr/bin/env python
+
+from dm.common.constants import dmRole
+from dm.common.objects.authorizationPrincipal import AuthorizationPrincipal
+from dm.common.utility.cryptUtility import CryptUtility
+from authorizationPrincipalRetriever import AuthorizationPrincipalRetriever 
+
+class NoOpPrincipalRetriever(AuthorizationPrincipalRetriever):
+
+    def __init__(self):
+        AuthorizationPrincipalRetriever.__init__(self, self.__class__.__name__)
+
+    def getAuthorizationPrincipal(self, username):
+        noOpPassword = CryptUtility.cryptPasswordWithPbkdf2(username)
+        principal = AuthorizationPrincipal(username, noOpPassword)
+        principal.setRole(dmRole.DM_USER_ROLE)
+        if self.adminGroupName is not None:
+            principal.setRole(dmRole.DM_ADMIN_ROLE)
+        return principal
+
+#######################################################################
+# Testing.
+if __name__ == '__main__':
+    pass
+
--- a/src/python/dm/common/service/loginController.py
+++ b/src/python/dm/common/service/loginController.py
+#!/usr/bin/env python
+
+import cherrypy
+import urllib
+from cherrypy.lib import httpauth
+
+from dm.common.constants import dmStatus
+from dm.common.constants import dmRole
+from dm.common.constants import dmHttpStatus
+from dm.common.exceptions.dmException import DmException
+from dm.common.exceptions.dmHttpError import DmHttpError
+from dm.common.exceptions.authorizationError import AuthorizationError
+from dm.common.utility.loggingManager import LoggingManager
+from dm.common.service.dmController import DmController
+from dm.common.service.impl.authorizationManager import AuthorizationManager
+
+class LoginController(DmController):
+    """ Controller to provide login and logout actions. """
+
+    SESSION_USERNAME_KEY = '_cp_username'
+    SESSION_USER_KEY = 'user'
+    SESSION_ROLE_KEY = 'role'
+    INVALID_SESSION_KEY = 'invalidSession'
+
+    _cp_config = {
+        'tools.sessions.on' : True,
+        'tools.auth.on' : True
+    }
+
+    def __init__(self):
+        DmController.__init__(self)
+
+    def onLogin(self, username):
+        """ Called on successful login. """
+        return
+
+    def onLogout(self, username):
+        """ Called on logout. """
+        return
+
+    @classmethod
+    def getLoginForm(cls, msg='Enter username and password:', username='', fromPage='/'):
+        return """
+        <html>
+            <body>
+                <form method='post' action='/auth/login'>
+                    <input type='hidden' name='fromPage' value='%(fromPage)s' />
+                    <h2>DM Service</h2>
+                    <p/>
+                    %(msg)s
+                    <p/>
+                    <table border='0'>
+                        <tr>
+                            <td>Username:</td><td><input type='text' name="username" value='%(username)s'/></td>
+                        </tr>
+                        <tr>
+                            <td>Password:</td><td><input type='password' name='password' /></td>
+                        </tr>
+                        <p/>
+                        <tr>
+                            <td></td>
+                            <td><input type='submit' value='Log In' /></td>
+                        </tr>
+                    </table>
+                </form>
+            </body>
+        </html>""" % locals()
+
+    @classmethod
+    def parseBasicAuthorizationHeaders(cls):
+        try:
+            username = None
+            password = None
+            authorization = cherrypy.request.headers['authorization']
+            authorizationHeader = httpauth.parseAuthorization(authorization)
+            if authorizationHeader['auth_scheme'] == 'basic':
+                username = authorizationHeader['username']
+                password = authorizationHeader['password']
+            if username and password:
+                return (username, password)
+            else:
+                raise AuthorizationError('Username and/or password not supplied.')
+        except Exception, ex:
+            errorMsg = 'Could not extract username/password from authorization header: %s' % ex
+            raise AuthorizationError(errorMsg)
+
+    @classmethod
+    def checkCredentials(cls, username, password):
+        """ Verifies credentials for username and password."""
+        logger = LoggingManager.getInstance().getLogger('LoginController:checkCredentials')
+        logger.debug('Checking credential for User: %s' % (username))
+        #logger.debug('Checking credential for User: %s, Password: %s' % (username, password))
+        logger.debug('Session id: %s' % cherrypy.serving.session.id)
+        principal = AuthorizationManager.getInstance().getAuthorizationPrincipal(username, password)
+        logger.debug('Principal: %s' % (principal))
+        if principal:
+            cherrypy.session[LoginController.SESSION_ROLE_KEY] = principal.getRole()
+            logger.debug('Successful login from user: %s (role: %s)' % (username, principal.getRole()))
+        else:
+            logger.debug('Login denied for user: %s' % username)
+            username = cherrypy.session.get(LoginController.SESSION_USERNAME_KEY, None)
+            if username is not None:
+                cherrypy.request.login = None
+                cherrypy.session[LoginController.INVALID_DM_SESSION_KEY] = True
+            raise AuthorizationError('Incorrect username or password.')
+        cherrypy.session[LoginController.SESSION_USER_KEY] = principal.getUserInfo()
+        return principal
+
+    @classmethod
+    def checkAuthorization(cls, *args, **kwargs):
+        """
+        A tool that looks in config for 'auth.require'. If found and it
+        is not None, a login is required and the entry is evaluated as a list of
+        conditions that the user must fulfill.
+        """
+        logger = LoggingManager.getInstance().getLogger('LoginController:checkAuthorization')
+        conditions = cherrypy.request.config.get('auth.require', None)
+        #logger.debug('Headers: %s' % (cherrypy.request.headers))
+        #logger.debug('Request params: %s' % (cherrypy.request.params))
+        #logger.debug('Request query string: %s' % (cherrypy.request.query_string))
+        method = urllib.quote(cherrypy.request.request_line.split()[0])
+        params = urllib.quote(cherrypy.request.request_line.split()[1])
+
+        if conditions is None:
+            logger.debug('No conditions imposed')
+            return
+
+        sessionId = cherrypy.serving.session.id
+        sessionCache = cherrypy.session.cache
+        #logger.debug('Session: %s' % ((cherrypy.session.__dict__)))
+        #logger.debug('Session cache length: %s' % (len(sessionCache)))
+        #logger.debug('Session cache: %s' % (sessionCache))
+
+        # Check session.
+        if not sessionCache.has_key(sessionId):
+            errorMsg = 'Invalid or expired session id: %s.' % sessionId
+            logger.debug(errorMsg)
+            raise DmHttpError(dmHttpStatus.DM_HTTP_UNAUTHORIZED, 'User Not Authorized', AuthorizationError(errorMsg))
+
+        username = cherrypy.session.get(LoginController.SESSION_USERNAME_KEY)
+        logger.debug('Session id %s is valid (username: %s)' % (sessionId, username))
+        if username:
+            cherrypy.request.login = username
+            for condition in conditions:
+                # A condition is just a callable that returns true or false
+                if not condition():
+                    logger.debug('Authorization check %s failed for username %s' % (condition.func_name, username))
+                    errorMsg = 'Authorization check %s failed for user %s.' % (condition.func_name, username)
+                    raise DmHttpError(dmHttpStatus.DM_HTTP_UNAUTHORIZED, 'User Not Authorized', AuthorizationError(errorMsg))
+        else:
+            logger.debug('Username is not supplied')
+            raise DmHttpError(dmHttpStatus.DM_HTTP_UNAUTHORIZED, 'User Not Authorized', ex)
+
+
+    @cherrypy.expose
+    def login(self, username=None, password=None, fromPage='/'):
+        self.logger.debug('Attempting login from username %s' % (username))
+        try:
+            if username is None or password is None:
+                self.logger.debug('Parsing auth headers for username %s' % (username))
+                (username, password) = LoginController.parseBasicAuthorizationHeaders()
+                self.logger.debug('Retrieving principal for username %s' % (username))
+            principal = LoginController.checkCredentials(username, password)
+        except DmHttpError, ex:
+            raise
+        except DmException, ex:
+            self.logger.debug('Authorization failed (username %s): %s' % (username, ex))
+            self.addDmExceptionHeaders(ex)
+            raise DmHttpError(dmHttpStatus.DM_HTTP_UNAUTHORIZED, 'User Not Authorized', ex)
+
+        # Authorization worked.
+        cherrypy.session[LoginController.SESSION_USERNAME_KEY] = cherrypy.request.login = username
+        self.onLogin(username)
+        self.addDmSessionRoleHeaders(principal.getRole())
+        self.addDmResponseHeaders()
+
+    @cherrypy.expose
+    def logout(self, fromPage='/'):
+        sess = cherrypy.session
+        username = sess.get(LoginController.SESSION_USERNAME_KEY, None)
+        if username:
+            del sess[LoginController.SESSION_USERNAME_KEY]
+            cherrypy.request.login = None
+        self.onLogout(username)
+
--- a/src/python/dm/common/utility/__init__.py
+++ b/src/python/dm/common/utility/__init__.py
--- a/src/python/dm/common/utility/configurationManager.py
+++ b/src/python/dm/common/utility/configurationManager.py
+#!/usr/bin/env python
+
+# 
+# Configuration manager singleton.
+#
+
+#######################################################################
+
+import os
+import socket
+import pwd
+import UserDict
+import ConfigParser
+
+from dm.common.constants import dmServiceConstants
+from dm.common.exceptions.configurationError import ConfigurationError
+
+#######################################################################
+
+# Defaults.
+
+DEFAULT_DM_ROOT_DIR = '/opt/dm'
+DEFAULT_DM_INSTALL_DIR = '%s'                     # requires install dir
+DEFAULT_DM_CONFIG_FILE = '%s/etc/%s.%s.conf'      # requires install dir/db name/service name
+DEFAULT_DM_SERVICE_NAME= 'web-service'
+
+DEFAULT_DM_LOG_FILE = '%s/var/log/%s.%s.log'         # requires install dir/db name/service name
+DEFAULT_DM_CONSOLE_LOG_LEVEL = 'CRITICAL'
+DEFAULT_DM_FILE_LOG_LEVEL = 'INFO'
+#DEFAULT_DM_LOG_RECORD_FORMAT = '%(asctime)s,%(msecs)03d [%(levelname)s] %(module)s:%(lineno)d %(user)s@%(host)s %(name)s (%(process)d): %(message)s'
+#DEFAULT_DM_LOG_RECORD_FORMAT = '%(asctime)s,%(msecs)03d %(levelname)s %(module)s:%(lineno)d %(process)d:  %(message)s'
+DEFAULT_DM_LOG_RECORD_FORMAT = '%(asctime)s,%(msecs)03d %(levelname)s %(process)d:  %(message)s'
+DEFAULT_DM_LOG_DATE_FORMAT = '%Y-%m-%d %H:%M:%S'
+
+DEFAULT_DM_CHERRYPY_LOG_LEVEL = 'ERROR'
+DEFAULT_DM_CHERRYPY_LOG_FILE = '%s/var/log/%s.%s.cherrypy.error'     # requires install dir/db name/service name
+DEFAULT_DM_CHERRYPY_ACCESS_FILE = '%s/var/log/%s.%s.cherrypy.access' # requires install dir/db name/service name
+
+DEFAULT_DM_SERVICE_PORT = 22236           # 222DM
+DEFAULT_DM_SERVICE_HOST = '127.0.0.1'
+DEFAULT_DM_SERVICE_PROTOCOL = dmServiceConstants.DM_SERVICE_PROTOCOL_HTTP
+DEFAULT_DM_SERVICE_USERNAME = ''
+DEFAULT_DM_SERVICE_PASSWORD = ''
+
+DEFAULT_DM_DB = 'postgresql'
+DEFAULT_DM_DB_HOST = '127.0.0.1'
+DEFAULT_DM_DB_PORT = 11136
+DEFAULT_DM_DB_PASSWORD = ''
+DEFAULT_DM_DB_NAME = 'dm'
+DEFAULT_DM_DB_SCHEMA = DEFAULT_DM_DB_NAME
+DEFAULT_DM_DB_USER = DEFAULT_DM_DB_NAME
+DEFAULT_DM_DB_PASSWORD_FILE = '%s/etc/%s.db.passwd' # requires install dir/db name
+
+DEFAULT_DM_CONTEXT_ROOT = '/dm'
+
+# Session cache file
+DEFAULT_DM_SESSION_CACHE_FILE = None
+
+# Enforce session credentials.
+DEFAULT_DM_REQUIRE_SESSION_CREDENTIALS = False
+
+# SSL variables
+DEFAULT_DM_SSL_CA_CERT_FILE = None
+DEFAULT_DM_SSL_CERT_FILE = None
+DEFAULT_DM_SSL_KEY_FILE = None
+
+class ConfigurationManager(UserDict.UserDict):
+    """ 
+    Singleton class used for keeping system configuration data. The class
+    initializes its data using predefined defaults, or from certain 
+    environment variables.
+
+    Usage:
+        from dm.common.utility import configurationManager
+        cm = configurationManager.getInstance()
+        cm.setConsoleLogLevel('info')
+        level = cm.getConsoleLogLevel()
+        cm['myKey'] = 'myValue'
+        value = cm.get('myKey')
+    """
+
+    # Get singleton instance.
+    @classmethod
+    def getInstance(cls):
+        """ Get configuration manager singleton instance. """
+        from dm.common.utility.configurationManager import ConfigurationManager
+        try:
+            cm = ConfigurationManager()
+        except ConfigurationManager, ex:
+            cm = ex
+        return cm
+
+    # Singleton.
+    __instance = None
+
+    def __init__(self):
+        if ConfigurationManager.__instance:
+            raise ConfigurationManager.__instance
+        ConfigurationManager.__instance = self
+        UserDict.UserDict.__init__(self)
+        self['user'] = pwd.getpwuid(os.getuid())[0]
+        self['host'] = socket.gethostname()
+
+        self['defaultRootDir'] = DEFAULT_DM_ROOT_DIR
+        self.__setFromEnvVar('rootDir', 'DM_ROOT_DIR')
+        self['defaultInstallDir'] = DEFAULT_DM_INSTALL_DIR % self.getRootDir()
+        self.__setFromEnvVar('installDir', 'DM_INSTALL_DIR')
+        self['defaultServiceName'] = DEFAULT_DM_SERVICE_NAME 
+        self.__setFromEnvVar('serviceName', 'DM_SERVICE_NAME')
+        self['defaultDbName'] = DEFAULT_DM_DB_NAME 
+        self.__setFromEnvVar('dbName', 'DM_DB_NAME')
+        self.__resetDynamicDefaults()
+
+        self['defaultConsoleLogLevel'] = DEFAULT_DM_CONSOLE_LOG_LEVEL
+        self['defaultFileLogLevel'] = DEFAULT_DM_FILE_LOG_LEVEL
+        self['defaultLogRecordFormat'] = DEFAULT_DM_LOG_RECORD_FORMAT
+        self['defaultLogDateFormat'] = DEFAULT_DM_LOG_DATE_FORMAT
+
+        self['defaultCherrypyLogLevel'] = DEFAULT_DM_CHERRYPY_LOG_LEVEL
+
+        self['defaultServicePort'] = DEFAULT_DM_SERVICE_PORT
+        self['defaultServiceHost'] = DEFAULT_DM_SERVICE_HOST
+        self['defaultServiceProtocol'] = DEFAULT_DM_SERVICE_PROTOCOL
+        self['defaultServiceUsername'] = DEFAULT_DM_SERVICE_USERNAME  
+        self['defaultServicePassword'] = DEFAULT_DM_SERVICE_PASSWORD
+        self['defaultDb'] = DEFAULT_DM_DB
+        self['defaultDbHost'] = DEFAULT_DM_DB_HOST
+        self['defaultDbPort'] = DEFAULT_DM_DB_PORT
+        self['defaultDbPassword'] = DEFAULT_DM_DB_PASSWORD
+
+        self['defaultContextRoot'] = DEFAULT_DM_CONTEXT_ROOT
+
+        self['defaultSessionCacheFile'] = DEFAULT_DM_SESSION_CACHE_FILE
+        self['defaultRequireSessionCredentials'] = DEFAULT_DM_REQUIRE_SESSION_CREDENTIALS
+
+        self['defaultSslCaCertFile'] = DEFAULT_DM_SSL_CA_CERT_FILE
+        self['defaultSslCertFile'] = DEFAULT_DM_SSL_CERT_FILE
+        self['defaultSslKeyFile'] = DEFAULT_DM_SSL_KEY_FILE
+                                                                                        # Settings that might come from environment variables.
+        self.__setFromEnvVar('logFile', 'DM_LOG_FILE')
+        self.__setFromEnvVar('consoleLogLevel', 'DM_CONSOLE_LOG_LEVEL')
+        self.__setFromEnvVar('fileLogLevel', 'DM_FILE_LOG_LEVEL')
+        self.__setFromEnvVar('logRecordFormat', 'DM_LOG_RECORD_FORMAT')
+        self.__setFromEnvVar('logDateFormat', 'DM_LOG_DATE_FORMAT')
+
+        self.__setFromEnvVar('cherrypyLogLevel', 'DM_CHERRYPY_LOG_LEVEL')
+        self.__setFromEnvVar('cherrypyLogFile', 'DM_CHERRYPY_LOG_FILE')
+        self.__setFromEnvVar('cherrypyAccessFile', 'DM_CHERRYPY_ACCESS_FILE')
+
+        self.__setFromEnvVar('serviceProtocol', 'DM_SERVICE_PROTOCOL')
+        self.__setFromEnvVar('serviceHost', 'DM_SERVICE_HOST')
+        self.__setFromEnvVar('servicePort', 'DM_SERVICE_PORT')
+        self.__setFromEnvVar('serviceUsername', 'DM_SERVICE_USERNAME')
+        self.__setFromEnvVar('servicePassword', 'DM_SERVICE_PASSWORD')
+
+        self.__setFromEnvVar('contextRoot', 'DM_CONTEXT_ROOT')
+
+        self.__setFromEnvVar('sessionCacheFile', 'DM_SESSION_CACHE_FILE')
+
+        self.__setFromEnvVar('sslCaCertFile', 'DM_SSL_CA_CERT_FILE')
+        self.__setFromEnvVar('sslCertFile', 'DM_SSL_CERT_FILE')
+        self.__setFromEnvVar('sslKeyFile', 'DM_SSL_KEY_FILE')
+
+        self.__setFromEnvVar('configFile', 'DM_CONFIG_FILE')
+        self.__setFromEnvVar('dbPasswordFile', 'DM_DB_PASSWORD_FILE')
+
+        # Settings that might come from file.
+        self.__setFromVarFile('dbPassword', self.getDbPasswordFile())
+
+        # Variables we do not keep in a dictionary
+        self.configParser = None
+
+    # Reset defaults that depend on install dir and service name
+    def __resetDynamicDefaults(self):
+        self['defaultConfigFile'] = DEFAULT_DM_CONFIG_FILE % (self.getInstallDir(), self.getDbName(), self.getServiceName())
+        self['defaultLogFile'] = DEFAULT_DM_LOG_FILE % (self.getInstallDir(), self.getDbName(), self.getServiceName())
+        self['defaultCherrypyAccessFile'] = DEFAULT_DM_CHERRYPY_ACCESS_FILE % (self.getInstallDir(), self.getDbName(), self.getServiceName())
+        self['defaultCherrypyLogFile'] = DEFAULT_DM_CHERRYPY_LOG_FILE % (self.getInstallDir(), self.getDbName(), self.getServiceName())
+        self['defaultDbUser'] = self.getDbName()
+        self['defaultDbSchema'] = self.getDbName()
+        self['defaultDbPasswordFile'] = DEFAULT_DM_DB_PASSWORD_FILE % (self.getInstallDir(), self.getDbName())
+
+    # This function will ignore errors if environment variable is not set.
+    def __setFromEnvVar(self, key, envVar):
+        """ 
+        Set value for the specified key from a given environment variable.
+        This function ignores errors for env. variables that are not set.
+        """
+        try:
+            self[key] = os.environ[envVar]
+        except:
+            pass
+
+    # This function will ignore errors if variable file is not present.
+    def __setFromVarFile(self, key, varFile):
+        """ 
+        Set value for the specified key from a given file. The first line  
+        in the file is variable value.
+        This function ignores errors.
+        """
+        try:
+            v = open(varFile, 'r').readline()
+            self[key] = v.lstrip().rstrip()
+        except Exception, ex:
+            pass
+
+    def __getKeyValue(self, key, default='__dm_default__'):
+        """
+        Get value for a given key.
+        Keys will be of the form 'logFile', and the default keys have
+        the form 'defaultLogFile'.
+        """
+        defaultKey = "default" + key[0].upper() + key[1:]
+        defaultValue = self.get(defaultKey, None)
+        if default != '__dm_default__':
+            defaultValue = default
+        return self.get(key, defaultValue)
+
+    def setOptionsFromConfigFile(self, configSection, keyList, configFile=None):
+        _configFile = configFile
+        if _configFile is None:
+           _configFile = self.getConfigFile()
+            
+        if _configFile is not None and os.path.exists(_configFile):
+            configParser = ConfigParser.RawConfigParser()
+            configParser.read(_configFile)
+            if not configParser.has_section(configSection):
+                return
+            for key in keyList:
+                if configParser.has_option(configSection, key):
+                    self[key] = configParser.get(configSection, key)
+
+    def clearConfigParser(self):
+        self.configParser = None
+
+    def getConfigParser(self, defaults={}):
+        if self.configParser is None:
+            configFile = self.getConfigFile()
+            if os.path.exists(configFile):
+                self.configParser = ConfigParser.ConfigParser(defaults)
+                self.configParser.read(configFile)
+                self.configParser.defaults = defaults
+        return self.configParser
+
+    def setConfigDefaults(self, defaults={}):
+        configParser = self.getConfigParser()
+        if configParser is not None:
+            configParser.defaults = defaults
+
+    def getConfigOption(self, configSection, key, defaultValue=None):
+        configParser = self.getConfigParser()
+        if self.hasConfigSection(configSection):
+            try:
+                return configParser.get(configSection, key)
+            except ConfigParser.NoOptionError, ex:
+                # ok, return default value
+                pass
+        return defaultValue
+
+    def getConfigSections(self):
+        configParser = self.getConfigParser()
+        if configParser is not None:
+            return configParser.sections()
+        return []
+
+    def hasConfigSection(self, name):
+        configSections = self.getConfigSections()
+        if name in configSections:
+            return True
+        return False
+
+    def getConfigItems(self, configSection):
+        configParser = self.getConfigParser()
+        if configParser is not None and configParser.has_section(configSection):
+            return configParser.items(configSection)
+        return []
+
+    @classmethod
+    def getConfigParserFromConfigFile(cls, configFile):
+        if not os.path.exists(configFile):
+            return None
+        configParser = ConfigParser.RawConfigParser()
+        configParser.read(configFile)
+        return configParser
+
+    @classmethod
+    def getOptionFromConfigParser(cls, configParser, configSection, key, defaultValue=None):
+        if configParser is not None and configParser.has_section(configSection):
+            return configParser.get(configSection, key)
+        else:
+            return defaultValue
+
+    @classmethod
+    def getConfigSectionsFromConfigParser(cls, configParser):
+        if configParser is not None:
+            return configParser.sections()
+        return []
+
+    @classmethod
+    def getModuleClassConstructorTuple(cls, value):
+        """ Extract (module,class,constructor) tuple from the given value. """
+        itemList = value.split('(')
+        if not itemList:
+            return ()
+        itemList2 = itemList[0].split('.')
+        moduleNameList = itemList2[0:-1]
+        className = itemList2[-1]
+        moduleName = className[0].lower() + className[1:]
+        if len(moduleNameList): 
+            moduleName = '.'.join(moduleNameList)
+        constructor = '%s(%s' % (className, ''.join(itemList[1:]))
+        return (moduleName,className,constructor)
+
+    def getHost(self):
+        return self['host']
+    
+    def getUser(self):
+        return self['user']
+
+    def getDefaultRootDir(self):
+        return self['defaultRootDir']
+
+    def setRootDir(self, rootDir):
+        self['rootDir'] = rootDir
+
+    def getRootDir(self, default='__dm_default__'):
+        return self.__getKeyValue('rootDir', default)
+
+    def getDefaultInstallDir(self):
+        return self['defaultInstallDir']
+
+    def setInstallDir(self, installDir):
+        self['installDir'] = installDir
+        self.__resetDynamicDefaults()
+
+    def getInstallDir(self, default='__dm_default__'):
+        return self.__getKeyValue('installDir', default)
+
+    def getDefaultServiceName(self):
+        return self['defaultServiceName']
+
+    def setServiceName(self, serviceName):
+        self['serviceName'] = serviceName
+        self.__resetDynamicDefaults()
+
+    def getServiceName(self, default='__dm_default__'):
+        return self.__getKeyValue('serviceName', default)
+
+    def getDefaultDbName(self):
+        return self['defaultDbName']
+
+    def setDbName(self, dbName):
+        self['dbName'] = dbName
+        self.__resetDynamicDefaults()
+
+    def getDbName(self, default='__dm_default__'):
+        return self.__getKeyValue('dbName', default)
+
+    def getDefaultLogFile(self):
+        return self['defaultLogFile']
+
+    def setLogFile(self, logFile):
+        self['logFile'] = logFile
+
+    def getLogFile(self, default='__dm_default__'):
+        return self.__getKeyValue('logFile', default)
+
+    def hasLogFile(self):
+        return self.has_key('logFile')
+
+    def getDefaultConsoleLogLevel(self):
+        return self['defaultConsoleLogLevel']
+
+    def setConsoleLogLevel(self, level):
+        self['consoleLogLevel'] = level 
+
+    def getConsoleLogLevel(self, default='__dm_default__'):
+        return self.__getKeyValue('consoleLogLevel', default)
+
+    def getConsoleLogLevelFromEnvVar(self):
+        return os.environ.get('DM_CONSOLE_LOG_LEVEL')
+
+    def hasConsoleLogLevel(self):
+        return self.has_key('consoleLogLevel')
+
+    def getDefaultFileLogLevel(self):
+        return self['defaultFileLogLevel']
+
+    def setFileLogLevel(self, level):
+        self['fileLogLevel'] = level 
+
+    def getFileLogLevel(self, default='__dm_default__'):
+        return self.__getKeyValue('fileLogLevel', default)
+
+    def hasFileLogLevel(self):
+        return self.has_key('fileLogLevel')
+
+    def getDefaultLogRecordFormat(self):
+        return self['defaultLogRecordFormat']
+
+    def setLogRecordFormat(self, format):
+        self['logRecordFormat'] = format
+
+    def getLogRecordFormat(self, default='__dm_default__'):
+        return self.__getKeyValue('logRecordFormat', default)
+
+    def hasLogRecordFormat(self):
+        return self.has_key('logRecordFormat')
+
+    def getDefaultLogDateFormat(self):
+        return self['defaultLogDateFormat']
+
+    def setLogDateFormat(self, format):
+        self['logDateFormat'] = format
+
+    def getLogDateFormat(self, default='__dm_default__'):
+        return self.__getKeyValue('logDateFormat', default)
+
+    def hasLogDateFormat(self):
+        return self.has_key('logDateFormat')
+
+    def getDefaultCherrypyLogLevel(self):
+        return self['defaultCherrypyLogLevel']
+
+    def setCherrypyLogLevel(self, level):
+        self['cherrypyLogLevel'] = level 
+
+    def getCherrypyLogLevel(self, default='__dm_default__'):
+        return self.__getKeyValue('cherrypyLogLevel', default)
+
+    def hasCherrypyLogLevel(self):
+        return self.has_key('cherrypyLogLevel')
+
+    def getDefaultCherrypyLogCherrypy(self):
+        return self['defaultCherrypyLogFile']
+
+    def setCherrypyLogFile(self, cherrypyLogFile):
+        self['cherrypyLogFile'] = cherrypyLogFile
+
+    def getCherrypyLogFile(self, default='__dm_default__'):
+        return self.__getKeyValue('cherrypyLogFile', default)
+
+    def hasCherrypyLogFile(self):
+        return self.has_key('cherrypyLogFile')
+
+    def getDefaultCherrypyAccessFile(self):
+        return self['defaultCherrypyAccessFile']
+
+    def setCherrypyAccessFile(self, cherrypyAccessFile):
+        self['cherrypyAccessFile'] = cherrypyAccessFile
+
+    def getCherrypyAccessFile(self, default='__dm_default__'):
+        return self.__getKeyValue('cherrypyAccessFile', default)
+
+    def hasCherrypyAccessFile(self):
+        return self.has_key('cherrypyAccessFile')
+
+    def isDbAvailable(self):
+        if os.access(self.getDbPasswordFile(), os.R_OK):
+            return True
+        return False
+
+    def getDefaultServiceProtocol(self):
+        return self['defaultServiceProtocol']
+
+    def setServiceProtocol(self, serviceProtocol):
+        self['serviceProtocol'] = serviceProtocol
+
+    def getServiceProtocol(self, default='__dm_default__'):
+        return self.__getKeyValue('serviceProtocol', default)
+
+    def hasServiceProtocol(self):
+        return self.has_key('serviceProtocol')
+
+    def getDefaultServicePort(self):
+        return self['defaultServicePort']
+
+    def setServicePort(self, servicePort):
+        self['servicePort'] = servicePort 
+
+    def getServicePort(self, default='__dm_default__'):
+        return int(self.__getKeyValue('servicePort', default))
+
+    def hasServicePort(self):
+        return self.has_key('servicePort')
+
+    def getDefaultServiceHost(self):
+        return self['defaultServiceHost']
+
+    def setServiceHost(self, serviceHost):
+        self['serviceHost'] = serviceHost
+
+    def getServiceHost(self, default='__dm_default__'):
+        return self.__getKeyValue('serviceHost', default)
+
+    def hasServiceHost(self):
+        return self.has_key('serviceHost')
+
+    def getDefaultServiceUsername(self):
+        return self['defaultServiceUsername']
+
+    def setServiceUsername(self, serviceUsername):
+        self['serviceUsername'] = serviceUsername 
+
+    def getServiceUsername(self, default='__dm_default__'):
+        return self.__getKeyValue('serviceUsername', default)
+
+    def hasServiceUsername(self):
+        return self.has_key('serviceUsername')
+
+    def getDefaultServicePassword(self):
+        return self['defaultServicePassword']
+
+    def setServicePassword(self, servicePassword):
+        self['servicePassword'] = servicePassword 
+
+    def getServicePassword(self, default='__dm_default__'):
+        return self.__getKeyValue('servicePassword', default)
+
+    def hasServicePassword(self):
+        return self.has_key('servicePassword')
+
+    def getDefaultDb(self):
+        return self['defaultDb']
+
+    def setDb(self, db):
+        self['db'] = db
+
+    def getDb(self, default='__dm_default__'):
+        return self.__getKeyValue('db', default) 
+
+    def hasDb(self):
+        return self.has_key('db')
+
+    def getDefaultDbHost(self):
+        return self['defaultDbHost']
+
+    def setDbHost(self, dbHost):
+        self['dbHost'] = dbHost
+
+    def getDbHost(self, default='__dm_default__'):
+        return self.__getKeyValue('dbHost', default) 
+
+    def hasDbHost(self):
+        return self.has_key('dbHost')
+
+    def getDefaultDbPort(self):
+        return self['defaultDbPort']
+
+    def setDbPort(self, dbPort):
+        self['dbPort'] = dbPort
+
+    def getDbPort(self, default='__dm_default__'):
+        return self.__getKeyValue('dbPort', default) 
+
+    def hasDbPort(self):
+        return self.has_key('dbPort')
+
+    def getDefaultDbPassword(self):
+        return self['defaultDbPassword']
+
+    def setDbPassword(self, dbPassword):
+        self['dbPassword'] = dbPassword
+
+    def getDbPassword(self, default='__dm_default__'):
+        return self.__getKeyValue('dbPassword', default) 
+
+    def hasDbPassword(self):
+        return self.has_key('dbPassword')
+
+    def getDefaultDbPasswordFile(self):
+        return self['defaultDbPasswordFile']
+
+    def getDbPasswordFile(self, default='__dm_default__'):
+        return self.__getKeyValue('dbPasswordFile', default) 
+
+    def setDbPasswordFile(self, f):
+        self['dbPasswordFile'] = f
+
+    def hasDbPasswordFile(self):
+        return self.has_key('dbPasswordFile')
+
+    def getDefaultDbUser(self):
+        return self['defaultDbUser']
+
+    def getDbUser(self, default='__dm_default__'):
+        return self.__getKeyValue('dbUser', default) 
+
+    def setDbUser(self, dbUser):
+        self['dbUser'] = dbUser
+
+    def hasDbUser(self):
+        return self.has_key('dbUser')
+
+    def getDbSchema(self, default='__dm_default__'):
+        return self.__getKeyValue('dbSchema', default)
+
+    def getDefaultConfigFile(self):
+        return self['defaultConfigFile']
+
+    def setConfigFile(self, configFile):
+        self['configFile'] = configFile
+        # Must reinitialize config parser at this point
+        self.configParser = None
+
+    def getConfigFile(self, default='__dm_default__'):
+        return self.__getKeyValue('configFile', default)
+
+    def hasConfigFile(self):
+        return self.has_key('configFile')
+
+    def getDefaultContextRoot(self):
+        return self['defaultContextRoot']
+
+    def setContextRoot(self, contextRoot):
+        self['contextRoot'] = contextRoot
+
+    def getContextRoot(self, default='__dm_default__'):
+        return self.__getKeyValue('contextRoot', default)
+
+    def hasContextRoot(self):
+        return self.has_key('contextRoot')
+
+    def getDefaultSessionCacheFile(self):
+        return self['defaultSessionCacheFile']
+
+    def setSessionCacheFile(self, sessionCacheFile):
+        self['sessionCacheFile'] = sessionCacheFile
+
+    def getSessionCacheFile(self, default='__dm_default__'):
+        return self.__getKeyValue('sessionCacheFile', default)
+
+    def hasSessionCacheFile(self):
+        return self.has_key('sessionCacheFile')
+
+    def getDefaultRequireSessionCredentials(self):
+        return self['defaultRequireSessionCredentials']
+
+    def setRequireSessionCredentials(self, requireSessionCredentials):
+        self['requireSessionCredentials'] = requireSessionCredentials
+
+    def getRequireSessionCredentials(self, default='__dm_default__'):
+        return self.__getKeyValue('requireSessionCredentials', default)
+
+    def hasRequireSessionCredentials(self):
+        return self.has_key('requireSessionCredentials')
+
+    def getDefaultSslCaCertFile(self):
+        return self['defaultSslCaCertFile']
+
+    def setSslCaCertFile(self, sslCaCertFile):
+        self['sslCaCertFile'] = sslCaCertFile
+
+    def getSslCaCertFile(self, default='__dm_default__'):
+        return self.__getKeyValue('sslCaCertFile', default)
+
+    def hasSslCaCertFile(self):
+        return self.has_key('sslCaCertFile')
+
+    def getDefaultSslCertFile(self):
+        return self['defaultSslCertFile']
+
+    def setSslCertFile(self, sslCertFile):
+        self['sslCertFile'] = sslCertFile
+
+    def getSslCertFile(self, default='__dm_default__'):
+        return self.__getKeyValue('sslCertFile', default)
+
+    def hasSslCertFile(self):
+        return self.has_key('sslCertFile')
+
+    def getDefaultSslKeyFile(self):
+        return self['defaultSslKeyFile']
+
+    def setSslKeyFile(self, sslKeyFile):
+        self['sslKeyFile'] = sslKeyFile
+
+    def getSslKeyFile(self, default='__dm_default__'):
+        return self.__getKeyValue('sslKeyFile', default)
+
+    def hasSslKeyFile(self):
+        return self.has_key('sslKeyFile')
+
+    def getDefaultUsername(self):
+        return self['defaultUsername']
+
+    def setUsername(self, username):
+        self['username'] = username
+
+    def getUsername(self, default='__dm_default__'):
+        return self.__getKeyValue('username', default)
+
+    def hasUsername(self):
+        return self.has_key('username')
+
+    def getDefaultPassword(self):
+        return self['defaultPassword']
+
+    def setPassword(self, password):
+        self['password'] = password
+
+    def getPassword(self, default='__dm_default__'):
+        return self.__getKeyValue('password', default)
+
+    def hasPassword(self):
+        return self.has_key('password')
+
+#######################################################################
+# Testing.
+
+if __name__ == '__main__':
+    cm = ConfigurationManager.getInstance()
+    print cm
--- a/src/python/dm/common/utility/consoleLoggingHandler.py
+++ b/src/python/dm/common/utility/consoleLoggingHandler.py
+#!/usr/bin/env python
+
+#
+# Console logging handler class
+#
+
+#######################################################################
+
+import socket
+import pwd
+import os
+from logging import StreamHandler
+
+#######################################################################
+
+class ConsoleLoggingHandler(StreamHandler):
+    """ Class that enables console logging. """
+    def __init__(self, *args):
+        StreamHandler.__init__(self, *args)
+        self.user = pwd.getpwuid(os.getuid())[0]
+        self.host = socket.gethostname()
+
+    def emit(self, record):
+        record.__dict__['user'] = self.user
+        record.__dict__['host'] = self.host
+        return StreamHandler.emit(self, record)
+
+#######################################################################
+# Testing.
+
+if __name__ == '__main__':
+    import sys
+    import logging
+    exec 'sh = ConsoleLoggingHandler(sys.stdout,)'
+    sh.setLevel(logging.INFO)
+    rootLogger = logging.getLogger('')
+    logging.basicConfig(level=logging.DEBUG)
+
+    mainLogger = logging.getLogger('main')
+    mainLogger.debug("main debug")
+    mainLogger.info("main info")
+                                                                                                                        
--- a/src/python/dm/common/utility/cryptUtility.py
+++ b/src/python/dm/common/utility/cryptUtility.py
+#!/usr/bin/env python
+
+import random
+import string
+import crypt
+#import md5
+import hashlib
+import base64
+
+class CryptUtility:
+
+    CRYPT_TYPE = 6  # SHA-512 (man crypt)
+    SALT_CHARACTERS = string.lowercase + string.uppercase + string.digits
+    SALT_DELIMITER = '$'
+    SALT_LENGTH_IN_BYTES = 4
+
+    PBKDF2_ENCRYPTION = 'sha1' # use SHA-1 for compatibility with java
+    PBKDF2_KEY_LENGTH_IN_BYTES = 24
+    PBKDF2_ITERATIONS = 1003
+
+    @classmethod
+    def getRandomWord(cls, length):
+        return ''.join(random.choice(CryptUtility.SALT_CHARACTERS) for i in range(length))
+
+    @classmethod
+    def cryptPassword(cls, password):
+        """ Return crypted password. """
+        #calculator = md5.md5()
+        #calculator.update(salt)
+        #md5Salt = calculator.hexdigest()
+        #return crypt.crypt(cleartext, md5Salt)
+
+        salt = CryptUtility.getRandomWord(CryptUtility.SALT_LENGTH_IN_BYTES)
+        salt = '%s%s%s%s%s'.format(CryptUtility.SALT_DELIMITER, CryptUtility.CRYPT_TYPE, CryptUtility.SALT_DELIMITER, salt, CryptUtility.SALT_DELIMITER)
+        return crypt.crypt(password, salt)
+
+    @classmethod
+    def verifyPassword(cls, password, cryptedPassword):
+        """ Verify crypted password. """
+        return cryptedPassword == crypt.crypt(password, cryptedPassword)
+
+    @classmethod
+    def cryptPasswordWithPbkdf2(cls, password):
+        """ Crypt password with pbkdf2 package and encode with b64. """
+        salt = CryptUtility.getRandomWord(CryptUtility.SALT_LENGTH_IN_BYTES)
+        return cls.saltAndCryptPasswordWithPbkdf2(password, salt)
+
+    @classmethod
+    def saltAndCryptPasswordWithPbkdf2(cls, password, salt):
+        """ Crypt salted password with pbkdf2 package and encode with b64. """
+        cryptedPassword = hashlib.pbkdf2_hmac(
+            CryptUtility.PBKDF2_ENCRYPTION, 
+            password, salt, 
+            CryptUtility.PBKDF2_ITERATIONS, 
+            CryptUtility.PBKDF2_KEY_LENGTH_IN_BYTES)
+        encodedPassword = base64.b64encode(cryptedPassword)
+        return '%s%s%s' % (salt, CryptUtility.SALT_DELIMITER, encodedPassword)
+
+    @classmethod
+    def verifyPasswordWithPbkdf2(cls, password, cryptedPassword):
+        """ Verify crypted password. """
+        # Get salt
+        salt = '%s' % cryptedPassword.split(CryptUtility.SALT_DELIMITER)[0]
+        # Verify crypted password
+        return cryptedPassword == cls.saltAndCryptPasswordWithPbkdf2(password, salt)
+
+#######################################################################
+# Testing.
+
+if __name__ == '__main__':
+    import sys
+    #password = "dm"
+    password = sys.argv[1]
+    print 'Clear text: ', password
+    #cryptedPassword = CryptUtility.cryptPassword(password)
+    #print 'Crypted: ', cryptedPassword
+    #isVerified = CryptUtility.verifyPassword(password, cryptedPassword)
+    #print 'Verify: ', isVerified
+
+    cryptedPassword = CryptUtility.cryptPasswordWithPbkdf2(password)
+    print 'Crypted: ', cryptedPassword
+    isVerified = CryptUtility.verifyPasswordWithPbkdf2(password, cryptedPassword)
+    print 'Verify: ', isVerified
+
--- a/src/python/dm/common/utility/dmModuleManager.py
+++ b/src/python/dm/common/utility/dmModuleManager.py
+#!/usr/bin/env python
+
+#
+# Module manager class.
+#
+
+#######################################################################
+
+import threading
+
+#######################################################################
+
+class DmModuleManager:
+    """ Singleton class used for managing dm modules. """
+
+    # Get singleton instance.
+    @classmethod
+    def getInstance(cls):
+        from dm.common.utility.dmModuleManager import DmModuleManager
+        try:
+            mgr = DmModuleManager()
+        except DmModuleManager, ex:
+            mgr = ex
+        return mgr
+
+    # Singleton.
+    __instanceLock = threading.RLock()
+    __instance = None
+
+    def __init__(self):
+        DmModuleManager.__instanceLock.acquire()
+        try:
+            if DmModuleManager.__instance:
+                raise DmModuleManager.__instance
+            DmModuleManager.__instance = self
+            from dm.common.utility.loggingManager import LoggingManager
+            self.logger = LoggingManager.getInstance().getLogger(self.__class__.__name__)
+            self.lock = threading.RLock()
+            self.moduleList = []
+            self.modulesRunning = False
+        finally:
+            DmModuleManager.__instanceLock.release()
+
+    def addModule(self, m):
+        self.lock.acquire()
+        try:
+            self.logger.debug('Adding dm module: %s' % m.__class__.__name__)
+            self.moduleList.append(m)
+        finally:
+            self.lock.release()
+
+    def startModules(self):
+        self.lock.acquire()
+        try:
+            if self.modulesRunning:
+                return
+            for m in self.moduleList:
+                self.logger.debug('Starting dm module: %s' % m.__class__.__name__)
+                m.start()
+            self.modulesRunning = True
+        finally:
+            self.lock.release()
+
+    def stopModules(self):
+        self.lock.acquire()
+        try:
+            if not self.modulesRunning:
+                return
+            n = len(self.moduleList)
+            for i in range(0, n):
+                m = self.moduleList[n-1-i]
+                self.logger.debug('Stopping dm module: %s' % m.__class__.__name__)
+                m.stop()
+            self.modulesRunning = False
+        finally:
+            self.lock.release()
+
+#######################################################################
+# Testing.
+
+if __name__ == '__main__':
+    pass
--- a/src/python/dm/common/utility/dmSubprocess.py
+++ b/src/python/dm/common/utility/dmSubprocess.py
+#!/usr/bin/env python
+
+# 
+# Subprocess class
+#
+
+import os
+import subprocess
+import platform
+
+from dm.common.utility.loggingManager import LoggingManager
+from dm.common.exceptions.commandFailed import CommandFailed
+
+#######################################################################
+
+class DmSubprocess(subprocess.Popen):
+
+    # Get subprocess instance.
+    @classmethod
+    def getSubprocess(cls, command):
+        close_fds = True
+        if platform.system() != 'Windows':
+            close_fds = False
+        p = DmSubprocess(command, close_fds=close_fds)
+        return p
+
+    # Execute command
+    @classmethod
+    def executeCommand(cls, command):
+        """ Create subprocess and run it, return subprocess object. """
+        p = cls.getSubprocess(command)
+        p.run()
+        return p
+
+    # Execute command, ignore errors.
+    @classmethod
+    def executeCommandAndIgnoreFailure(cls, command):
+        """ Create subprocess, run it, igore any failures, and return subprocess object. """
+        p = cls.getSubprocess(command)
+        try:
+            p.run()
+        except CommandFailed, ex:
+            p.getLogger().debug('Command failed, stdout: %s, stderr: %s' % (p.getStdOut(), p.getStdErr()))
+        return p
+
+    @classmethod
+    def executeCommandAndLogToStdOut(cls, command):
+        """ Execute command, display output to stdout, maintain log file and return subprocess object. """
+        p = cls.getSubprocess(command)
+        p.__commandLog()
+
+        while True:
+            outp = p.stdout.readline()
+            if not outp:
+                break
+            print outp,
+
+        retval = p.wait()
+
+        p.logger.debug('Exit status: %s' % retval)
+
+        if retval != 0:
+            error = ''
+            while True:
+                err = p.stderr.readline()
+                if not err:
+                    break
+                error += err
+            raise CommandFailed(error)
+        return p
+
+    def __init__(self, args, bufsize=0, executable=None, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, preexec_fn=None, close_fds=False, shell=True, cwd=None, env=None, universal_newlines=False, startupinfo=None, creationflags=0, useExceptions=True, quietMode=False):
+        """ Overrides Popen constructor with more appropriate defaults. """
+        subprocess.Popen.__init__(self, args, bufsize, executable, stdin, stdout, stderr, preexec_fn, close_fds, shell, cwd, env, universal_newlines, startupinfo, creationflags)
+        self.logger = LoggingManager.getInstance().getLogger(self.__class__.__name__)
+        self._stdout = None
+        self._stderr = None
+        self._args = args
+        self.useExceptions = useExceptions
+        self.quietMode = quietMode
+
+    def __commandLog(self):
+        # Not very useful to show the name of this file.
+        # Walk up the stack to find the caller.
+        import traceback
+        stack =  traceback.extract_stack()
+        for i in range(2, len(stack)):
+            if stack[-i][0] != stack[-1][0]:
+                fileName, lineNumber, functionName, text = stack[-i]
+                break
+            else:
+                fileName = lineNumber = functionName = text = '?'
+
+        self.logger.debug('From [%s:%s] Invoking: [%s]' % (os.path.basename(fileName), lineNumber, self._args))
+
+    def run(self, input=None):
+        """ Run subprocess. """
+        if not self.quietMode:
+            self.__commandLog()
+        (self._stdout, self._stderr) = subprocess.Popen.communicate(self, input)
+        if not self.quietMode:
+            self.logger.debug('Exit status: %s' % self.returncode)
+        if self.returncode != 0 and self.useExceptions:
+            if not self.quietMode:
+                self.logger.debug('StdOut: %s' % self._stdout)
+                self.logger.debug('StdErr: %s' % self._stderr)
+            error = self._stderr.strip()
+            if error == '':
+                error = self._stdout.strip()
+            raise CommandFailed('%s' % (error))
+        return (self._stdout, self._stderr) 
+
+    def getLogger(self):
+        return self.logger
+
+    def getArgs(self):
+        return self._args
+
+    def getStdOut(self):
+        return self._stdout
+
+    def getStdErr(self):
+        return self._stderr
+
+    def getExitStatus(self):
+        return self.returncode
+
+#######################################################################
+# Testing.
+
+if __name__ == '__main__':
+    p = DmSubprocess('ls -l', useExceptions=False)
+    p.run()
+    print p.getStdOut()
+    print p.getStdErr()
+    print p.getExitStatus()
+
--- a/src/python/dm/common/utility/encoder.py
+++ b/src/python/dm/common/utility/encoder.py
+#!/usr/bin/env python
+
+import base64
+
+class Encoder:
+
+    @classmethod
+    def encode(cls, data):
+        # Encode twice, in order to avoid issues like '+' being
+        # interpreted as space after decoding
+        encodedData = base64.b64encode(base64.encodestring('%s' % data))
+        return encodedData
+
+    @classmethod
+    def decode(cls, encodedData):
+        data = base64.decodestring(base64.b64decode('%s' % encodedData))
+        return data
--- a/src/python/dm/common/utility/ldapUtility.py
+++ b/src/python/dm/common/utility/ldapUtility.py
+#!/usr/bin/env python
+
+import ldap
+
+from dm.common.exceptions.authenticationError import AuthenticationError
+from dm.common.exceptions.communicationError import CommunicationError
+
+class LdapUtility:
+
+    def __init__(self, serverUrl, dnFormat):
+        self.serverUrl = serverUrl
+        self.dnFormat = dnFormat
+         
+    def checkCredentials(self, username, password):
+        """Verifies credentials for username and password. """
+        ldapUsername = self.dnFormat % username
+        try:
+            # build client
+            ldap.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_NEVER)
+            ldapClient = ldap.initialize(self.serverUrl)
+            ldapClient.set_option(ldap.OPT_REFERRALS,0)
+            ldapClient.set_option(ldap.OPT_PROTOCOL_VERSION, ldap.VERSION3)
+
+            #ldapClient.ststart_tls_s()
+            #ldapClient.set_option(ldap.OPT_X_TLS,ldap.OPT_X_TLS_DEMAND)
+            #ldapClient.set_option( ldap.OPT_X_TLS_DEMAND, True)
+            #ldapClient.set_option( ldap.OPT_DEBUG_LEVEL, 255)
+
+            # perform a synchronous bind
+            ldapClient.simple_bind_s(ldapUsername, password)
+            #ldapClient.whoami_s()
+        except ldap.INVALID_CREDENTIALS, ex:
+            ldapClient.unbind()
+            raise AuthenticationError('Invalid LDAP credentials for user %s' % username)
+        except ldap.SERVER_DOWN, ex:
+            raise CommunicationError('Cannot reach LDAP server %s' % self.serverUrl)
+
+#######################################################################
+# Testing.
+
+if __name__ == '__main__':
+    ldapUtility = LdapUtility(serverUrl='ldaps://ldap.anl.gov:636', dnFormat='uid=%s,dc=anl,dc=gov')
+    ldapUtility.checkCredentials('sveseli', 'sv')
--- a/src/python/dm/common/utility/loggingManager.py
+++ b/src/python/dm/common/utility/loggingManager.py
+#!/usr/bin/env python
+
+#
+# Logging manager singleton.
+#
+
+#######################################################################
+
+import re
+import sys
+import os.path
+import logging
+from dm.common.utility.configurationManager import ConfigurationManager
+from dm.common.exceptions.configurationError import ConfigurationError
+
+#######################################################################
+
+
+class LoggingManager:
+    """ 
+    The log manager class is initialized via a configuration file 
+    that may have the following sections:
+
+    ConsoleLogging      # Used for output on the screen
+    FileLogging         # Used for logging into a file
+
+    Each section in the configuration file should have the following 
+    keys:
+        handler     # Indicates which handler class to use 
+        level       # Indicates logging level
+        format      # Indicates format for log messages
+        dateFormat  # Indicates date format used for log messages
+
+    Given below is an example of a valid configuration file:
+
+    [ConsoleLogging]
+        handler=ConsoleLoggingHandler(sys.stdout,)
+        level=info
+        format=[%(levelname)s] %(message)s 
+        dateFormat=%m/%d/%y %H:%M:%S
+    [FileLogging]
+        handler=TimedRotatingFileLoggingHandler('/tmp/dm.log')
+        level=debug
+        format=%(asctime)s,%(msecs)d [%(levelname)s] %(module)s:%(lineno)d %(user)s@%(host)s %(name)s (%(process)d): %(message)s
+        dateFormat=%m/%d/%y %H:%M:%S
+    """
+
+    # Get singleton instance.
+    @classmethod
+    def getInstance(cls):
+        from dm.common.utility.loggingManager import LoggingManager
+        try:
+            lm = LoggingManager()
+        except LoggingManager, ex:
+            lm = ex
+        return lm
+
+    # Singleton.
+    __instance = None
+
+    def __init__(self):
+        if LoggingManager.__instance:
+             raise LoggingManager.__instance
+        LoggingManager.__instance = self
+        self.consoleHandler = None
+        self.fileHandlerList = []
+        self.maxIntLevel = logging.CRITICAL
+        self.minIntLevel = logging.NOTSET
+        self.levelRegExList = []
+        self.logger = logging.getLogger(self.__class__.__name__)
+        self.initFlag = False
+
+    def setMinLogLevel(self, minLogLevel=logging.INFO):
+        self.minIntLevel = minLogLevel
+
+    def parseLevelRegEx(self, levelRegExList):
+        """ Parse expressions of the form <regex>=<log level>. """
+        lines = levelRegExList.split('\n')
+        for line in lines:
+            try:
+                 (regex, level) = line.rsplit('=', 1)
+                 pattern = re.compile(regex)
+                 tuple = (pattern, logging.getLevelName(level.upper()))
+                 self.levelRegExList.append(tuple)
+            except Exception, ex:
+                 self.logger.error('Parser error in log configuration file: %s' % line)
+                 self.logger.exception(ex)
+
+    # Get Log Level based on a string representation
+    def getIntLogLevel(self, levelStr):
+        level = logging.getLevelName(levelStr)
+        # Level should be an integer
+        try:
+            return int(level) 
+        except ValueError, ex:
+            raise ConfigurationError('"%s" is not valid log level' % levelStr)
+
+    # Configure log handlers.
+    def configureHandlers(self):
+        """ Configure log handlers from the config file. """
+        cm = ConfigurationManager.getInstance()
+        configFile = cm.getConfigFile()
+        configParser = cm.getConfigParserFromConfigFile(configFile)
+        configSections = cm.getConfigSectionsFromConfigParser(configParser)
+
+        # Console handler.
+        defaults = { 
+            'level' : cm.getConsoleLogLevel(),
+            'format' : cm.getLogRecordFormat(),
+            'dateFormat' : cm.getLogDateFormat(),
+            'handler' : 'ConsoleLoggingHandler(sys.stdout,)'
+        }
+        consoleHandler = self.__configureHandler(configParser, 'ConsoleLogging', defaults)
+
+        if consoleHandler != None:
+            self.consoleHandler = consoleHandler
+
+        # File logging. 
+        # Do not configure if log directory does not exist.
+        defaults['handler'] = None
+        defaults['level'] = cm.getFileLogLevel() 
+        if not os.path.exists(configFile):
+            # No config file, we'll configure default.
+            defaultLogFile = cm.getLogFile()
+            defaultLogDir = os.path.dirname(defaultLogFile)
+            if os.path.exists(defaultLogDir):
+                handler = 'TimedRotatingFileLoggingHandler("%s")' % defaultLogFile 
+                defaults['handler'] = handler
+                fileHandler = self.__configureHandler(configParser, 'FileLogging', defaults)
+                if fileHandler != None:
+                    self.fileHandlerList.append(fileHandler)
+
+        else:
+            # Parse all file loggers present in the config file
+            for configSection in configSections:
+                if configSection.startswith('FileLogging'):
+                     fileHandler = self.__configureHandler(configParser, configSection, defaults)
+                     if fileHandler != None:
+                         self.fileHandlerList.append(fileHandler)
+
+        # Add handlers to the root logger.  Use logging class here
+        # to make sure we can have a logger when we parse the 
+        # logger expressions
+        rootLogger = logging.getLogger('')
+        for handler in [self.consoleHandler] + self.fileHandlerList:
+            rootLogger.addHandler(handler)
+
+        # Get a logger factory based on our current config 
+        self.configureLoggers(configParser, defaultLevel='debug')
+
+    def configureLoggers(self, configParser, defaultLevel='error'):
+        rootLogLevel = 'error'
+        levelRegEx = '^.*$=%s' % (defaultLevel)
+        if configParser is not None and configParser.has_section('LoggerLevels'):
+            rootLogLevel = ConfigurationManager.getOptionFromConfigParser(configParser, 'LoggerLevels', 'root', rootLogLevel)
+            levelRegEx = ConfigurationManager.getOptionFromConfigParser(configParser, 'LoggerLevels', 'levelregex', levelRegEx)
+
+        rootLevelInt = logging.getLevelName(rootLogLevel.upper())
+        logging.getLogger('').root.setLevel(rootLevelInt)
+        logging.getLogger('').debug('Set root logger to %s' % rootLevelInt)
+
+        if not levelRegEx:
+            return
+
+        # Parse expressions of the form <regex>=<log-level>. """
+        lines = levelRegEx.split('\n')
+        for line in lines:
+            try:
+                # Use the right split so we can have '='s in the regex
+                (regex, level) = line.rsplit('=', 1)
+                pattern = re.compile(regex)
+                tuple = (pattern, logging.getLevelName(level.upper()))
+                self.levelRegExList.append(tuple)
+            except Exception, ex:
+                # Do not fail
+                self.logger.error('Parser error in log configuration file: %s' % line)
+                self.logger.exception(ex)
+
+    # Configure particular handler with given defaults.
+    def __configureHandler(self, configParser, configSection, defaults):
+        """ Configure specified handler with a given defaults. """
+        handlerOption = defaults['handler']
+        try:
+            if configParser is not None:
+                handlerOption = configParser.get(configSection, 'handler')
+        except Exception, ex:
+            pass
+
+        # If handlerOption is empty, handler cannot be instantiated.
+        handler = None
+        if handlerOption != None:
+            # Handler argument format: MyHandler(arg1, arg2, ...)
+            # Module will be in lowercase letters, but the class
+            # should be capitalized.
+            handlerName = re.sub('\(.*', '', handlerOption)
+            moduleName = handlerName[0].lower() + handlerName[1:]
+            try:
+                exec 'from dm.common.utility import %s' % (moduleName)
+                exec 'handler = %s.%s' % (moduleName, handlerOption)
+            except IOError, ex:
+                errNo, errMsg = ex
+                import errno
+
+                # If the exception raised is an I/O permissions error, ignore
+                # it and disable this log handler.  This allows non-root users
+                # to use the (system-wide) default log configuration
+                if errNo != errno.EACCES:
+                    raise
+                handler = None 
+            except Exception, ex:
+                raise ConfigurationError(exception=ex)
+
+        # Only request setting from the config file if it was
+        # not set via environment variable, or programmatically.
+        cm = ConfigurationManager.getInstance()
+        if handler != None:
+            try:
+                level = cm.getOptionFromConfigParser(configParser, configSection, 'level', defaults['level'])
+                intLevel = self.getIntLogLevel(level.upper())
+                handler.setLevel(intLevel)
+
+                format = cm.getOptionFromConfigParser(configParser, configSection, 'format', defaults['format'])
+                dateFormat = cm.getOptionFromConfigParser(configParser, configSection, 'dateFormat', defaults['dateFormat'])
+
+                handler.setFormatter(logging.Formatter(format, dateFormat))
+            except Exception, ex:
+                raise ConfigurationError(exception=ex)
+
+            # Apply filters to handler
+            filter = None
+            try:
+                filter = configParser.get(configSection, 'filter')
+                if filter:
+                    handler.addFilter(logging.Filter(filter))
+            except Exception, ex:
+                pass
+        return handler
+
+    def getLogger(self, name='defaultLogger'):
+        if not self.initFlag:
+            self.initFlag = True
+            self.configureHandlers()
+        logger = logging.getLogger(name)
+        logger.setLevel(self.getLevel(name))
+        return logger
+
+    def getLevel(self, name):
+        # Match from the known regex list.
+        level = logging.NOTSET
+
+        # The last regex is most important.
+        for e in reversed(self.levelRegExList):
+            (pattern, level) = e
+
+            # If we return not None it is a match
+            if not None == pattern.match(name):
+                break
+
+        if level > self.maxIntLevel:
+            level = self.maxIntLevel
+        if level < self.minIntLevel:
+            level = self.minIntLevel
+        return level
+
+    def setConsoleLogLevel(self, level):
+        try:
+            # We need to override the logger levels and the handler
+            intLevel = self.getIntLogLevel(level.upper())
+            self.consoleHandler.setLevel(intLevel)
+            self.maxIntLevel = intLevel
+            self.logger.setLevel(intLevel)
+        except Exception, ex:
+            raise ConfigurationError(exception=ex)
+
+    def setFileLogLevel(self, level):
+        try:
+            # We need to override the logger levels and the handler
+            intLevel = self.getIntLogLevel(level.upper())
+            for handler in self.fileHandlerList:
+                handler.setLevel(intLevel)
+            self.maxIntLevel = intLevel
+            self.logger.setLevel(intLevel)
+        except Exception, ex:
+            raise ConfigurationError(exception=ex)
+
+#######################################################################
+# Testing.
+
+if __name__ == '__main__':
+    lm = LoggingManager.getInstance()
+    logger = lm.getLogger('Main')
+    logger.error('Error In Main')
+    logger.debug('Debug In Main')
+    logger.warn('Warn In Main')
+    logger.info('Info In Main')
+    logger = lm.getLogger('Main')
+    logger.info('Info In Main')
+    logger = lm.getLogger('')
+    logger.info('Info using root logger')
+    logger = lm.getLogger('Main.2')
+    logger.info('Info in Main.2')
+    lm.setConsoleLogLevel('info')
+    logger.debug('You should not see this message')
+    lm.setConsoleLogLevel('debug')
+    logger.debug('Debug in Main.2')
--- a/src/python/dm/common/utility/objectCache.py
+++ b/src/python/dm/common/utility/objectCache.py
+#!/usr/bin/env python
+
+import threading
+import time
+from collections import deque
+
+class ObjectCache:
+    """
+    Cache objects identified by id. Objects are removed from cache
+    based on the last accessed algorithm.
+    """
+
+    # How much larger than object cache should time stamp deq be
+    # allowed to grow.
+    DEFAULT_TIME_STAMP_DEQ_SIZE_FACTOR = 2
+    # Cache info expiration time.
+    DEFAULT_OBJECT_LIFETIME = 60 # seconds
+
+    def __init__(self, cacheSize, objectLifetime=DEFAULT_OBJECT_LIFETIME):
+        self.lock = threading.RLock()
+        self.objectMap = {} # id/object map
+        self.timeStampDeq = deque() # timeStamp deq
+        self.cacheSize = cacheSize
+        self.objectLifetime = objectLifetime
+        self.deqSize = ObjectCache.DEFAULT_TIME_STAMP_DEQ_SIZE_FACTOR*cacheSize
+
+    def setCacheSize(self, cacheSize):
+        self.cacheSize = cacheSize
+
+    def setObjectLifetime(self, objectLifetime):
+        self.objectLifetime = objectLifetime
+
+    def __purgeOne(self):
+        # Get rid of one cached item based on the last accessed algorithm.
+        while True:
+            deqEntry = self.timeStampDeq.popleft()
+            oldId = deqEntry[0]
+            cachedEntry = self.objectMap.get(oldId)
+            if cachedEntry is not None:
+                # Timestamp entry is valid.
+                if cachedEntry == deqEntry:
+                    # Found an old item, get rid of it from the cache.
+                    del self.objectMap[oldId]
+                    break
+        # Done.
+        return
+
+    def __purgeTimeStampDeq(self):
+        # Get rid of stale entries.
+        timeStampDeq = deque()
+        while len(self.timeStampDeq):
+            deqEntry = self.timeStampDeq.popleft()
+            id = deqEntry[0]
+            cachedEntry = self.objectMap.get(id)
+            if cachedEntry is not None:
+                # Timestamp entry is valid.
+                if cachedEntry == deqEntry:
+                    # Found current item, keep it.
+                    timeStampDeq.append(deqEntry)
+        # Done.
+        self.timeStampDeq = timeStampDeq 
+        return
+
+    def put(self, id, item, objectLifetime=None):
+        updateTime = time.time()
+        expirationTime = updateTime + self.objectLifetime
+        if objectLifetime is not None:
+            expirationTime = updateTime + objectLifetime
+        entry = (id, item, updateTime, expirationTime)
+        self.lock.acquire()
+        try:
+            self.objectMap[id] = entry
+            self.timeStampDeq.append(entry)
+            if len(self.objectMap) > self.cacheSize:
+                self.__purgeOne()
+            if len(self.timeStampDeq) > self.deqSize:
+                self.__purgeTimeStampDeq()
+        
+        finally:
+            self.lock.release()
+
+    def get(self, id):
+        return self.objectMap.get(id)
+
+    def remove(self, id):
+        self.lock.acquire()
+        try:
+            item = self.objectMap.get(id)
+            if item is not None:
+                del self.objectMap[id]
+            return item
+        finally:
+            self.lock.release()
+
+    def isEmpty(self):
+        return len(self.objectMap) == 0
+
+    def size(self):
+        return len(self.objectMap) 
+
+    def __str__(self):
+        return '%s' % self.timeStampDeq
+
+#######################################################################
+# Testing.
+if __name__ == '__main__':
+    c = ObjectCache(3)
+
+    class Item:
+        def __init__(self, id):
+            self.id = id
+        def getId(self):
+            return self.id
+        def __str__(self):
+            return '%s' % self.id
+
+    class Item2:
+        def __init__(self, name):
+            self.name = name 
+        def getName(self):
+            return self.name
+        def __str__(self):
+            return '%s' % self.name
+
+    for i in range(0,5):
+        item = Item(i)
+        c.put(i, item)
+        print 'Added item: ', item
+        print 'Cache: ', c
+        time.sleep(1)
+
+    for j in range(0,3):
+        item = Item(2)
+        c.put(2, item)
+        print 'Updated item: ', item
+        print 'Cache: ', c
+        time.sleep(1)
+
+    item = c.remove(2)
+    print 'Deleted item 2: ', item
+    print 'Cache: ', c
+    time.sleep(1)
+    item = c.get(2)
+    print 'Got item 2: ', item
+    print 'Cache: ', c
+    print
+    time.sleep(1)
+
+    print
+    c = ObjectCache(3)
+    c.put('sv', Item2('sv')) 
+    print c
+    i = c.get('sv')
+    print i
+    print 'Done'
+
--- a/src/python/dm/common/utility/osUtility.py
+++ b/src/python/dm/common/utility/osUtility.py
+#!/usr/bin/env python
+
+import os
+
+class OsUtility:
+
+    @classmethod
+    def createDir(cls, path, mode=None):
+        """ Create directory if it does not exist already. """
+        if not os.path.isdir(path):
+            os.makedirs(path)
+            if mode is not None:
+                os.chmod(path, mode)
+
+    @classmethod
+    def removeLink(cls, path):
+        """ Remove link on a given path. """
+        if not os.path.islink(path):
+            return
+        os.remove(path)
+
+    @classmethod
+    def removeFile(cls, path):
+        """ Remove file on a given path. """
+        if not os.path.isfile(path):
+            return
+        os.remove(path)
+
+    @classmethod
+    def removeAndIgnoreErrors(cls, path):
+        """ Remove file on a given path and ignore any errors. """
+        try:
+            os.remove(path)
+        except Exception, ex:
+            pass
+
+    @classmethod
+    def removeDir(cls, path):
+        """ Remove dir on a given path, even if it is not empty. """
+        if not os.path.isdir(path):
+            return
+        files=os.listdir(path)
+        for f in files:
+            fullpath=os.path.join(path, f)
+            if os.path.islink(fullpath) or not os.path.isdir(fullpath):
+                os.remove(fullpath)
+            else:
+                removeDir(fullpath)
+        os.rmdir(path)
+        
+    @classmethod
+    def chownPath(cls, path, uid, gid):
+        """ Change owner on a given path recursively.  """
+        if os.path.isfile(path):
+            os.chown(path, uid, gid)
+            return 
+        elif os.path.islink(path):
+            os.lchown(path, uid, gid)
+            return 
+        elif os.path.isdir(path):
+            files=os.listdir(path)
+            for f in files:
+                fullpath=os.path.join(path, f)
+                chownPath(fullpath, uid, gid)
+            os.chown(path, uid, gid)
+
+    @classmethod
+    def chownPathByUserName(cls, path, userName):
+        """ Change owner on a given path recursively.  """
+        import pwd
+        user = pwd.getpwnam(userName)
+        chownPath(path, user.pw_uid, user.pw_gid)
+
+    @classmethod
+    def findFiles(cls, dirPath, fileList=None):
+        """ List files in a given directory. Return list of absolute paths.
+            Do not follow symbolic links.
+        """
+        fList = fileList
+        if not fList:
+            fList = []
+        if os.path.isdir(dirPath):
+            files = os.listdir(dirPath)
+            for f in files:
+                fullPath = os.path.join(dirPath, f)
+                if os.path.isfile(fullPath):
+                    fList.append(fullPath)
+                elif os.path.isdir(fullPath):
+                    fList = findFiles(fullPath, fList)
+        return fList
+
+    @classmethod
+    def importNameFromFile(cls, name, filePath):
+        """ Import specified name from file. """
+        import sys
+        import os.path
+        dirName = os.path.dirname(filePath)
+        moduleName = os.path.basename(filePath).replace('.py', '')
+        sys.path = [dirName] + sys.path
+        cmd = 'from %s import %s as tmpObject' % (moduleName, name)
+        exec cmd
+        del sys.path[0]
+        return tmpObject
+
+    @classmethod
+    def getUserHomeDir(cls):
+        """ Get current user home directory. """
+        from os.path import expanduser
+        home = expanduser('~')
+        return home
+
+#######################################################################
+# Testing.
+
+if __name__ == '__main__':
+    pass
--- a/src/python/dm/common/utility/sslUtility.py
+++ b/src/python/dm/common/utility/sslUtility.py
+#!/usr/bin/env python
+
+import ssl
+
+class SslUtility:
+
+    DEFAULT_SSL_CONTEXT = ssl._create_default_https_context
+
+    @classmethod
+    def useUnverifiedSslContext(cls, func):
+
+        def wrapper(*args, **kwargs):
+            # Disable SSL checking
+            ssl._create_default_https_context = ssl._create_unverified_context
+
+            # Perform function call 
+            result = func(*args, **kwargs)
+
+            # Revert back to original SSL settings
+            ssl._create_default_https_context = SslUtility.DEFAULT_SSL_CONTEXT 
+            return result
+
+        return wrapper
+
--- a/src/python/dm/common/utility/timeUtility.py
+++ b/src/python/dm/common/utility/timeUtility.py
+#!/usr/bin/env python
+
+import time
+class TimeUtility:
+
+    @classmethod
+    def getCurrentGMTimeStamp(cls):
+        """ Formats GMT timestamp. """
+        return time.strftime('%Y-%m-%d %H:%M:%S', time.gmtime(time.time()))
+
+    @classmethod
+    def formatGMTimeStamp(cls, t):
+        """ Format GMT timestamp. """
+        return time.strftime('%Y-%m-%d %H:%M:%S', time.gmtime(t))
+
+    @classmethod
+    def getCurrentLocalTimeStamp(cls):
+        """ Formats local timestamp. """
+        return time.strftime('%Y/%m/%d %H:%M:%S %Z', time.localtime(time.time()))
+
+    @classmethod
+    def formatLocalTimeStamp(cls, t):
+        """ Formats local timestamp. """
+        return time.strftime('%Y/%m/%d %H:%M:%S %Z', time.localtime(t))
+
+
--- a/src/python/dm/common/utility/timedRotatingFileLoggingHandler.py
+++ b/src/python/dm/common/utility/timedRotatingFileLoggingHandler.py
+#!/usr/bin/env python
+
+#######################################################################
+
+import socket
+import pwd
+import os
+from logging.handlers import TimedRotatingFileHandler
+
+#######################################################################
+
+class TimedRotatingFileLoggingHandler(TimedRotatingFileHandler):
+    """ Class that enables logging into files. """
+    def __init__(self, filename, when='D', interval=1, backupCount=0, encoding=None):
+        TimedRotatingFileHandler.__init__(self, filename, when, interval, backupCount, encoding)
+        self.user = pwd.getpwuid(os.getuid())[0]
+        self.host = socket.gethostname()
+
+    def emit(self, record):
+        record.__dict__['user'] = self.user
+        record.__dict__['host'] = self.host
+        return TimedRotatingFileHandler.emit(self, record)
+                                                                                
+#######################################################################
+# Testing.
+
+if __name__ == '__main__':
+    pass
--- a/tools/make/RULES_DM
+++ b/tools/make/RULES_DM
+all:
+	for d in $(SUBDIRS); do $(MAKE) -C $$d $(ARCH); done
+
+dist:
+	for d in $(SUBDIRS); do $(MAKE) -C $$d $(ARCH); done
+
+clean:
+	for d in $(SUBDIRS); do $(MAKE) -C $$d clean; done
+
+distclean:
+	for d in $(SUBDIRS); do $(MAKE) -C $$d distclean; done
+	for d in $(SUBDIRS); do rm -f `find $$d -name 'RELEASE.local'`; done
+
+tidy: distclean
+
No results found