import tools
+# When this variable is true, start after any ensure_created
+Startingup = False
+# Cumulative delay for starts when Startingup is true
+csd_lock = threading.Lock()
+cumstartdelay = 0
+
# shell path -> account class association
shell_acct_class = {}
# account type -> account class association
name_worker_lock = threading.Lock()
name_worker = {}
+def allpwents():
+ return [pw_ent for pw_ent in pwd.getpwall() if pw_ent[6] in shell_acct_class]
+
def all():
"""Return the names of all accounts on the system with recognized shells."""
- return [pw_ent[0] for pw_ent in pwd.getpwall() if pw_ent[6] in shell_acct_class]
+ return [pw_ent[0] for pw_ent in allpwents()]
def get(name):
"""Return the worker object for a particular username. If no such object exists, create it first."""
def __init__(self, rec):
self.name = rec['name']
self.keys = ''
+ self.initscriptchanged = False
self.configure(rec)
@staticmethod
- def create(name): abstract
+ def create(name, vref = None): abstract
@staticmethod
def destroy(name): abstract
dot_ssh = '/home/%s/.ssh' % self.name
def do_installation():
if not os.access(dot_ssh, os.F_OK): os.mkdir(dot_ssh)
+ os.chmod(dot_ssh, 0700)
tools.write_file(dot_ssh + '/authorized_keys', lambda f: f.write(new_keys))
logger.log('%s: installing ssh keys' % self.name)
tools.fork_as(self.name, do_installation)
def ensure_created(self, rec):
"""Cause the account specified by <rec> to exist if it doesn't already."""
- self._q.put((self._ensure_created, rec.copy()))
+ self._q.put((self._ensure_created, rec.copy(), Startingup))
- def _ensure_created(self, rec):
+ def _ensure_created(self, rec, startingup):
curr_class = self._get_class()
next_class = type_acct_class[rec['type']]
if next_class != curr_class:
self._destroy(curr_class)
self._create_sem.acquire()
- try: next_class.create(self.name)
+ try: next_class.create(self.name, rec['vref'])
finally: self._create_sem.release()
if not isinstance(self._acct, next_class): self._acct = next_class(rec)
else: self._acct.configure(rec)
- if next_class != curr_class: self._acct.start()
+ if startingup:
+ csd_lock.acquire()
+ global cumstartdelay
+ delay = cumstartdelay
+ cumstartdelay += 2
+ csd_lock.release()
+ self._acct.start(delay=delay)
+ elif next_class != curr_class or self._acct.initscriptchanged:
+ self._acct.start()
def ensure_destroyed(self): self._q.put((self._ensure_destroyed,))
def _ensure_destroyed(self): self._destroy(self._get_class())