Skip to content

Commit 085fae9

Browse files
icewind1991icewind1991
committed
update icewind/smb to 3.2.4
Signed-off-by: Robin Appelman <robin@icewind.nl>
1 parent 31ecdfb commit 085fae9

6 files changed

Lines changed: 53 additions & 46 deletions

File tree

‎apps/files_external/3rdparty/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
},
1010
"require": {
1111
"icewind/streams": "0.7.1",
12-
"icewind/smb": "^3.2.3"
12+
"icewind/smb": "^3.2.4"
1313
}
1414
}

‎apps/files_external/3rdparty/composer.lock‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apps/files_external/3rdparty/composer/autoload_classmap.php‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,6 @@
5858
'Icewind\\SMB\\Options' => $vendorDir . '/icewind/smb/src/Options.php',
5959
'Icewind\\SMB\\ServerFactory' => $vendorDir . '/icewind/smb/src/ServerFactory.php',
6060
'Icewind\\SMB\\System' => $vendorDir . '/icewind/smb/src/System.php',
61-
'Icewind\\SMB\\Test\\AbstractShareTest' => $vendorDir . '/icewind/smb/tests/AbstractShareTest.php',
62-
'Icewind\\SMB\\Test\\NativeShareTest' => $vendorDir . '/icewind/smb/tests/NativeShareTest.php',
63-
'Icewind\\SMB\\Test\\NativeStreamTest' => $vendorDir . '/icewind/smb/tests/NativeStreamTest.php',
64-
'Icewind\\SMB\\Test\\NotifyHandlerTest' => $vendorDir . '/icewind/smb/tests/NotifyHandlerTest.php',
65-
'Icewind\\SMB\\Test\\ParserTest' => $vendorDir . '/icewind/smb/tests/ParserTest.php',
66-
'Icewind\\SMB\\Test\\ServerFactoryTest' => $vendorDir . '/icewind/smb/tests/ServerFactoryTest.php',
67-
'Icewind\\SMB\\Test\\ServerTest' => $vendorDir . '/icewind/smb/tests/ServerTest.php',
68-
'Icewind\\SMB\\Test\\ShareTest' => $vendorDir . '/icewind/smb/tests/ShareTest.php',
69-
'Icewind\\SMB\\Test\\TestCase' => $vendorDir . '/icewind/smb/tests/TestCase.php',
70-
'Icewind\\SMB\\Test\\TimeZoneProviderTest' => $vendorDir . '/icewind/smb/tests/TimeZoneProviderTest.php',
7161
'Icewind\\SMB\\TimeZoneProvider' => $vendorDir . '/icewind/smb/src/TimeZoneProvider.php',
7262
'Icewind\\SMB\\Wrapped\\Connection' => $vendorDir . '/icewind/smb/src/Wrapped/Connection.php',
7363
'Icewind\\SMB\\Wrapped\\ErrorCodes' => $vendorDir . '/icewind/smb/src/Wrapped/ErrorCodes.php',

‎apps/files_external/3rdparty/composer/autoload_static.php‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -88,16 +88,6 @@ class ComposerStaticInit98fe9b281934250b3a93f69a5ce843b3
8888
'Icewind\\SMB\\Options' => __DIR__ . '/..' . '/icewind/smb/src/Options.php',
8989
'Icewind\\SMB\\ServerFactory' => __DIR__ . '/..' . '/icewind/smb/src/ServerFactory.php',
9090
'Icewind\\SMB\\System' => __DIR__ . '/..' . '/icewind/smb/src/System.php',
91-
'Icewind\\SMB\\Test\\AbstractShareTest' => __DIR__ . '/..' . '/icewind/smb/tests/AbstractShareTest.php',
92-
'Icewind\\SMB\\Test\\NativeShareTest' => __DIR__ . '/..' . '/icewind/smb/tests/NativeShareTest.php',
93-
'Icewind\\SMB\\Test\\NativeStreamTest' => __DIR__ . '/..' . '/icewind/smb/tests/NativeStreamTest.php',
94-
'Icewind\\SMB\\Test\\NotifyHandlerTest' => __DIR__ . '/..' . '/icewind/smb/tests/NotifyHandlerTest.php',
95-
'Icewind\\SMB\\Test\\ParserTest' => __DIR__ . '/..' . '/icewind/smb/tests/ParserTest.php',
96-
'Icewind\\SMB\\Test\\ServerFactoryTest' => __DIR__ . '/..' . '/icewind/smb/tests/ServerFactoryTest.php',
97-
'Icewind\\SMB\\Test\\ServerTest' => __DIR__ . '/..' . '/icewind/smb/tests/ServerTest.php',
98-
'Icewind\\SMB\\Test\\ShareTest' => __DIR__ . '/..' . '/icewind/smb/tests/ShareTest.php',
99-
'Icewind\\SMB\\Test\\TestCase' => __DIR__ . '/..' . '/icewind/smb/tests/TestCase.php',
100-
'Icewind\\SMB\\Test\\TimeZoneProviderTest' => __DIR__ . '/..' . '/icewind/smb/tests/TimeZoneProviderTest.php',
10191
'Icewind\\SMB\\TimeZoneProvider' => __DIR__ . '/..' . '/icewind/smb/src/TimeZoneProvider.php',
10292
'Icewind\\SMB\\Wrapped\\Connection' => __DIR__ . '/..' . '/icewind/smb/src/Wrapped/Connection.php',
10393
'Icewind\\SMB\\Wrapped\\ErrorCodes' => __DIR__ . '/..' . '/icewind/smb/src/Wrapped/ErrorCodes.php',

