RESOLVED #JJ306: Upgrade to webtrees 2.1.12 - Merge (Git 40eaba6)

https://bugs.jaubart.com/view.php?id=306
jon48 · Dec 11, 2022 · 2848ef2 · 2848ef2
2 parents cd33595 + 40eaba6
commit 2848ef2
Show file tree

Hide file tree

Showing 74 changed files with 586 additions and 234 deletions.
diff --git a/app/Contracts/FilesystemFactoryInterface.php b/app/Contracts/FilesystemFactoryInterface.php
@@ -19,7 +19,6 @@
 
 namespace Fisharebest\Webtrees\Contracts;
 
-use Fisharebest\Webtrees\Tree;
 use League\Flysystem\FilesystemOperator;
 
 /**

diff --git a/app/Contracts/IdFactoryInterface.php b/app/Contracts/IdFactoryInterface.php
@@ -32,6 +32,8 @@ public function uuid(): string;
     /**
      * An identifier for use in CSS/HTML
      *
+     * @param string $prefix
+     *
      * @return string
      */
     public function id(string $prefix = 'id-'): string;

diff --git a/app/CustomTags/Gedcom7.php b/app/CustomTags/Gedcom7.php
@@ -21,7 +21,6 @@
 
 use Fisharebest\Webtrees\Contracts\CustomTagInterface;
 use Fisharebest\Webtrees\Contracts\ElementInterface;
-use Fisharebest\Webtrees\Elements\CountOfChildren;
 use Fisharebest\Webtrees\Elements\Creation;
 use Fisharebest\Webtrees\Elements\CustomElement;
 use Fisharebest\Webtrees\Elements\DateValueExact;

diff --git a/app/Elements/AbstractElement.php b/app/Elements/AbstractElement.php
@@ -30,7 +30,6 @@
 use function e;
 use function is_numeric;
 use function nl2br;
-use function preg_replace;
 use function str_contains;
 use function str_starts_with;
 use function strip_tags;

diff --git a/app/Elements/CountOfChildrenFam.php b/app/Elements/CountOfChildrenFam.php
@@ -19,8 +19,6 @@
 
 namespace Fisharebest\Webtrees\Elements;
 
-use Fisharebest\Webtrees\Tree;
-
 /**
  * COUNT_OF_CHILDREN := {Size=1:3}
  * The known number of children of this individual from all marriages or, if

diff --git a/app/Elements/NamePersonal.php b/app/Elements/NamePersonal.php
@@ -25,7 +25,6 @@
 
 use function e;
 use function in_array;
-use function trim;
 use function view;
 
 /**

diff --git a/app/Fact.php b/app/Fact.php
@@ -32,14 +32,11 @@
 use function implode;
 use function in_array;
 use function preg_match;
-use function preg_match_all;
 use function preg_replace;
 use function str_contains;
 use function str_ends_with;
 use function usort;
 
-use const PREG_SET_ORDER;
-
 /**
  * A GEDCOM fact or event object.
  */
@@ -320,7 +317,8 @@ public function canShow(int $access_level = null): bool
         $access_level = $access_level ?? Auth::accessLevel($this->record->tree());
 
         // Does this record have an explicit restriction notice?
