QubesOS/qubes-installer-qubes-os
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

anaconda: add option to lock root account

Browse Source 
Not only default setting, so one could leave account locked if entered
password setting spoke.
This commit is contained in:
Marek Marczykowski 2013-02-13 11:14:28 +01:00
parent 2b0bda77a8
commit 5e55b430b7
2 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
anaconda/pyanaconda/ui/gui/spokes/password.glade
View File

@ -40,6 +40,22 @@
<object class="GtkBox" id="AnacondaSpokeWindow-action_area1">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkCheckButton" id="lock">
<property name="label" translatable="yes">Lock root account</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<signal name="clicked" handler="on_lock_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkGrid" id="pwgrid">
<property name="visible">True</property>
@ -137,7 +153,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
<property name="position">1</property>
</packing>
</child>
</object>

27
anaconda/pyanaconda/ui/gui/spokes/password.py
View File

@ -52,16 +52,25 @@ class PasswordSpoke(NormalSpoke):
self._password = None
self._error = False
self._oldweak = None
self._lock = self.data.rootpw.lock
def initialize(self):
NormalSpoke.initialize(self)
# place holders for the text boxes
self.pw = self.builder.get_object("pw")
self.confirm = self.builder.get_object("confirm")
self.lock = self.builder.get_object("lock")
def refresh(self):
# self.setCapsLockLabel()
self.pw.grab_focus()
self.lock.set_active(self._lock)
self.on_lock_clicked(self.lock)
def on_lock_clicked(self, lock):
self.pw.set_sensitive(not lock.get_active())
self.confirm.set_sensitive(not lock.get_active())
if not lock.get_active():
self.pw.grab_focus()
# Caps lock detection isn't hooked up right now
# def setCapsLockLabel(self):
@ -83,9 +92,10 @@ class PasswordSpoke(NormalSpoke):
return _("Root password is not set")
def apply(self):
self.data.rootpw.password = cryptPassword(self._password)
self.data.rootpw.isCrypted = True
self.data.rootpw.lock = False
if self._password:
self.data.rootpw.password = cryptPassword(self._password)
self.data.rootpw.isCrypted = True
self.data.rootpw.lock = self._lock
@property
def completed(self):
@ -98,6 +108,14 @@ class PasswordSpoke(NormalSpoke):
self._error = False
pw = self.pw.get_text()
confirm = self.confirm.get_text()
lock = self.lock.get_active()
if lock:
self._lock = True
self._password = None
self.clear_info()
self._error = False
return True
if not pw and not confirm:
self._error = _("You must provide and confirm a password.")
@ -120,6 +138,7 @@ class PasswordSpoke(NormalSpoke):
# if no errors, clear the info for next time we go into the spoke
self._password = pw
self._lock = False
self.clear_info()
self._error = False
return True