X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fgprobe.php;h=dfa9137d7de03d6677a20b29a7cdf699c51bb121;hb=1f61efc7fef9196aaba9082d6b0e92e371da088c;hp=00a8e562af07f950b73a73b6265ebf332fa803a1;hpb=e746c4955bd9b8230d1c5427cfaeb18c6e370a3a;p=friendica.git

diff --git a/include/gprobe.php b/include/gprobe.php
index 00a8e562af..dfa9137d7d 100644
--- a/include/gprobe.php
+++ b/include/gprobe.php
@@ -10,7 +10,7 @@ function gprobe_run(&$argv, &$argc){
 	if(is_null($a)) {
 		$a = new App;
 	}
-  
+
 	if(is_null($db)) {
 	    @include(".htconfig.php");
     	require_once("include/dba.php");
@@ -24,9 +24,6 @@ function gprobe_run(&$argv, &$argc){
 	load_config('config');
 	load_config('system');
 
-	if ($hostname =  get_config('system', 'hostname'))
-		$a->set_hostname($hostname);
-
 	$a->set_baseurl(get_config('system','url'));
 
 	load_hooks();
@@ -36,33 +33,47 @@ function gprobe_run(&$argv, &$argc){
 
 	$url = hex2bin($argv[1]);
 
-	$r = q("select * from gcontact where nurl = '%s' limit 1",
+	$r = q("SELECT `id`, `url`, `network` FROM `gcontact` WHERE `nurl` = '%s' ORDER BY `id` LIMIT 1",
 		dbesc(normalise_link($url))
 	);
 
+	logger("gprobe start for ".normalise_link($url), LOGGER_DEBUG);
+
 	if(! count($r)) {
 
-		$arr = probe_url($url);
-		if(count($arr) && x($arr,'network') && $arr['network'] === NETWORK_DFRN) {
-			q("insert into `gcontact` (`name`,`url`,`nurl`,`photo`)
-				values ( '%s', '%s', '%s', '%s') ",
-				dbesc($arr['name']),
-				dbesc($arr['url']),
-				dbesc(normalise_link($arr['url'])),
-				dbesc($arr['photo'])
-			);
+		// Is it a DDoS attempt?
+		$urlparts = parse_url($url);
+
+		$result = Cache::get("gprobe:".$urlparts["host"]);
+		if (!is_null($result)) {
+			$result = unserialize($result);
+			if (in_array($result["network"], array(NETWORK_FEED, NETWORK_PHANTOM))) {
+				logger("DDoS attempt detected for ".$urlparts["host"]." by ".$_SERVER["REMOTE_ADDR"].". server data: ".print_r($_SERVER, true), LOGGER_DEBUG);
+				return;
+			}
 		}
-		$r = q("select * from gcontact where nurl = '%s' limit 1",
+
+		$arr = probe_url($url);
+
+		if (is_null($result))
+			Cache::set("gprobe:".$urlparts["host"],serialize($arr));
+
+		if (!in_array($result["network"], array(NETWORK_FEED, NETWORK_PHANTOM)))
+			update_gcontact($arr);
+
+		$r = q("SELECT `id`, `url`, `network` FROM `gcontact` WHERE `nurl` = '%s' ORDER BY `id` LIMIT 1",
 			dbesc(normalise_link($url))
 		);
 	}
 	if(count($r))
-		poco_load(0,0,$r[0]['id'], str_replace('/profile/','/poco/',$r[0]['url']));
-		
+		if ($r[0]["network"] == NETWORK_DFRN)
+			poco_load(0,0,$r[0]['id'], str_replace('/profile/','/poco/',$r[0]['url']));
+
+	logger("gprobe end for ".normalise_link($url), LOGGER_DEBUG);
 	return;
 }
 
 if (array_search(__file__,get_included_files())===0){
-  gprobe_run($argv,$argc);
+  gprobe_run($_SERVER["argv"],$_SERVER["argc"]);
   killme();
 }