CSRF protection for subscription/unsubscription

[quix0rs-gnu-social.git] / actions / password.php

diff --git a/actions/password.php b/actions/password.php
index 603ae58eaf0405c9884b775c0c2b0b50cdc879c0..23b95f7b68f4be6c4e600787e6a2ea53f9f6be38 100644 (file)
--- a/actions/password.php
+++ b/actions/password.php
@@ -23,24 +23,28 @@ require_once(INSTALLDIR.'/lib/settingsaction.php');
 
 class PasswordAction extends SettingsAction {
 
+       function get_instructions() {
+               return _('You can change your password here. Choose a good one!');
+       }
+
        function show_form($msg=NULL, $success=false) {
-               common_show_header(_t('Change password'), NULL, NULL, array($this, 'settings_menu'));
-               if ($msg) {
-                       $this->message($msg, $success);
-               } else {
-                       common_element('div', 'instructions', 
-                                                  _t('You can change your password here. Choose a good one!'));
-               }
-               common_element_start('form', array('method' => 'POST',
+               $user = common_current_user();
+               $this->form_header(_('Change password'), $msg, $success);
+               $token = common_session_token();
+               common_element_start('form', array('method' => 'post',
                                                                                   'id' => 'password',
                                                                                   'action' =>
                                                                                   common_local_url('password')));
-               common_password('oldpassword', _t('Old password'));
-               common_password('newpassword', _t('New password'),
-                                               _t('6 or more characters'));
-               common_password('confirm', _t('Confirm'),
-                                               _t('same as password above'));
-               common_submit('submit', _t('Change'));
+               common_hidden('token', $token);
+               # Users who logged in with OpenID won't have a pwd
+               if ($user->password) {
+                       common_password('oldpassword', _('Old password'));
+               }
+               common_password('newpassword', _('New password'),
+                                               _('6 or more characters'));
+               common_password('confirm', _('Confirm'),
+                                               _('same as password above'));
+               common_submit('submit', _('Change'));
                common_element_end('form');
                common_show_footer();
        }
@@ -52,18 +56,25 @@ class PasswordAction extends SettingsAction {
 
                # FIXME: scrub input
 
-               $oldpassword = $this->arg('oldpassword');
                $newpassword = $this->arg('newpassword');
                $confirm = $this->arg('confirm');
-
-               if (0 != strcmp($newpassword, $confirm)) {
-                       $this->show_form(_t('Passwords don\'t match'));
+               $token = $this->arg('token');
+               
+               if (!$token || $token != common_session_token()) {
+                       $this->show_form(_('There was a problem with your session token. Try again, please.'));
+                       return;
+               } else if (0 != strcmp($newpassword, $confirm)) {
+                       $this->show_form(_('Passwords don\'t match.'));
                        return;
                }
 
-               if (!common_check_user($user->nickname, $oldpassword)) {
-                       $this->show_form(_t('Incorrect old password'));
-                       return;
+               if ($user->password) {
+                       $oldpassword = $this->arg('oldpassword');
+
+                       if (!common_check_user($user->nickname, $oldpassword)) {
+                               $this->show_form(_('Incorrect old password'));
+                               return;
+                       }
                }
 
                $original = clone($user);
@@ -72,15 +83,15 @@ class PasswordAction extends SettingsAction {
 
                $val = $user->validate();
                if ($val !== TRUE) {
-                       $this->show_form(_t('Error saving user; invalid.'));
+                       $this->show_form(_('Error saving user; invalid.'));
                        return;
                }
 
                if (!$user->update($original)) {
-                       common_server_error(_t('Can\'t save new password.'));
+                       common_server_error(_('Can\'t save new password.'));
                        return;
                }
 
-               $this->show_form(_t('Password saved'), true);
+               $this->show_form(_('Password saved.'), true);
        }
-}
\ No newline at end of file
+}