-        $restriction = $this->attribute('RESN');
+        $element     = new RestrictionNotice('');
+        $restriction = $element->canonical($this->attribute('RESN'));
 
         if (str_ends_with($restriction, RestrictionNotice::VALUE_CONFIDENTIAL)) {
             return Auth::PRIV_NONE >= $access_level;

diff --git a/app/Factories/FilesystemFactory.php b/app/Factories/FilesystemFactory.php
@@ -22,7 +22,6 @@
 use Fisharebest\Flysystem\Adapter\ChrootAdapter;
 use Fisharebest\Webtrees\Contracts\FilesystemFactoryInterface;
 use Fisharebest\Webtrees\Site;
-use Fisharebest\Webtrees\Tree;
 use League\Flysystem\Filesystem;
 use League\Flysystem\FilesystemOperator;
 use League\Flysystem\Local\LocalFilesystemAdapter;

diff --git a/app/Factories/IdFactory.php b/app/Factories/IdFactory.php
@@ -52,6 +52,8 @@ public function uuid(): string
     /**
      * An identifier for use in CSS/HTML
      *
+     * @param string $prefix
+     *
      * @return string
      */
     public function id(string $prefix = 'id-'): string

diff --git a/app/Gedcom.php b/app/Gedcom.php
@@ -98,7 +98,6 @@
 use Fisharebest\Webtrees\Elements\EventTypeCitedFrom;
 use Fisharebest\Webtrees\Elements\FamilyCensus;
 use Fisharebest\Webtrees\Elements\FamilyEvent;
-use Fisharebest\Webtrees\Elements\FamilyFact;
 use Fisharebest\Webtrees\Elements\FamilyRecord;
 use Fisharebest\Webtrees\Elements\FamilyResidence;
 use Fisharebest\Webtrees\Elements\FileName;

diff --git a/app/GedcomRecord.php b/app/GedcomRecord.php
@@ -389,7 +389,7 @@ public function getPrimaryName(): int
             $this->getPrimaryName = 0;
             // ...except when the language/name use different character sets
             foreach ($this->getAllNames() as $n => $name) {
-                if ($name['type'] !== '_MARNM' && I18N::textScript($name['sort']) === $language_script) {
+                if (I18N::textScript($name['sort']) === $language_script) {
                     $this->getPrimaryName = $n;
                     break;
                 }

diff --git a/app/Http/Middleware/BadBotBlocker.php b/app/Http/Middleware/BadBotBlocker.php
@@ -22,6 +22,8 @@
 use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Registry;
 use Fisharebest\Webtrees\Validator;
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\GuzzleException;
 use Iodev\Whois\Loaders\CurlLoader;
 use Iodev\Whois\Modules\Asn\AsnRouteInfo;
 use Iodev\Whois\Whois;
@@ -50,6 +52,9 @@
  */
 class BadBotBlocker implements MiddlewareInterface
 {
+    private const REGEX_OCTET = '(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)';
+    private const REGEX_IPV4  = '/\\b' . self::REGEX_OCTET . '(?:\\.' . self::REGEX_OCTET . '){3}\\b/';
+
     // Cache whois requests.  Try to avoid all caches expiring at the same time.
     private const WHOIS_TTL_MIN = 28 * 86400;
     private const WHOIS_TTL_MAX = 35 * 86400;
@@ -67,6 +72,7 @@ class BadBotBlocker implements MiddlewareInterface
         'DataForSEO',
         'DotBot',
         'Grapeshot',
+        'Honolulu-bot', // Aggressive crawer, no info available
         'ia_archiver',
         'Linguee',
         'MJ12bot',
@@ -75,6 +81,7 @@ class BadBotBlocker implements MiddlewareInterface
         'PetalBot',
         'proximic',
         'SemrushBot',
+        'serpstatbot',
         'SEOkicks',
         'SiteKiosk',
         'Turnitin',
@@ -160,6 +167,15 @@ class BadBotBlocker implements MiddlewareInterface
         ],
     ];
 
+    /**
+     * Some search engines operate from designated IP addresses.
+     *
+     * @see https://bot.seekport.com/
+     */
+    private const ROBOT_IP_FILES = [
+        'SeekportBot' => 'https://bot.seekport.com/seekportbot_ips.txt',
+    ];
+
     /**
      * Some search engines operate from within a designated autonomous system.
      *
@@ -202,10 +218,26 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
             }
         }
 
-        foreach (self::ROBOT_IPS as $robot => $valid_ips) {
+        foreach (self::ROBOT_IPS as $robot => $valid_ip_ranges) {
+            if (str_contains($ua, $robot)) {
+                foreach ($valid_ip_ranges as $ip_range) {
+                    $range = IPFactory::parseRangeString($ip_range);
+
+                    if ($range instanceof RangeInterface && $range->contains($address)) {
+                        continue 2;
+                    }
+                }
+
+                return $this->response();
+            }
+        }
+
+        foreach (self::ROBOT_IP_FILES as $robot => $url) {
             if (str_contains($ua, $robot)) {
-                foreach ($valid_ips as $ip) {
-                    $range = IPFactory::parseRangeString($ip);
+                $valid_ip_ranges = $this->fetchIpRangesForUrl($robot, $url);
+
+                foreach ($valid_ip_ranges as $ip_range) {
+                    $range = IPFactory::parseRangeString($ip_range);
 
                     if ($range instanceof RangeInterface && $range->contains($address)) {
                         continue 2;
@@ -297,6 +329,31 @@ private function fetchIpRangesForAsn(string $asn): array
         }, random_int(self::WHOIS_TTL_MIN, self::WHOIS_TTL_MAX));
     }
 
+    /**
+     * Fetch a list of IP addresses from a remote file.
+     *
+     * @param string $ua
+     * @param string $url
+     *
+     * @return array<string>
+     */
+    private function fetchIpRangesForUrl(string $ua, string $url): array
+    {
+        return Registry::cache()->file()->remember('url-ip-list-' . $ua, static function () use ($url): array {
+            try {
+                $client   = new Client();
+                $response = $client->get($url, ['timeout' => 5]);
+                $contents = $response->getBody()->getContents();
+
+                preg_match_all(self::REGEX_IPV4, $contents, $matches);
+
+                return $matches[0];
+            } catch (GuzzleException $ex) {
+                return [];
+            }
+        }, random_int(self::WHOIS_TTL_MIN, self::WHOIS_TTL_MAX));
+    }
+
     /**
      * @return ResponseInterface
      */

diff --git a/app/Http/RequestHandlers/AutoCompleteFolder.php b/app/Http/RequestHandlers/AutoCompleteFolder.php
@@ -35,7 +35,8 @@ class AutoCompleteFolder extends AbstractAutocompleteHandler
     private MediaFileService $media_file_service;
 
     /**
-     * @param SearchService $search_service
+     * @param MediaFileService $media_file_service
+     * @param SearchService    $search_service
      */
     public function __construct(MediaFileService $media_file_service, SearchService $search_service)
     {

diff --git a/app/Http/RequestHandlers/CreateMediaObjectAction.php b/app/Http/RequestHandlers/CreateMediaObjectAction.php
@@ -29,7 +29,6 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
-use function in_array;
 use function response;
 
 /**
@@ -66,7 +65,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         $note        = Validator::parsedBody($request)->string('media-note');
         $title       = Validator::parsedBody($request)->string('title');
         $type        = Validator::parsedBody($request)->string('type');
-        $restriction = Validator::parsedBody($request)->string('restriction');
+        $restriction = Validator::parsedBody($request)->isInArray(['', 'NONE', 'PRIVACY', 'CONFIDENTIAL', 'LOCKED'])->string('restriction');
 
         $file = $this->media_file_service->uploadFile($request);
 
@@ -76,7 +75,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
 
         $gedcom = "0 @@ OBJE\n" . $this->media_file_service->createMediaFileGedcom($file, $type, $title, $note);
 
-        if (in_array($restriction, ['none', 'privacy', 'confidential', 'locked'], true)) {
+        if ($restriction !== '') {
             $gedcom .= "\n1 RESN " . $restriction;
         }
 

diff --git a/app/Http/RequestHandlers/CreateNoteAction.php b/app/Http/RequestHandlers/CreateNoteAction.php
@@ -26,8 +26,6 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
-use function in_array;
-
 /**
  * Process a form to create a new note object.
  */
@@ -42,14 +40,14 @@ public function handle(ServerRequestInterface $request): ResponseInterface
     {
         $tree        = Validator::attributes($request)->tree();
         $note        = Validator::parsedBody($request)->string('note');
-        $restriction = Validator::parsedBody($request)->isInArray(['none', 'privacy', 'confidential', 'locked'])->string('restriction');
+        $restriction = Validator::parsedBody($request)->isInArray(['', 'NONE', 'PRIVACY', 'CONFIDENTIAL', 'LOCKED'])->string('restriction');
 
         // Convert HTML line endings to GEDCOM continuations
         $note = strtr($note, ["\r\n" => "\n1 CONT "]);
 
         $gedcom = '0 @@ NOTE ' . $note;
 
-        if (in_array($restriction, ['none', 'privacy', 'confidential', 'locked'], true)) {
+        if ($restriction !== '') {
             $gedcom .= "\n1 RESN " . $restriction;
         }
 

diff --git a/app/Http/RequestHandlers/CreateRepositoryAction.php b/app/Http/RequestHandlers/CreateRepositoryAction.php
@@ -26,7 +26,6 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
-use function in_array;
 use function preg_replace;
 use function response;
 use function trim;
@@ -48,7 +47,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         $name        = Validator::parsedBody($request)->string('name');
         $address     = Validator::parsedBody($request)->string('address');
         $url         = Validator::parsedBody($request)->string('url');
-        $restriction = Validator::parsedBody($request)->string('restriction');
+        $restriction = Validator::parsedBody($request)->isInArray(['', 'NONE', 'PRIVACY', 'CONFIDENTIAL', 'LOCKED'])->string('restriction');
 
         // Fix non-printing characters
         $name = trim(preg_replace('/\s+/', ' ', $name));
@@ -63,7 +62,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             $gedcom .= "\n1 WWW " . $url;
         }
 
-        if (in_array($restriction, ['none', 'privacy', 'confidential', 'locked'], true)) {
+        if ($restriction !== '') {
             $gedcom .= "\n1 RESN " . $restriction;
         }
 

diff --git a/app/Http/RequestHandlers/CreateSourceAction.php b/app/Http/RequestHandlers/CreateSourceAction.php
@@ -26,8 +26,6 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
-use function in_array;
-
 /**
  * Process a form to create a new source.
  */
@@ -48,7 +46,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         $repository   = Validator::parsedBody($request)->string('source-repository');
         $call_number  = Validator::parsedBody($request)->string('source-call-number');
         $text         = Validator::parsedBody($request)->string('source-text');
-        $restriction  = Validator::parsedBody($request)->string('restriction');
+        $restriction  = Validator::parsedBody($request)->isInArray(['', 'NONE', 'PRIVACY', 'CONFIDENTIAL', 'LOCKED'])->string('restriction');
 
         // Fix non-printing characters
         $title        = trim(preg_replace('/\s+/', ' ', $title));
@@ -87,7 +85,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             }
         }
 
-        if (in_array($restriction, ['none', 'privacy', 'confidential', 'locked'], true)) {
+        if ($restriction !== '') {
             $gedcom .= "\n1 RESN " . $restriction;
         }
 

diff --git a/app/Http/RequestHandlers/CreateSubmitterAction.php b/app/Http/RequestHandlers/CreateSubmitterAction.php
@@ -26,8 +26,6 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
-use function in_array;
-
 /**
  * Process a form to create a new submitter.
  */
@@ -45,7 +43,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         $address     = Validator::parsedBody($request)->string('submitter_address');
         $email       = Validator::parsedBody($request)->string('submitter_email');
         $phone       = Validator::parsedBody($request)->string('submitter_phone');
-        $restriction = Validator::parsedBody($request)->string('restriction');
+        $restriction = Validator::parsedBody($request)->isInArray(['', 'NONE', 'PRIVACY', 'CONFIDENTIAL', 'LOCKED'])->string('restriction');
 
         // Fix non-printing characters
         $name = trim(preg_replace('/\s+/', ' ', $name));
@@ -64,7 +62,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             $gedcom .= "\n1 PHON " . $phone;
         }
 
-        if (in_array($restriction, ['none', 'privacy', 'confidential', 'locked'], true)) {
+        if ($restriction !== '') {
             $gedcom .= "\n1 RESN " . $restriction;
         }
 

diff --git a/app/Http/RequestHandlers/DataFixUpdateAll.php b/app/Http/RequestHandlers/DataFixUpdateAll.php
@@ -82,8 +82,8 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             return response([]);
         }
 
-        $start = Validator::queryParams($request)->string('start');
-        $end   = Validator::queryParams($request)->string('end');
+        $start = Validator::queryParams($request)->string('start', '');
+        $end   = Validator::queryParams($request)->string('end', '');
 
         if ($start === '' || $end === '') {
             return $this->createUpdateRanges($tree, $module, $rows, $params);

diff --git a/app/Http/RequestHandlers/MapDataAdd.php b/app/Http/RequestHandlers/MapDataAdd.php
@@ -109,6 +109,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             'marker_position' => $marker_position,
             'parent'          => $parent,
             'leaflet_config'  => $this->leaflet_js_service->config(),
+            'url'             => route(MapDataList::class, ['parent_id' => $parent->id()])
         ]);
     }
 }
diff --git a/app/Http/RequestHandlers/MapDataSave.php b/app/Http/RequestHandlers/MapDataSave.php
@@ -30,7 +30,6 @@
 use function e;
 use function redirect;
 use function round;
-use function route;
 
 /**
  * Controller for maintaining geographic data.

diff --git a/app/Http/RequestHandlers/MediaFileDownload.php b/app/Http/RequestHandlers/MediaFileDownload.php
@@ -27,7 +27,6 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
-use function assert;
 use function redirect;
 
 /**