vérificatio CSRF et mise en page

diff --git a/css/style.css b/css/style.css
index 959a411a6bd5ee82c7b666ca22dface1640c038b..d77fb9e70e585ea89ac9e3fd169eba826fc59cc9 100644 (file)
--- a/css/style.css
+++ b/css/style.css
@@ -65,6 +65,16 @@ footer {
     cursor: pointer;
 }
 
+input[type=submit].delete {
+    background : url('../img/delete.png') no-repeat center center;
+    width : 16px;
+    height :16px;
+    border : none;
+    color : transparent;
+    cursor: pointer;
+    font-size : 0;
+}
+
 #main #content {
     margin-top: 20px;
 }
@@ -77,13 +87,15 @@ footer {
     min-height: 8em;
     -webkit-border-radius: 2px;
     border-radius: 2px;
-    -webkit-box-shadow:  0px 0px 2px -1px #000;
-    box-shadow:  0px 0px 2px -1px #000;
+    -webkit-box-shadow:  0px 0px 6px -1px #000;
+    box-shadow:  0px 0px 6px -1px #000;
     width: 30%;
     margin: 10px;
     float: left;
 }
-
+#main .entrie h2 {
+    width: 95%;
+}
 #main .entrie h2 a {
     text-decoration: none;
 }
@@ -92,20 +104,38 @@ footer {
     color: #F5BE00;
 }
 
-#main .entrie .tools {
-    position:absolute;
-    bottom: 0;
-    width: 100%;
+.tools {
+    position: absolute;
+    top: 20px;
+    right: 20px;
+    width: 30px;
     text-align: right;
-    margin-left: -20px;
+}
+
+.tools ul {
+    padding: 0; margin: 0;
+    list-style-type: none;
+}
+
+.tools ul li {
+    line-height: 20px;
+}
+
+.tools a.tool {
+    cursor: pointer;
 }
 
 #article .tools {
+    position: relative;
     display: inline;
+    top: 0px;
+    right: 0px;
+    width: 100%;
+    text-align: left;
 }
 
-#article .tools a.tool {
-    cursor: pointer;
+#article.tools ul li{
+    display: inline;
 }
 
 #main .entrie .tools a.tool span, #article .tools a.tool span {

diff --git a/inc/config.php b/inc/config.php
index 29a22507c32067bb20ec75354915c6d6744a491c..84b86998de69754dfb8b70a7ee10cb5fb2f4b0ee 100644 (file)
--- a/inc/config.php
+++ b/inc/config.php
@@ -22,4 +22,12 @@ raintpl::$cache_dir = './cache/';
 raintpl::$base_url  = get_poche_url();
 raintpl::configure('path_replace', false);
 raintpl::configure('debug', false);
-$tpl = new raintpl();
\ No newline at end of file
+$tpl = new raintpl();
+
+session_start();
+
+if (!isset($_SESSION['token_poche'])) {
+    $token = md5(uniqid(rand(), TRUE));
+    $_SESSION['token_poche'] = $token;
+    $_SESSION['token_time_poche'] = time();
+}
\ No newline at end of file

diff --git a/inc/functions.php b/inc/functions.php
index 45828bf2b67fbf4cfb2ba38aa206dbb87cb52b32..30e00393c126ead88c9908fd09a3bd20ce20ffaa 100755 (executable)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -125,7 +125,7 @@ function prepare_url($url)
 /**
  * Appel d'une action (mark as fav, archive, delete)
  */
-function action_to_do($action, $id)
+function action_to_do($action, $id, $url, $token)
 {
     global $db;
 
@@ -140,8 +140,11 @@ function action_to_do($action, $id)
             $params_action  = array($url, $parametres_url['title'], $parametres_url['content']);
             break;
         case 'delete':
-            $sql_action     = "DELETE FROM entries WHERE id=?";
-            $params_action  = array($id);
+            if (verif_token($token)) {
+                $sql_action     = "DELETE FROM entries WHERE id=?";
+                $params_action  = array($id);
+            }
+            else die('CSRF problem');
             break;
         default:
             break;
@@ -224,4 +227,25 @@ function get_article($id)
     }
 
     return $entry;
+}
+
+/**
+ * Vérifie si le jeton passé en $_POST correspond à celui en session
+ */
+function verif_token($token)
+{
+    if(isset($_SESSION['token_poche']) && isset($_SESSION['token_time_poche']) && isset($token))
+    {
+        if($_SESSION['token_poche'] == $token)
+        {
+            $old_timestamp = time() - (15*60);
+            if($_SESSION['token_time_poche'] >= $old_timestamp)
+            {
+                return TRUE;
+            }
+            else return FALSE;
+        }
+        else return FALSE;
+    }
+    else return FALSE;
 }
\ No newline at end of file

