Merge branch 'hotfix/0.2.0'

Author: pipinfitriadi

.github/workflows/ci-cd.yml

@@ -11,6 +11,37 @@ on:
       - '[0-9]+.[0-9]+.[0-9]+-[a-z]+'
       - '[0-9]+.[0-9]+.[0-9]+-[a-z]+.[0-9]+'
 jobs:
+  lint:
+    name: Linter Test
+    runs-on: ubuntu-latest
+    container:
+      image: pipelinecomponents/flake8
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Lint with flake8
+        run: flake8
+  jar:
+    name: Get Jar File
+    if:
+      github.ref_type == 'tag' ||
+      github.event_name == 'pull_request' ||
+      contains('refs/heads/main refs/heads/develop', github.ref) ||
+      startsWith(github.ref, 'refs/heads/release/') ||
+      startsWith(github.ref, 'refs/heads/hotfix/')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cache jar
+        id: cache-java-jar
+        uses: actions/cache@v3
+        with:
+          path: app/asicverifier.jar
+          key: java-jar
+      - name: Get jar file from docker
+        if: steps.cache-java-jar.outputs.cache-hit != 'true'
+        run: docker run --rm --platform linux/amd64 -v $PWD/app/:/app/ --entrypoint cp niis/xroad-security-server-sidecar:7.0.4 /usr/share/xroad/jlib/asicverifier.jar app/asicverifier.jar
   venv:
     name: Virtual environment
     if:
@@ -39,21 +70,9 @@ jobs:
           . venv/bin/activate
           pip install --upgrade pip
           pip install build 'coverage[toml]' httpx
-  lint:
-    name: Linter Test
-    runs-on: ubuntu-latest
-    container:
-      image: pipelinecomponents/flake8
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Lint with flake8
-        run: flake8
   unittest:
     name: Unit Test
-    needs: venv
+    needs: [jar, venv]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -71,7 +90,19 @@ jobs:
           echo PATH=$PATH >> $GITHUB_ENV
       - name: Install package
         run: pip install '.[restful-api]'
+      - name: Set up Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: '8'
+      - name: Cache jar
+        uses: actions/cache@v3
+        with:
+          path: app/asicverifier.jar
+          key: java-jar
       - name: Test
+        env:
+          JAR_PATH: app/asicverifier.jar
         run: python -m coverage run -m unittest
       - name: Display test coverage
         run: python -m coverage report -m

asicverifier/__init__.py

@@ -3,6 +3,8 @@
 # This module is part of AsicVerifier and is released under
 # the AGPL-3.0-only License: https://opensource.org/license/agpl-v3/
 
+from dateutil import tz
+from dateutil.parser import parse
 from datetime import datetime
 from enum import Enum
 from io import BytesIO
@@ -25,7 +27,7 @@
 
 
 def to_datetime(string: str) -> datetime:
-    return datetime.strptime(string, r'%a %b %d %H:%M:%S %Z %Y')
+    return parse(string, tzinfos={'WIB': tz.gettz('Asia/Jakarta')})
 
 
 def extract_subject_or_issuer(message: str) -> dict:

pyproject.toml

@@ -26,7 +26,7 @@ classifiers = [
     'Topic :: Text Processing',
     'Topic :: Utilities'
 ]
-dependencies = ['python-dotenv', 'typer[all]', 'requests']
+dependencies = ['python-dotenv', 'typer[all]', 'requests', 'python-dateutil']
 scripts = { asicverifier = 'asicverifier.__main__:cli' }
 dynamic = ['version']
 

tests/__init__.py

@@ -3,6 +3,8 @@
 # This module is part of AsicVerifier and is released under
 # the AGPL-3.0-only License: https://opensource.org/license/agpl-v3/
 
+from dateutil.parser import parse
+from dateutil.tz import tzutc
 from datetime import datetime
 import json
 import unittest
@@ -34,11 +36,11 @@
 DIRS: str = 'tests/data/'
 
 
-def datetime_parser(data: dict, format: str = r'%Y-%m-%dT%H:%M:%S') -> dict:
+def datetime_parser(data: dict) -> dict:
     for key, value in data.items():
         if isinstance(value, str):
             try:
-                data[key] = datetime.strptime(value, format)
+                data[key] = parse(value)
             except ValueError:
                 pass
 
@@ -106,7 +108,7 @@ def test_main(self):
     def test_to_datetime(self):
         self.assertEqual(
             to_datetime('Mon May 29 08:33:50 GMT 2023'),
-            datetime(2023, 5, 29, 8, 33, 50)
+            datetime(2023, 5, 29, 8, 33, 50, tzinfo=tzutc())
         )
 
     def test_extract_subject_or_issuer(self):

tests/data/asicverifier.json

@@ -13,8 +13,8 @@
             },
             "serial_number": 13,
             "valid": {
-                "from": "2023-05-29T15:33:50",
-                "until": "2043-05-24T15:33:50"
+                "from": "2023-05-29T15:33:50+07:00",
+                "until": "2043-05-24T15:33:50+07:00"
             }
         },
         "id": {
@@ -33,11 +33,11 @@
             },
             "serial_number": 1,
             "valid": {
-                "from": "2023-05-23T04:08:07",
-                "until": "2043-05-18T04:08:07"
+                "from": "2023-05-23T04:08:07+07:00",
+                "until": "2043-05-18T04:08:07+07:00"
             }
         },
-        "produced_at": "2023-10-02T09:44:28"
+        "produced_at": "2023-10-02T09:44:28+07:00"
     },
     "timestamp": {
         "signed_by": {
@@ -62,11 +62,11 @@
             },
             "serial_number": 13972846748170250626,
             "valid": {
-                "from": "2016-03-13T08:57:39",
-                "until": "2026-03-11T08:57:39"
+                "from": "2016-03-13T08:57:39+07:00",
+                "until": "2026-03-11T08:57:39+07:00"
             }
         },
-        "date": "2023-10-02T10:02:03"
+        "date": "2023-10-02T10:02:03+07:00"
     },
     "file": [
         {