upstream/opnsense-plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2026-05-28 04:34:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3398 from jkellerer/fix-sftp-relaxed-ls-regex

Browse source 
security/acme-client: Use a more general ls parser in SFTP upload
This commit is contained in:
Frank Wall 2023-05-02 11:00:39 +02:00 committed by GitHub
commit 9ca8537e42
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/SftpClient.php
View file

@ -199,17 +199,28 @@ class SftpClient
$this->processAvailableInput();
$this->process->put("ls -la");
$regex = '/^([bcdlsp\-][rwx\-]{9}[+@]?)\s+[0-9]+\s+([^\s]+)\s+([^\s]+)\s+([0-9]+)\s+(\w+\s+[0-9]+\s+[0-9:]+)\s+(.+)$/';
$regex = '/^'
. '(?P<type>[?bcCdDlMnpPs\-])'
. '(?P<permissions>([rw\-]{2}[sStTx\-]){3})'
. '(?P<acl>[^\s])?' . '\s+'
. '(?P<links>[^\s]+)' . '\s+'
. '(?P<owner>[^\s]+)' . '\s+'
. '(?P<group>[^\s]+)' . '\s+'
. '(?P<size>[^\s]+)' . '\s+'
. '(?P<mtime>\w+\s+[0-9]+\s+[0-9:]+)' . '\s+'
. '(?P<filename>.+)' . '\s*'
. '$/';
$this->processAvailableInput(self::COMMAND_REPLY_TIMEOUT, 2, function ($line) use (&$files, $regex) {
if (preg_match($regex, $line, $matches)) {
$filename = trim(stripcslashes($matches[6])); // decodes octal UTF-8 sequences
$filename = trim(stripcslashes($matches["filename"])); // decodes octal UTF-8 sequences
$files[$filename] = [
"type" => $matches[1][0],
"permissions" => $matches[1],
"owner" => $matches[2],
"group" => $matches[3],
"size" => intval($matches[4]),
"mtime" => strtotime($matches[5])
"type" => $matches["type"],
"permissions" => $matches["permissions"],
"owner" => stripcslashes($matches["owner"]),
"group" => stripcslashes($matches["group"]),
"size" => intval($matches["size"]),
"mtime" => strtotime($matches["mtime"])
];
return true;
}