update icewind/smb to 3.2.4
Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
parent
703d716a32
commit
42019c0f4f
|
@ -9,6 +9,6 @@
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"icewind/streams": "0.7.1",
|
"icewind/streams": "0.7.1",
|
||||||
"icewind/smb": "3.2.3"
|
"icewind/smb": "3.2.4"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,20 +4,20 @@
|
||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"content-hash": "ef0d9929f5f25696e010d5733eb51fbb",
|
"content-hash": "9454f546b6ab8865140c991e8f197951",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "icewind/smb",
|
"name": "icewind/smb",
|
||||||
"version": "v3.2.3",
|
"version": "v3.2.4",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/icewind1991/SMB.git",
|
"url": "https://github.com/icewind1991/SMB.git",
|
||||||
"reference": "db50bb51bd0a0e55506e82cf439a9ecd232f64d4"
|
"reference": "999d6687ca9d4ac2600185c935b45206e47e604a"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/icewind1991/SMB/zipball/db50bb51bd0a0e55506e82cf439a9ecd232f64d4",
|
"url": "https://api.github.com/repos/icewind1991/SMB/zipball/999d6687ca9d4ac2600185c935b45206e47e604a",
|
||||||
"reference": "db50bb51bd0a0e55506e82cf439a9ecd232f64d4",
|
"reference": "999d6687ca9d4ac2600185c935b45206e47e604a",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -46,7 +46,7 @@
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"description": "php wrapper for smbclient and libsmbclient-php",
|
"description": "php wrapper for smbclient and libsmbclient-php",
|
||||||
"time": "2020-04-08T15:20:22+00:00"
|
"time": "2020-05-11T14:12:35+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "icewind/streams",
|
"name": "icewind/streams",
|
||||||
|
|
|
@ -1,17 +1,17 @@
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
"name": "icewind/smb",
|
"name": "icewind/smb",
|
||||||
"version": "v3.2.3",
|
"version": "v3.2.4",
|
||||||
"version_normalized": "3.2.3.0",
|
"version_normalized": "3.2.4.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/icewind1991/SMB.git",
|
"url": "https://github.com/icewind1991/SMB.git",
|
||||||
"reference": "db50bb51bd0a0e55506e82cf439a9ecd232f64d4"
|
"reference": "999d6687ca9d4ac2600185c935b45206e47e604a"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/icewind1991/SMB/zipball/db50bb51bd0a0e55506e82cf439a9ecd232f64d4",
|
"url": "https://api.github.com/repos/icewind1991/SMB/zipball/999d6687ca9d4ac2600185c935b45206e47e604a",
|
||||||
"reference": "db50bb51bd0a0e55506e82cf439a9ecd232f64d4",
|
"reference": "999d6687ca9d4ac2600185c935b45206e47e604a",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -22,7 +22,7 @@
|
||||||
"friendsofphp/php-cs-fixer": "^2.13",
|
"friendsofphp/php-cs-fixer": "^2.13",
|
||||||
"phpunit/phpunit": "^7.0"
|
"phpunit/phpunit": "^7.0"
|
||||||
},
|
},
|
||||||
"time": "2020-04-08T15:20:22+00:00",
|
"time": "2020-05-11T14:12:35+00:00",
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"installation-source": "dist",
|
"installation-source": "dist",
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
|
|
@ -31,11 +31,6 @@ class NativeFileInfo implements IFileInfo {
|
||||||
*/
|
*/
|
||||||
protected $attributeCache = null;
|
protected $attributeCache = null;
|
||||||
|
|
||||||
/**
|
|
||||||
* @var int
|
|
||||||
*/
|
|
||||||
protected $modeCache;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param NativeShare $share
|
* @param NativeShare $share
|
||||||
* @param string $path
|
* @param string $path
|
||||||
|
@ -69,7 +64,7 @@ class NativeFileInfo implements IFileInfo {
|
||||||
$rawAttributes = explode(',', $this->share->getAttribute($this->path, 'system.dos_attr.*'));
|
$rawAttributes = explode(',', $this->share->getAttribute($this->path, 'system.dos_attr.*'));
|
||||||
$this->attributeCache = [];
|
$this->attributeCache = [];
|
||||||
foreach ($rawAttributes as $rawAttribute) {
|
foreach ($rawAttributes as $rawAttribute) {
|
||||||
[$name, $value] = explode(':', $rawAttribute);
|
list($name, $value) = explode(':', $rawAttribute);
|
||||||
$name = strtolower($name);
|
$name = strtolower($name);
|
||||||
if ($name == 'mode') {
|
if ($name == 'mode') {
|
||||||
$this->attributeCache[$name] = (int)hexdec(substr($value, 2));
|
$this->attributeCache[$name] = (int)hexdec(substr($value, 2));
|
||||||
|
@ -97,6 +92,18 @@ class NativeFileInfo implements IFileInfo {
|
||||||
return $stat['change_time'];
|
return $stat['change_time'];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* On "mode":
|
||||||
|
*
|
||||||
|
* different smbclient versions seem to return different mode values for 'system.dos_attr.mode'
|
||||||
|
*
|
||||||
|
* older versions return the dos permissions mask as defined in `IFileInfo::MODE_*` while
|
||||||
|
* newer versions return the equivalent unix permission mask.
|
||||||
|
*
|
||||||
|
* Since the unix mask doesn't contain the proper hidden/archive/system flags we have to assume them
|
||||||
|
* as false (except for `hidden` where we use the unix dotfile convention)
|
||||||
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return int
|
* @return int
|
||||||
*/
|
*/
|
||||||
|
@ -109,40 +116,60 @@ class NativeFileInfo implements IFileInfo {
|
||||||
*/
|
*/
|
||||||
public function isDirectory() {
|
public function isDirectory() {
|
||||||
$mode = $this->getMode();
|
$mode = $this->getMode();
|
||||||
|
if ($mode > 0x80) {
|
||||||
|
return (bool)($mode & 0x4000); // 0x80: unix directory flag
|
||||||
|
} else {
|
||||||
return (bool)($mode & IFileInfo::MODE_DIRECTORY);
|
return (bool)($mode & IFileInfo::MODE_DIRECTORY);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
public function isReadOnly() {
|
public function isReadOnly() {
|
||||||
$mode = $this->getMode();
|
$mode = $this->getMode();
|
||||||
|
if ($mode > 0x80) {
|
||||||
|
return !(bool)($mode & 0x80); // 0x80: owner write permissions
|
||||||
|
} else {
|
||||||
return (bool)($mode & IFileInfo::MODE_READONLY);
|
return (bool)($mode & IFileInfo::MODE_READONLY);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
public function isHidden() {
|
public function isHidden() {
|
||||||
$mode = $this->getMode();
|
$mode = $this->getMode();
|
||||||
|
if ($mode > 0x80) {
|
||||||
|
return $this->name[0] === '.';
|
||||||
|
} else {
|
||||||
return (bool)($mode & IFileInfo::MODE_HIDDEN);
|
return (bool)($mode & IFileInfo::MODE_HIDDEN);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
public function isSystem() {
|
public function isSystem() {
|
||||||
$mode = $this->getMode();
|
$mode = $this->getMode();
|
||||||
|
if ($mode > 0x80) {
|
||||||
|
return false;
|
||||||
|
} else {
|
||||||
return (bool)($mode & IFileInfo::MODE_SYSTEM);
|
return (bool)($mode & IFileInfo::MODE_SYSTEM);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
public function isArchived() {
|
public function isArchived() {
|
||||||
$mode = $this->getMode();
|
$mode = $this->getMode();
|
||||||
|
if ($mode > 0x80) {
|
||||||
|
return false;
|
||||||
|
} else {
|
||||||
return (bool)($mode & IFileInfo::MODE_ARCHIVE);
|
return (bool)($mode & IFileInfo::MODE_ARCHIVE);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return ACL[]
|
* @return ACL[]
|
||||||
|
@ -152,8 +179,8 @@ class NativeFileInfo implements IFileInfo {
|
||||||
$attribute = $this->share->getAttribute($this->path, 'system.nt_sec_desc.acl.*+');
|
$attribute = $this->share->getAttribute($this->path, 'system.nt_sec_desc.acl.*+');
|
||||||
|
|
||||||
foreach (explode(',', $attribute) as $acl) {
|
foreach (explode(',', $attribute) as $acl) {
|
||||||
[$user, $permissions] = explode(':', $acl, 2);
|
list($user, $permissions) = explode(':', $acl, 2);
|
||||||
[$type, $flags, $mask] = explode('/', $permissions);
|
list($type, $flags, $mask) = explode('/', $permissions);
|
||||||
$mask = hexdec($mask);
|
$mask = hexdec($mask);
|
||||||
|
|
||||||
$acls[$user] = new ACL($type, $flags, $mask);
|
$acls[$user] = new ACL($type, $flags, $mask);
|
||||||
|
|
Loading…
Reference in New Issue