Skip to content

cs_user.py: allow current_password to be blank(#12981) #13027

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

cs_user.py: allow current_password to be blank(#12981) #13027

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 31 additions & 25 deletions files/usr/share/cinnamon/cinnamon-settings/modules/cs_user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,12 +332,19 @@ def change_password(self):
oldpass = self.current_password.get_text()
newpass = self.new_password.get_text()
passwd = pexpect.spawn("/usr/bin/passwd")
time.sleep(0.5)
passwd.sendline(oldpass)
time.sleep(0.5)
passwd.sendline(newpass)
time.sleep(0.5)
passwd.sendline(newpass)
# passwd only asks for the old password when there already is one set.
if oldpass == "":
time.sleep(0.5)
passwd.sendline(newpass)
time.sleep(0.5)
passwd.sendline(newpass)
else:
time.sleep(0.5)
passwd.sendline(oldpass)
time.sleep(0.5)
passwd.sendline(newpass)
time.sleep(0.5)
passwd.sendline(newpass)
time.sleep(0.5)
passwd.close()

Expand Down Expand Up @@ -385,25 +392,24 @@ def auth_PyPAM(self):

def _on_current_password_changed(self, widget, event):
self.infobar.hide()
if self.current_password.get_text() != "":
try:
self.auth_pam() if pam else self.auth_PyPAM()
except PasswordError:
self.current_password.set_icon_from_stock(Gtk.EntryIconPosition.SECONDARY, Gtk.STOCK_DIALOG_WARNING)
self.current_password.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY, _("Wrong password"))
self.current_password.set_tooltip_text(_("Wrong password"))
self.correct_current_password = False
except:
self.current_password.set_icon_from_stock(Gtk.EntryIconPosition.SECONDARY, Gtk.STOCK_DIALOG_WARNING)
self.current_password.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY, _("Internal Error"))
self.current_password.set_tooltip_text(_("Internal Error"))
self.correct_current_password = False
raise
else:
self.current_password.set_icon_from_stock(Gtk.EntryIconPosition.SECONDARY, None)
self.current_password.set_tooltip_text("")
self.correct_current_password = True
self.check_passwords()
try:
self.auth_pam() if pam else self.auth_PyPAM()
except PasswordError:
self.current_password.set_icon_from_stock(Gtk.EntryIconPosition.SECONDARY, Gtk.STOCK_DIALOG_WARNING)
self.current_password.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY, _("Wrong password"))
self.current_password.set_tooltip_text(_("Wrong password"))
self.correct_current_password = False
except:
self.current_password.set_icon_from_stock(Gtk.EntryIconPosition.SECONDARY, Gtk.STOCK_DIALOG_WARNING)
self.current_password.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY, _("Internal Error"))
self.current_password.set_tooltip_text(_("Internal Error"))
self.correct_current_password = False
raise
else:
self.current_password.set_icon_from_stock(Gtk.EntryIconPosition.SECONDARY, None)
self.current_password.set_tooltip_text("")
self.correct_current_password = True
self.check_passwords()

# Based on setPasswordStrength() in Mozilla Seamonkey, which is tri-licensed under MPL 1.1, GPL 2.0, and LGPL 2.1.
# Forked from Ubiquity validation.py
Expand Down