Merge pull request #573 from yosaka/feature/202501-rcos-office

[GRDM-48578] オフィスソフトウエア連携機能実装　エラー処理追加、不具合修正 (to rcos-release branch)

Author: ShimoyamaT

addons/onlyoffice/requirements.txt

@@ -1,2 +1 @@
 #
-pycryptodome==3.20.0

addons/onlyoffice/routes.py

@@ -7,7 +7,7 @@
 edit_routes = {
     # Edit by ONLYOFFICE
     'rules': [
-        Rule(['/<guid>/editonlyoffice/<file_id>'], 'get',
+        Rule(['/<guid>/editonlyoffice/<provider>/<path:path>/'], 'get',
         views.onlyoffice_edit_by_onlyoffice,
         OsfWebRenderer('edit_online.mako', trust=True, template_dir=TEMPLATE_DIR),)
     ]

addons/onlyoffice/templates/error.mako

@@ -0,0 +1,12 @@
+<%inherit file="base.mako"/>
+<%def name="title()">${message_short}</%def>
+<%def name="content()">
+<div class="container">
+    <div class='row'>
+        <div class='col-md-12'>
+            <h2 id='error' data-http-status-code="${code}">${message_short}</h2>
+            <p>${ message_long | unicode, n }</p>
+        </div>
+    </div>
+</div>
+</%def>

addons/onlyoffice/tests/test_view.py

@@ -89,7 +89,8 @@ def test_check_file_info(self):
         mock_filenode = Filenode()
         mock_filenode.name = 'filename.docx'
         mock_user_info = {'user_id': 'userid', 'full_name': 'fullname', 'display_name': 'dispname'}
-        mock_file_info = {'name': 'filename.docx'}
+        mock_file_info = {'name': 'filename.docx', 'mtime': '202501010000'}
+        mock_file_version = ''
         mock_access_token = {websettings.COOKIE_NAME: 'cookie'}
 
         with mock.patch.object(BaseFileNode.objects, 'get', return_value=mock_filenode):
@@ -98,6 +99,7 @@ def test_check_file_info(self):
                     with mock.patch.object(onlyoffice_token, 'decrypt', return_value=mock_jsonobj):
                         with mock.patch.object(onlyoffice_token, 'check_token', return_value=mock_check_token):
                             with mock.patch.object(onlyoffice_util, 'get_file_info', return_value=mock_file_info):
-                                with mock.patch.object(onlyoffice_util, 'check_proof_key', return_value=mock_proof_key):
-                                    res = onlyoffice_check_file_info(file_id='ABCDEFG')
+                                with mock.patch.object(onlyoffice_util, 'get_file_version', return_value=mock_file_version):
+                                    with mock.patch.object(onlyoffice_util, 'check_proof_key', return_value=mock_proof_key):
+                                        res = onlyoffice_check_file_info(file_id='ABCDEFG')
         assert res['BaseFileName'] == 'filename.docx'

addons/onlyoffice/util.py

@@ -2,13 +2,14 @@
 import logging
 import requests
 from lxml import etree
-from osf.models import BaseFileNode, OSFUser
+from osf.models import OSFUser
+from osf.utils.permissions import WRITE
 from requests.exceptions import RequestException
 
 from . import settings
 from . import proof_key as pfkey
-logger = logging.getLogger(__name__)
 
+logger = logging.getLogger(__name__)
 
 def get_user_info(cookie):
     user = OSFUser.from_cookie(cookie)
@@ -42,7 +43,7 @@ def get_file_info(file_node, file_version, cookies):
         )
         response.raise_for_status()
     except RequestException as e:
-        logger.debug('onlyoffice: get_file_info = {}'.format(e))
+        logger.warning('onlyoffice: get_file_info = {}'.format(e))
         return None
 
     file_data = response.json().get('data')
@@ -57,14 +58,11 @@ def get_file_info(file_node, file_version, cookies):
     return file_info
 
 
-def get_file_version(file_id):
+def get_file_version(file_node):
     file_version = ''
-    base_file_data = BaseFileNode.objects.filter(_id=file_id)
-    if base_file_data.exists():
-        file_node = BaseFileNode.load(file_id)
-        if file_node.provider == 'osfstorage':
-            base_file_data = base_file_data.get()
-            file_versions = base_file_data.versions.all()
+    if file_node.provider == 'osfstorage':
+        file_versions = file_node.versions.all()
+        if file_versions is not None and file_versions.exists():
             file_version = file_versions.latest('id').identifier
     return file_version
 
@@ -183,3 +181,17 @@ def check_proof_key(pkhelper, request, access_token):
     else:
         logger.warning('onlyoffice: proof key check return False.')
         return False
+
+
+def check_permission(user, file_node, target):
+    if not user:
+        logger.warning('onlyoffice: check_permission: no OSFUser')
+        return False
+    logger.info('check_permission user : {}'.format(user._id))
+
+    # SEE ALSO: addons/osfstorage/views.py:osfstorage_create_child()
+    # checkout: used for OsfStorage
+    if file_node.checkout and file_node.checkout._id != user._id:
+        return False
+
+    return target.has_permission(user, WRITE)