[SPIP] v3.2.1-->v3.2.2

[lhc/web/www.git] / www / config / ecran_securite.php

diff --git a/www/config/ecran_securite.php b/www/config/ecran_securite.php
index d0b9cfb..d33df61 100644 (file)
--- a/www/config/ecran_securite.php
+++ b/www/config/ecran_securite.php
@@ -5,7 +5,7 @@
  * ------------------
  */
 
-define('_ECRAN_SECURITE', '1.3.2'); // 2017-06-12
+define('_ECRAN_SECURITE', '1.3.8'); // 2018-10-31
 
 /*
  * Documentation : http://www.spip.net/fr_article4200.html
@@ -33,23 +33,160 @@ if (!defined('_IS_BOT') and isset($_GET['var_isbot'])){
 if (!defined('_IS_BOT')){
        define('_IS_BOT',
                isset($_SERVER['HTTP_USER_AGENT'])
-               and preg_match(
-               // mots generiques
-                       ',bot|slurp|crawler|spider|webvac|yandex|'
-                       // MSIE 6.0 est un botnet 99,9% du temps, on traite donc ce USER_AGENT comme un bot
-                       . 'MSIE 6\.0|'
-                       // UA plus cibles
-                       . '80legs|accoona|AltaVista|ASPSeek|Baidu|Charlotte|EC2LinkFinder|eStyle|facebookexternalhit|flipboard|hootsuite|FunWebProducts|Google|Genieo|INA dlweb|InfegyAtlas|Java VM|LiteFinder|Lycos|MegaIndex|MetaURI|Moreover|Rambler|Scrapy|Scooter|ScrubbyBloglines|Yahoo|Yeti'
-                       . ',i', (string)$_SERVER['HTTP_USER_AGENT'])
+               and preg_match(','
+               . implode ('|', array(
+                       // mots generiques
+                       'bot',
+                       'slurp',
+                       'crawler',
+                       'spider',
+                       'webvac',
+                       'yandex',
+                       'MSIE 6\.0', // botnet 99,9% du temps
+                       // UA plus cibles 
+                       '200please',
+                       '80legs',
+                       'a6-indexer',
+                       'aboundex',
+                       'accoona',
+                       'addthis',
+                       'adressendeutschland',
+                       'alexa',
+                       'altavista',
+                       'analyticsseo',
+                       'archive',
+                       'aspseek',
+                       'baidu',
+                       'begunadvertising',
+                       'bingpreview',
+                       'bloglines',
+                       'browsershots',
+                       'bubing',
+                       'butterfly',
+                       'changedetection',
+                       'charlotte',
+                       'chilkat',
+                       'china',
+                       'coccoc',
+                       'crowsnest',
+                       'dataminr',
+                       'daumoa',
+                       'dlweb',
+                       'ec2linkfinder',
+                       'estyle',
+                       'ezooms',
+                       'facebookexternalhit',
+                       'facebookplatform',
+                       'fairshare',
+                       'feedfetcher',
+                       'feedfetcher-google',
+                       'feedly',
+                       'fetch',
+                       'flipboardproxy',
+                       'genieo',
+                       'google',
+                       'grapeshot',
+                       'hatena-useragent',
+                       'head',
+                       'hosttracker',
+                       'hubspot',
+                       'ia_archiver',
+                       'ichiro',
+                       'iltrovatore-setaccio',
+                       'immediatenet',
+                       'ina',
+                       'infegyatlas',
+                       'infohelfer',
+                       'instapaper',
+                       'jabse',
+                       'james',
+                       'kumkie',
+                       'linkdex',
+                       'linkfluence',
+                       'linkwalker',
+                       'litefinder',
+                       'loadimpactpageanalyzer',
+                       'luminate',
+                       'lycos',
+                       'lycosa',
+                       'mediapartners-google',
+                       'msai',
+                       'najdi',
+                       'netcraftsurveyagent',
+                       'netestate',
+                       'netseer',
+                       'nuhk',
+                       'owlin',
+                       'panscient',
+                       'parsijoo',
+                       'plukkie',
+                       'proximic',
+                       'qirina',
+                       'qualidator',
+                       'rambler',
+                       'readability',
+                       'sbsearch',
+                       'scooter',
+                       'scrapy',
+                       'scrubby',
+                       'scrubbybloglines',
+                       'shareaholic',
+                       'shopwiki',
+                       'sistrix',
+                       'sitechecker',
+                       'siteexplorer',
+                       'sogou',
+                       'special_archiver',
+                       'speedy',
+                       'spinn3r',
+                       'spreadtrum',
+                       'steeler',
+                       'subscriber',
+                       'suma',
+                       'superdownloads',
+                       'svenska-webbsido',
+                       'teoma',
+                       'thumbshots',
+                       'tineye',
+                       'trendiction',
+                       'tweetedtimes',
+                       'tweetmeme',
+                       'uaslinkchecker',
+                       'undrip',
+                       'unwindfetchor',
+                       'vedma',
+                       'vkshare',
+                       'vm',
+                       'wch',
+                       'webalta',
+                       'webcookies',
+                       'webthumbnail',
+                       'wesee',
+                       'wise-guys',
+                       'woko',
+                       'wotbox',
+                       'y!j-bri',
+                       'y!j-bro',
+                       'y!j-brw',
+                       'y!j-bsc',
+                       'yahoo',
+                       'yahoo!',
+                       'yahooysmcm',
+                       'yats',
+                       'yeti',
+                       'zeerch'
+               )) . ',i',
+               (string)$_SERVER['HTTP_USER_AGENT'])
        );
 }
 if (!defined('_IS_BOT_FRIEND')){
        define('_IS_BOT_FRIEND',
                isset($_SERVER['HTTP_USER_AGENT'])
-               and preg_match(','
-                       // UA plus cibles
-                       . 'facebookexternalhit'
-                       . ',i', (string)$_SERVER['HTTP_USER_AGENT'])
+               and preg_match(',' . implode ('|', array(
+                       'facebookexternalhit',
+                       'flipboardproxy'
+               )) . ',i',
+               (string)$_SERVER['HTTP_USER_AGENT'])
        );
 }
 
@@ -237,6 +374,7 @@ if (isset($_REQUEST['var_url']) and $_REQUEST['var_url'] and isset($_REQUEST['ex
        $url = trim($_REQUEST['var_url']);
        if (strncmp($url,'/',1)==0
          or (($p=strpos($url,'..'))!==false AND strpos($url,'..',$p+3)!==false)
+         or (($p=strpos($url,'..'))!==false AND strpos($url,'IMG',$p+3)!==false)
                or (strpos($url,'://')!==false or strpos($url,':\\')!==false)) {
                $ecran_securite_raison = 'URL interdite pour var_url';
        }