From a8936bb4369f20ebc8add241c9c4df5e96337bfb Mon Sep 17 00:00:00 2001 From: Liraz Siri Date: Sat, 6 Aug 2011 02:10:28 +0300 Subject: [PATCH] don't save HUB_APIKEY to conf (security) rational: if you launch a cloudtask from a command line or environment, you may not want the apikey hanging around forever in the session configuration. --- cloudtask/session.py | 4 +++- cloudtask/task.py | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cloudtask/session.py b/cloudtask/session.py index 0754f0c..3e2f09e 100644 --- a/cloudtask/session.py +++ b/cloudtask/session.py @@ -168,7 +168,9 @@ def taskconf(self, val=UNDEFINED): if val is UNDEFINED: return TaskConf.fromdict(eval(file(path).read())) else: - print >> file(path, "w"), pprint.pformat(val.dict()) + d = val.dict() + del d['hub_apikey'] + print >> file(path, "w"), pprint.pformat(d) taskconf = property(taskconf, taskconf) @property diff --git a/cloudtask/task.py b/cloudtask/task.py index 56aaa94..6e6223d 100644 --- a/cloudtask/task.py +++ b/cloudtask/task.py @@ -208,12 +208,12 @@ def main(cls): for attr in taskconf.__all__: taskconf[attr] = getattr(cls, attr.upper()) - if not taskconf.hub_apikey: - taskconf.hub_apikey = os.environ.get('HUB_APIKEY') - if taskconf.overlay and not taskconf.overlay.startswith('/'): taskconf.overlay = abspath(join(dirname(sys.argv[0]), taskconf.overlay)) + if not taskconf.hub_apikey: + taskconf.hub_apikey = os.environ.get('HUB_APIKEY') + for opt, val in opts: if opt in ('--resume', '--sessions', '--force'): continue