Fix phpGH-20679: finfo_file() doesn't work on remote resources

ndossche · ndossche · commit f3380b669b8e · 2025-12-13T14:21:08.000+01:00
WIP
diff --git a/ext/fileinfo/fileinfo.c b/ext/fileinfo/fileinfo.c
@@ -242,16 +242,8 @@ static const char* php_fileinfo_from_path(struct magic_set *magic, const zend_st
 	ZEND_ASSERT(!zend_str_has_nul_byte(path));
 	ZEND_ASSERT(context != NULL);
 
-	/* determine if the file is a local file or remote URL */
-	const char *dummy;
-	php_stream_statbuf ssb;
-
-	const php_stream_wrapper *wrap = php_stream_locate_url_wrapper(ZSTR_VAL(path), &dummy, 0);
-	if (UNEXPECTED(wrap == NULL)) {
-		return NULL;
-	}
-
 #ifdef PHP_WIN32
+	php_stream_statbuf ssb;
 	if (php_stream_stat_path_ex(ZSTR_VAL(path), 0, &ssb, context) == SUCCESS) {
 		if (ssb.sb.st_mode & S_IFDIR) {
 			return "directory";
@@ -264,16 +256,9 @@ static const char* php_fileinfo_from_path(struct magic_set *magic, const zend_st
 		return NULL;
 	}
 
-	const char *ret_val = NULL;
-	if (php_stream_stat(stream, &ssb) == SUCCESS) {
-		if (ssb.sb.st_mode & S_IFDIR) {
-			ret_val = "directory";
-		} else {
-			ret_val = magic_stream(magic, stream);
-			if (UNEXPECTED(ret_val == NULL)) {
-				php_error_docref(NULL, E_WARNING, "Failed identify data %d:%s", magic_errno(magic), magic_error(magic));
-			}
-		}
+	const char *ret_val = magic_stream(magic, stream);
+	if (UNEXPECTED(ret_val == NULL)) {
+		php_error_docref(NULL, E_WARNING, "Failed identify data %d:%s", magic_errno(magic), magic_error(magic));
 	}
 
 	php_stream_close(stream);
diff --git a/ext/fileinfo/libmagic/magic.c b/ext/fileinfo/libmagic/magic.c
@@ -195,7 +195,7 @@ magic_stream(struct magic_set *ms, php_stream *stream)
 file_private const char *
 file_or_stream(struct magic_set *ms, const char *inname, php_stream *stream)
 {
-	int	rv = -1;
+	const char *ret = NULL;
 	unsigned char *buf;
 	zend_stat_t   sb = {0};
 	ssize_t nbytes = 0;	/* number of bytes read from a datafile */
@@ -218,7 +218,7 @@ file_or_stream(struct magic_set *ms, const char *inname, php_stream *stream)
 	case 0:			/* nothing found */
 		break;
 	default:		/* matched it and printed type */
-		rv = 0;
+		ret = file_getbuffer(ms);
 		goto done;
 	}
 
@@ -230,7 +230,6 @@ file_or_stream(struct magic_set *ms, const char *inname, php_stream *stream)
 		if (!stream) {
 			if (unreadable_info(ms, sb.st_mode, inname) == -1)
 				goto done;
-			rv = -1;
 			goto done;
 		}
 	}
@@ -239,7 +238,6 @@ file_or_stream(struct magic_set *ms, const char *inname, php_stream *stream)
 	if (php_stream_stat(stream, &ssb) < 0) {
 		if (ms->flags & MAGIC_ERROR) {
 			file_error(ms, errno, "cannot stat `%s'", inname);
-			rv = -1;
 			goto done;
 		}
 	}
@@ -248,23 +246,34 @@ file_or_stream(struct magic_set *ms, const char *inname, php_stream *stream)
 	/*
 	 * try looking at the first ms->bytes_max bytes
 	 */
+	zend_begin_record_errors();
 	if ((nbytes = php_stream_read(stream, (char *)buf, ms->bytes_max - nbytes)) < 0) {
-		file_error(ms, errno, "cannot read `%s'", inname);
+		if (errno == EISDIR) {
+			EG(record_errors) = false;
+			ret = "directory";
+		} else {
+			zend_emit_recorded_errors();
+			file_error(ms, errno, "cannot read `%s'", inname);
+		}
+		zend_free_recorded_errors();
 		goto done;
 	}
+	zend_emit_recorded_errors();
+	zend_free_recorded_errors();
 
 	(void)memset(buf + nbytes, 0, SLOP); /* NUL terminate */
 	if (file_buffer(ms, stream, &sb, inname, buf, CAST(size_t, nbytes)) == -1)
 		goto done;
-	rv = 0;
+	ret = file_getbuffer(ms);
+
 done:
 	efree(buf);
 
 	if (no_in_stream && stream) {
 		php_stream_close(stream);
 	}
 out:
-	return rv == 0 ? file_getbuffer(ms) : NULL;
+	return ret;
 }
 
 
diff --git a/ext/fileinfo/tests/remote_resource.phpt b/ext/fileinfo/tests/remote_resource.phpt
@@ -0,0 +1,26 @@
+--TEST--
+GH-20679 (finfo_file() doesn't work on remote resources)
+--EXTENSIONS--
+fileinfo
+--INI--
+allow_url_fopen=1
+--SKIPIF--
+<?php
+if (@!include "./ext/standard/tests/http/server.inc") die('skip server.inc not available');
+http_server_skipif();
+?>
+--FILE--
+<?php
+require "./ext/standard/tests/http/server.inc";
+
+['pid' => $pid, 'uri' => $uri] = http_server([
+    "data://text/plain,HTTP/1.0 200 Ok\r\n\r\n<html>foo",
+], $output);
+
+$f = finfo_open();
+var_dump(finfo_file($f, $uri));
+
+http_server_kill($pid);
+?>
+--EXPECT--
+string(51) "HTML document, ASCII text, with no line terminators"
