[Stable9] smbfixes #25817

butonic · 2016-08-16T13:46:12Z

forward port of some of the smb fixes that went into 8.2

mention-bot · 2016-08-16T13:46:14Z

@butonic, thanks for your PR! By analyzing the annotation information on this pull request, we identified @icewind1991, @jmaciasportela, @PVince81 and @Xenopathic to be potential reviewers

jvillafanez · 2016-08-19T06:52:46Z

apps/files_external/lib/smb.php

Maybe we should add a log here. We don't overwrite things often so debugging this could be confusing because we expect no modifications.

butonic · 2016-08-19T14:49:39Z

This has become a release blocker.

butonic · 2016-08-22T13:04:07Z

hm, I can rename a felder just fine ... also with spaces ... investigating

butonic · 2016-08-22T13:57:29Z

@DeepDiver1975 is jenkins using phpsmbclient or smbclient via cli? icewind1991/SMB#52

DeepDiver1975 · 2016-08-22T14:56:56Z

@DeepDiver1975 is jenkins using phpsmbclient or smbclient via cli? icewind1991/SMB#52

smbclient

butonic · 2016-08-23T06:44:57Z

@DeepDiver1975 for smbclient running the testsuite locally gives me only errors and failures. debugging it I don't seem to be able to allinfo any file. Testing it on the cli with smbclient I see the same thing.

Testing with libsmbclient 57of77 tests fail. Running individual tests alone makes them pass ... WTF.

Investigating further.

jvillafanez · 2016-08-23T06:49:52Z

apps/files_external/lib/smb.php

