CU-3884ybt - fix an issue on travis.

Author: fred-yu-2013

.travis.yml

@@ -1,6 +1,6 @@
 language: python
 python:
-  - "3.9"
+  - "3.9.12"
 dist: bionic
 services:
   - docker
@@ -12,7 +12,6 @@ before_install:
   - docker run -d --name ipfs-node -v ${PWD}/.ipfs-data/ipfs-docker-staging:/export -v ${PWD}/.ipfs-data/ipfs-docker-data:/data/ipfs -p 8080:8080 -p 4001:4001 -p 127.0.0.1:5001:5001 ipfs/go-ipfs:latest
   - cp config/.env.travis .env
   - pip install -r requirements.txt
-  - LD_LIBRARY_PATH="$PWD/src/util/did/" TRAVIS=True python manage.py runserver &
 install:
   - docker ps
 script:
@@ -22,6 +21,7 @@ script:
   - pytest --disable-pytest-warnings -xs tests_v1/hive_file_test.py
   - pytest --disable-pytest-warnings -xs tests_v1/hive_scripting_test.py
 
+  - TRAVIS=True python manage.py runserver &
   - ./wait_node.sh
   - pytest --disable-pytest-warnings -xs tests/about_test.py
   - pytest --disable-pytest-warnings -xs tests/auth_test.py

requirements.txt

@@ -1,27 +1,27 @@
-google-api-python-client
-google-auth
-google-auth-oauthlib
-google-auth-httplib2
-pymongo==4.1.1
+base58==2.0.1
+cffi==1.14.1
+click==8.1.2
 Flask==2.0.3
 Flask-Script==2.0.5
 Flask-APScheduler==1.11.0
 Flask-RESTful==0.3.9
 Flask-RangeRequest==0.0.2
-cffi==1.14.1
-base58==2.0.1
+Flask-Testing===0.8.1
+flask-cors==3.0.10
+flask-unittest==0.1.2
+Flask-Executor==0.10.0
+google-api-python-client
+google-auth
+google-auth-oauthlib
+google-auth-httplib2
+pyftpdlib==1.5.6
+PyOpenSSL==22.0.0
+pysendfile==2.0.1
+PyJWT==2.0.0
+pymongo==4.1.1
 python-decouple==3.3
 PyYAML==5.4.1
 pytest==6.0.1
 requests==2.25.0
 sentry-sdk[flask]==0.19.4
-pyftpdlib==1.5.6
-PyOpenSSL==22.0.0
-pysendfile==2.0.1
-PyJWT==2.0.0
-Flask-Testing===0.8.1
-flask-cors==3.0.10
-flask-unittest==0.1.2
-web3==5.29.0
-click==8.1.2
-Flask-Executor==0.10.0
+web3==5.29.0

run.sh

@@ -229,6 +229,6 @@ case "$1" in
         stop
         ;;
     *)
-    echo "Usage: run.sh {docker|direct|test}"
+    echo "Usage: run.sh {setup|direct|docker|test|test_v1|test_v2|stop}"
     exit 1
 esac

src/__init__.py

@@ -13,7 +13,7 @@
 from src.settings import hive_setting
 from src.utils.executor import init_executor, update_vault_databases_usage_task
 from src.utils.http_exception import HiveException, InternalServerErrorException, UnauthorizedException
-from src.utils.http_request import RegexConverter
+from src.utils.http_request import RegexConverter, FileFolderPath
 from src.utils.http_response import HiveApi
 from src.utils.sentry_error import init_sentry_hook
 from src.utils.auth_token import TokenParser
@@ -30,6 +30,7 @@
 
 
 app = Flask('Hive Node V2')
+app.url_map.converters['folder_path'] = FileFolderPath
 app.url_map.converters['regex'] = RegexConverter
 api = HiveApi(app, prefix='/api/v2')
 

src/utils/did/did_wrapper.py

@@ -382,8 +382,8 @@ def list_dids(self):
         """
         dids = []
 
-        @ffi.callback("int(struct DID *, void *)")
-        def did_callback(did, context):
+        @ffi.def_extern()
+        def ListDIDsCallback(did, context):
             # INFO: contains a terminating signal by a did with None.
             if did:
                 did_str = ffi.new('char[64]')
@@ -394,7 +394,7 @@ def did_callback(did, context):
             return 0
 
         filter_has_private_keys = 1
-        ret_value = lib.DIDStore_ListDIDs(self.store, filter_has_private_keys, did_callback, ffi.NULL)
+        ret_value = lib.DIDStore_ListDIDs(self.store, filter_has_private_keys, lib.ListDIDsCallback, ffi.NULL)
         if ret_value != 0:
             raise ElaDIDException(ElaError.get_from_method())
 

src/utils/http_request.py

@@ -9,11 +9,20 @@
 from flask import request, g
 from werkzeug.routing import BaseConverter
 
-from src.utils.http_exception import InvalidParameterException, NotImplementedException
+from src.utils.http_exception import InvalidParameterException
+
+
+class FileFolderPath(BaseConverter):
+    """ support read empty folder path, based on PathConverter """
+    regex = r'[0-9a-zA-Z_/.]*'
+    weight = 200
+    part_isolating = False
 
 
 class RegexConverter(BaseConverter):
-    """ Support regex on url match """
+    """ Support regex on url match
+    @deprecated
+    """
     def __init__(self, url_map, *items):
         super().__init__(url_map)
         self.regex = items[0]

src/view/__init__.py

@@ -38,7 +38,7 @@ def init_app(api: Api):
     api.add_resource(database.Query, '/vault/db/query', endpoint='database.query')
 
     # files service
-    api.add_resource(files.ReadingOperation, '/vault/files/<regex("(|[0-9a-zA-Z_/.]*)"):path>', endpoint='files.reading_operation')
+    api.add_resource(files.ReadingOperation, '/vault/files/<folder_path:path>', endpoint='files.reading_operation')
     api.add_resource(files.WritingOperation, '/vault/files/<path:path>', endpoint='files.writing_operation')
     api.add_resource(files.MoveFile, '/vault/files/<path:path>', endpoint='files.move_file')
     api.add_resource(files.DeleteFile, '/vault/files/<path:path>', endpoint='files.delete_file')