Link sanitation added to some more places

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 67a3aae863e2de5b0f324cb245190b24d56e0a7c..4c2a3a6b4606ce7197a81018fdc5c7afcb71168c 100644 (file)
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -125,7 +125,7 @@ class BBCode
                                                break;
 
                                        case 'publisher_url':
-                                               $data['provider_url'] = html_entity_decode($value, ENT_QUOTES, 'UTF-8');
+                                               $data['provider_url'] = Network::sanitizeUrl(html_entity_decode($value, ENT_QUOTES, 'UTF-8'));
                                                break;
 
                                        case 'author_name':
@@ -136,7 +136,7 @@ class BBCode
                                                break;
 
                                        case 'author_url':
-                                               $data['author_url'] = html_entity_decode($value, ENT_QUOTES, 'UTF-8');
+                                               $data['author_url'] = Network::sanitizeUrl(html_entity_decode($value, ENT_QUOTES, 'UTF-8'));
                                                if ($data['provider_url'] == $data['author_url']) {
                                                        $data['author_url'] = '';
                                                }

diff --git a/src/Util/ParseUrl.php b/src/Util/ParseUrl.php
index 184a02ae7502db77cd3a787f78ffca9b898b1a21..cd9669624afd1fda214cc8bf0acce4802a529f5f 100644 (file)
--- a/src/Util/ParseUrl.php
+++ b/src/Util/ParseUrl.php
@@ -274,13 +274,13 @@ class ParseUrl
                                                $siteinfo['author_name'] = trim($oembed_data->author_name);
                                        }
                                        if (!empty($oembed_data->author_url)) {
-                                               $siteinfo['author_url'] = trim($oembed_data->author_url);
+                                               $siteinfo['author_url'] = Network::sanitizeUrl($oembed_data->author_url);
                                        }
                                        if (!empty($oembed_data->provider_name)) {
                                                $siteinfo['publisher_name'] = trim($oembed_data->provider_name);
                                        }
                                        if (!empty($oembed_data->provider_url)) {
-                                               $siteinfo['publisher_url'] = trim($oembed_data->provider_url);
+                                               $siteinfo['publisher_url'] = Network::sanitizeUrl($oembed_data->provider_url);
                                        }
                                        if (!empty($oembed_data->thumbnail_url)) {
                                                $siteinfo['image'] = $oembed_data->thumbnail_url;
@@ -884,7 +884,7 @@ class ParseUrl
 
                        $content = JsonLD::fetchElement($jsonld, 'publisher', 'url');
                        if (!empty($content) && is_string($content)) {
-                               $jsonldinfo['publisher_url'] = trim($content);
+                               $jsonldinfo['publisher_url'] = Network::sanitizeUrl($content);
                        }
 
                        $brand = JsonLD::fetchElement($jsonld, 'publisher', 'brand', '@type', 'Organization');
@@ -896,7 +896,7 @@ class ParseUrl
 
                                $content = JsonLD::fetchElement($brand, 'url');
                                if (!empty($content) && is_string($content)) {
-                                       $jsonldinfo['publisher_url'] = trim($content);
+                                       $jsonldinfo['publisher_url'] = Network::sanitizeUrl($content);
                                }
 
                                $content = JsonLD::fetchElement($brand, 'logo', 'url');
@@ -924,12 +924,12 @@ class ParseUrl
 
                        $content = JsonLD::fetchElement($jsonld, 'author', 'sameAs');
                        if (!empty($content) && is_string($content)) {
-                               $jsonldinfo['author_url'] = trim($content);
+                               $jsonldinfo['author_url'] = Network::sanitizeUrl($content);
                        }
 
                        $content = JsonLD::fetchElement($jsonld, 'author', 'url');
                        if (!empty($content) && is_string($content)) {
-                               $jsonldinfo['author_url'] = trim($content);
+                               $jsonldinfo['author_url'] = Network::sanitizeUrl($content);
                        }
 
                        $logo = JsonLD::fetchElement($jsonld, 'author', 'logo');
@@ -1084,7 +1084,7 @@ class ParseUrl
 
                $content = JsonLD::fetchElement($jsonld, 'url');
                if (!empty($content) && is_string($content)) {
-                       $jsonldinfo['publisher_url'] = trim($content);
+                       $jsonldinfo['publisher_url'] = Network::sanitizeUrl($content);
                }
 
                $content = JsonLD::fetchElement($jsonld, 'thumbnailUrl');
@@ -1123,7 +1123,7 @@ class ParseUrl
 
                $content = JsonLD::fetchElement($jsonld, 'url');
                if (!empty($content) && is_string($content)) {
-                       $jsonldinfo['publisher_url'] = trim($content);
+                       $jsonldinfo['publisher_url'] = Network::sanitizeUrl($content);
                }
 
                $content = JsonLD::fetchElement($jsonld, 'logo', 'url', '@type', 'ImageObject');
@@ -1140,7 +1140,7 @@ class ParseUrl
 
                $content = JsonLD::fetchElement($jsonld, 'brand', 'url', '@type', 'Organization');
                if (!empty($content) && is_string($content)) {
-                       $jsonldinfo['publisher_url'] = trim($content);
+                       $jsonldinfo['publisher_url'] = Network::sanitizeUrl($content);
                }
 
                Logger::info('Fetched Organization information', ['url' => $siteinfo['url'], 'fetched' => $jsonldinfo]);
@@ -1172,12 +1172,12 @@ class ParseUrl
 
                $content = JsonLD::fetchElement($jsonld, 'sameAs');
                if (!empty($content) && is_string($content)) {
-                       $jsonldinfo['author_url'] = trim($content);
+                       $jsonldinfo['author_url'] = Network::sanitizeUrl($content);
                }
 
                $content = JsonLD::fetchElement($jsonld, 'url');
                if (!empty($content) && is_string($content)) {
-                       $jsonldinfo['author_url'] = trim($content);
+                       $jsonldinfo['author_url'] = Network::sanitizeUrl($content);
                }
 
                $content = JsonLD::fetchElement($jsonld, 'image', 'url', '@type', 'ImageObject');