fix: Return X-WOPI-Lock when a manual lock from outside exists #442

juliushaertl · 2023-05-11T10:22:16Z

Signed-off-by: Julius Härtl jus@bitgrid.net

Resolves Office online does not respect a local locked file by user. #428
Target version: main

Summary

This change makes sure that we return a proper locked response in cases where an outside lock exists.

I've tested this change with word, excel, powerpoint, however on my OOS server switching to read only mode only work with excel. I couldn't figure out a reason for that yet, but as it seems to work fine with excel it would rather assume this is a bug or misconfiguration of my OOS server.

Checklist

Code is properly formatted
Sign-off message is added to all commits
Documentation (manuals or wiki) has been updated or is not required

enoch85 · 2023-05-11T14:21:24Z

Scenario 1

User A created a new docx
Share the file with user B
User A opened the file locally (with "Edit locally" button in GUI)
User B opened the file online

RESULT: User B got a pop up that the file can't be edited simultaneously, with an option to open in read only mode:

Scenario 2:

User A created a new docx
Share the file with user B
User B opens the file
User A opens the file

RESULT: File can be edited simultaneously by user A and user B.

I'd say tested and works!

juliushaertl · 2023-05-11T15:09:53Z

Thanks a lot already. Just to double check does switching to the read only mode work for you for all file types (word/excel/PowerPoint)?

enoch85 · 2023-05-11T15:44:11Z

Powerpoint:

Locking works, but not read only

Excel:
Does not even open as it seems (waited ~3 minutes):

More testing:
Now I only get internal server error...

