X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=accounts.py;h=47e7af5a39d77a49218a474961510610be4899fd;hb=refs%2Fheads%2F1.5;hp=1c495ee8a65aa4595241cdf0bbd6fe4cc834b0be;hpb=dfbec103d5234340d11f454c70c82891e5ac9344;p=nodemanager.git diff --git a/accounts.py b/accounts.py index 1c495ee..47e7af5 100644 --- a/accounts.py +++ b/accounts.py @@ -1,15 +1,14 @@ """Functionality common to all account classes. -Each account class must provide five methods: create(), destroy(), -configure(), start(), and stop(). In addition, it must provide static -member variables SHELL, which contains the unique shell that it uses; -and TYPE, which contains a description of the type that it uses. TYPE -is divided hierarchically by periods; at the moment the only -convention is that all sliver accounts have type that begins with -sliver. - -Because Python does dynamic method lookup, we do not bother with a -boilerplate abstract superclass. +Each subclass of Account must provide five methods: create() and +destroy(), which are static; configure(), start(), and stop(), which +are not. configure(), which takes a record as its only argument, does +things like set up ssh keys. In addition, an Account subclass must +provide static member variables SHELL, which contains the unique shell +that it uses; and TYPE, a string that is used by the account creation +code. For no particular reason, TYPE is divided hierarchically by +periods; at the moment the only convention is that all sliver accounts +have type that begins with sliver. There are any number of race conditions that may result from the fact that account names are not unique over time. Moreover, it's a bad @@ -30,6 +29,12 @@ import logger 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 @@ -42,31 +47,52 @@ def register_class(acct_class): # private account name -> worker object association and associated lock -_name_worker_lock = threading.Lock() -_name_worker = {} +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.""" - _name_worker_lock.acquire() + name_worker_lock.acquire() try: - if name not in _name_worker: _name_worker[name] = Worker(name) - return _name_worker[name] - finally: _name_worker_lock.release() - - -def install_keys(rec): - """Write to 's authorized_keys file.""" - name = rec['name'] - dot_ssh = '/home/%s/.ssh' % name - def do_installation(): - if not os.access(dot_ssh, os.F_OK): os.mkdir(dot_ssh) - tools.write_file(dot_ssh + '/authorized_keys', lambda thefile: thefile.write(rec['keys'])) - logger.log('%s: installing ssh keys' % name) - tools.fork_as(name, do_installation) + if name not in name_worker: name_worker[name] = Worker(name) + return name_worker[name] + finally: name_worker_lock.release() + + +class Account: + def __init__(self, rec): + self.name = rec['name'] + self.keys = '' + self.initscriptchanged = False + self.configure(rec) + + @staticmethod + def create(name, vref = None): abstract + @staticmethod + def destroy(name): abstract + + def configure(self, rec): + """Write to my authorized_keys file.""" + new_keys = rec['keys'] + if new_keys != self.keys: + self.keys = new_keys + 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 start(self, delay=0): pass + def stop(self): pass class Worker: @@ -85,32 +111,36 @@ class Worker: def ensure_created(self, rec): """Cause the account specified by 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['account_type']] + 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() - self._make_acct_obj() - self._acct.configure(rec) - if next_class != curr_class: self._acct.start() + if not isinstance(self._acct, next_class): self._acct = next_class(rec) + else: self._acct.configure(rec) + 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()) - def start(self): self._q.put((self._start,)) - def _start(self): - self._make_acct_obj() - self._acct.start() + def start(self, delay=0): self._q.put((self._start, delay)) + def _start(self, d): self._acct.start(delay=d) def stop(self): self._q.put((self._stop,)) - def _stop(self): - self._make_acct_obj() - self._acct.stop() + def _stop(self): self._acct.stop() def _destroy(self, curr_class): self._acct = None @@ -124,13 +154,11 @@ class Worker: except KeyError: return None return shell_acct_class[shell] - def _make_acct_obj(self): - curr_class = self._get_class() - if not isinstance(self._acct, curr_class): self._acct = curr_class(self.name) - def _run(self): + """Repeatedly pull commands off the queue and execute. If memory usage becomes an issue, it might be wise to terminate after a while.""" while True: try: cmd = self._q.get() cmd[0](*cmd[1:]) - except: logger.log_exc() + except: + logger.log_exc(self.name)