Skip to content

Commit 85c9c85

Browse files
committed
wip
1 parent e857587 commit 85c9c85

19 files changed

+246
-24
lines changed

.github/workflows/run-tests.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,13 @@ jobs:
4747
- name: Execute tests
4848
run: vendor/bin/pest
4949
env:
50-
DOCUWARE_URL: ${{ secrets.DOCUWARE_URL }}
51-
DOCUWARE_USERNAME: ${{ secrets.DOCUWARE_USERNAME }}
52-
DOCUWARE_PASSWORD: ${{ secrets.DOCUWARE_PASSWORD }}
53-
DOCUWARE_COOKIES: ${{ secrets.DOCUWARE_COOKIES }}
50+
M_FILES_URL: ${{ secrets.M_FILES_URL }}
51+
M_FILES_USERNAME: ${{ secrets.M_FILES_USERNAME }}
52+
M_FILES_PASSWORD: ${{ secrets.M_FILES_PASSWORD }}
53+
M_FILES_VAULT_GUID: ${{ secrets.M_FILES_VAULT_GUID }}
54+
M_FILES_CACHE_DRIVER: ${{ secrets.M_FILES_CACHE_DRIVER }}
55+
M_FILES_CACHE_LIFETIME_IN_SECONDS: ${{ secrets.M_FILES_CACHE_LIFETIME_IN_SECONDS }}
56+
SALOON_FIXTURE_REDACTION: true
5457

5558
- name: Store Log Artifacts
5659
if: failure()

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,3 @@ vendor
1010
node_modules
1111
.phpactor.json
1212
build
13-
tests/Fixtures/Saloon/

phpunit.xml.dist

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<env name="M_FILES_VAULT_GUID" value=""/>
2828
<env name="M_FILES_CACHE_DRIVER" value="file"/>
2929
<env name="M_FILES_CACHE_LIFETIME_IN_SECONDS" value="0"/>
30+
<env name="SALOON_FIXTURE_REDACTION" value="true"/>
3031
</php>
3132
<source>
3233
<include>

src/Fixtures/AuthenticationTokenFixture.php

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,34 @@ protected function defineName(): string
1515

1616
protected function defineSensitiveHeaders(): array
1717
{
18+
if (!env('SALOON_FIXTURE_REDACTION', true)) {
19+
return [];
20+
}
21+
1822
return [
19-
// 'Set-Cookie' => 'REDACTED',
23+
'Set-Cookie' => 'REDACTED',
2024
];
2125
}
2226

2327
protected function defineSensitiveJsonParameters(): array
2428
{
29+
if (!env('SALOON_FIXTURE_REDACTION', true)) {
30+
return [];
31+
}
32+
2533
return [
26-
// 'Value' => 'REDACTED-AUTH-TOKEN',
34+
'Value' => 'REDACTED-AUTH-TOKEN',
2735
];
2836
}
2937

3038
protected function defineSensitiveRegexPatterns(): array
3139
{
40+
if (!env('SALOON_FIXTURE_REDACTION', true)) {
41+
return [];
42+
}
43+
3244
return [
33-
// '/[A-Za-z0-9_-]{100,}/' => 'REDACTED-AUTH-TOKEN',
45+
'/[A-Za-z0-9_-]{100,}/' => 'REDACTED-AUTH-TOKEN',
3446
];
3547
}
3648
}

src/Fixtures/CreateSingleFileDocumentFixture.php

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,13 @@ protected function defineName(): string
1515

1616
protected function defineSensitiveHeaders(): array
1717
{
18-
return [];
18+
if (!env('SALOON_FIXTURE_REDACTION', true)) {
19+
return [];
20+
}
21+
22+
return [
23+
'Set-Cookie' => 'REDACTED',
24+
];
1925
}
2026

2127
protected function defineSensitiveJsonParameters(): array
@@ -25,6 +31,12 @@ protected function defineSensitiveJsonParameters(): array
2531

2632
protected function defineSensitiveRegexPatterns(): array
2733
{
28-
return [];
34+
if (!env('SALOON_FIXTURE_REDACTION', true)) {
35+
return [];
36+
}
37+
38+
return [
39+
'/2025-07-1[0-9]T[0-9]{2}:[0-9]{2}:[0-9]{2}Z/' => '2024-01-01T00:00:00Z',
40+
];
2941
}
3042
}

src/Fixtures/CurrentUserFixture.php

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,25 @@ protected function defineName(): string
1515

1616
protected function defineSensitiveHeaders(): array
1717
{
18+
if (!env('SALOON_FIXTURE_REDACTION', true)) {
19+
return [];
20+
}
21+
1822
return [
19-
// 'Set-Cookie' => 'REDACTED',
23+
'Set-Cookie' => 'REDACTED',
2024
];
2125
}
2226

