-import os
import sys
-import datetime
-import time
from sfa.util.config import Config
-from sfa.util.xrn import Xrn, get_leaf, get_authority, hrn_to_urn
-from sfa.planetlab.plxrn import PlXrn, slicename_to_hrn, email_to_hrn, hrn_to_pl_slicename
+from sfa.util.xrn import Xrn, get_authority, hrn_to_urn
-from sfa.senslab.LDAPapi import LDAPapi
from sfa.senslab.slabdriver import SlabDriver
-from sfa.senslab.slabpostgres import SliceSenslab, slab_dbsession
+from sfa.senslab.slabpostgres import SenslabXP, slab_dbsession
from sfa.trust.certificate import Keypair,convert_public_key
from sfa.trust.gid import create_uuid
from sfa.storage.alchemy import dbsession
-from sfa.storage.model import RegRecord, RegAuthority, RegSlice, RegNode, RegUser, RegKey
-from sfa.storage.dbschema import DBSchema
+from sfa.storage.model import RegRecord, RegAuthority, RegSlice, RegNode, \
+ RegUser, RegKey
+from sfa.util.sfalogging import logger
+from sqlalchemy.exc import SQLAlchemyError
def _get_site_hrn(site):
class SlabImporter:
- def __init__ (self, auth_hierarchy, logger):
+ def __init__ (self, auth_hierarchy, loc_logger):
self.auth_hierarchy = auth_hierarchy
- self.logger=logger
+ self.logger = loc_logger
+ self.logger.setLevelDebug()
+
+ def hostname_to_hrn_escaped(self, root_auth, hostname):
+ return '.'.join( [root_auth,Xrn.escape(hostname)] )
+
-
- def hostname_to_hrn(self,root_auth,login_base,hostname):
- return PlXrn(auth=root_auth,hostname = hostname).get_hrn()
def slicename_to_hrn(self, person_hrn):
return (person_hrn +'_slice')
#Create special slice table for senslab
- if not slabdriver.db.exists('slice_senslab'):
- slabdriver.db.createtable('slice_senslab')
- self.logger.info ("SlabImporter.run: slice_senslab table created ")
+ if not slabdriver.db.exists('slab_xp'):
+ slabdriver.db.createtable()
+ self.logger.info ("SlabImporter.run: slab_xp table created ")
#retrieve all existing SFA objects
all_records = dbsession.query(RegRecord).all()
sites_listdict = slabdriver.GetSites()
ldap_person_listdict = slabdriver.GetPersons()
+ print>>sys.stderr,"\r\n SLABIMPORT \t ldap_person_listdict %s \r\n" %(ldap_person_listdict)
slices_listdict = slabdriver.GetSlices()
try:
- slices_by_userid = dict ( [ (slice.record_id_user, slice ) for slice in slices_listdict ] )
+ slices_by_userid = dict ( [ (one_slice['record_id_user'], one_slice ) for one_slice in slices_listdict ] )
except TypeError:
self.logger.log_exc("SlabImporter: failed to create list of slices by user id.")
pass
site_record = self.find_record_by_type_hrn ('authority', site_hrn)
if not site_record:
try:
- urn = hrn_to_urn(site_hrn, 'authority')
+ urn = hrn_to_urn(site_hrn, 'authority')
if not self.auth_hierarchy.auth_exists(urn):
self.auth_hierarchy.create_auth(urn)
auth_info = self.auth_hierarchy.get_auth_info(urn)
dbsession.commit()
self.logger.info("SlabImporter: imported authority (site) : %s" % site_record)
self.update_just_added_records_dict(site_record)
- except:
+ except SQLAlchemyError:
# if the site import fails then there is no point in trying to import the
# site's child records (node, slices, persons), so skip them.
self.logger.log_exc("SlabImporter: failed to import site. Skipping child records")
self.logger.warning ("SlabImporter: cannot find node_id %s - ignored"%node_id)
continue
site_auth = get_authority(site_hrn)
- site_name = site['name']
- hrn = self.hostname_to_hrn(slabdriver.root_auth, site_name, node['hostname'])
+ site_name = site['name']
+ escaped_hrn = self.hostname_to_hrn_escaped(slabdriver.root_auth, node['hostname'])
+ print>>sys.stderr, "\r\n \r\n SLABIMPORTER node %s " %(node)
+ hrn = node['hrn']
+
+
# xxx this sounds suspicious
if len(hrn) > 64: hrn = hrn[:64]
node_record = self.find_record_by_type_hrn( 'node', hrn )
if not node_record:
try:
pkey = Keypair(create=True)
- urn = hrn_to_urn(hrn, 'node')
+ urn = hrn_to_urn(escaped_hrn, 'node')
node_gid = self.auth_hierarchy.create_gid(urn, create_uuid(), pkey)
+ def slab_get_authority(hrn):
+ return hrn.split(".")[0]
+
node_record = RegNode (hrn=hrn, gid=node_gid,
pointer = '-1',
- authority=get_authority(hrn))
+ authority=slab_get_authority(hrn))
node_record.just_created()
dbsession.add(node_record)
dbsession.commit()
- self.logger.info("SlabImporter: imported node: %s" % node_record)
- print>>sys.stderr, "\r\n \t\t\t SLAB IMPORTER NODE IMPORT NOTnode_record %s " %(node_record)
+ #self.logger.info("SlabImporter: imported node: %s" % node_record)
self.update_just_added_records_dict(node_record)
except:
self.logger.log_exc("SlabImporter: failed to import node")
node_record.stale=False
- # import persons
- for person in ldap_person_listdict :
+ # import persons
+ for person in ldap_person_listdict :
+ print>>sys.stderr,"SlabImporter: person: %s" %(person['hrn'])
+ if 'ssh-rsa' not in person['pkey']:
+ #people with invalid ssh key (ssh-dss, empty, bullshit keys...)
+ #won't be imported
+ continue
+ person_hrn = person['hrn']
+ slice_hrn = self.slicename_to_hrn(person['hrn'])
- person_hrn = person['hrn']
- slice_hrn = self.slicename_to_hrn(person['hrn'])
-
- # xxx suspicious again
- if len(person_hrn) > 64: person_hrn = person_hrn[:64]
- person_urn = hrn_to_urn(person_hrn, 'user')
-
- user_record = self.find_record_by_type_hrn( 'user', person_hrn)
- slice_record = self.find_record_by_type_hrn ('slice', slice_hrn)
-
- # return a tuple pubkey (a plc key object) and pkey (a Keypair object)
- def init_person_key (person, slab_key):
- pubkey=None
- if person['pkey']:
- # randomly pick first key in set
- pubkey = slab_key
- try:
- pkey = convert_public_key(pubkey)
- except:
- self.logger.warn('SlabImporter: unable to convert public key for %s' % person_hrn)
- pkey = Keypair(create=True)
- else:
- # the user has no keys. Creating a random keypair for the user's gid
- self.logger.warn("SlabImporter: person %s does not have a PL public key"%person_hrn)
+ # xxx suspicious again
+ if len(person_hrn) > 64: person_hrn = person_hrn[:64]
+ person_urn = hrn_to_urn(person_hrn, 'user')
+
+ user_record = self.find_record_by_type_hrn('user', person_hrn)
+ slice_record = self.find_record_by_type_hrn ('slice', slice_hrn)
+
+ # return a tuple pubkey (a plc key object) and pkey (a Keypair object)
+ def init_person_key (person, slab_key):
+ pubkey = None
+ if person['pkey']:
+ # randomly pick first key in set
+ pubkey = slab_key
+
+ try:
+ pkey = convert_public_key(pubkey)
+ except TypeError:
+ #key not good. create another pkey
+ self.logger.warn('SlabImporter: \
+ unable to convert public \
+ key for %s' % person_hrn)
pkey = Keypair(create=True)
- return (pubkey, pkey)
-
-
- try:
- slab_key = person['pkey']
- # new person
- if not user_record:
- (pubkey,pkey) = init_person_key (person, slab_key )
+
+ else:
+ # the user has no keys. Creating a random keypair for the user's gid
+ self.logger.warn("SlabImporter: person %s does not have a public key"%person_hrn)
+ pkey = Keypair(create=True)
+ return (pubkey, pkey)
+
+
+ try:
+ slab_key = person['pkey']
+ # new person
+ if not user_record:
+ (pubkey,pkey) = init_person_key (person, slab_key )
+ if pubkey is not None and pkey is not None :
person_gid = self.auth_hierarchy.create_gid(person_urn, create_uuid(), pkey)
if person['email']:
print>>sys.stderr, "\r\n \r\n SLAB IMPORTER PERSON EMAIL OK email %s " %(person['email'])
authority=get_authority(person_hrn))
if pubkey:
- user_record.reg_keys=[RegKey (pubkey)]
+ user_record.reg_keys = [RegKey (pubkey)]
else:
self.logger.warning("No key found for user %s"%user_record)
user_record.just_created()
dbsession.add (user_record)
dbsession.commit()
self.logger.info("SlabImporter: imported person: %s" % user_record)
- print>>sys.stderr, "\r\n \r\n SLAB IMPORTER PERSON IMPORT NOTuser_record %s " %(user_record)
self.update_just_added_records_dict( user_record )
- else:
- # update the record ?
- # if user's primary key has changed then we need to update the
- # users gid by forcing an update here
- sfa_keys = user_record.reg_keys
-
- new_key=False
- if slab_key is not sfa_keys :
- new_key = True
- if new_key:
- (pubkey,pkey) = init_person_key (person, slab_key)
- person_gid = self.auth_hierarchy.create_gid(person_urn, create_uuid(), pkey)
- if not pubkey:
- user_record.reg_keys=[]
- else:
- user_record.reg_keys=[ RegKey (pubkey)]
- self.logger.info("SlabImporter: updated person: %s" % user_record)
+ else:
+ # update the record ?
+ # if user's primary key has changed then we need to update the
+ # users gid by forcing an update here
+ sfa_keys = user_record.reg_keys
+
+ new_key=False
+ if slab_key is not sfa_keys :
+ new_key = True
+ if new_key:
+ print>>sys.stderr,"SlabImporter: \t \t USER UPDATE person: %s" %(person['hrn'])
+ (pubkey,pkey) = init_person_key (person, slab_key)
+ person_gid = self.auth_hierarchy.create_gid(person_urn, create_uuid(), pkey)
+ if not pubkey:
+ user_record.reg_keys=[]
+ else:
+ user_record.reg_keys=[ RegKey (pubkey)]
+ self.logger.info("SlabImporter: updated person: %s" % user_record)
+
if person['email']:
user_record.email = person['email']
- dbsession.commit()
- user_record.stale=False
- except:
- self.logger.log_exc("SlabImporter: failed to import person %s"%(person) )
-
+
+ dbsession.commit()
+
+ user_record.stale = False
+ except:
+ self.logger.log_exc("SlabImporter: failed to import person %s"%(person) )
+
+ try:
+ slice = slices_by_userid[user_record.record_id]
+ except:
+ self.logger.warning ("SlabImporter: cannot locate slices_by_userid[user_record.record_id] %s - ignored"%user_record)
+
+ if not slice_record :
try:
- slice = slices_by_userid[user_record.record_id]
+ pkey = Keypair(create=True)
+ urn = hrn_to_urn(slice_hrn, 'slice')
+ slice_gid = self.auth_hierarchy.create_gid(urn, create_uuid(), pkey)
+ slice_record = RegSlice (hrn=slice_hrn, gid=slice_gid,
+ pointer='-1',
+ authority=get_authority(slice_hrn))
+
+ slice_record.just_created()
+ dbsession.add(slice_record)
+ dbsession.commit()
+
+ #Serial id created after commit
+ #Get it
+ sl_rec = dbsession.query(RegSlice).filter(RegSlice.hrn.match(slice_hrn)).all()
+
+ #slab_slice = SenslabXP( slice_hrn = slice_hrn, record_id_slice=sl_rec[0].record_id, record_id_user= user_record.record_id)
+ #print>>sys.stderr, "\r\n \r\n SLAB IMPORTER SLICE IMPORT NOTslice_record %s \r\n slab_slice %s" %(sl_rec,slab_slice)
+ #slab_dbsession.add(slab_slice)
+ #slab_dbsession.commit()
+ #self.logger.info("SlabImporter: imported slice: %s" % slice_record)
+ self.update_just_added_records_dict ( slice_record )
+
except:
- self.logger.warning ("SlabImporter: cannot locate slices_by_userid[user_record.record_id] %s - ignored"%user_record.record_id )
- if not slice_record:
-
- try:
- pkey = Keypair(create=True)
- urn = hrn_to_urn(slice_hrn, 'slice')
- slice_gid = self.auth_hierarchy.create_gid(urn, create_uuid(), pkey)
- slice_record = RegSlice (hrn=slice_hrn, gid=slice_gid,
- pointer='-1',
- authority=get_authority(slice_hrn))
-
- slice_record.just_created()
- dbsession.add(slice_record)
- dbsession.commit()
-
- #Serial id created after commit
- #Get it
- sl_rec = dbsession.query(RegSlice).filter(RegSlice.hrn.match(slice_hrn)).all()
-
- slab_slice = SliceSenslab( slice_hrn = slice_hrn, record_id_slice=sl_rec[0].record_id, record_id_user= user_record.record_id)
- print>>sys.stderr, "\r\n \r\n SLAB IMPORTER SLICE IMPORT NOTslice_record %s \r\n slab_slice %s" %(sl_rec,slab_slice)
- slab_dbsession.add(slab_slice)
- slab_dbsession.commit()
- self.logger.info("SlabImporter: imported slice: %s" % slice_record)
- self.update_just_added_records_dict ( slice_record )
- except:
- self.logger.log_exc("SlabImporter: failed to import slice")
-
- #No slice update upon import in senslab
- else:
- # xxx update the record ...
- self.logger.warning ("Slice update not yet implemented")
- pass
- # record current users affiliated with the slice
+ self.logger.log_exc("SlabImporter: failed to import slice")
+
+ #No slice update upon import in senslab
+ else:
+ # xxx update the record ...
+ self.logger.warning ("Slice update not yet implemented")
+ pass
+ # record current users affiliated with the slice
- slice_record.reg_researchers = [user_record]
- dbsession.commit()
- slice_record.stale=False
+
+ slice_record.reg_researchers = [user_record]
+ dbsession.commit()
+ slice_record.stale=False
record.stale=False
- for record in all_records:
+ for record in all_records:
+ if record.type == 'user':
+ print>>sys.stderr,"SlabImporter: stale records: hrn %s %s" %(record.hrn,record.stale)
try:
stale=record.stale
except:
self.logger.warning("stale not found with %s"%record)
if stale:
self.logger.info("SlabImporter: deleting stale record: %s" % record)
+ #if record.type == 'user':
+ #rec = slab_dbsession.query(SenslabXP).filter_by(record_id_user = record.record_id).first()
+ #slab_dbsession.delete(rec)
+ #slab_dbsession.commit()
dbsession.delete(record)
dbsession.commit()
git://git.onelab.eu / sfa.git / blobdiff