tanyuan
/
wx.sstbc.com
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改后台登录短信验证码发送失败的提示语

Browse Source
master
weizong song 3 days ago
parent 6f7874d23c
commit b624c3bf0a
2 changed files with 114 additions and 25 deletions
Show Stats Download Patch File Download Diff File

68
app/Http/Controllers/Admin/AuthController.php
Unescape View File

@ -245,33 +245,51 @@ class AuthController extends Controller
if ($validator->fails()) { if ($validator->fails()) {
return $this->fail([StarterResponseCode::START_ERROR_PARAMETER, implode(',', $validator->errors()->all())]); return $this->fail([StarterResponseCode::START_ERROR_PARAMETER, implode(',', $validator->errors()->all())]);
} }
$service = app(AdminSmsChallengeService::class); $stage = 'can_send';
$canSend = $service->canSend($all['mobile'], request()->ip()); try {
$admin = Admin::where('mobile', $all['mobile'])->first(); $service = app(AdminSmsChallengeService::class);
$challengeId = null; $canSend = $service->canSend($all['mobile'], request()->ip());
$stage = 'lookup_admin';
$admin = Admin::where('mobile', $all['mobile'])->first();
$challengeId = null;
if ($canSend && $admin) { if ($canSend && $admin) {
$smsSign = Config::getValueByKey('sms_sign'); $stage = 'issue_challenge';
$challengeId = $service->issueChallenge($all['mobile'], request()->ip(), function ($code) use ($all, $smsSign) { $smsSign = Config::getValueByKey('sms_sign');
$content = "{$smsSign}验证码{$code}，您正在登陆苏州科技商学院信息化系统，请在5分钟内完成验证。"; $challengeId = $service->issueChallenge($all['mobile'], request()->ip(), function ($code) use ($all, $smsSign) {
try { $content = "{$smsSign}验证码{$code}，您正在登陆苏州科技商学院信息化系统，请在5分钟内完成验证。";
return (bool) ymSms($all['mobile'], $content); try {
} catch (\Throwable $e) { return (bool) ymSms($all['mobile'], $content);
// Do not expose provider/network errors or the mobile number to the client. } catch (\Throwable $e) {
Log::error('admin_sms_provider_error', [ // Do not expose provider/network errors or the mobile number to the client.
'mobile_hash' => hash('sha256', (string) $all['mobile']), Log::error('admin_sms_provider_error', [
'exception' => get_class($e), 'mobile_hash' => hash('sha256', (string) $all['mobile']),
]); 'exception' => get_class($e),
return false; ]);
} return false;
}, (string) request()->userAgent()); }
} }, (string) request()->userAgent());
}
// Always return the same shape, including for unknown or throttled numbers. if (!$challengeId) {
return $this->success([ $stage = 'issue_decoy';
'message' => '如果手机号已登记，验证码将发送', $challengeId = $service->issueDecoyChallenge($all['mobile'], request()->ip(), (string) request()->userAgent());
'challenge_id' => $challengeId ?: $service->issueDecoyChallenge($all['mobile'], request()->ip(), (string) request()->userAgent()), }
]);
// Always return the same shape, including for unknown or throttled numbers.
return $this->success([
'message' => '如果手机号已登记，验证码将发送',
'challenge_id' => $challengeId,
]);
} catch (\Throwable $e) {
// A challenge cannot be issued if a dependency such as the cache is unavailable.
Log::error('admin_sms_send_error', [
'mobile_hash' => hash('sha256', (string) $all['mobile']),
'exception' => get_class($e),
'stage' => $stage,
]);
return $this->fail([ResponseCode::ERROR_INSIDE, '验证码服务暂不可用，请稍后重试']);
}
} }

71
tests/Feature/AdminSmsSendFailureTest.php
Unescape View File

@ -0,0 +1,71 @@
<?php
namespace Tests\Feature;
use App\Services\AdminSmsChallengeService;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema;
use Mockery;
use Tests\TestCase;
class AdminSmsSendFailureTest extends TestCase
{
protected function setUp(): void
{
parent::setUp();
config()->set('database.default', 'sqlite');
config()->set('database.connections.sqlite.database', ':memory:');
DB::purge('sqlite');
Schema::create('admins', function (Blueprint $table) {
$table->increments('id');
$table->string('mobile');
$table->softDeletes();
});
Schema::create('configs', function (Blueprint $table) {
$table->increments('id');
$table->string('key');
$table->string('value');
$table->softDeletes();
});
DB::table('admins')->insert(['mobile' => '13800138000']);
DB::table('configs')->insert(['key' => 'sms_sign', 'value' => '测试']);
}
public function test_provider_failure_and_unknown_mobile_have_the_same_response(): void
{
$challengeId = '4d2fd7fc-2630-4432-8df5-34f3edc029d0';
$service = Mockery::mock(AdminSmsChallengeService::class);
$service->shouldReceive('canSend')->twice()->andReturn(true);
$service->shouldReceive('issueChallenge')->once()->andReturn(null);
$service->shouldReceive('issueDecoyChallenge')->twice()->andReturn($challengeId);
$this->app->instance(AdminSmsChallengeService::class, $service);
$registered = $this->postJson('/api/admin/auth/send-sms', ['mobile' => '13800138000']);
$unknown = $this->postJson('/api/admin/auth/send-sms', ['mobile' => '13900139000']);
$registered->assertOk()->assertExactJson([
'message' => '如果手机号已登记，验证码将发送',
'challenge_id' => $challengeId,
]);
$unknown->assertOk()->assertExactJson($registered->json());
}
public function test_challenge_store_failure_returns_a_controlled_error(): void
{
$service = Mockery::mock(AdminSmsChallengeService::class);
$service->shouldReceive('canSend')->once()->andReturn(true);
$service->shouldReceive('issueChallenge')->once()->andReturn(null);
$service->shouldReceive('issueDecoyChallenge')->once()->andThrow(new \RuntimeException('cache unavailable'));
$this->app->instance(AdminSmsChallengeService::class, $service);
$this->postJson('/api/admin/auth/send-sms', ['mobile' => '13800138000'])
->assertOk()
->assertExactJson([
'errcode' => 10003,
'errmsg' => '验证码服务暂不可用，请稍后重试',
]);
}
}
Write Preview
Loading…
Cancel
Save