X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnet.php;h=dcb6d61e405a7ec1dce38a5cd7e1edfbf00281c5;hb=a9ec92989943725b07ba678ff7a00eb7d9b6f415;hp=607b30ca7a665430055704ed60418355e6acab3c;hpb=b80cbf0db8e7ac7e11ea2bb49bbf3efd79f4fadf;p=platal.git diff --git a/modules/xnet.php b/modules/xnet.php index 607b30c..dcb6d61 100644 --- a/modules/xnet.php +++ b/modules/xnet.php @@ -24,20 +24,23 @@ class XnetModule extends PLModule function handlers() { return array( - 'index' => $this->make_hook('index', AUTH_PUBLIC), - 'exit' => $this->make_hook('exit', AUTH_PUBLIC), - - 'admin' => $this->make_hook('admin', AUTH_MDP, 'admin'), - 'groups' => $this->make_hook('groups', AUTH_PUBLIC), - 'groupes.php' => $this->make_hook('groups2', AUTH_PUBLIC), - 'plan' => $this->make_hook('plan', AUTH_PUBLIC), - 'photo' => $this->make_hook('photo', AUTH_MDP), - 'autologin' => $this->make_hook('autologin', AUTH_MDP), - 'login/ext' => $this->make_hook('login_ext', AUTH_PUBLIC), + 'index' => $this->make_hook('index', AUTH_PUBLIC), + 'exit' => $this->make_hook('exit', AUTH_PUBLIC), + + 'admin' => $this->make_hook('admin', AUTH_MDP, 'admin'), + 'groups' => $this->make_hook('groups', AUTH_PUBLIC), + 'groupes.php' => $this->make_hook('groups2', AUTH_PUBLIC), + 'plan' => $this->make_hook('plan', AUTH_PUBLIC), + 'photo' => $this->make_hook('photo', AUTH_MDP), + 'autologin' => $this->make_hook('autologin', AUTH_MDP), + 'login/ext' => $this->make_hook('login_ext', AUTH_PUBLIC), 'register/ext' => $this->make_hook('register_ext', AUTH_PUBLIC), - 'edit' => $this->make_hook('edit', AUTH_MDP, 'user'), + 'recovery/ext' => $this->make_hook('recovery_ext', AUTH_PUBLIC), + 'tmpPWD/ext' => $this->make_hook('tmpPWD_ext', AUTH_PUBLIC), + 'edit' => $this->make_hook('edit', AUTH_MDP, 'user'), + 'password' => $this->make_hook('password', AUTH_MDP, 'user'), - 'Xnet' => $this->make_wiki_hook(), + 'Xnet' => $this->make_wiki_hook(), ); } @@ -259,15 +262,115 @@ class XnetModule extends PLModule $res['uid']); S::logger($res['uid'])->log('passwd', ''); + + // Try to start a session (so the user don't have to log in); we will use + // the password available in Post:: to authenticate the user. + Post::kill('wait'); + Platal::session()->startAvailableAuth(); + $page->changeTpl('xnet/register.success.tpl'); $page->assign('hruid', $res['hruid']); } else { $page->changeTpl('platal/password.tpl'); $page->assign('xnet', true); + $page->assign('hruid', $res['hruid']); + $page->assign('do_auth', 1); + } + } + + function handler_recovery_ext($page) + { + $page->changeTpl('xnet/recovery.tpl'); + + if (!Post::has('login')) { + return; + } + + $user = User::getSilent(Post::t('login')); + if (is_null($user)) { + $page->trigError('Le compte n\'existe pas.'); + return; + } + if ($user->state != 'active') { + $page->trigError('Ton compte n\'est pas activé.'); + return; + } + + $page->assign('ok', true); + + $hash = rand_url_id(); + XDB::execute('INSERT INTO account_xnet_lost_passwords (uid, date, hash) + VALUES ({?}, NOW(), {?})', + $user->id(), $hash); + + $mymail = new PlMailer(); + $mymail->setFrom('"Gestion des mots de passe" mail->domain . '>'); + $mymail->addTo($user); + $mymail->setSubject("Votre certificat d'authentification"); + $mymail->setTxtBody("Visitez la page suivante qui expire dans six heures : +http://polytechnique.net/tmpPWD/$hash + +Si en cliquant dessus vous n'y arrivez pas, copiez intégralement l'adresse dans la barre de votre navigateur. Si vous n'avez pas utilisé ce lien dans six heures, vous pouvez tout simplement recommencer cette procédure. + +-- +Polytechnique.org +\"Le portail des élèves & anciens élèves de l'École polytechnique\" + +Email envoyé à " . Post::t('login')); + $mymail->send(); + + S::logger($user->id())->log('recovery', $user->bestEmail()); + } + + function handler_tmpPWD_ext($page, $hash = null) + { + global $globals; + XDB::execute('DELETE FROM account_xnet_lost_passwords + WHERE DATE_SUB(NOW(), INTERVAL 380 MINUTE) > date'); + + $uid = XDB::fetchOneCell('SELECT uid + FROM account_xnet_lost_passwords + WHERE hash = {?}', + $hash); + if (is_null($uid)) { + $page->trigErrorRedirect("Cette adresse n'existe pas ou n'existe plus sur le serveur.", ''); + } + + $hruid = XDB::fetchOneCell('SELECT hruid + FROM accounts + WHERE uid = {?}', + $uid); + + if (Post::has('pwhash') && Post::t('pwhash')) { + $password = Post::t('pwhash'); + XDB::query('UPDATE accounts + SET password = {?} + WHERE uid = {?} AND state = \'active\'', + $password, $uid); + XDB::query('DELETE FROM account_xnet_lost_passwords + WHERE hash = {?}', + $hash); + + S::logger($uid)->log('passwd', ''); + + // Try to start a session (so the user don't have to log in); we will use + // the password available in Post:: to authenticate the user. + Post::kill('wait'); + Platal::session()->startAvailableAuth(); + + $page->changeTpl('xnet/register.success.tpl'); + $page->assign('hruid', $hruid); + } else { + $page->changeTpl('platal/password.tpl'); + $page->assign('xnet_reset', true); + $page->assign('hruid', $hruid); + $page->assign('do_auth', 1); } } - function handler_edit(&$page) + + + function handler_edit($page) { global $globals; @@ -283,13 +386,6 @@ class XnetModule extends PLModule if (Post::has('change')) { S::assert_xsrf_token(); - if ($user->groupCount() == 0 && Post::t('delete') == 'OUI') { - XDB::execute('DELETE FROM accounts - WHERE uid = {?}', - $user->id()); - pl_redirect('index'); - } - // Convert user status to X if (!Post::blank('login_X')) { $forlife = $this->changeLogin($page, $user, Post::t('login_X')); @@ -305,14 +401,9 @@ class XnetModule extends PLModule WHERE uid = {?}', Post::t('full_name'), Post::t('directory_name'), Post::t('display_name'), (Post::t('sex') == 'male') ? 'male' : 'female', Post::t('email'), $user->id()); - // If user is of type xnet and new password is given. - if (!Post::blank('pwhash')) { - XDB::query('UPDATE accounts - SET password = {?} - WHERE uid = {?}', - Post::t('pwhash'), $user->id()); - } if (XDB::affectedRows()) { + $user = User::getWithUID($user->id()); + S::set('user', $user); $page->trigSuccess('Données mises à jour.'); } } @@ -320,6 +411,27 @@ class XnetModule extends PLModule $page->addJsLink('password.js'); $page->assign('user', $user); } + + function handler_password ($page) + { + if (Post::has('pwhash') && Post::t('pwhash')) { + S::assert_xsrf_token(); + + S::set('password', $password = Post::t('pwhash')); + XDB::execute('UPDATE accounts + SET password = {?} + WHERE uid={?}', $password, + S::i('uid')); + S::logger()->log('passwd'); + Platal::session()->setAccessCookie(true); + $page->changeTpl('platal/password.success.tpl'); + $page->run(); + } + + $page->changeTpl('platal/password.tpl'); + $page->assign('xnet_reset', true); + $page->assign('do_auth', 0); + } } // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: