Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[OWASP ZAP] 会員管理 会員情報編集 #5333

Merged
merged 6 commits into from
Apr 21, 2022
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/penetration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ jobs:
- 'test/front_guest/contact.test.ts'
- 'test/admin/content_layout.test.ts'
- 'test/admin/content_layout_delete.test.ts'
- 'test/admin/customer_edit.test.ts'
- 'test/admin/order_mail.test.ts'

steps:
Expand Down Expand Up @@ -47,6 +48,10 @@ jobs:
if: matrix.group == 'test/admin/content_layout_delete.test.ts'
working-directory: zap/selenium/ci/TypeScript
run: git am patches/0001-DeleteLayout.patch
- name: Apply patch to edit_customer
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

更新の場合は commit されても重複エラーになったりすることは無いのでパッチ不要かと思いますがいかがでしょう?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nanasess
ありがとうございます。
パッチを取り下げさせて頂きました。

if: matrix.group == 'test/admin/customer_edit.test.ts'
working-directory: zap/selenium/ci/TypeScript
run: git am patches/0002-EditCustomer.patch
- name: Penetration testing
working-directory: zap/selenium/ci/TypeScript
env:
Expand Down
32 changes: 32 additions & 0 deletions zap/selenium/ci/TypeScript/patches/0002-EditCustomer.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
From 8ef429a0efe81ef1cebcd778170e14f30d1663eb Mon Sep 17 00:00:00 2001
From: Kazuaki Yabu <carbuncle.panic@gmail.com>
Date: Wed, 23 Mar 2022 16:10:44 +0900
Subject: [PATCH] =?UTF-8?q?[OWASP=20ZAP]=20=E4=BC=9A=E5=93=A1=E7=AE=A1?=
=?UTF-8?q?=E7=90=86=20=E4=BC=9A=E5=93=A1=E6=83=85=E5=A0=B1=E7=B7=A8?=
=?UTF-8?q?=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
.../Controller/Admin/Customer/CustomerEditController.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Eccube/Controller/Admin/Customer/CustomerEditController.php b/src/Eccube/Controller/Admin/Customer/CustomerEditController.php
index f8beac4f6d..ef55c7fca9 100644
--- a/src/Eccube/Controller/Admin/Customer/CustomerEditController.php
+++ b/src/Eccube/Controller/Admin/Customer/CustomerEditController.php
@@ -113,8 +113,8 @@ class CustomerEditController extends AbstractController
$Customer->setEmail(StringUtil::random(60).'@dummy.dummy');
}

- $this->entityManager->persist($Customer);
- $this->entityManager->flush();
+// $this->entityManager->persist($Customer);
+// $this->entityManager->flush();

log_info('会員登録完了', [$Customer->getId()]);

--
2.30.2

91 changes: 91 additions & 0 deletions zap/selenium/ci/TypeScript/test/admin/customer_edit.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
import { test, expect, chromium, Page } from '@playwright/test';
import PlaywrightConfig from '../../playwright.config';
import { intervalRepeater } from '../../utils/Progress';
import { ZapClient, Mode, ContextType, Risk, HttpMessage } from '../../utils/ZapClient';
import { ECCUBE_ADMIN_ROUTE } from '../../config/default.config';

const zapClient = new ZapClient();

const url = `${PlaywrightConfig.use.baseURL}/${ECCUBE_ADMIN_ROUTE}/customer/1/edit`;

test.describe.serial('会員登録 会員管理->編集のテストをします', () => {
let page: Page;
test.beforeAll(async () => {
await zapClient.setMode(Mode.Protect);
await zapClient.newSession('/zap/wrk/sessions/admin_customer_edit', true);
await zapClient.importContext(ContextType.Admin);

if (!await zapClient.isForcedUserModeEnabled()) {
await zapClient.setForcedUserModeEnabled();
expect(await zapClient.isForcedUserModeEnabled()).toBeTruthy();
}
const browser = await chromium.launch();
page = await browser.newPage();
await page.goto(url);
});

test('会員管理ページを表示します', async () => {
await expect(page).toHaveTitle(/会員管理/);
});

test('タイトルを確認します', async () => {
await page.textContent('.c-pageTitle__subTitle')
.then(title => expect(title).toContain('会員管理'));
});

test.describe('テストを実行します[GET] @attack', () => {
let scanId: number;
test('アクティブスキャンを実行します[GET]', async () => {
scanId = await zapClient.activeScanAsUser(url, 2, 55, false, null, 'GET');
await intervalRepeater(async () => await zapClient.getActiveScanStatus(scanId), 5000, page);
});

test('結果を確認します[GET]', async () => {
await zapClient.getAlerts(url, 0, 1, Risk.High)
.then(alerts => expect(alerts).toEqual([]));
});
});

test('会員情報を更新します', async () => {
await page.fill('[placeholder="姓"]', '山田');
await page.fill('[placeholder="名"]', '太郎');
await page.fill('[placeholder="セイ"]', 'ヤマダ');
await page.fill('[placeholder="メイ"]', 'タロウ');
await page.fill('input[name="admin_customer\\[company_name\\]"]', 'イーシーキューブ');
await page.fill('[placeholder="例:5300001"]', '5300001');
await page.click('select[name="admin_customer\\[address\\]\\[pref\\]"]');
await page.selectOption('select[name="admin_customer\\[address\\]\\[pref\\]"]', '1');
await page.fill('[placeholder="市区町村名\\(例:大阪市北区\\)"]', '大阪市北区梅田');
await page.fill('[placeholder="番地・ビル名\\(例:西梅田1丁目6-8\\)"]', '2-4-9');
await page.fill('[placeholder="例:ec-cube\\@example\\.com"]', 'test12345@test.local');
await page.fill('[placeholder="例:11122223333"]', '0001112222');
await page.fill('input[name="admin_customer\\[password\\]\\[first\\]"]', 'password123');
await page.fill('input[name="admin_customer\\[password\\]\\[second\\]"]', 'password123');
await page.click('input[name="admin_customer\\[sex\\]"]');
await page.selectOption('select[name="admin_customer\\[job\\]"]', '3');
await page.fill('input[name="admin_customer\\[birth\\]"]', '1980-04-01');
await page.fill('input[name="admin_customer\\[point\\]"]', '10');
await page.fill('textarea[name="admin_customer\\[note\\]"]', '国語国語国語国語国語国語国語国語国語国語国語国語国語国語国語国語国語国語国語国語国語国語');
await page.click('button:has-text("登録")');
await expect(page).toHaveURL(url);
});

let message: HttpMessage;
test('HttpMessage を取得します', async () => {
const messages = await zapClient.getMessages(url, await zapClient.getNumberOfMessages(url) - 1, 1);
message = messages.pop();
expect(message.requestHeader).toContain(`POST ${url}`)
expect(message.responseHeader).toContain('HTTP/1.1 302 Found');
});

let scanId: number;
test('アクティブスキャンを実行します[POST]', async () => {
scanId = await zapClient.activeScanAsUser(url, 2, 55, false, null, 'POST', message.requestBody);
await intervalRepeater(async () => await zapClient.getActiveScanStatus(scanId), 5000, page);
});

test('結果を確認します[POST]', async () => {
await zapClient.getAlerts(url, 0, 1, Risk.High)
.then(alerts => expect(alerts).toEqual([]));
});
});