Bug fixes

Fix parse_data returning None for no MetaInfo Data
Fix datetime.utcnow() deprecated
Upgrade dependencies

Fix: #77

Author: zjkmxy

poetry.lock

@@ -41,11 +41,11 @@ include = [{ path = "tests", format = "sdist" }]
 
 [tool.poetry.dependencies]
 python = "^3.10"
-pycryptodomex = "^3.18.0"
+pycryptodomex = "^3.20.0"
 pygtrie = "^2.5.0"
 aenum = "^3.1.12"
-lark = "^1.1.7"
-aiohttp = "^3.8.5"
+lark = "^1.1.9"
+aiohttp = "^3.9.3"
 
 # Extra dependencies [dev]
 pytest = { version = "^7.1.2", optional = true }

pyproject.toml

@@ -16,7 +16,7 @@
 # limitations under the License.
 # -----------------------------------------------------------------------------
 from typing import Tuple
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from ..utils import timestamp
 from ..encoding import Component, Name, ModelField, TlvModel, ContentType, BytesField,\
     SignatureInfo, TypeNumber, RepeatedField, IncludeBase, MetaInfo, VarBinaryStr,\
@@ -112,17 +112,17 @@ def new_cert(key_name, issuer_id_component, pub_key, signer, start_time, end_tim
 
 
 def self_sign(key_name, pub_key, signer) -> Tuple[FormalName, VarBinaryStr]:
-    end_time = datetime.utcnow()
+    end_time = datetime.now(timezone.utc)
     end_time = end_time.replace(year=end_time.year + 20)
     return new_cert(key_name, SELF_COMPONENT, pub_key, signer,
                     datetime.fromisoformat('1970-01-01T00:00:00'), end_time)
 
 
 def sign_req(key_name, pub_key, signer) -> Tuple[FormalName, VarBinaryStr]:
-    start_time = datetime.utcnow()
+    start_time = datetime.now(timezone.utc)
     end_time = start_time + timedelta(days=10)
     return new_cert(key_name, SIGN_REQ_COMPONENT, pub_key, signer,
-                    datetime.utcnow(), end_time)
+                    datetime.now(timezone.utc), end_time)
 
 
 def derive_cert(key_name, issuer_id, pub_key, signer, start_time, expire_sec) -> Tuple[FormalName, VarBinaryStr]:

src/ndn/app_support/security_v2.py

@@ -19,7 +19,7 @@
 import sys
 import base64
 import argparse
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from ...encoding import Name
 from ...app_support.security_v2 import parse_certificate, new_cert
 from .utils import resolve_keychain, infer_obj_name
@@ -89,7 +89,7 @@ def execute(args: argparse.Namespace):
         return -3
 
     if not args.not_before:
-        not_before = datetime.utcnow()
+        not_before = datetime.now(timezone.utc)
     else:
         try:
             not_before = datetime.strptime(args.not_before, '%Y%m%dT%H%M%S')

src/ndn/bin/sec/cmd_sign_cert.py

@@ -501,6 +501,8 @@ def parse_data(wire: BinaryStr, with_tl: bool = True) -> Data:
     markers = {}
     ret = DataPacketValue.parse(wire, markers)
     params = ret.meta_info
+    if params is None:
+        params = MetaInfo()
     sig_ptrs = SignaturePtrs(
         signature_info=ret.signature_info,
         signature_covered_part=ret._sig_cover_part.get_arg(markers),

src/ndn/encoding/ndn_format_0_3.py

@@ -435,3 +435,10 @@ def test_meta_info():
         for part in sig.signature_covered_part:
             algo.update(part)
         assert sig.signature_value_buf == algo.digest()
+
+    @staticmethod
+    def test_none_meta_info():
+        wire = b'\x06\x0f\x07\x06\x08\x01\x41\x08\x01\x31\x16\x03\x1b\x01\xc8\x17\x00'
+        _, meta_info, _, _ = parse_data(wire)
+        assert meta_info is not None
+        assert meta_info.content_type == ContentType.BLOB

tests/encoding/ndn_format_0_3_test.py

@@ -16,7 +16,7 @@
 # limitations under the License.
 # -----------------------------------------------------------------------------
 import os
-from datetime import datetime
+from datetime import datetime, timezone
 import pytest
 from tempfile import TemporaryDirectory
 from ndn.encoding import Component
@@ -321,7 +321,7 @@ def test_signing_suggest():
             la_author_cert_name, la_author_cert = derive_cert(la_author_id.default_key().name,
                                                               Component.from_str('la-signer'),
                                                               la_cert_data.content, la_signer,
-                                                              datetime.utcnow(), 100)
+                                                              datetime.now(timezone.utc), 100)
             keychain.import_cert(la_id.default_key().name, la_author_cert_name, la_author_cert)
 
             ny_id = keychain.touch_identity('/ny')
@@ -334,7 +334,7 @@ def test_signing_suggest():
             ny_author_cert_name, ny_author_cert = derive_cert(ny_author_id.default_key().name,
                                                               Component.from_str('ny-signer'),
                                                               ny_cert_data.content, ny_signer,
-                                                              datetime.utcnow(), 100)
+                                                              datetime.now(timezone.utc), 100)
             keychain.import_cert(ny_id.default_key().name, ny_author_cert_name, ny_author_cert)
 
             lvs = r'''