reduce logging, remove password log entries

src/python/dm/aps_user_db/cli/updateUserFromApsDbCli.py

@@ -43,14 +43,14 @@ Description:
         username = 'd%s' % badge
         self.logger.debug('Retrieving APS user with badge %s' % badge)
         apsUser = apsUserDbApi.getApsUserByBadgeNumber(badge)
-        self.logger.info('APS User Info: %s' % apsUser)
+        #self.logger.info('APS User Info: %s' % apsUser)
         print('APS User Info: %s\n' % apsUser)
         ldapUserManager = LdapUserManager.createInstance()
         try:
             self.logger.debug('Modifying LDAP user with badge %s: %s' % (badge, apsUser['name']))
             ldapUser = ldapUserManager.getUserInfo(username)
-            self.logger.info('LDAP User Info (before update): %s' % ldapUser)
-            self.logger.info('LDAP User Password Hash (before update): %s\n' % ldapUserManager.decodePasswordHash(ldapUser.getUserPassword()))
+            #self.logger.info('LDAP User Info (before update): %s' % ldapUser)
+            #self.logger.info('LDAP User Password Hash (before update): %s\n' % ldapUserManager.decodePasswordHash(ldapUser.getUserPassword()))
             print('LDAP User Info (before update): %s' % ldapUser)
             print('LDAP User Password Hash (before update): %s\n' % ldapUserManager.decodePasswordHash(ldapUser.getUserPassword()))
 
@@ -59,8 +59,8 @@ Description:
         except ObjectNotFound, ex:
             self.logger.debug('User with badge %s does not exist, creating it' % (badge))
             ldapUser = ldapUserManager.createUserInfo(username, apsUser)
-        self.logger.info('LDAP User Info (after update): %s' % ldapUser)
-        self.logger.info('LDAP User Password Hash (after update): %s\n' % ldapUserManager.decodePasswordHash(ldapUser.getUserPassword()))
+        #self.logger.info('LDAP User Info (after update): %s' % ldapUser)
+        #self.logger.info('LDAP User Password Hash (after update): %s\n' % ldapUserManager.decodePasswordHash(ldapUser.getUserPassword()))
         print('LDAP User Info (after update): %s' % ldapUser)
         print('LDAP User Password Hash (after update): %s\n' % ldapUserManager.decodePasswordHash(ldapUser.getUserPassword()))
 

src/python/dm/aps_user_db/impl/apsUserDbManager.py

@@ -49,19 +49,19 @@ class ApsUserDbManager:
         cm = ConfigurationManager.getInstance()
         self.logger.debug('Configuring APS User DB Manager')
         self.db = cm.getConfigOption(ApsUserDbManager.CONFIG_SECTION_NAME, ApsUserDbManager.DB_KEY)
-        self.logger.debug('Using APS DB: %s' % self.db)
+        #self.logger.debug('Using APS DB: %s' % self.db)
         self.dbUser = cm.getConfigOption(ApsUserDbManager.CONFIG_SECTION_NAME, ApsUserDbManager.DB_USER_KEY)
-        self.logger.debug('Using APS DB user: %s' % self.dbUser)
+        #self.logger.debug('Using APS DB user: %s' % self.dbUser)
         self.dbHost = cm.getConfigOption(ApsUserDbManager.CONFIG_SECTION_NAME, ApsUserDbManager.DB_HOST_KEY)
-        self.logger.debug('Using APS DB host: %s' % self.dbHost)
+        #self.logger.debug('Using APS DB host: %s' % self.dbHost)
         self.dbPort = cm.getConfigOption(ApsUserDbManager.CONFIG_SECTION_NAME, ApsUserDbManager.DB_PORT_KEY)
-        self.logger.debug('Using APS DB port: %s' % self.dbPort)
+        #self.logger.debug('Using APS DB port: %s' % self.dbPort)
         self.dbName = cm.getConfigOption(ApsUserDbManager.CONFIG_SECTION_NAME, ApsUserDbManager.DB_NAME_KEY)
-        self.logger.debug('Using APS DB name: %s' % self.dbName)
+        #self.logger.debug('Using APS DB name: %s' % self.dbName)
         self.dbSchema = cm.getConfigOption(ApsUserDbManager.CONFIG_SECTION_NAME, ApsUserDbManager.DB_SCHEMA_KEY)
