Apply changes made on ldap1 as of 2023-01-02

cronscript.sh

 #!/bin/sh
-exit 0
+
+#exit 0  #(krishnaveni: 2022-08-18 till auth1 is fixed due to CVE-2022-2414) 
 
 # Source init scripts.
 . /etc/profile
@@ -15,4 +16,3 @@ then
 	echo "Python script failed"
 fi
 deactivate
-

requirements.txt

 python-ldap
 requests
+python-kadmin==0.1.2+twtr # Busted

supr_ldap.py

@@ -166,7 +166,7 @@ class SUPR_LDAP:
             # (Krishnaveni: 2022-11-21 commented out as IPA is replaced by Kerberos)
             #if self.ipa_pers_cnt:
             #   self.msgtext += str(self.IPA_PERS_MAIL) + "\n"
-            
+
             if self.krb_pers_cnt:
                self.msgtext += str(self.KRB_PERS_MAIL) + "\n"
 

supr_ldap_ipa_krb.py

@@ -624,7 +624,12 @@ class SUPR_LDAP:
                 if ((not result_data) and (not result_data_mid)):
 
                     if (m.user_agreement_version and m.user_agreement_accepted):
-                        self.logger.info("addUpdateProjects m.id -- " + str(m.id))
+                        self.logger.info("addUpdateProjects m.id -- " + str(m.id) + "  merge_ids --  " + str(m.merge_ids))
+                        
+                        if m.merge_ids:
+			    self.persons_modified = [m]
+                            self.updateDeletePersons()
+                        
                         self.addPerson(m,uidNumber,resourceIDList)
                         sua_accepted = True
 

supr_ldap_krb.py

@@ -634,7 +634,12 @@ class SUPR_LDAP:
                 if ((not result_data) and (not result_data_mid)):
 
                     if (m.user_agreement_version and m.user_agreement_accepted):
-                        self.logger.info("addUpdateProjects m.id -- " + str(m.id))
+                        self.logger.info("addUpdateProjects m.id -- " + str(m.id) + " merged_ids -- " + str(m.merged_ids))
+                        
+                        if m.merged_ids:
+                            self.persons_modified = [m]
+                            self.updateDeletePersons()
+                        
                         self.addPerson(m,uidNumber,resourceIDList)
                         sua_accepted = True
 

supr_swestore_main.py

@@ -6,6 +6,7 @@ import sys
 import supr
 import settings
 #import supr_ldap_ipa_krb as supr_ldap
+#(Krishnaveni: 2022-11-28 switch to this once IPA is decommissioned)
 import supr_ldap_krb as supr_ldap
 
 from datetime import datetime