Merge pull request #16 from luoweiwang/migration-4.3

Update plugin version to ec-cube 4.3
EC-CUBE · Apr 8, 2024 · 80eca26 · 80eca26
2 parents 8aa71a4 + dd1a69c
commit 80eca26
Show file tree

Hide file tree

Showing 4 changed files with 200 additions and 11 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -0,0 +1,190 @@
+name: CI for TwoFactorAuthCustomerSms42
+on:
+  push:
+    branches:
+      - '*'
+    tags:
+      - '*'
+    paths:
+      - '**'
+      - '!*.md'
+  pull_request:
+    branches:
+      - '*'
+    paths:
+      - '**'
+      - '!*.md'
+jobs:
+  run-on-linux:
+    name: Run on Linux
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        eccube_version: [ '4.2','4.3' ]
+        php: [ '7.4', '8.0', '8.1','8.2', '8.3' ]
+        db: [ 'mysql', 'mysql8', 'pgsql' ]
+        plugin_code: [ 'TwoFactorAuthCustomerSms42' ]
+        include:
+          - db: mysql
+            database_url: mysql://root:[email protected]:3306/eccube_db
+            database_server_version: 5.7
+            database_charset: utf8mb4
+          - db: mysql8
+            database_url: mysql://root:[email protected]:3308/eccube_db
+            database_server_version: 8
+            database_charset: utf8mb4
+          - db: pgsql
+            database_url: postgres://postgres:[email protected]:5432/eccube_db
+            database_server_version: 14
+            database_charset: utf8
+        exclude:
+          -   eccube_version: 4.2
+              php: 8.2
+          -   eccube_version: 4.2
+              php: 8.3
+          -   eccube_version: 4.3
+              php: 7.4
+          -   eccube_version: 4.3
+              php: 8.0
+    services:
+      mysql:
+        image: mysql:5.7
+        env:
+          MYSQL_ROOT_PASSWORD: password
+          MYSQL_DATABASE: ${{ matrix.dbname }}
+        ports:
+          - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+      mysql8:
+        image: mysql:8
+        env:
+          MYSQL_ROOT_PASSWORD: password
+          MYSQL_DATABASE: ${{ matrix.dbname }}
+        ports:
+          - 3308:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+      postgres:
+        image: postgres:14
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: password
+          POSTGRES_DB: ${{ matrix.dbname }}
+        ports:
+          - 5432:5432
+        # needed because the postgres container does not provide a healthcheck
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+      mailcatcher:
+        image: schickling/mailcatcher
+        ports:
+          - 1080:1080
+          - 1025:1025
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: nanasess/setup-php@master
+        with:
+          php-version: ${{ matrix.php }}
+
+      - name: Archive Plugin
+        env:
+          PLUGIN_CODE: ${{ matrix.plugin_code }}
+        run: |
+          tar cvzf ${GITHUB_WORKSPACE}/${PLUGIN_CODE}.tar.gz ./*
+
+      - name: Checkout Base Plugin
+        uses: actions/checkout@v4
+        with:
+          repository: 'EC-CUBE/TwoFactorAuthCustomer42'
+          path: 'TwoFactorAuthCustomer42'
+
+      - name: Archive Base Plugin
+        working-directory: 'TwoFactorAuthCustomer42'
+        run: |
+          tar cvzf ${GITHUB_WORKSPACE}/TwoFactorAuthCustomer42.tar.gz ./*
+
+      - name: Setup mock-package-api
+        env:
+          PLUGIN_CODE: ${{ matrix.plugin_code }}
+        run: |
+          mkdir -p /tmp/repos
+          for f in ${PLUGIN_CODE} TwoFactorAuthCustomer42; do
+            cp ${GITHUB_WORKSPACE}/${f}.tar.gz /tmp/repos/${f}.tgz
+          done
+          docker run --name package-api -d -v /tmp/repos:/repos -e MOCK_REPO_DIR=/repos -p 8080:8080 eccube/mock-package-api:composer2
+
+      - name: Checkout EC-CUBE
+        uses: actions/checkout@v2
+        with:
+          repository: 'EC-CUBE/ec-cube'
+          ref: ${{ matrix.eccube_version }}
+          path: 'ec-cube'
+
+      - name: Get Composer Cache Directory
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
+      - uses: actions/cache@v1
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-
+      - name: Install to composer
+        working-directory: 'ec-cube'
+        run: composer install --no-interaction -o --apcu-autoloader
+
+      - name: Setup EC-CUBE
+        env:
+          APP_ENV: 'test'
+          APP_DEBUG: 0
+          DATABASE_URL: ${{ matrix.database_url }}
+          DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }}
+          DATABASE_CHARSET: ${{ matrix.database_charset }}
+          ECCUBE_PACKAGE_API_URL: 'http://127.0.0.1:8080'
+        working-directory: 'ec-cube'
+        run: |
+          bin/console doctrine:database:create
+          bin/console doctrine:schema:create
+          bin/console eccube:fixtures:load
+      - name: Setup Plugin
+        env:
+          APP_ENV: 'test'
+          APP_DEBUG: 0
+          DATABASE_URL: ${{ matrix.database_url }}
+          DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }}
+          DATABASE_CHARSET: ${{ matrix.database_charset }}
+          PLUGIN_CODE: ${{ matrix.plugin_code }}
+          ECCUBE_PACKAGE_API_URL: 'http://127.0.0.1:8080'
+        working-directory: 'ec-cube'
+        run: |
+          bin/console eccube:composer:require ec-cube/twofactorauthcustomer42
+          bin/console eccube:plugin:enable --code=TwoFactorAuthCustomer42
+          bin/console eccube:composer:require ec-cube/twofactorauthcustomersms42
+          bin/console eccube:plugin:enable --code=${PLUGIN_CODE}
+
+      - name: Disable Plugin
+        working-directory: 'ec-cube'
+        env:
+          APP_ENV: 'test'
+          APP_DEBUG: 0
+          DATABASE_URL: ${{ matrix.database_url }}
+          DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }}
+          DATABASE_CHARSET: ${{ matrix.database_charset }}
+          PLUGIN_CODE: ${{ matrix.plugin_code }}
+          ECCUBE_PACKAGE_API_URL: 'http://127.0.0.1:8080'
+        run: bin/console eccube:plugin:disable --code=${PLUGIN_CODE}
+
+      - name: Uninstall Plugin
+        env:
+          APP_ENV: 'test'
+          APP_DEBUG: 0
+          DATABASE_URL: ${{ matrix.database_url }}
+          DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }}
+          DATABASE_CHARSET: ${{ matrix.database_charset }}
+          PLUGIN_CODE: ${{ matrix.plugin_code }}
+          ECCUBE_PACKAGE_API_URL: 'http://127.0.0.1:8080'
+        working-directory: 'ec-cube'
+        run: bin/console eccube:plugin:uninstall --code=${PLUGIN_CODE}
diff --git a/Controller/TwoFactorAuthCustomerSmsController.php b/Controller/TwoFactorAuthCustomerSmsController.php
@@ -13,6 +13,7 @@
 
 namespace Plugin\TwoFactorAuthCustomerSms42\Controller;
 
+use Eccube\Common\Constant;
 use Eccube\Entity\Customer;
 use Plugin\TwoFactorAuthCustomer42\Controller\TwoFactorAuthCustomerController;
 use Plugin\TwoFactorAuthCustomer42\Form\Type\TwoFactorAuthPhoneNumberTypeCustomer;
@@ -155,14 +156,11 @@ public function inputToken(Request $request)
     private function checkToken(Customer $Customer, $token): bool
     {
         $now = new \DateTime();
+        $hashedToken = $Customer->getTwoFactorAuthOneTimeToken();
+        $expire = $Customer->getTwoFactorAuthOneTimeTokenExpire();
 
-        // フォームからのハッシュしたワンタイムパスワードとDBに保存しているワンタイムパスワードのハッシュは一致しているかどうか
-        if ($Customer->getTwoFactorAuthOneTimeToken() !== $this->customerTwoFactorAuthService->hashOneTimeToken($token)
-            || $Customer->getTwoFactorAuthOneTimeTokenExpire() < $now) {
-            return false;
-        }
-
-        return true;
+        // トークン検証
+        return $this->customerTwoFactorAuthService->verifyOneTimeToken($hashedToken, $token) && $expire > $now;
     }
 
     /**

diff --git a/PluginManager.php b/PluginManager.php
@@ -17,10 +17,11 @@
 use Eccube\Entity\Layout;
 use Eccube\Entity\Page;
 use Eccube\Entity\PageLayout;
+use Eccube\Common\EccubeConfig;
 use Eccube\Plugin\AbstractPluginManager;
 use Plugin\TwoFactorAuthCustomer42\Entity\TwoFactorAuthConfig;
 use Plugin\TwoFactorAuthCustomer42\Entity\TwoFactorAuthType;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Symfony\Component\Filesystem\Filesystem;
 
 /**
@@ -122,7 +123,7 @@ protected function createConfig(EntityManagerInterface $em)
     protected function copyTwigFiles(ContainerInterface $container)
     {
         // テンプレートファイルコピー
-        $templatePath = $container->getParameter('eccube_theme_front_dir')
+        $templatePath = $container->get(EccubeConfig::class)->get('eccube_theme_front_dir')
             .'/TwoFactorAuthCustomerSms42/Resource/template/default';
         $fs = new Filesystem();
         if ($fs->exists($templatePath)) {
@@ -194,7 +195,7 @@ protected function removeConfig(EntityManagerInterface $em)
      */
     protected function removeTwigFiles(ContainerInterface $container)
     {
-        $templatePath = $container->getParameter('eccube_theme_front_dir')
+        $templatePath = $container->get(EccubeConfig::class)->get('eccube_theme_front_dir')
             .'/TwoFactorAuthCustomerSms42';
         $fs = new Filesystem();
         $fs->remove($templatePath);

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "ec-cube/twofactorauthcustomersms42",
-    "version": "1.0.0",
+    "version": "4.3.0",
     "description": "2 factor authentication for Customers(SMS) EC-CUBE42",
     "type": "eccube-plugin",
     "extra": {