-        self.logger.debug('Using APS DB schema: %s' % self.dbSchema)
+        #self.logger.debug('Using APS DB schema: %s' % self.dbSchema)
         self.dbPasswordFile = cm.getConfigOption(ApsUserDbManager.CONFIG_SECTION_NAME, ApsUserDbManager.DB_PASSWORD_FILE_KEY)
-        self.logger.debug('Using APS DB password file: %s' % self.dbPasswordFile)
+        #self.logger.debug('Using APS DB password file: %s' % self.dbPasswordFile)
         self.dbPassword = open(self.dbPasswordFile, 'r').readline().strip()
 
     def __init__(self):

src/python/dm/common/utility/ldapUserManager.py

@@ -38,10 +38,10 @@ class LdapUserManager(LdapClient):
         self.userDnFormat = userDnFormat
         self.groupDnFormat = groupDnFormat
         self.minGidNumber = minGidNumber
-        self.getLogger().debug('Min GID number: %s' % minGidNumber)
+        #self.getLogger().debug('Min GID number: %s' % minGidNumber)
         # Remove first entry from the dn format to get tree base
         self.groupBaseDn = ','.join(groupDnFormat.split(',')[1:])
-        self.getLogger().debug('Group base DN: %s' % self.groupBaseDn)
+        #self.getLogger().debug('Group base DN: %s' % self.groupBaseDn)
 
     @classmethod
     def createInstance(cls):
@@ -49,17 +49,17 @@ class LdapUserManager(LdapClient):
         logger = cls.getLogger()
         logger.debug('Creating LDAP User Manager instance')
         serverUrl = cm.getConfigOption(LdapUserManager.CONFIG_SECTION_NAME, LdapUserManager.SERVER_URL_KEY)
-        logger.debug('Using server URL: %s' % serverUrl)
+        #logger.debug('Using server URL: %s' % serverUrl)
         adminDn = cm.getConfigOption(LdapUserManager.CONFIG_SECTION_NAME, LdapUserManager.ADMIN_DN_KEY)
-        logger.debug('Using admin DN: %s' % adminDn)
+        #logger.debug('Using admin DN: %s' % adminDn)
         adminPasswordFile = cm.getConfigOption(LdapUserManager.CONFIG_SECTION_NAME, LdapUserManager.ADMIN_PASSWORD_FILE_KEY)
-        logger.debug('Using admin password file: %s' % adminPasswordFile)
+        #logger.debug('Using admin password file: %s' % adminPasswordFile)
         userDnFormat = cm.getConfigOption(LdapUserManager.CONFIG_SECTION_NAME, LdapUserManager.USER_DN_FORMAT_KEY)
-        logger.debug('Using user DN format: %s' % userDnFormat)
+        #logger.debug('Using user DN format: %s' % userDnFormat)
         groupDnFormat = cm.getConfigOption(LdapUserManager.CONFIG_SECTION_NAME, LdapUserManager.GROUP_DN_FORMAT_KEY)
-        logger.debug('Using group DN format: %s' % groupDnFormat)
+        #logger.debug('Using group DN format: %s' % groupDnFormat)
         minGidNumber = cm.getConfigOption(LdapUserManager.CONFIG_SECTION_NAME, LdapUserManager.MIN_GID_NUMBER_KEY)
-        logger.debug('Using min GID number: %s' % minGidNumber)
+        #logger.debug('Using min GID number: %s' % minGidNumber)
         return LdapUserManager(serverUrl, adminDn, adminPasswordFile, userDnFormat, groupDnFormat, minGidNumber)
 
     @classmethod
@@ -150,7 +150,7 @@ class LdapUserManager(LdapClient):
             passwordHash = attrDict.get('passwordHashValue')
         if passwordHash:
             userAttrs2['userPassword'] = [self.encodePasswordHash(passwordHash)]
-            logger.debug('Encoded password entry: %s' % passwordHash)
+            #logger.debug('Encoded password entry: %s' % passwordHash)
         logger.debug('Modifying user %s with attrs %s' % (username, userAttrs2))
 
         userLdif = ldap.modlist.modifyModlist(userAttrs, userAttrs2)