},
"require": {
"icewind/streams": "0.7.1",
- "icewind/smb": "3.1.1"
+ "icewind/smb": "3.2.1"
}
}
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "5639a09feff2318b1b69e11a10a81e7d",
+ "content-hash": "adc3b3531ee8503b485092e60c569b42",
"packages": [
{
"name": "icewind/smb",
- "version": "v3.1.1",
+ "version": "v3.2.1",
"source": {
"type": "git",
"url": "https://github.com/icewind1991/SMB.git",
- "reference": "26b7b8780342d0e61313b464b880d50a2ea898e2"
+ "reference": "5330edcc579a2dcc4759b8e5779eb5aa3385a878"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/icewind1991/SMB/zipball/26b7b8780342d0e61313b464b880d50a2ea898e2",
- "reference": "26b7b8780342d0e61313b464b880d50a2ea898e2",
+ "url": "https://api.github.com/repos/icewind1991/SMB/zipball/5330edcc579a2dcc4759b8e5779eb5aa3385a878",
+ "reference": "5330edcc579a2dcc4759b8e5779eb5aa3385a878",
"shasum": ""
},
"require": {
"icewind/streams": ">=0.2.0",
- "php": ">=5.6"
+ "php": ">=7.1"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.13",
- "phpunit/phpunit": "^5.7"
+ "phpunit/phpunit": "^7.0"
},
"type": "library",
"autoload": {
}
],
"description": "php wrapper for smbclient and libsmbclient-php",
- "time": "2019-03-04T15:02:42+00:00"
+ "time": "2020-03-24T18:19:18+00:00"
},
{
"name": "icewind/streams",
"prefer-stable": false,
"prefer-lowest": false,
"platform": [],
- "platform-dev": []
+ "platform-dev": [],
+ "plugin-api-version": "1.1.0"
}
$baseDir = $vendorDir;
return array(
+ 'Icewind\\SMB\\ACL' => $vendorDir . '/icewind/smb/src/ACL.php',
'Icewind\\SMB\\AbstractServer' => $vendorDir . '/icewind/smb/src/AbstractServer.php',
'Icewind\\SMB\\AbstractShare' => $vendorDir . '/icewind/smb/src/AbstractShare.php',
'Icewind\\SMB\\AnonymousAuth' => $vendorDir . '/icewind/smb/src/AnonymousAuth.php',
}
}
+ /**
+ * @return \Composer\Autoload\ClassLoader
+ */
public static function getLoader()
{
if (null !== self::$loader) {
);
public static $classMap = array (
+ 'Icewind\\SMB\\ACL' => __DIR__ . '/..' . '/icewind/smb/src/ACL.php',
'Icewind\\SMB\\AbstractServer' => __DIR__ . '/..' . '/icewind/smb/src/AbstractServer.php',
'Icewind\\SMB\\AbstractShare' => __DIR__ . '/..' . '/icewind/smb/src/AbstractShare.php',
'Icewind\\SMB\\AnonymousAuth' => __DIR__ . '/..' . '/icewind/smb/src/AnonymousAuth.php',
[
{
"name": "icewind/smb",
- "version": "v3.1.1",
- "version_normalized": "3.1.1.0",
+ "version": "v3.2.1",
+ "version_normalized": "3.2.1.0",
"source": {
"type": "git",
"url": "https://github.com/icewind1991/SMB.git",
- "reference": "26b7b8780342d0e61313b464b880d50a2ea898e2"
+ "reference": "5330edcc579a2dcc4759b8e5779eb5aa3385a878"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/icewind1991/SMB/zipball/26b7b8780342d0e61313b464b880d50a2ea898e2",
- "reference": "26b7b8780342d0e61313b464b880d50a2ea898e2",
+ "url": "https://api.github.com/repos/icewind1991/SMB/zipball/5330edcc579a2dcc4759b8e5779eb5aa3385a878",
+ "reference": "5330edcc579a2dcc4759b8e5779eb5aa3385a878",
"shasum": ""
},
"require": {
"icewind/streams": ">=0.2.0",
- "php": ">=5.6"
+ "php": ">=7.1"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.13",
- "phpunit/phpunit": "^5.7"
+ "phpunit/phpunit": "^7.0"
},
- "time": "2019-03-04T15:02:42+00:00",
+ "time": "2020-03-24T18:19:18+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
vendor
composer.lock
.php_cs.cache
-
+listen.php
+test.php
require('vendor/autoload.php');
$serverFactory = new ServerFactory();
-$auth = new BasicAuth('test', 'workgroup', 'test');
+$auth = new BasicAuth('user', 'workgroup', 'password');
$server = $serverFactory->createServer('localhost', $auth);
$share = $server->getShare('test');
}
],
"require" : {
- "php": ">=5.6",
+ "php": ">=7.1",
"icewind/streams": ">=0.2.0"
},
"require-dev": {
- "phpunit/phpunit": "^5.7",
+ "phpunit/phpunit": "^7.0",
"friendsofphp/php-cs-fixer": "^2.13"
},
"autoload" : {
--- /dev/null
+<?php declare(strict_types=1);
+/**
+ * @copyright Copyright (c) 2020 Robin Appelman <robin@icewind.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Icewind\SMB;
+
+class ACL {
+ const TYPE_ALLOW = 0;
+ const TYPE_DENY = 1;
+
+ const MASK_READ = 0x0001;
+ const MASK_WRITE = 0x0002;
+ const MASK_EXECUTE = 0x00020;
+ const MASK_DELETE = 0x10000;
+
+ const FLAG_OBJECT_INHERIT = 0x1;
+ const FLAG_CONTAINER_INHERIT = 0x2;
+
+ private $type;
+ private $flags;
+ private $mask;
+
+ public function __construct(int $type, int $flags, int $mask) {
+ $this->type = $type;
+ $this->flags = $flags;
+ $this->mask = $mask;
+ }
+
+ /**
+ * Check if the acl allows a specific permissions
+ *
+ * Note that this does not take inherited acls into account
+ *
+ * @param int $mask one of the ACL::MASK_* constants
+ * @return bool
+ */
+ public function allows(int $mask): bool {
+ return $this->type === self::TYPE_ALLOW && ($this->mask & $mask) === $mask;
+ }
+
+ /**
+ * Check if the acl allows a specific permissions
+ *
+ * Note that this does not take inherited acls into account
+ *
+ * @param int $mask one of the ACL::MASK_* constants
+ * @return bool
+ */
+ public function denies(int $mask): bool {
+ return $this->type === self::TYPE_DENY && ($this->mask & $mask) === $mask;
+ }
+
+ public function getType(): int {
+ return $this->type;
+ }
+
+ public function getFlags(): int {
+ return $this->flags;
+ }
+
+ public function getMask(): int {
+ return $this->mask;
+ }
+}
* @return bool
*/
public function isArchived();
+
+ /**
+ * @return ACL[]
+ */
+ public function getAcls(): array;
}
*/
public function getNetPath();
+ /**
+ * Get the full path to the `smbcacls` binary of false if the binary is not available
+ *
+ * @return string|bool
+ */
+ public function getSmbcAclsPath();
+
/**
* Get the full path to the `stdbuf` binary of false if the binary is not available
*
namespace Icewind\SMB\Native;
+use Icewind\SMB\ACL;
use Icewind\SMB\IFileInfo;
class NativeFileInfo implements IFileInfo {
- const MODE_FILE = 0100000;
-
/**
* @var string
*/
/**
* @var array|null
*/
- protected $statCache = null;
-
- /** @var callable|null */
- protected $statCallback = null;
+ protected $attributeCache = null;
/**
* @var int
* @param NativeShare $share
* @param string $path
* @param string $name
- * @param array|callable $stat
*/
- public function __construct($share, $path, $name, $stat) {
+ public function __construct($share, $path, $name) {
$this->share = $share;
$this->path = $path;
$this->name = $name;
-
- if (is_array($stat)) {
- $this->statCache = $stat;
- } elseif (is_callable($stat)) {
- $this->statCallback = $stat;
- } else {
- throw new \InvalidArgumentException('$stat needs to be an array or callback');
- }
}
/**
* @return array
*/
protected function stat() {
- if (is_null($this->statCache)) {
- $this->statCache = call_user_func($this->statCallback);
+ if (is_null($this->attributeCache)) {
+ $rawAttributes = explode(',', $this->share->getAttribute($this->path, 'system.dos_attr.*'));
+ $this->attributeCache = [];
+ foreach ($rawAttributes as $rawAttribute) {
+ [$name, $value] = explode(':', $rawAttribute);
+ $name = strtolower($name);
+ if ($name == 'mode') {
+ $this->attributeCache[$name] = (int)hexdec(substr($value, 2));
+ } else {
+ $this->attributeCache[$name] = (int)$value;
+ }
+ }
}
- return $this->statCache;
+ return $this->attributeCache;
}
/**
*/
public function getMTime() {
$stat = $this->stat();
- return $stat['mtime'];
+ return $stat['change_time'];
}
/**
- * @return bool
+ * @return int
*/
- public function isDirectory() {
- $stat = $this->stat();
- return !($stat['mode'] & self::MODE_FILE);
+ protected function getMode() {
+ return $this->stat()['mode'];
}
/**
- * @return int
+ * @return bool
*/
- protected function getMode() {
- if (!$this->modeCache) {
- $attribute = $this->share->getAttribute($this->path, 'system.dos_attr.mode');
- // parse hex string
- $this->modeCache = (int)hexdec(substr($attribute, 2));
- }
- return $this->modeCache;
+ public function isDirectory() {
+ $mode = $this->getMode();
+ return (bool)($mode & IFileInfo::MODE_DIRECTORY);
}
/**
$mode = $this->getMode();
return (bool)($mode & IFileInfo::MODE_ARCHIVE);
}
+
+ /**
+ * @return ACL[]
+ */
+ public function getAcls(): array {
+ $acls = [];
+ $attribute = $this->share->getAttribute($this->path, 'system.nt_sec_desc.acl.*+');
+
+ foreach (explode(',', $attribute) as $acl) {
+ [$user, $permissions] = explode(':', $acl, 2);
+ [$type, $flags, $mask] = explode('/', $permissions);
+ $mask = hexdec($mask);
+
+ $acls[$user] = new ACL($type, $flags, $mask);
+ }
+
+ return $acls;
+ }
}
$name = $file['name'];
if ($name !== '.' and $name !== '..') {
$fullPath = $path . '/' . $name;
- $files [] = new NativeFileInfo($this, $fullPath, $name, function () use ($fullPath) {
- return $this->getStat($fullPath);
- });
+ $files [] = new NativeFileInfo($this, $fullPath, $name);
}
}
* @return \Icewind\SMB\IFileInfo
*/
public function stat($path) {
- return new NativeFileInfo($this, $path, self::mb_basename($path), $this->getStat($path));
+ $info = new NativeFileInfo($this, $path, self::mb_basename($path));
+
+ // trigger attribute loading
+ $info->getSize();
+
+ return $info;
}
/**
return '';
}
- private function getStat($path) {
- return $this->getState()->stat($this->buildUrl($path));
- }
-
/**
* Create a folder on the share
*
if (!$target) {
throw new InvalidPathException('Invalid target path: Filename cannot be empty');
}
+
+ $sourceHandle = $this->getState()->open($this->buildUrl($source), 'r');
+ if (!$sourceHandle) {
+ throw new InvalidResourceException('Failed opening remote file "' . $source . '" for reading');
+ }
+
$targetHandle = @fopen($target, 'wb');
if (!$targetHandle) {
$error = error_get_last();
} else {
$reason = 'Unknown error';
}
+ $this->getState()->close($sourceHandle);
throw new InvalidResourceException('Failed opening local file "' . $target . '" for writing: ' . $reason);
}
- $sourceHandle = $this->getState()->open($this->buildUrl($source), 'r');
- if (!$sourceHandle) {
- fclose($targetHandle);
- throw new InvalidResourceException('Failed opening remote file "' . $source . '" for reading');
- }
-
while ($data = $this->getState()->read($sourceHandle, NativeReadStream::CHUNK_SIZE)) {
fwrite($targetHandle, $data);
}
*/
public function append($source) {
$url = $this->buildUrl($source);
- $handle = $this->getState()->open($url, "a");
+ $handle = $this->getState()->open($url, "a+");
return NativeWriteStream::wrap($this->getState(), $handle, "a", $url);
}
use Icewind\SMB\Exception\AlreadyExistsException;
use Icewind\SMB\Exception\ConnectionRefusedException;
+use Icewind\SMB\Exception\ConnectionResetException;
use Icewind\SMB\Exception\Exception;
use Icewind\SMB\Exception\FileInUseException;
use Icewind\SMB\Exception\ForbiddenException;
22 => InvalidArgumentException::class,
28 => OutOfSpaceException::class,
39 => NotEmptyException::class,
+ 104 => ConnectionResetException::class,
110 => TimedOutException::class,
111 => ConnectionRefusedException::class,
112 => HostDownException::class,
return $this->getBinaryPath('net');
}
+ public function getSmbcAclsPath() {
+ return $this->getBinaryPath('smbcacls');
+ }
+
public function getStdBufPath() {
return $this->getBinaryPath('stdbuf');
}
}
public function close($terminate = true) {
- if (is_resource($this->getInputStream())) {
- $this->write('close' . PHP_EOL);
+ if (get_resource_type($this->getInputStream()) === 'stream') {
+ // ignore any errors while trying to send the close command, the process might already be dead
+ @$this->write('close' . PHP_EOL);
}
parent::close($terminate);
}
namespace Icewind\SMB\Wrapped;
+use Icewind\SMB\ACL;
use Icewind\SMB\IFileInfo;
class FileInfo implements IFileInfo {
*/
protected $mode;
+ /**
+ * @var callable
+ */
+ protected $aclCallback;
+
/**
* @param string $path
* @param string $name
* @param int $size
* @param int $time
* @param int $mode
+ * @param callable $aclCallback
*/
- public function __construct($path, $name, $size, $time, $mode) {
+ public function __construct($path, $name, $size, $time, $mode, callable $aclCallback) {
$this->path = $path;
$this->name = $name;
$this->size = $size;
$this->time = $time;
$this->mode = $mode;
+ $this->aclCallback = $aclCallback;
}
/**
public function isArchived() {
return (bool)($this->mode & IFileInfo::MODE_ARCHIVE);
}
+
+ /**
+ * @return ACL[]
+ */
+ public function getAcls(): array {
+ return ($this->aclCallback)();
+ }
}
*/
private $host;
- // todo replace with static once <5.6 support is dropped
// see error.h
const EXCEPTION_MAP = [
ErrorCodes::LogonFailure => AuthenticationException::class,
}
return [
'mtime' => strtotime($data['write_time']),
- 'mode' => hexdec(substr($data['attributes'], strpos($data['attributes'], '('), -1)),
+ 'mode' => hexdec(substr($data['attributes'], strpos($data['attributes'], '(') + 1, -1)),
'size' => isset($data['stream']) ? (int)(explode(' ', $data['stream'])[1]) : 0
];
}
- public function parseDir($output, $basePath) {
+ public function parseDir($output, $basePath, callable $aclCallback) {
//last line is used space
array_pop($output);
$regex = '/^\s*(.*?)\s\s\s\s+(?:([NDHARS]*)\s+)?([0-9]+)\s+(.*)$/';
if ($name !== '.' and $name !== '..') {
$mode = $this->parseMode($mode);
$time = strtotime($time . ' ' . $this->timeZone);
- $content[] = new FileInfo($basePath . '/' . $name, $name, $size, $time, $mode);
+ $path = $basePath . '/' . $name;
+ $content[] = new FileInfo($path, $name, $size, $time, $mode, function () use ($aclCallback, $path) {
+ return $aclCallback($path);
+ });
}
}
}
return;
}
if ($terminate) {
- // if for case that posix_ functions are not available
- if (function_exists('posix_kill')) {
- $status = proc_get_status($this->process);
- $ppid = $status['pid'];
- $pids = preg_split('/\s+/', `ps -o pid --no-heading --ppid $ppid`);
- foreach ($pids as $pid) {
- if (is_numeric($pid)) {
- //9 is the SIGKILL signal
- posix_kill($pid, 9);
- }
- }
- }
proc_terminate($this->process);
}
proc_close($this->process);
namespace Icewind\SMB\Wrapped;
use Icewind\SMB\AbstractShare;
+use Icewind\SMB\ACL;
use Icewind\SMB\Exception\ConnectionException;
use Icewind\SMB\Exception\DependencyException;
use Icewind\SMB\Exception\FileInUseException;
FileInfo::MODE_SYSTEM => 's'
];
+ const EXEC_CMD = 'exec';
+
/**
* @param IServer $server
* @param string $name
protected function getConnection() {
$command = sprintf(
- '%s%s -t %s %s %s %s',
+ '%s %s%s -t %s %s %s %s',
+ self::EXEC_CMD,
$this->system->getStdBufPath() ? $this->system->getStdBufPath() . ' -o0 ' : '',
$this->system->getSmbclientPath(),
$this->server->getOptions()->getTimeout(),
$this->execute('cd /');
- return $this->parser->parseDir($output, $path);
+ return $this->parser->parseDir($output, $path, function ($path) {
+ return $this->getAcls($path);
+ });
}
/**
$this->parseOutput($output, $path);
}
$stat = $this->parser->parseStat($output);
- return new FileInfo($path, basename($path), $stat['size'], $stat['mtime'], $stat['mode']);
+ return new FileInfo($path, basename($path), $stat['size'], $stat['mtime'], $stat['mode'], function () use ($path) {
+ return $this->getAcls($path);
+ });
}
/**
* @param string[] $lines
* @param string $path
*
- * @throws NotFoundException
+ * @return bool
* @throws \Icewind\SMB\Exception\AlreadyExistsException
* @throws \Icewind\SMB\Exception\AccessDeniedException
* @throws \Icewind\SMB\Exception\NotEmptyException
* @throws \Icewind\SMB\Exception\InvalidTypeException
* @throws \Icewind\SMB\Exception\Exception
- * @return bool
+ * @throws NotFoundException
*/
protected function parseOutput($lines, $path = '') {
if (count($lines) === 0) {
return '"' . $path . '"';
}
+ protected function getAcls($path) {
+ $commandPath = $this->system->getSmbcAclsPath();
+ if (!$commandPath) {
+ return [];
+ }
+
+ $command = sprintf(
+ '%s %s %s %s/%s %s',
+ $commandPath,
+ $this->getAuthFileArgument(),
+ $this->server->getAuth()->getExtraCommandLineArguments(),
+ escapeshellarg('//' . $this->server->getHost()),
+ escapeshellarg($this->name),
+ escapeshellarg($path)
+ );
+ $connection = new RawConnection($command);
+ $connection->writeAuthentication($this->server->getAuth()->getUsername(), $this->server->getAuth()->getPassword());
+ $connection->connect();
+ if (!$connection->isValid()) {
+ throw new ConnectionException($connection->readLine());
+ }
+
+ $rawAcls = $connection->readAll();
+
+ $acls = [];
+ foreach ($rawAcls as $acl) {
+ [$type, $acl] = explode(':', $acl, 2);
+ if ($type !== 'ACL') {
+ continue;
+ }
+ [$user, $permissions] = explode(':', $acl, 2);
+ [$type, $flags, $mask] = explode('/', $permissions);
+
+ $type = $type === 'ALLOWED' ? ACL::TYPE_ALLOW : ACL::TYPE_DENY;
+
+ $flagsInt = 0;
+ foreach (explode('|', $flags) as $flagString) {
+ if ($flagString === 'OI') {
+ $flagsInt += ACL::FLAG_OBJECT_INHERIT;
+ } elseif ($flagString === 'CI') {
+ $flagsInt += ACL::FLAG_CONTAINER_INHERIT;
+ }
+ }
+
+ if (substr($mask, 0, 2) === '0x') {
+ $maskInt = hexdec($mask);
+ } else {
+ $maskInt = 0;
+ foreach (explode('|', $mask) as $maskString) {
+ if ($maskString === 'R') {
+ $maskInt += ACL::MASK_READ;
+ } elseif ($maskString === 'W') {
+ $maskInt += ACL::MASK_WRITE;
+ } elseif ($maskString === 'X') {
+ $maskInt += ACL::MASK_EXECUTE;
+ } elseif ($maskString === 'D') {
+ $maskInt += ACL::MASK_DELETE;
+ } elseif ($maskString === 'READ') {
+ $maskInt += ACL::MASK_READ + ACL::MASK_EXECUTE;
+ } elseif ($maskString === 'CHANGE') {
+ $maskInt += ACL::MASK_READ + ACL::MASK_EXECUTE + ACL::MASK_WRITE + ACL::MASK_DELETE;
+ } elseif ($maskString === 'FULL') {
+ $maskInt += ACL::MASK_READ + ACL::MASK_EXECUTE + ACL::MASK_WRITE + ACL::MASK_DELETE;
+ }
+ }
+ }
+
+ if (isset($acls[$user])) {
+ $existing = $acls[$user];
+ $maskInt += $existing->getMask();
+ }
+ $acls[$user] = new ACL($type, $flagsInt, $maskInt);
+ }
+
+ return $acls;
+ }
+
public function __destruct() {
unset($this->connection);
}
projects / nextcloud-server.git / commitdiff