Sfoglia il codice sorgente

Merge pull request #685 from pixelfed/frontend-ui-refactor

Frontend ui refactor
daniel 6 anni fa
parent
commit
77b0d36d49
2 ha cambiato i file con 13 aggiunte e 1 eliminazioni
  1. 12 0
      app/Util/ActivityPub/Helpers.php
  2. 1 1
      config/pixelfed.php

+ 12 - 0
app/Util/ActivityPub/Helpers.php

@@ -210,6 +210,18 @@ class Helpers {
 				$activity = ['object' => $res];
 				$activity = ['object' => $res];
 			}
 			}
 
 
+			$idDomain = parse_url($activity['id'], PHP_URL_HOST);
+			$urlDomain = parse_url($url, PHP_URL_HOST);
+			$actorDomain = parse_url($activity['object']['attributedTo'], PHP_URL_HOST);
+
+			if(
+				$idDomain !== $urlDomain || 
+				$actorDomain !== $urlDomain || 
+				$idDomain !== $actorDomain
+			) {
+				abort(400, 'Invalid object');
+			}
+
 			$profile = self::profileFirstOrNew($activity['object']['attributedTo']);
 			$profile = self::profileFirstOrNew($activity['object']['attributedTo']);
 			if(isset($activity['object']['inReplyTo']) && !empty($activity['object']['inReplyTo']) && $replyTo == true) {
 			if(isset($activity['object']['inReplyTo']) && !empty($activity['object']['inReplyTo']) && $replyTo == true) {
 				$reply_to = self::statusFirstOrFetch($activity['object']['inReplyTo'], false);
 				$reply_to = self::statusFirstOrFetch($activity['object']['inReplyTo'], false);

+ 1 - 1
config/pixelfed.php

@@ -23,7 +23,7 @@ return [
     | This value is the version of your PixelFed instance.
     | This value is the version of your PixelFed instance.
     |
     |
     */
     */
-    'version' => '0.7.3',
+    'version' => '0.7.4',
 
 
     /*
     /*
     |--------------------------------------------------------------------------
     |--------------------------------------------------------------------------