diff --git a/index.php b/index.php
index 1cb32f58ca9ca5358abecafb21ab4f5da9ed364a..d477d699d965cafa945d6c9e22233beecdb94d11 100755 (executable)
--- a/index.php
+++ b/index.php
@@ -10,12 +10,16 @@
 
 include dirname(__FILE__).'/inc/config.php';
 
-$action = (isset ($_GET['action'])) ? htmlspecialchars($_GET['action']) : '';
-$view   = (isset ($_GET['view'])) ? htmlspecialchars($_GET['view']) : 'index';
-$id     = (isset ($_GET['id'])) ? htmlspecialchars($_GET['id']) : '';
+$action = (isset ($_REQUEST['action'])) ? htmlentities($_REQUEST['action']) : '';
+$view   = (isset ($_GET['view'])) ? htmlentities($_GET['view']) : 'index';
+$id     = (isset ($_REQUEST['id'])) ? htmlspecialchars($_REQUEST['id']) : '';
 $url    = (isset ($_GET['url'])) ? $_GET['url'] : '';
+$token    = (isset ($_POST['token'])) ? $_POST['token'] : '';
+
+if ($action != '') {
+    action_to_do($action, $id, $url, $token);
+}
 
-action_to_do($action, $id);
 $entries = display_view($view);
 
 $tpl->assign('title', 'poche, a read it later open source system');
@@ -23,4 +27,5 @@ $tpl->assign('view', $view);
 $tpl->assign('poche_url', get_poche_url());
 $tpl->assign('entries', $entries);
 $tpl->assign('load_all_js', 1);
+$tpl->assign('token', $_SESSION['token_poche']);
 $tpl->draw('home');
\ No newline at end of file

