if command in ("myslice"):
parser.add_option("-p","--password",dest='password',action='store',default=None,
help="specify mainfold password on the command line")
+ parser.add_option("-s", "--slice", dest="delegate_slices",action='append',default=[],
+ metavar="slice_hrn", help="delegate cred. for slice HRN")
+ parser.add_option("-a", "--auths", dest='delegate_auths',action='append',default=[],
+ metavar='auth_hrn', help="delegate PI cred for auth HRN")
+ parser.add_option('-d', '--delegate', dest='delegate', help="Override 'delegate' from the config file")
+ parser.add_option('-b', '--backend', dest='backend', help="Override 'backend' from the config file")
return parser
if 'sfa' not in server_version:
users = pg_users_arg(user_records)
- rspec = RSpec(rspec)
- rspec.filter({'component_manager_id': server_version['urn']})
- rspec = RSpecConverter.to_pg_rspec(rspec.toxml(), content_type='request')
+ #rspec = RSpec(rspec)
+ #rspec.filter({'component_manager_id': server_version['urn']})
+ #rspec = RSpecConverter.to_pg_rspec(rspec.toxml(), content_type='request')
else:
users = sfa_users_arg(user_records, slice_record)
if len(args)>0:
self.print_help()
sys.exit(1)
-
### the rough sketch goes like this
# (a) rain check for sufficient config in sfi_config
# we don't allow to override these settings for now
myslice_dict={}
myslice_keys=['backend', 'delegate', 'platform', 'username']
for key in myslice_keys:
- full_key="MYSLICE_" + key.upper()
- value=getattr(self.config_instance,full_key,None)
+ value=None
+ # oct 2013 - I'm finding myself juggling with config files
+ # so I'm adding a few command-line options to override config
+ if hasattr(args,key):
+ value=getattr(args,key)
+ else:
+ full_key="MYSLICE_" + key.upper()
+ value=getattr(self.config_instance,full_key,None)
if value: myslice_dict[key]=value
else: print "Unsufficient config, missing key %s in [myslice] section of sfi_config"%key
if len(myslice_dict) != len(myslice_keys):
sys.exit(1)
# (b) figure whether we are PI for the authority where we belong
- sfi_logger.info("Resolving our own id")
+ self.logger.info("Resolving our own id")
my_records=self.registry().Resolve(self.user,self.my_credential_string)
if len(my_records)!=1: print "Cannot Resolve %s -- exiting"%self.user; sys.exit(1)
my_record=my_records[0]
- my_auths = my_record['reg-pi-authorities']
- sfi_logger.info("Found %d authorities that we are PI for"%len(my_auths))
- sfi_logger.debug("They are %s"%(my_auths))
+ my_auths_all = my_record['reg-pi-authorities']
+ self.logger.info("Found %d authorities that we are PI for"%len(my_auths_all))
+ self.logger.debug("They are %s"%(my_auths_all))
+
+ my_auths = my_auths_all
+ if options.delegate_auths:
+ my_auths = list(set(my_auths_all).intersection(set(options.delegate_auths)))
+ self.logger.info("Delegate PI creds for authorities: %s"%my_auths )
# (c) get the set of slices that we are in
- my_slices=my_record['reg-slices']
- sfi_logger.info("Found %d slices that we are member of"%len(my_slices))
- sfi_logger.debug("They are: %s"%(my_slices))
+ my_slices_all=my_record['reg-slices']
+ self.logger.info("Found %d slices that we are member of"%len(my_slices_all))
+ self.logger.debug("They are: %s"%(my_slices_all))
+
+ my_slices = my_slices_all
+ if options.delegate_slices:
+ my_slices = list(set(my_slices_all).intersection(set(options.delegate_slices)))
+
+ self.logger.info("Delegate slice creds for slices: %s"%my_slices)
# (d) make sure we have *valid* credentials for all these
hrn_credentials=[]
for (hrn, htype, credential) in hrn_credentials:
delegated_credential = self.client_bootstrap.delegate_credential_string (credential, delegatee_hrn, delegatee_type)
hrn_delegated_credentials.append ((hrn, htype, delegated_credential, ))
- # inspect
- inspect=Credential(string=delegated_credential)
- expire_datetime=inspect.get_expiration()
- sfi_logger.info("Delegated credential for %s (%s) expires on %s"%(hrn,htype,expire_datetime))
# (f) and finally upload them to manifold server
# xxx todo add an option so the password can be set on the command line
# (but *NOT* in the config file) so other apps can leverage this
- uploader = ManifoldUploader (logger=sfi_logger,
+ uploader = ManifoldUploader (logger=self.logger,
url=myslice_dict['backend'],
platform=myslice_dict['platform'],
username=myslice_dict['username'],
password=options.password)
uploader.prompt_all()
+ (count_all,count_success)=(0,0)
for (hrn,htype,delegated_credential) in hrn_delegated_credentials:
- sfi_logger.info("Uploading delegated credential for %s (%s)"%(hrn,htype))
- uploader.upload(delegated_credential,message="%s (%s)"%(hrn,htype))
+ # inspect
+ inspect=Credential(string=delegated_credential)
+ expire_datetime=inspect.get_expiration()
+ message="%s (%s) [exp:%s]"%(hrn,htype,expire_datetime)
+ if uploader.upload(delegated_credential,message=message):
+ count_success+=1
+ count_all+=1
+
+ self.logger.info("Successfully uploaded %d/%d credentials"%(count_success,count_all))
# at first I thought we would want to save these,
# like 'sfi delegate does' but on second thought
# it is probably not helpful as people would not
# need to run 'sfi delegate' at all anymore
+ if count_success != count_all: sys.exit(1)
return
-# Thierry: I'm turning this off as a command, no idea what it's used for
-# @register_command("cred","")
+ @register_command("cred","")
def trusted(self, options, args):
"""
return the trusted certs at this interface (get_trusted_certs)
"""
trusted_certs = self.registry().get_trusted_certs()
for trusted_cert in trusted_certs:
+ print "\n===========================================================\n"
gid = GID(string=trusted_cert)
gid.dump()
cert = Certificate(string=trusted_cert)
self.logger.debug('Sfi.trusted -> %r'%cert.get_subject())
+ print "Certificate:\n%s\n\n"%trusted_cert
return
git://git.onelab.eu / sfa.git / blobdiff