2327
protected function defineSensitiveJsonParameters(): array
2428
{
29+
if (!env('SALOON_FIXTURE_REDACTION', true)) {
30+
return [];
31+
}
32+
2533
return [
26-
// 'AccountName' => '[email protected]',
27-
// 'SerialNumber' => 'REDACTED-SERIAL',
28-
// 'FullName' => 'REDACTED USER',
34+
'AccountName' => '[email protected]',
35+
'SerialNumber' => 'REDACTED-SERIAL',
36+
'FullName' => 'REDACTED USER',
2937
];
3038
}
3139

src/Fixtures/DocumentPropertiesFixture.php

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,13 @@ protected function defineName(): string
1515

1616
protected function defineSensitiveHeaders(): array
1717
{
18-
return [];
18+
if (!env('SALOON_FIXTURE_REDACTION', true)) {
19+
return [];
20+
}
21+
22+
return [
23+
'Set-Cookie' => 'REDACTED',
24+
];
1925
}
2026

2127
protected function defineSensitiveJsonParameters(): array
@@ -25,6 +31,12 @@ protected function defineSensitiveJsonParameters(): array
2531

2632
protected function defineSensitiveRegexPatterns(): array
2733
{
28-
return [];
34+
if (!env('SALOON_FIXTURE_REDACTION', true)) {
35+
return [];
36+
}
37+
38+
return [
39+
'/Fehlerreferenz-ID: [a-f0-9-]{36}/' => 'Fehlerreferenz-ID: REDACTED-ERROR-ID',
40+
];
2941
}
3042
}

src/Fixtures/DocumentsFixture.php

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,36 @@ protected function defineName(): string
1515

1616
protected function defineSensitiveHeaders(): array
1717
{
18-
return [];
18+
if (!env('SALOON_FIXTURE_REDACTION', true)) {
19+
return [];
20+
}
21+
22+
return [
23+
'Set-Cookie' => 'REDACTED',
24+
];
1925
}
2026

2127
protected function defineSensitiveJsonParameters(): array
2228
{
23-
return [];
29+
if (!env('SALOON_FIXTURE_REDACTION', true)) {
30+
return [];
31+
}
32+
33+
return [
34+
'ObjectGUID' => 'REDACTED-GUID',
35+
];
2436
}
2537

2638
protected function defineSensitiveRegexPatterns(): array
2739
{
28-
return [];
40+
if (!env('SALOON_FIXTURE_REDACTION', true)) {
41+
return [];
42+
}
43+
44+
return [
45+
'/\{[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}\}/i' => '{REDACTED-GUID}',
46+
'/2025-07-1[0-9]T[0-9]{2}:[0-9]{2}:[0-9]{2}Z/' => '2024-01-01T00:00:00Z',
47+
'/[0-9]{2}\.07\.2025 [0-9]{2}:[0-9]{2}/' => '01.01.2024 00:00',
48+
];
2949
}
3050
}

src/Fixtures/DownloadFileFixture.php

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,34 @@ protected function defineName(): string
1515

1616
protected function defineSensitiveHeaders(): array
1717
{
18+
if (!env('SALOON_FIXTURE_REDACTION', true)) {
19+
return [];
20+
}
21+
1822
return [
19-
// 'Set-Cookie' => 'REDACTED',
23+
'Set-Cookie' => 'REDACTED',
2024
];
2125
}
2226

2327
protected function defineSensitiveJsonParameters(): array
2428
{
29+
if (!env('SALOON_FIXTURE_REDACTION', true)) {
30+
return [];
31+
}
32+
2533
return [
26-
// 'Value' => 'REDACTED-AUTH-TOKEN',
34+
'Value' => 'REDACTED-AUTH-TOKEN',
2735
];
2836
}
2937

3038
protected function defineSensitiveRegexPatterns(): array
3139
{
40+
if (!env('SALOON_FIXTURE_REDACTION', true)) {
41+
return [];
42+
}
43+
3244
return [
33-
// '/[A-Za-z0-9_-]{100,}/' => 'REDACTED-AUTH-TOKEN',
45+
'/[A-Za-z0-9_-]{100,}/' => 'REDACTED-AUTH-TOKEN',
3446
];
3547
}
3648
}

src/Fixtures/LogoutSessionFixture.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,12 @@ protected function defineName(): string
1515

1616
protected function defineSensitiveHeaders(): array
1717
{
18+
if (!env('SALOON_FIXTURE_REDACTION', true)) {
19+
return [];
20+
}
21+
1822
return [
19-
// 'Set-Cookie' => 'REDACTED',
23+
'Set-Cookie' => 'REDACTED',
2024
];
2125
}
2226

0 commit comments

Comments
 (0)