Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Dont allow server auth to be turned on without at least one user account being created

Browse Source
This commit is contained in:
Kovid Goyal 2017-04-11 19:55:27 +05:30
parent 9ab7cf6e9c
commit 04210274f6
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/calibre/gui2/preferences/server.py
View File

@ -14,7 +14,7 @@ from PyQt5.Qt import (
from calibre import as_unicode from calibre import as_unicode
from calibre.gui2 import config, error_dialog, info_dialog, open_url, warning_dialog from calibre.gui2 import config, error_dialog, info_dialog, open_url, warning_dialog
from calibre.gui2.preferences import ConfigWidgetBase, test_widget from calibre.gui2.preferences import AbortCommit, ConfigWidgetBase, test_widget
from calibre.srv.opts import change_settings, options, server_config from calibre.srv.opts import change_settings, options, server_config
@ -305,7 +305,8 @@ class ConfigWidget(ConfigWidgetBase):
r('autolaunch_server', config) r('autolaunch_server', config)
def start_server(self): def start_server(self):
self.save_changes() if not self.save_changes():
return
self.setCursor(Qt.BusyCursor) self.setCursor(Qt.BusyCursor)
try: try:
self.gui.start_content_server(check_started=False) self.gui.start_content_server(check_started=False)
@ -368,14 +369,25 @@ class ConfigWidget(ConfigWidgetBase):
d.show() d.show()
def save_changes(self): def save_changes(self):
ConfigWidgetBase.commit(self)
settings = {} settings = {}
for tab in self.tabs: for tab in self.tabs:
settings.update(getattr(tab, 'settings', {})) settings.update(getattr(tab, 'settings', {}))
if settings['auth']:
from calibre.srv.users import UserManager
if not UserManager(settings['userdb']).all_user_names:
error_dialog(self.gui, _('No users specified'), _(
'You have turned on the setting to require passwords to access'
' the content server, but you have not created any user accounts.'
' Create at least one user account in the "Users" tab to proceed.'),
show=True)
return False
ConfigWidgetBase.commit(self)
change_settings(**settings) change_settings(**settings)
return True
def commit(self): def commit(self):
self.save_changes() if not self.save_changes():
raise AbortCommit()
warning_dialog(self, _('Restart needed'), warning_dialog(self, _('Restart needed'),
_('You need to restart the server for changes to' _('You need to restart the server for changes to'
' take effect'), show=True) ' take effect'), show=True)