nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-09-19 04:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check user db permissions when we redirect to firstboot, instead of trying to check if the file exists.

Browse Source
This commit is contained in:
James Valleroy 2013-11-14 18:28:47 -05:00
parent 3f36781fdf
commit a7decf383e
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plinth.py
View File

@ -57,6 +57,9 @@ class Root(plugin_mount.PagePlugin):
## TODO: firstboot hijacking root should probably be in the firstboot module with a hook in plinth.py ## TODO: firstboot hijacking root should probably be in the firstboot module with a hook in plinth.py
with sqlite_db(cfg.store_file, table="firstboot") as db: with sqlite_db(cfg.store_file, table="firstboot") as db:
if not 'state' in db: if not 'state' in db:
# if we created a new user db, make sure it can't be read by everyone
userdb_fname = '{}.sqlite3'.format(cfg.user_db)
os.chmod(userdb_fname, stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP)
raise cherrypy.InternalRedirect('firstboot') raise cherrypy.InternalRedirect('firstboot')
elif db['state'] < 5: elif db['state'] < 5:
cfg.log("First Boot state = %d" % db['state']) cfg.log("First Boot state = %d" % db['state'])
@ -136,18 +139,7 @@ def setup():
load_modules() load_modules()
cfg.html_root = Root() cfg.html_root = Root()
# check if we are creating a new user db
userdb_fname = '{}.sqlite3'.format(cfg.user_db)
try:
with open(userdb_fname):
userdb_exists = True
except IOError:
userdb_exists = False
cfg.users = plugin_mount.UserStoreModule.get_plugins()[0] cfg.users = plugin_mount.UserStoreModule.get_plugins()[0]
# if we created a new user db, make sure it can't be read by everyone
if not userdb_exists:
os.chmod(userdb_fname, stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP)
cfg.page_plugins = plugin_mount.PagePlugin.get_plugins() cfg.page_plugins = plugin_mount.PagePlugin.get_plugins()
cfg.log("Loaded %d page plugins" % len(cfg.page_plugins)) cfg.log("Loaded %d page plugins" % len(cfg.page_plugins))
cfg.forms = plugin_mount.FormPlugin.get_plugins() cfg.forms = plugin_mount.FormPlugin.get_plugins()