add Net Socket

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

diff --git a/actions/openidlogin.php b/actions/openidlogin.php
index f9743ecde4951b110d4e6ef037d61eaf8de8c5fb..b066b9aa4ecdb349381d1e0c4fbd38e7aa7b563b 100644 (file)
--- a/actions/openidlogin.php
+++ b/actions/openidlogin.php
@@ -26,9 +26,17 @@ class OpenidloginAction extends Action {
        function handle($args) {
                parent::handle($args);
                if (common_logged_in()) {
-                       common_user_error(_t('Already logged in.'));
+                       common_user_error(_('Already logged in.'));
                } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
                        $openid_url = $this->trimmed('openid_url');
+
+                       # CSRF protection
+                       $token = $this->trimmed('token');
+                       if (!$token || $token != common_session_token()) {
+                               $this->show_form(_('There was a problem with your session token. Try again, please.'), $openid_url);
+                               return;
+                       }
+
                        $result = oid_authenticate($openid_url,
                                                                           'finishopenidlogin');
                        if (is_string($result)) { # error message
@@ -41,7 +49,7 @@ class OpenidloginAction extends Action {
        }
 
        function get_instructions() {
-               return _t('Login with an [OpenID](%%doc.openid%%) account.');
+               return _('Login with an [OpenID](%%doc.openid%%) account.');
        }
 
        function show_top($error=NULL) {
@@ -57,15 +65,16 @@ class OpenidloginAction extends Action {
        }
 
        function show_form($error=NULL, $openid_url) {
-               common_show_header(_t('OpenID Login'), NULL, $error, array($this, 'show_top'));
+               common_show_header(_('OpenID Login'), NULL, $error, array($this, 'show_top'));
                $formaction = common_local_url('openidlogin');
                common_element_start('form', array('method' => 'post',
                                                                                   'id' => 'openidlogin',
                                                                                   'action' => $formaction));
-               common_input('openid_url', _t('OpenID URL'),
+               common_hidden('token', common_session_token());
+               common_input('openid_url', _('OpenID URL'),
                                         $openid_url,
-                                        _t('Your OpenID URL'));
-               common_submit('submit', _t('Login'));
+                                        _('Your OpenID URL'));
+               common_submit('submit', _('Login'));
                common_element_end('form');
                common_show_footer();
        }