{"reqId":"iDvMUGWEPhm3iVV7KzGl","level":3,"time":"2023-05-11T10:50:50+00:00","remoteAddr":"1.2.3.4","user":"Jorgen@email.com","app":"officeonline","method":"GET","url":"/apps/officeonline/public?shareToken=&fileName=%252FKollektiv%252FIT%2520S%25C3%25A4kerhetssamordning%252FAP-lista.xlsx&requesttoken=WWRb6zCt%2FyiomUicCRznI3bETeqWA0zp%2B7SSaAdlgQ8%3D%3AKgk0s2bFsF7jyTzPTl2yQiCrK676eTaFyeX7GW1ds2Y%3D&fileId=%7BfileId%7D","message":"Den beg\u00e4rda delningen finns inte mer","userAgent":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/537.36 Edg/112.0.1722.64","version":"26.0.1.1","exception":{"Exception":"OCP\\Share\\Exceptions\\ShareNotFound","Message":"Den beg\u00e4rda delningen finns inte mer","Code":0,"Trace":[{"file":"/srv/www/nextcloud/apps/officeonline/lib/Controller/DocumentController.php","line":349,"function":"getShareByToken","class":"OC\\Share20\\Manager","type":"->"},{"file":"/srv/www/nextcloud/lib/private/AppFramework/Http/Dispatcher.php","line":230,"function":"publicPage","class":"OCA\\Officeonline\\Controller\\DocumentController","type":"->"},{"file":"/srv/www/nextcloud/lib/private/AppFramework/Http/Dispatcher.php","line":137,"function":"executeController","class":"OC\\AppFramework\\Http\\Dispatcher","type":"->"},{"file":"/srv/www/nextcloud/lib/private/AppFramework/App.php","line":183,"function":"dispatch","class":"OC\\AppFramework\\Http\\Dispatcher","type":"->"},{"file":"/srv/www/nextcloud/lib/private/Route/Router.php","line":315,"function":"main","class":"OC\\AppFramework\\App","type":"::"},{"file":"/srv/www/nextcloud/lib/base.php","line":1056,"function":"match","class":"OC\\Route\\Router","type":"->"},{"file":"/srv/www/nextcloud/index.php","line":36,"function":"handleRequest","class":"OC","type":"::"}],"File":"/srv/www/nextcloud/lib/private/Share20/Manager.php","Line":1537,"Hint":"Den beg\u00e4rda delningen finns inte mer","CustomMessage":"--"}}
{"reqId":"Ov03BXGfHe67oJemiEsr","level":3,"time":"2023-05-11T11:43:48+00:00","remoteAddr":"1.2.3.4","user":"daniel.hansson@email.com","app":"webdav","method":"POST","url":"/remote.php/dav/bulk","message":"Unknown error while seeking content","userAgent":"Mozilla/5.0 (Windows) mirall/3.8.1stable-Win64 (build 20230419) (Nextcloud, windows-10.0.19045 ClientArchitecture: x86_64 OsArchitecture: x86_64)","version":"26.0.1.1","exception":{"Exception":"Sabre\\DAV\\Exception","Message":"Unknown error while seeking content","Code":500,"Trace":[{"file":"/srv/www/nextcloud/apps/dav/lib/BulkUpload/MultipartRequestParser.php","line":129,"function":"isAt","class":"OCA\\DAV\\BulkUpload\\MultipartRequestParser","type":"->"},{"file":"/srv/www/nextcloud/apps/dav/lib/BulkUpload/BulkUploadPlugin.php","line":71,"function":"isAtLastBoundary","class":"OCA\\DAV\\BulkUpload\\MultipartRequestParser","type":"->"},{"file":"/srv/www/nextcloud/3rdparty/sabre/event/lib/WildcardEmitterTrait.php","line":89,"function":"httpPost","class":"OCA\\DAV\\BulkUpload\\BulkUploadPlugin","type":"->"},{"file":"/srv/www/nextcloud/3rdparty/sabre/dav/lib/DAV/Server.php","line":472,"function":"emit","class":"Sabre\\DAV\\Server","type":"->"},{"file":"/srv/www/nextcloud/3rdparty/sabre/dav/lib/DAV/Server.php","line":253,"function":"invokeMethod","class":"Sabre\\DAV\\Server","type":"->"},{"file":"/srv/www/nextcloud/3rdparty/sabre/dav/lib/DAV/Server.php","line":321,"function":"start","class":"Sabre\\DAV\\Server","type":"->"},{"file":"/srv/www/nextcloud/apps/dav/lib/Server.php","line":366,"function":"exec","class":"Sabre\\DAV\\Server","type":"->"},{"file":"/srv/www/nextcloud/apps/dav/appinfo/v2/remote.php","line":35,"function":"exec","class":"OCA\\DAV\\Server","type":"->"},{"file":"/srv/www/nextcloud/remote.php","line":172,"args":["/srv/www/nextcloud/apps/dav/appinfo/v2/remote.php"],"function":"require_once"}],"File":"/srv/www/nextcloud/apps/dav/lib/BulkUpload/MultipartRequestParser.php","Line":111,"message":"Unknown error while seeking content","exception":{},"CustomMessage":"Unknown error while seeking content"}}
{"reqId":"wwtKXR1rrbE9X9aDue8H","level":4,"time":"2023-05-11T12:22:24+00:00","remoteAddr":"1.2.3.4","user":"--","app":"user_saml","method":"POST","url":"/apps/user_saml/saml/acs","message":"invalid_response","userAgent":"Mozilla/5.0 (iOS) NextcloudNotes/4.1.7","version":"26.0.1.1","data":{"app":"user_saml"}}
{"reqId":"wwtKXR1rrbE9X9aDue8H","level":4,"time":"2023-05-11T12:22:24+00:00","remoteAddr":"1.2.3.4","user":"--","app":"user_saml","method":"POST","url":"/apps/user_saml/saml/acs","message":"The status code of the Response was not Success, was Responder -&gt; urn:oasis:names:tc:SAML:2.0:status:RequestDenied","userAgent":"Mozilla/5.0 (iOS) NextcloudNotes/4.1.7","version":"26.0.1.1","data":{"app":"user_saml"}}
{"reqId":"fqQV3UA8LdECOzhtjWst","level":3,"time":"2023-05-11T14:07:10+00:00","remoteAddr":"1.2.3.4","user":"danh","app":"no app in context","method":"POST","url":"/ocs/v2.php/apps/files_sharing/api/v1/shares","message":"Path contains files shared with you","userAgent":"Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/112.0","version":"26.0.1.1","exception":{"Exception":"InvalidArgumentException","Message":"Path contains files shared with you","Code":0,"Trace":[{"file":"/srv/www/nextcloud/lib/private/Share20/Manager.php","line":727,"function":"pathCreateChecks","class":"OC\\Share20\\Manager","type":"->"},{"file":"/srv/www/nextcloud/apps/files_sharing/lib/Controller/ShareAPIController.php","line":720,"function":"createShare","class":"OC\\Share20\\Manager","type":"->","args":["*** sensitive parameters replaced ***"]},{"file":"/srv/www/nextcloud/lib/private/AppFramework/Http/Dispatcher.php","line":230,"function":"createShare","class":"OCA\\Files_Sharing\\Controller\\ShareAPIController","type":"->","args":["*** sensitive parameters replaced ***"]},{"file":"/srv/www/nextcloud/lib/private/AppFramework/Http/Dispatcher.php","line":137,"function":"executeController","class":"OC\\AppFramework\\Http\\Dispatcher","type":"->"},{"file":"/srv/www/nextcloud/lib/private/AppFramework/App.php","line":183,"function":"dispatch","class":"OC\\AppFramework\\Http\\Dispatcher","type":"->"},{"file":"/srv/www/nextcloud/lib/private/Route/Router.php","line":315,"function":"main","class":"OC\\AppFramework\\App","type":"::"},{"file":"/srv/www/nextcloud/ocs/v1.php","line":64,"function":"match","class":"OC\\Route\\Router","type":"->"},{"file":"/srv/www/nextcloud/ocs/v2.php","line":23,"args":["/srv/www/nextcloud/ocs/v1.php"],"function":"require_once"}],"File":"/srv/www/nextcloud/lib/private/Share20/Manager.php","Line":690,"CustomMessage":"--"}}

enoch85 · 2023-05-11T15:48:00Z

Also noted, the actual internal server error doesn't get logged anywhere afaik.

juliushaertl · 2023-05-11T17:09:22Z

The log messages indeed don't look related.

Now I only get internal server error...

How do you trigger that and where you see it? Is there a request id mentioned in the output that could help find the log messages?

juliushaertl · 2023-05-11T17:10:36Z

Regarding the error that powerpoint shows, are you able to find something meaninful regaring the session id in the OOS server logs? I had a hard time checking those and also haven't noticed any message on mine that would indicate an error.

juliushaertl · 2023-05-12T10:51:08Z

Had one more confirmation that this fixes the issue as expected.

enoch85 · 2023-05-12T11:18:01Z

How do you trigger that and where you see it? Is there a request id mentioned in the output that could help find the log messages?

I just try to open the document in the web as usual. Might have been something temporary.

Regarding the error that powerpoint shows, are you able to find something meaninful regaring the session id in the OOS server logs?

Does OSS have seperate sevrer logs? 🤷‍♂️

juliushaertl · 2023-05-12T11:26:11Z

Yes, see https://learn.microsoft.com/en-us/compliance/regulatory/gdpr-for-office-online-server and https://sharepoint.stackexchange.com/questions/286061/where-is-oos-loglocation-path-for-win2019

But I haven't found any useful message in there on my setup

lib/Controller/WopiController.php

Signed-off-by: Julius Härtl <jus@bitgrid.net>

juliushaertl mentioned this pull request May 11, 2023

Office online does not respect a local locked file by user. #428

Closed

juliushaertl marked this pull request as ready for review May 12, 2023 10:50

juliushaertl requested review from blizzz and max-nextcloud May 12, 2023 10:50

juliushaertl added 3. to review Waiting for reviews bug Something isn't working labels May 12, 2023

blizzz reviewed May 15, 2023

View reviewed changes

lib/Controller/WopiController.php Outdated Show resolved Hide resolved

fix: Return X-WOPI-Lock when a manual lock from outside exists

ebd3f14

Signed-off-by: Julius Härtl <jus@bitgrid.net>

juliushaertl force-pushed the bugfix/428 branch from e9cc722 to ebd3f14 Compare May 15, 2023 18:38

juliushaertl requested a review from blizzz May 15, 2023 18:39

blizzz approved these changes May 16, 2023

View reviewed changes

blizzz merged commit 55a346c into main May 16, 2023

delete-merged-branch bot deleted the bugfix/428 branch May 16, 2023 07:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Return X-WOPI-Lock when a manual lock from outside exists #442

fix: Return X-WOPI-Lock when a manual lock from outside exists #442

juliushaertl commented May 11, 2023 •

edited

Loading

enoch85 commented May 11, 2023

juliushaertl commented May 11, 2023

enoch85 commented May 11, 2023

enoch85 commented May 11, 2023

juliushaertl commented May 11, 2023

juliushaertl commented May 11, 2023

juliushaertl commented May 12, 2023

enoch85 commented May 12, 2023

juliushaertl commented May 12, 2023

fix: Return X-WOPI-Lock when a manual lock from outside exists #442

fix: Return X-WOPI-Lock when a manual lock from outside exists #442

Conversation

juliushaertl commented May 11, 2023 • edited Loading

Summary

Checklist

enoch85 commented May 11, 2023

juliushaertl commented May 11, 2023

enoch85 commented May 11, 2023

enoch85 commented May 11, 2023

juliushaertl commented May 11, 2023

juliushaertl commented May 11, 2023

juliushaertl commented May 12, 2023

enoch85 commented May 12, 2023

juliushaertl commented May 12, 2023

juliushaertl commented May 11, 2023 •

edited

Loading