+				try {
+					$this->log("stat fetching '{$this->root}|$path'");
+					$this->statCache[$path] = $this->share->stat($path);
+					if ($this->remoteIsShare() && $this->isRootDir($path) && $this->statCache[$path]->isHidden()) {


we might want to remove the $this->remoteIsShare() from here. If the remote subfolder isn't empty, the function is intended to return false (we aren't connecting directly to a share but to a inner folder), so in that case if the folder is hidden it won't be shown.

butonic · 2016-08-23T09:45:11Z

FYI: this cannot be automatically tested when you are using any Windows desktop os because "The number of connections is limited to 20 by the software license agreement". Running individual tests works.

We are not explicitly closing / disconnecting in tearDown(). That piles up connections and after 20 tests the rest fails ...

butonic · 2016-08-23T14:40:15Z

great, now all of the tests are broken, but they all work on my machine.

PVince81 · 2016-08-24T07:15:35Z

apps/files_external/tests/backends/smb.php

 		if ($this->instance) {
 			$this->instance->rmdir('');
+			// force disconnect of the client
+			unset($this->instance);


maybe needs a more explicit disconnect ? If it doesn't work on CI it could be due to a different PHP version where maybe the GC works differently ?

Maybe add a method "close" on the SMB instance and use method_exists here before trying to call it ?

oh, unsetting works around the connection limit just fine. The problem with nearly all tests failing may have been caused by how the share was set up and which version of smbclient is available.

I have shared my E: drive as 'guest', with a root of '' the testsuite fails completely when using smbclient but completes fine with lbsmbclient. The problem is that I smbclient cannot get a stat with allinfo "/path/to/file". It will always get a NT_STATUS_OBJECT_NAME_NOT_FOUND getting alt name for /path/to/file. There was a related issue regarding the root of a share: #14347

Also, it seems recent smbclient changed the output of allinfo, see icewind1991/SMB#52

remember, all these problems only arise whan using the fallback smbclient implementation.

@DeepDiver1975 we also need to test libsmbclient automatically.

I added a fallback for failing stats thet try reading the stat info from the parent folders dirlisting. Waiting for jenkins...

PVince81 · 2016-08-24T08:25:56Z

@butonic are these already on stable9.1 or will they need to be forward-ported too ?

butonic · 2016-08-24T09:23:49Z

need to be forward ported as I was debugging this at a customer. the code in 9.1 and master is exactly the same with the upper/lower case filenames being the exception.

jvillafanez · 2016-08-24T09:26:08Z

apps/files_external/lib/smb.php

+							throw $e;
+						}
+					}
+					if ($this->remoteIsShare() && $this->isRootDir($path) && $this->statCache[$path]->isHidden()) {


This also applies if our root path targets a remote folder, not just the share, so the $this->remoteIsShare() condition should be removed

You mean when the actual share is eg. \\host\Users but in oc is configured as 'share'=>'\\host\User\Bob', 'root'=>'' ?

yes, more or less. An expected configuration should be 'share' => 'Users' , 'root' => 'Bob' so when the user ask for the storage's root path ('') it's internally mapped to \\host\Users\Bob.

In that case, the remoteIsShare() should return false because we're connecting to an inner folder not to the share's root.

butonic · 2016-08-24T12:15:09Z

@jvillafanez I also added the smbclient vs libsmbcliend toggle.

@ALL can I haz 👍 pls?

jvillafanez · 2016-08-24T14:38:41Z

apps/files_external/lib/smb.php

+	private function removeFromCache($path) {
+		$path = trim($path, '/');
+		// TODO The CappedCache does not really clear by prefix. It just clears all.
+		//$this->dirCache->clear($path);


⚠️ commented code!

yes, I left them in to hint at what was cached in 8.2. But performance improvements can be done in a separate PR.

jvillafanez · 2016-08-24T14:45:30Z

My only concern is that the getFileInfo function has gotten big. I'm not sure if it's possible to simplify the function and reduce the number of lines just by splitting it into smaller functions.

Anyway 👍 unless @owncloud/qa says otherwise.

see icewind1991/SMB@6e544f6

PVince81 · 2016-08-26T07:49:12Z

@butonic had a quick look and it looks fine.

@butonic please answer this comment https://github.com/owncloud/core/pull/25817/files#r75436102

Then once Jenkins is ressurected, if the tests pass then 👍

butonic · 2016-08-26T10:06:58Z

all tests pass, two thumbs, all comments answered.

butonic · 2016-08-26T10:07:14Z

will port forward now

lock · 2019-08-04T04:02:08Z

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

butonic added Type:Bug 3 - To Review app:files_external labels Aug 16, 2016

butonic added this to the 9.0.5 milestone Aug 16, 2016

butonic added 2 - Developing and removed 3 - To Review labels Aug 18, 2016

butonic force-pushed the stable9-smbfixes branch from f001f53 to a76fa75 Compare August 18, 2016 13:26

jvillafanez reviewed Aug 19, 2016
View reviewed changes

butonic force-pushed the stable9-smbfixes branch from 0be7a54 to cdffa9a Compare August 19, 2016 12:01

butonic added the green-ticket label Aug 19, 2016

butonic force-pushed the stable9-smbfixes branch 2 times, most recently from 0eeeb82 to 8b3aad7 Compare August 19, 2016 14:57

felixboehm added the sev1-critical label Aug 22, 2016

jvillafanez reviewed Aug 23, 2016
View reviewed changes

PVince81 reviewed Aug 24, 2016
View reviewed changes

butonic force-pushed the stable9-smbfixes branch from 3893092 to 4a5e32d Compare August 24, 2016 09:22

jvillafanez reviewed Aug 24, 2016
View reviewed changes

butonic removed the 2 - Developing label Aug 24, 2016

butonic changed the title ~~[WIP][Stable9] smbfixes~~ [Stable9] smbfixes Aug 24, 2016

jvillafanez reviewed Aug 24, 2016
View reviewed changes

butonic added 15 commits August 26, 2016 09:38

stat for root of a share does not work

61c9a06

don't list hidden files

e0c8696

formatInfo should include type

baec3a0

overwrite target on rename

f4051a1

use stat to determine has updated

5d11696

stat now handles mtime for root shares, simplify hasUpdated

b53de63

move share check to getFileInfo

f95fc02

always try stat, fake if forbidden, actually return the fileinfo array

2565eac

share root is always readable

717c521

do not overwrite stat cache with plain array

d253b6d

fix test execution due to connection limit

1ac6f4f

add dir based stat fallback

1ef2059

fix return values for smbclient backend

93229e7

see icewind1991/SMB@6e544f6

allow unhiding root folder in subfolder of share

185ce22

trust libsmbclient on stat, only do dir fallback for smbclient

ebf8be1

butonic force-pushed the stable9-smbfixes branch from 220a0d3 to ebf8be1 Compare August 26, 2016 07:38

butonic merged commit 72fa98b into stable9 Aug 26, 2016

This was referenced Aug 26, 2016

[stable9.1] forward port smbfixes #25951

Merged

forward port smbfixes #25954

Merged

PVince81 deleted the stable9-smbfixes branch January 12, 2017 09:00

lock bot locked as resolved and limited conversation to collaborators Aug 4, 2019

[Stable9] smbfixes #25817

[Stable9] smbfixes #25817

Uh oh!

Conversation

butonic commented Aug 16, 2016

Uh oh!

mention-bot commented Aug 16, 2016

Uh oh!

Choose a reason for hiding this comment

Uh oh!

butonic commented Aug 19, 2016

Uh oh!

butonic commented Aug 22, 2016

Uh oh!

butonic commented Aug 22, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

DeepDiver1975 commented Aug 22, 2016

Uh oh!

butonic commented Aug 23, 2016

Uh oh!

Choose a reason for hiding this comment

Uh oh!

butonic commented Aug 23, 2016

Uh oh!

butonic commented Aug 23, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

PVince81 commented Aug 24, 2016

Uh oh!

butonic commented Aug 24, 2016

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

butonic commented Aug 24, 2016

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jvillafanez commented Aug 24, 2016

Uh oh!

PVince81 commented Aug 26, 2016

Uh oh!

butonic commented Aug 26, 2016

Uh oh!

butonic commented Aug 26, 2016

Uh oh!

lock bot commented Aug 4, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

butonic commented Aug 22, 2016 •

edited

Loading

butonic commented Aug 23, 2016 •

edited

Loading