Skip to content

Add a check for eof to avoid adding empty string to the socket data. #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add a check for eof to avoid adding empty string to the socket data. #27

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf0a9b5
Add a check for eof to avoid adding empty string to the socket data.
May 24, 2023
ef971c2
fix: Do not chunk file to avoid detection failures
vagiguere Jul 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 13 additions & 17 deletions src/ClamAV/ClamAV.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,28 +95,24 @@ public function shutdown(): ?string
*/
public function fileScanInStream(string $file): bool
{
$socket = $this->getSocket();

$handle = \fopen($file, 'rb');
$chunkSize = \filesize($file) < 8192 ? \filesize($file) : 8192;
$command = "zINSTREAM\0";
$file_handler = fopen($file, 'r');
$scanner_handler = socket_export_stream($this->getSocket());

\socket_send($socket, $command, \strlen($command), 0);
// Push to the ClamAV socket.
$bytes = filesize($file);
fwrite($scanner_handler, "zINSTREAM\0");
fwrite($scanner_handler, pack("N", $bytes));
stream_copy_to_stream($file_handler, $scanner_handler);

while (!\feof($handle)) {
$data = \fread($handle, $chunkSize);
$packet = \pack(\sprintf("Na%d", $chunkSize), $chunkSize, $data);
\socket_send($socket, $packet, $chunkSize + 4, 0);
}
// Send a zero-length block to indicate that we're done sending file data.
fwrite($scanner_handler, pack("N", 0));

\socket_send($socket, \pack("Nx", 0), 5, 0);
\socket_recv($socket, $out, 20000, 0);
\socket_close($socket);
// Request a response from the service.
$response = trim(fgets($scanner_handler));

$out = \explode(':', $out);
$stats = \end($out);
fclose($scanner_handler);

return \trim($stats) === 'OK';
return preg_match('/^stream: OK$/', $response);
}

/**
Expand Down