Skip to content

Commit 42cb7ab

Browse files
TheNorthMemoryTheNorthMemory
authored
optim the pay client and server on APIv2 specials, ref efedd21 (#2888)
1 parent b49c484 commit 42cb7ab

File tree

5 files changed

+159
-7
lines changed

5 files changed

+159
-7
lines changed

‎.github/workflows/deploy.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@ name: Deploy
44

55
# Controls when the workflow will run
66
on:
7-
# Triggers the workflow on push or pull request events but only for the 6.x branch
7+
# Triggers the workflow on push event but only for the 6.x branch(required the secrets environment)
88
push:
99
branches: [ 6.x ]
10-
pull_request:
11-
branches: [ 6.x ]
1210

1311
# Allows you to run this workflow manually from the Actions tab
1412
workflow_dispatch:

‎src/Pay/Client.php

+7-3
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@
3030
use Symfony\Contracts\HttpClient\HttpClientInterface;
3131
use Symfony\Contracts\HttpClient\ResponseInterface;
3232

33+
use function array_key_exists;
3334
use function is_array;
3435
use function is_string;
36+
use function ltrim;
3537
use function str_starts_with;
3638
use function strcasecmp;
3739

@@ -164,9 +166,11 @@ public function request(string $method, string $url, array $options = []): Respo
164166
failureJudge: $this->isV3Request($url) ? null : function (Response $response) use ($url): bool {
165167
$arr = $response->toArray();
166168

169+
if ($url === self::V2_URI_OVER_GETS[0]) {
170+
return ! (array_key_exists('retcode', $arr) && $arr['retcode'] === 0);
171+
}
172+
167173
return ! (
168-
$url === self::V2_URI_OVER_GETS[0] && array_key_exists('retcode', $arr) && $arr['retcode'] === 0
169-
) || ! (
170174
// protocol code, most similar to the HTTP status code in APIv3
171175
array_key_exists('return_code', $arr) && $arr['return_code'] === 'SUCCESS'
172176
) || (
@@ -180,7 +184,7 @@ public function request(string $method, string $url, array $options = []): Respo
180184

181185
protected function isV3Request(string $url): bool
182186
{
183-
$uri = (new Uri($url))->getPath();
187+
$uri = '/'.ltrim((new Uri($url))->getPath(), '/');
184188

185189
foreach (self::V3_URI_PREFIXES as $prefix) {
186190
if (str_starts_with($uri, $prefix)) {

‎src/Pay/Server.php

+16
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
use Psr\Http\Message\ResponseInterface;
1919
use Psr\Http\Message\ServerRequestInterface;
2020

21+
use function array_key_exists;
2122
use function is_array;
23+
use function is_string;
2224
use function json_decode;
2325
use function json_encode;
2426
use function str_contains;
@@ -141,6 +143,20 @@ protected function decodeXmlMessage(string $contents): array
141143
$attributes = Xml::parse(AesEcb::decrypt($attributes['req_info'], md5($key), iv: ''));
142144
}
143145

146+
if (
147+
is_array($attributes)
148+
&& array_key_exists('event_ciphertext', $attributes) && is_string($attributes['event_ciphertext'])
149+
&& array_key_exists('event_nonce', $attributes) && is_string($attributes['event_nonce'])
150+
&& array_key_exists('event_associated_data', $attributes) && is_string($attributes['event_associated_data'])
151+
) {
152+
$attributes += Xml::parse(AesGcm::decrypt(
153+
$attributes['event_ciphertext'],
154+
$this->merchant->getSecretKey(),
155+
$attributes['event_nonce'],
156+
$attributes['event_associated_data'] // maybe empty string
157+
));
158+
}
159+
144160
if (! is_array($attributes)) {
145161
throw new RuntimeException('Failed to decrypt request message.');
146162
}

‎tests/Pay/ClientTest.php

+17
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,23 @@ public function test_v2_request_with_xml_string_as_body()
126126
$this->assertSame(Xml::build(['foo' => 'bar']), $client->getRequestOptions()['body']);
127127
}
128128

129+
public function test_v2_request_appauth_getaccesstoken()
130+
{
131+
$client = Client::mock('{"retcode":-1,"access_token":"mock-token"}', 200, ['Content-Type' => 'application/json']);
132+
$client->shouldReceive('createSignature')->never();
133+
$client->shouldReceive('isV3Request')->andReturn(false);
134+
$client->shouldReceive('attachLegacySignature')->with([
135+
'foo' => 'bar',
136+
])->andReturn(['foo' => 'bar', 'sign' => 'mock-signature']);
137+
138+
$response = $client->get('/appauth/getaccesstoken', ['query' => ['foo' => 'bar']]);
139+
140+
$this->assertSame('GET', $client->getRequestMethod());
141+
$this->assertEquals(['foo' => 'bar', 'sign' => 'mock-signature'], $client->getRequestOptions()['query']);
142+
$this->assertSame('https://api.mch.weixin.qq.com/appauth/getaccesstoken?foo=bar&sign=mock-signature', $client->getRequestUrl());
143+
$this->assertContains('Content-Type: text/xml', $client->getRequestOptions()['headers']);
144+
}
145+
129146
public function test_v3_upload_media()
130147
{
131148
$client = Client::mock();

‎tests/Pay/ServerTest.php

+118-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,22 @@
44

55
namespace EasyWeChat\Tests\Pay;
66

7+
use EasyWeChat\Kernel\Support\AesEcb;
8+
use EasyWeChat\Kernel\Support\AesGcm;
9+
use EasyWeChat\Kernel\Support\Xml;
710
use EasyWeChat\Pay\Contracts\Merchant;
11+
use EasyWeChat\Pay\Message;
812
use EasyWeChat\Pay\Server;
913
use EasyWeChat\Tests\TestCase;
14+
use Mockery\LegacyMockInterface;
15+
use Nyholm\Psr7\Response;
1016
use Nyholm\Psr7\ServerRequest;
17+
use Psr\Http\Message\ResponseInterface;
18+
19+
use function bin2hex;
20+
use function fopen;
21+
use function md5;
22+
use function random_bytes;
1123

1224
class ServerTest extends TestCase
1325
{
@@ -16,10 +28,13 @@ public function test_it_will_handle_validation_request()
1628
$request = (new ServerRequest(
1729
'POST',
1830
'http://easywechat.com/',
19-
[],
31+
[
32+
'Content-Type' => 'application/json',
33+
],
2034
fopen(__DIR__.'/../fixtures/files/pay_demo.json', 'r')
2135
));
2236

37+
/** @var Merchant&LegacyMockInterface $merchant */
2338
$merchant = \Mockery::mock(Merchant::class);
2439
$merchant->shouldReceive('getSecretKey')->andReturn('key');
2540

@@ -28,4 +43,106 @@ public function test_it_will_handle_validation_request()
2843
$response = $server->serve();
2944
$this->assertSame('{"code":"SUCCESS","message":"成功"}', \strval($response->getBody()));
3045
}
46+
47+
public function test_legacy_encryped_by_aesecb_refund_request()
48+
{
49+
/** @var Merchant&LegacyMockInterface $merchant */
50+
$merchant = \Mockery::mock(Merchant::class);
51+
$merchant->shouldReceive(['getV2SecretKey' => random_bytes(32)]);
52+
$symmtricKey = $merchant->getV2SecretKey();
53+
54+
$server = new Server($merchant, new ServerRequest(
55+
'POST',
56+
'http://easywechat.com/sample-webhook-handler',
57+
[
58+
'Content-Type' => 'text/xml',
59+
],
60+
Xml::build([
61+
'return_code' => 'SUCCESS',
62+
'req_info' => AesEcb::encrypt(Xml::build([
63+
'refund_id' => '50000408942018111907145868882',
64+
'transaction_id' => '4200000215201811190261405420',
65+
]), md5($symmtricKey), ''),
66+
])
67+
));
68+
69+
$response = $server->with(function (Message $message): ResponseInterface {
70+
$source = $message->getOriginalContents();
71+
$parsed = $message->toArray();
72+
73+
$this->assertStringContainsString('<xml>', $source);
74+
$this->assertStringContainsString('<req_info>', $source);
75+
$this->assertStringNotContainsString('<refund_id>', $source);
76+
$this->assertStringNotContainsString('<transaction_id>', $source);
77+
$this->assertArrayNotHasKey('return_code', $parsed);
78+
$this->assertArrayNotHasKey('req_info', $parsed);
79+
$this->assertArrayHasKey('refund_id', $parsed);
80+
$this->assertArrayHasKey('transaction_id', $parsed);
81+
82+
return new Response(
83+
200,
84+
['Content-Type' => 'text/xml'],
85+
'<xml><return_code>SUCCESS</return_code></xml>'
86+
);
87+
})->serve();
88+
89+
$this->assertEquals(200, $response->getStatusCode());
90+
$this->assertSame('<xml><return_code>SUCCESS</return_code></xml>', \strval($response->getBody()));
91+
}
92+
93+
public function test_legacy_encryped_by_aesgcm_notification_request()
94+
{
95+
/** @var Merchant&LegacyMockInterface $merchant */
96+
$merchant = \Mockery::mock(Merchant::class);
97+
$merchant->shouldReceive(['getSecretKey' => random_bytes(32)]);
98+
$symmtricKey = $merchant->getSecretKey();
99+
100+
$server = new Server($merchant, new ServerRequest(
101+
'POST',
102+
'http://easywechat.com/sample-webhook-handler',
103+
[
104+
'Content-Type' => 'text/xml',
105+
],
106+
Xml::build([
107+
'event_type' => 'TRANSACTION.SUCCESS',
108+
'event_algorithm' => 'AEAD_AES_256_GCM',
109+
'event_nonce' => $nonce = bin2hex(random_bytes(6)),
110+
'event_associated_data' => $aad = '',
111+
'event_ciphertext' => AesGcm::encrypt(Xml::build([
112+
'state' => 'USER_PAID',
113+
'service_id' => '1234352342',
114+
]), $symmtricKey, iv: $nonce, aad: $aad),
115+
])
116+
));
117+
118+
$response = $server->with(function (Message $message): ResponseInterface {
119+
$source = $message->getOriginalContents();
120+
$parsed = $message->toArray();
121+
122+
$this->assertStringContainsString('<xml>', $source);
123+
$this->assertStringContainsString('<event_type>', $source);
124+
$this->assertStringContainsString('<event_algorithm>', $source);
125+
$this->assertStringContainsString('<event_nonce>', $source);
126+
$this->assertStringContainsString('<event_associated_data>', $source);
127+
$this->assertStringContainsString('<event_ciphertext>', $source);
128+
$this->assertStringNotContainsString('<state>', $source);
129+
$this->assertStringNotContainsString('<service_id>', $source);
130+
$this->assertArrayHasKey('event_type', $parsed);
131+
$this->assertArrayHasKey('event_algorithm', $parsed);
132+
$this->assertArrayHasKey('event_nonce', $parsed);
133+
$this->assertArrayHasKey('event_associated_data', $parsed);
134+
$this->assertArrayHasKey('event_ciphertext', $parsed);
135+
$this->assertArrayHasKey('state', $parsed);
136+
$this->assertArrayHasKey('service_id', $parsed);
137+
138+
return new Response(
139+
500,
140+
['Content-Type' => 'text/xml'],
141+
'<xml><code>ERROR_NAME</code><message>ERROR_DESCRIPTION</message></xml>'
142+
);
143+
})->serve();
144+
145+
$this->assertEquals(500, $response->getStatusCode());
146+
$this->assertSame('<xml><code>ERROR_NAME</code><message>ERROR_DESCRIPTION</message></xml>', \strval($response->getBody()));
147+
}
31148
}

0 commit comments

Comments
 (0)