From: Nicolas Turro <Nicolas.Turro@inria.fr>
Date: Wed, 26 Oct 2011 15:11:01 +0000 (+0200)
Subject: LDAP queries moved out of this file. NT.
X-Git-Tag: sfa-2.1-24~3^2~315^2
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=2436aa99c11ebf80292cd144723472870365d4a7

LDAP queries moved out of this file. NT.
---

diff --git a/sfa/senslab/table_slab.py b/sfa/senslab/table_slab.py
index a09b6654..62c3af77 100644
--- a/sfa/senslab/table_slab.py
+++ b/sfa/senslab/table_slab.py
@@ -3,7 +3,7 @@
 #
 # TODO: Use existing PLC database methods? or keep this separate?
 
-import ldap
+
 from sfa.trust.gid import *
 from sfa.util.record import *
 from sfa.util.config import *
@@ -12,16 +12,16 @@ from sfa.trust.hierarchy import *
 from sfa.trust.certificate import *
 from sfa.trust.auth import *
 from sfa.senslab.OARrestapi import *
+from sfa.senslab.LDAPapi import *
 
 class SfaTable(list):
     authname=""
     def __init__(self, record_filter = None):
 	self.oar = OARapi()
-        self.ldapserv=ldap.open("192.168.0.251")
+	self.ldap = LDAPapi()
 	self.senslabauth=Hierarchy()
 	config=Config()
 	self.authname=config.SFA_REGISTRY_ROOT_AUTH
-	print >>sys.stderr,"AUTHNAME :  ",self.authname
 	authinfo=self.senslabauth.get_auth_info(self.authname)
 	
 	self.auth=Auth()
@@ -63,78 +63,7 @@ class SfaTable(list):
     def quote(self, value):
         return self.db.quote(value)
     
-    def ldapFind(self, record_filter = None, columns=None):
-
- 	results = []
-	
-	#first, ldap for users
-
-	if 'authority' in record_filter:
-		# ask for authority
-		if record_filter['authority']==self.authname:
-			# which is SFA_REGISTRY_ROOT_AUTH
-			# request all records which are under our authority, ie all ldap entries
-			ldapfilter="cn=*"
-		else:
-			#which is NOT SFA_REGISTRY_ROOT_AUTH
-			return []
-	else :
-		if not 'hrn' in record_filter:
-			print >>sys.stderr,"find : don't know how to handle filter ",record_filter
-			return []
-		else:
-			hrns=[]
-			h=record_filter['hrn']
-			if  isinstance(h,list):
-				hrns=h
-			else : 
-				hrns.append(h)
-	
-			ldapfilter="(|"
-			for hrn in hrns:
-				splited_hrn=hrn.split(".")
-				if splited_hrn[0] != "SFA_REGISTRY_ROOT_AUTH" :
-					print >>sys.stderr,"i know nothing about",hrn
-				else :
-					login=splited_hrn[1]
-					ldapfilter+="(uid="
-					ldapfilter+=login
-					ldapfilter+=")"
-			ldapfilter+=")"
-	
-	
-	rindex=self.ldapserv.search("ou=people,dc=senslab,dc=info",ldap.SCOPE_SUBTREE,ldapfilter, ['mail','givenName', 'sn', 'uid','sshPublicKey'])
-	ldapresponse=self.ldapserv.result(rindex,1)
-	for ldapentry in ldapresponse[1]:
-		hrn=self.authname+"."+ldapentry[1]['uid'][0]
-		uuid=create_uuid() 
-		
-		RSA_KEY_STRING=ldapentry[1]['sshPublicKey'][0]
-		
-		pkey=convert_public_key(RSA_KEY_STRING)
-		
-		gid=self.senslabauth.create_gid("urn:publicid:IDN+"+self.authname+"+user+"+ldapentry[1]['uid'][0], uuid, pkey, CA=False)
-		
-		parent_hrn = get_authority(hrn)
-		parent_auth_info = self.senslabauth.get_auth_info(parent_hrn)
-
-		results.append(  {	
-			'type': 'user',
-#			'email': ldapentry[1]['mail'][0],
-#			'first_name': ldapentry[1]['givenName'][0],
-#			'last_name': ldapentry[1]['sn'][0],
-#			'phone': 'none',
-			'gid': gid.save_to_string(),
-			'serial': 'none',
-			'authority': self.authname,
-			'peer_authority': '',
-			'pointer' : '',
-			'hrn': hrn,
-			'date_created' : 'none',
-			'last_updated': 'none'
-		 	} )
-	return results
-
+ 
     def oarFind(self, record_filter = None, columns=None):
 	results=[]
 	node_ids=[]
@@ -210,14 +139,14 @@ class SfaTable(list):
 				print >>sys.stderr,"find which authority ?"
 				return []
 		if record_filter['type'] == 'user':
-			return self.ldapFind(record_filter, columns)
+			return self.ldap.ldapFind(record_filter, columns)
 		if record_filter['type'] == 'node':
-			return self.ldapFind(record_filter, columns)
+			return self.ldap.ldapFind(record_filter, columns)
 		else:
 			print >>sys.stderr,"unknown type to find : ", record_filter['type']
 			return []
 	else:
-		allResults = self.ldapFind(record_filter, columns)
+		allResults = self.ldap.ldapFind(record_filter, columns)
 		allResults+= self.oarFind(record_filter, columns)
 	
 	return allResults