Removed protection as this is currently implemented in the WOPI logic…

… itself, not by the storage layers
cs3org · Mar 21, 2022 · 02f7072 · 02f7072
1 parent 5af560c
commit 02f7072
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 12 deletions.
diff --git a/src/core/localiface.py b/src/core/localiface.py
@@ -127,10 +127,6 @@ def refreshlock(endpoint, filepath, _userid, appname, value):
         log.warning('msg="Failed to refreshlock" filepath="%s" appname="%s" reason="%s"' %
                     (filepath, appname, 'File is not locked'))
         raise IOError('File was not locked')
-    if l['app_name'] != appname and l['app_name'] != 'wopi':
-        log.warning('msg="Failed to refreshlock" filepath="%s" appname="%s" reason="%s"' %
-                    (filepath, appname, 'File is locked by %s' % l['app_name']))
-        raise IOError('File is locked by %s' % l['app_name'])
     log.debug('msg="Invoked refreshlock" filepath="%s" value="%s"' % (filepath, value))
     # this is non-atomic, but the lock was already held
     setxattr(endpoint, filepath, '0:0', common.LOCKKEY, common.genrevalock(appname, value), None)

diff --git a/src/core/xrootiface.py b/src/core/xrootiface.py
@@ -287,10 +287,6 @@ def refreshlock(endpoint, filepath, userid, appname, value):
         log.warning('msg="Failed to refreshlock" filepath="%s" appname="%s" reason="%s"' %
                     (filepath, appname, 'File is not locked'))
         raise IOError('File was not locked')
-    if l['app_name'] != appname and l['app_name'] != 'wopi':
-        log.warning('msg="Failed to refreshlock" filepath="%s" appname="%s" reason="%s"' %
-                    (filepath, appname, 'File is locked by %s' % l['app_name']))
-        raise IOError('File is locked by %s' % l['app_name'])
     log.debug('msg="Invoked refreshlock" filepath="%s" value="%s"' % (filepath, value))
     # this is non-atomic, but the lock was already held
     setxattr(endpoint, filepath, userid, common.LOCKKEY, common.genrevalock(appname, value), None)
@@ -303,10 +299,6 @@ def unlock(endpoint, filepath, userid, appname, value):
         log.warning('msg="Failed to unlock" filepath="%s" appname="%s" reason="%s"' %
                     (filepath, appname, 'File is not locked'))
         raise IOError('File was not locked')
-    if l['app_name'] != appname and l['app_name'] != 'wopi':
-        log.warning('msg="Failed to unlock" filepath="%s" appname="%s" reason="%s"' %
-                    (filepath, appname, 'File is locked by %s' % l['app_name']))
-        raise IOError('File is locked by %s' % l['app_name'])
     log.debug('msg="Invoked unlock" filepath="%s" value="%s' % (filepath, value))
     rmxattr(endpoint, filepath, userid, common.LOCKKEY, None)