‎apps/files_external/3rdparty/composer/installed.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
[
22
{
33
"name": "icewind/smb",
4-
"version": "v3.2.3",
5-
"version_normalized": "3.2.3.0",
4+
"version": "v3.2.4",
5+
"version_normalized": "3.2.4.0",
66
"source": {
77
"type": "git",
88
"url": "https://github.com/icewind1991/SMB.git",
9-
"reference": "db50bb51bd0a0e55506e82cf439a9ecd232f64d4"
9+
"reference": "999d6687ca9d4ac2600185c935b45206e47e604a"
1010
},
1111
"dist": {
1212
"type": "zip",
13-
"url": "https://api.github.com/repos/icewind1991/SMB/zipball/db50bb51bd0a0e55506e82cf439a9ecd232f64d4",
14-
"reference": "db50bb51bd0a0e55506e82cf439a9ecd232f64d4",
13+
"url": "https://api.github.com/repos/icewind1991/SMB/zipball/999d6687ca9d4ac2600185c935b45206e47e604a",
14+
"reference": "999d6687ca9d4ac2600185c935b45206e47e604a",
1515
"shasum": ""
1616
},
1717
"require": {
@@ -22,7 +22,7 @@
2222
"friendsofphp/php-cs-fixer": "^2.13",
2323
"phpunit/phpunit": "^7.0"
2424
},
25-
"time": "2020-04-08T15:20:22+00:00",
25+
"time": "2020-05-11T14:12:35+00:00",
2626
"type": "library",
2727
"installation-source": "dist",
2828
"autoload": {

‎apps/files_external/3rdparty/icewind/smb/src/Native/NativeFileInfo.php‎

Lines changed: 40 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@ class NativeFileInfo implements IFileInfo {
3131
*/
3232
protected $attributeCache = null;
3333

34-
/**
35-
* @var int
36-
*/
37-
protected $modeCache;
38-
3934
/**
4035
* @param NativeShare $share
4136
* @param string $path
@@ -69,7 +64,7 @@ protected function stat() {
6964
$rawAttributes = explode(',', $this->share->getAttribute($this->path, 'system.dos_attr.*'));
7065
$this->attributeCache = [];
7166
foreach ($rawAttributes as $rawAttribute) {
72-
[$name, $value] = explode(':', $rawAttribute);
67+
list($name, $value) = explode(':', $rawAttribute);
7368
$name = strtolower($name);
7469
if ($name == 'mode') {
7570
$this->attributeCache[$name] = (int)hexdec(substr($value, 2));
@@ -97,6 +92,18 @@ public function getMTime() {
9792
return $stat['change_time'];
9893
}
9994

95+
/**
96+
* On "mode":
97+
*
98+
* different smbclient versions seem to return different mode values for 'system.dos_attr.mode'
99+
*
100+
* older versions return the dos permissions mask as defined in `IFileInfo::MODE_*` while
101+
* newer versions return the equivalent unix permission mask.
102+
*
103+
* Since the unix mask doesn't contain the proper hidden/archive/system flags we have to assume them
104+
* as false (except for `hidden` where we use the unix dotfile convention)
105+
*/
106+
100107
/**
101108
* @return int
102109
*/
@@ -109,39 +116,59 @@ protected function getMode() {
109116
*/
110117
public function isDirectory() {
111118
$mode = $this->getMode();
112-
return (bool)($mode & IFileInfo::MODE_DIRECTORY);
119+
if ($mode > 0x80) {
120+
return (bool)($mode & 0x4000); // 0x80: unix directory flag
121+
} else {
122+
return (bool)($mode & IFileInfo::MODE_DIRECTORY);
123+
}
113124
}
114125

115126
/**
116127
* @return bool
117128
*/
118129
public function isReadOnly() {
119130
$mode = $this->getMode();
120-
return (bool)($mode & IFileInfo::MODE_READONLY);
131+
if ($mode > 0x80) {
132+
return !(bool)($mode & 0x80); // 0x80: owner write permissions
133+
} else {
134+
return (bool)($mode & IFileInfo::MODE_READONLY);
135+
}
121136
}
122137

123138
/**
124139
* @return bool
125140
*/
126141
public function isHidden() {
127142
$mode = $this->getMode();
128-
return (bool)($mode & IFileInfo::MODE_HIDDEN);
143+
if ($mode > 0x80) {
144+
return $this->name[0] === '.';
145+
} else {
146+
return (bool)($mode & IFileInfo::MODE_HIDDEN);
147+
}
129148
}
130149

131150
/**
132151
* @return bool
133152
*/
134153
public function isSystem() {
135154
$mode = $this->getMode();
136-
return (bool)($mode & IFileInfo::MODE_SYSTEM);
155+
if ($mode > 0x80) {
156+
return false;
157+
} else {
158+
return (bool)($mode & IFileInfo::MODE_SYSTEM);
159+
}
137160
}
138161

139162
/**
140163
* @return bool
141164
*/
142165
public function isArchived() {
143166
$mode = $this->getMode();
144-
return (bool)($mode & IFileInfo::MODE_ARCHIVE);
167+
if ($mode > 0x80) {
168+
return false;
169+
} else {
170+
return (bool)($mode & IFileInfo::MODE_ARCHIVE);
171+
}
145172
}
146173

147174
/**
@@ -152,8 +179,8 @@ public function getAcls(): array {
152179
$attribute = $this->share->getAttribute($this->path, 'system.nt_sec_desc.acl.*+');
153180

154181
foreach (explode(',', $attribute) as $acl) {
155-
[$user, $permissions] = explode(':', $acl, 2);
156-
[$type, $flags, $mask] = explode('/', $permissions);
182+
list($user, $permissions) = explode(':', $acl, 2);
183+
list($type, $flags, $mask) = explode('/', $permissions);
157184
$mask = hexdec($mask);
158185

159186
$acls[$user] = new ACL($type, $flags, $mask);

0 commit comments

Comments
 (0)