Added better url validation

Author: gdarko

loadnoncomposer.php

@@ -18,6 +18,8 @@
  * along with MegaOptim Image Optimizer. If not, see <https://www.gnu.org/licenses/>.
  **********************************************************************/
 
+require_once('src/Tools/PATH.php');
+require_once('src/Tools/URL.php');
 require_once('src/Interfaces/IFile.php');
 require_once('src/Tools/FileSystem.php');
 require_once('src/Http/HTTP.php');

src/Optimizer.php

@@ -24,6 +24,8 @@
 use MegaOptim\Responses\Response;
 use MegaOptim\Services\OptimizerService;
 use MegaOptim\Tools\FileSystem;
+use MegaOptim\Tools\PATH;
+use MegaOptim\Tools\URL;
 
 class Optimizer {
 
@@ -163,11 +165,11 @@ public function run( $resource, $args = array(), $local_wait = false ) {
 
 	/**
 	 * Returns the results of the process
-	 *
 	 * @param $process_id
-	 * @param $max_wait_seconds
+	 * @param int $max_wait_seconds
 	 *
 	 * @return Response
+	 * @throws \Exception
 	 */
 	public function get_result( $process_id, $max_wait_seconds = 5 ) {
 		$result = $this->service->get_result( $process_id, $max_wait_seconds );
@@ -201,38 +203,7 @@ public static function validate( $resource, $args ) {
 	 * @return bool
 	 */
 	public static function is_url( $resource ) {
-		return ! ! filter_var( $resource, FILTER_VALIDATE_URL );
-	}
-
-	/**
-	 * Check if the given path is support image type (jpg,png,gif,svg)
-	 *
-	 * @param string $path - The local temporary path
-	 *
-	 * @return bool
-	 */
-	public static function is_supported( $path ) {
-		return array_key_exists( pathinfo( $path, PATHINFO_EXTENSION ), self::accepted_types() );
-	}
-
-	/**
-	 * Return the accepted file types
-	 * @return array
-	 */
-	public static function accepted_types() {
-		return array(
-			'png'  => 'image/png',
-			'jpe'  => 'image/jpeg',
-			'jpeg' => 'image/jpeg',
-			'jpg'  => 'image/jpeg',
-			'gif'  => 'image/gif',
-			//'bmp' => 'image/bmp',
-			//'ico' => 'image/vnd.microsoft.icon',
-			//'tiff' => 'image/tiff',
-			//'tif' => 'image/tiff',
-			//'svg'  => 'image/svg+xml',
-			//'svgz' => 'image/svg+xml',
-		);
+		return URL::validate($resource);
 	}
 
 	/**

src/Tools/FileSystem.php

@@ -37,7 +37,7 @@ public static function scan_dir( $dir ) {
 		if ( ! is_dir( $dir ) ) {
 			return $resources;
 		} else {
-			foreach ( Optimizer::accepted_types() as $extension => $mime_type ) {
+			foreach ( PATH::accepted_types() as $extension => $mime_type ) {
 				$paths = glob( $dir . DIRECTORY_SEPARATOR . '*.' . $extension );
 				if ( is_array( $paths ) ) {
 					$resources = array_merge( $resources, $paths );

src/Tools/PATH.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace MegaOptim\Tools;
+
+class PATH {
+	/**
+	 * Check if the given path is support image type (jpg,png,gif,svg)
+	 *
+	 * @param string $path - The local temporary path
+	 *
+	 * @return bool
+	 */
+	public static function is_supported( $path ) {
+		return array_key_exists( pathinfo( $path, PATHINFO_EXTENSION ), self::accepted_types() );
+	}
+	/**
+	 * Return the accepted file types
+	 * @return array
+	 */
+	public static function accepted_types() {
+		return array(
+			'png'  => 'image/png',
+			'jpe'  => 'image/jpeg',
+			'jpeg' => 'image/jpeg',
+			'jpg'  => 'image/jpeg',
+			'gif'  => 'image/gif',
+			//'bmp' => 'image/bmp',
+			//'ico' => 'image/vnd.microsoft.icon',
+			//'tiff' => 'image/tiff',
+			//'tif' => 'image/tiff',
+			//'svg'  => 'image/svg+xml',
+			//'svgz' => 'image/svg+xml',
+		);
+	}
+}

src/Tools/URL.php

@@ -0,0 +1,16 @@
+<?php
+namespace MegaOptim\Tools;
+
+class URL {
+	/**
+	 * Validates url
+	 * @param $resource
+	 *
+	 * @return bool
+	 */
+	public static function validate($resource) {
+		$pattern = "#(?i)\b((?:[a-z][\w-]+:(?:/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}/)(?:[^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:'\".,<>?«»“”‘’]))#iS";
+		preg_match( $pattern, $resource, $matches );
+		return !empty($matches);
+	}
+}