diff --git a/js/poche.js b/js/poche.js
index 64df553c9d91c25cec31cea1bf29e628a8703873..0dcc0a35fa3a0e9aed739081b9fe748bd41a4a31 100644 (file)
--- a/js/poche.js
+++ b/js/poche.js
@@ -1,16 +1,16 @@
-function toggle_favorite(element, id) {
+function toggle_favorite(element, id, token) {
     $(element).toggleClass('fav-off');
     $.ajax ({
         url: "process.php?action=toggle_fav",
-        data:{id:id}
+        data:{id:id, token:token}
     });
 }
 
-function toggle_archive(element, id, view_article) {
+function toggle_archive(element, id, token, view_article) {
     $(element).toggleClass('archive-off');
     $.ajax ({
         url: "process.php?action=toggle_archive",
-        data:{id:id}
+        data:{id:id, token:token}
     });
     var obj = $('#entry-'+id);
 

diff --git a/process.php b/process.php
index 0bd20e5deff71d6d184955f0fb283848675f0e69..5a056caac795bf851a1546bd8327f4a66edccaf6 100644 (file)
--- a/process.php
+++ b/process.php
@@ -11,27 +11,30 @@
 include dirname(__FILE__).'/inc/config.php';
 $db = new db(DB_PATH);
 
-$action = (isset ($_GET['action'])) ? htmlspecialchars($_GET['action']) : '';
-$id     = (isset ($_GET['id'])) ? htmlspecialchars($_GET['id']) : '';
+$action = (isset ($_GET['action'])) ? htmlentities($_GET['action']) : '';
+$id     = (isset ($_GET['id'])) ? htmlentities($_GET['id']) : '';
+$token  = (isset ($_GET['token'])) ? $_GET['token'] : '';
 
-switch ($action)
-{
-    case 'toggle_fav' :
-        $sql_action     = "UPDATE entries SET is_fav=~is_fav WHERE id=?";
-        $params_action  = array($id);
-        break;
-    case 'toggle_archive' :
-        $sql_action     = "UPDATE entries SET is_read=~is_read WHERE id=?";
-        $params_action  = array($id);
-        break;
-    default:
-        break;
-}
+if (verif_token($token)) {
+    switch ($action)
+    {
+        case 'toggle_fav' :
+            $sql_action     = "UPDATE entries SET is_fav=~is_fav WHERE id=?";
+            $params_action  = array($id);
+            break;
+        case 'toggle_archive' :
+            $sql_action     = "UPDATE entries SET is_read=~is_read WHERE id=?";
+            $params_action  = array($id);
+            break;
+        default:
+            break;
+    }
 
-# action query
-if (isset($sql_action))
-{
-    $query = $db->getHandle()->prepare($sql_action);
-    $query->execute($params_action);
+    # action query
+    if (isset($sql_action))
+    {
+        $query = $db->getHandle()->prepare($sql_action);
+        $query->execute($params_action);
+    }
 }
-?>
\ No newline at end of file
+else die('CSRF problem');
\ No newline at end of file

diff --git a/tpl/home.html b/tpl/home.html
index 70a35a7fce0f6178f1335d9ed5c6127d9885a4b4..0de8007b32680431d5612361357947ac0b4f38f3 100644 (file)
--- a/tpl/home.html
+++ b/tpl/home.html
@@ -8,7 +8,7 @@
                 <li><a href="index.php" {if="$view == 'index'"}class="current"{/if}>home</a></li>
                 <li><a href="?view=fav" {if="$view == 'fav'"}class="current"{/if}>favorites</a></li>
                 <li><a href="?view=archive" {if="$view == 'archive'"}class="current"{/if}>archive</a></li>
-                <li><a style="cursor: move" title="i am a bookmarklet, use me !" href="javascript:(function(){var%20url%20=%20location.href;var%20title%20=%20document.title%20||%20url;window.open('{$poche_url}?action=add&url='%20+%20encodeURIComponent(url),'_self');})();">poche it !</a></li>
+                <li><a style="cursor: move" title="i am a bookmarklet, use me !" href="javascript:(function(){var%20url%20=%20location.href%20||%20url;window.open('{$poche_url}?action=add&url='%20+%20encodeURIComponent(url),'_self');})();">poche it !</a></li>
             </ul>
             <div id="content">
                 {loop="entries"}
@@ -18,9 +18,11 @@
                                 <a href="view.php?id={$value.id}">{$value.title}</a>
                             </h2>
                             <div class="tools">
-                                <a title="toggle mark as read" class="tool archive {if="$value.is_read == '0'"}archive-off{/if}" onclick="toggle_archive(this, {$value.id})"><span></span></a>
-                                <a title="toggle favorite" class="tool fav {if="$value.is_fav == '0'"}fav-off{/if}" onclick="toggle_favorite(this, {$value.id})"><span></span></a>
-                                <a href="?action=delete&id={$value.id}" title="toggle delete" onclick="return confirm('Are you sure?')" class="tool delete"><span></span></a>
+                                <ul>
+                                    <li><a title="toggle mark as read" class="tool archive {if="$value.is_read == '0'"}archive-off{/if}" onclick="toggle_archive(this, {$value.id}, '{$token}')"><span></span></a></li>
+                                    <li><a title="toggle favorite" class="tool fav {if="$value.is_fav == '0'"}fav-off{/if}" onclick="toggle_favorite(this, {$value.id}, '{$token}')"><span></span></a></li>
+                                    <li><form method="post" onsubmit="return confirm('Are you sure?')" style="display: inline;"><input type="hidden" name="token" id="token" value="{$token}" /><input type="hidden" id="action" name="action" value="delete" /><input type="hidden" id="id" name="id" value="{$value.id}" /><input type="submit" class="delete" title="toggle delete" /></form></li>
+                                </ul>
                             </div>
                         </span>
                     </div>

diff --git a/tpl/view.html b/tpl/view.html
index 1e0578899beac2e866683c2944c1b8a27f9dfb60..d24d26edbca969261400f1b0894dd0bf2f6a5738 100755 (executable)
--- a/tpl/view.html
+++ b/tpl/view.html
@@ -5,9 +5,11 @@
                        <a href="index.php" title="back to home">&larr;</a>
                </div>
             <div class="tools">
-                <a title="toggle mark as read" class="tool archive {if="$is_read == 0"}archive-off{/if}" onclick="toggle_archive(this, {$id}, 1)"><span></span></a>
-                <a title="toggle favorite" class="tool fav  {if="$is_fav == 0"}fav-off{/if}" onclick="toggle_favorite(this, {$id})"><span></span></a>
-                <a href="index.php?action=delete&id={$id}" title="toggle delete" onclick="return confirm('Are you sure?')" class="tool delete"><span></span></a>
+                <ul>
+                    <li><a title="toggle mark as read" class="tool archive {if="$is_read == '0'"}archive-off{/if}" onclick="toggle_archive(this, {$id}, '{$token}')"><span></span></a></li>
+                    <li><a title="toggle favorite" class="tool fav {if="$is_fav == '0'"}fav-off{/if}" onclick="toggle_favorite(this, {$id}, '{$token}')"><span></span></a></li>
+                    <li><form method="post" onsubmit="return confirm('Are you sure?')" style="display: inline;"><input type="hidden" name="token" id="token" value="{$token}" /><input type="hidden" id="action" name="action" value="delete" /><input type="hidden" id="id" name="id" value="{$id}" /><input type="submit" class="delete" title="toggle delete" /></form></li>
+                </ul>
             </div>
             <header class="mbm">
                 <h1><a href="{$url}">{$title}</a></h1>

diff --git a/view.php b/view.php
index dfc26b9d504ec1991d5fe75c24a343434398d0d6..dbafec6bcd8d5bdca99ba8e17aed3eac291bbbb8 100755 (executable)
--- a/view.php
+++ b/view.php
@@ -24,6 +24,7 @@ if(!empty($id)) {
         $tpl->assign('is_fav', $entry[0]['is_fav']);
         $tpl->assign('is_read', $entry[0]['is_read']);
         $tpl->assign('load_all_js', 0);
+        $tpl->assign('token', $_SESSION['token_poche']);
         $tpl->draw('view');
     }
     else {