phpmon/laravel-valet
1
0
Fork 0
mirror of https://github.com/laravel/valet.git synced 2026-02-05 16:40:05 +01:00
Code Activity

Merge pull request #1498 from adrum/feature/renew-ca

Browse Source 
Add the ability to renew the Certificate Authority certificate
This commit is contained in:
Matt Stauffer
2024-12-09 20:37:05 -05:00
committed by GitHub
parent 1a0077a69d 3c0015c305
commit 440bb128ad
2 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
cli/Valet/Site.php
View File

@@ -437,9 +437,9 @@ public function secured(): array
/** /**
* Get all of the URLs with expiration dates that are currently secured. * Get all of the URLs with expiration dates that are currently secured.
*/ */
public function securedWithDates(): array public function securedWithDates($ca = false): array
{ {
return collect($this->secured())->map(function ($site) { $sites = collect($this->secured())->map(function ($site) {
$filePath = $this->certificatesPath().'/'.$site.'.crt'; $filePath = $this->certificatesPath().'/'.$site.'.crt';
$expiration = $this->cli->run("openssl x509 -enddate -noout -in $filePath"); $expiration = $this->cli->run("openssl x509 -enddate -noout -in $filePath");
@@ -450,7 +450,22 @@ public function securedWithDates(): array
'site' => $site, 'site' => $site,
'exp' => new DateTime($expiration), 'exp' => new DateTime($expiration),
]; ];
})->unique()->values()->all(); })->unique()->values();
if ($ca) {
$filePath = $this->caPath('LaravelValetCASelfSigned.pem');
$expiration = $this->cli->run("openssl x509 -enddate -noout -in $filePath");
$expiration = str_replace('notAfter=', '', $expiration);
$sites->prepend([
'site' => 'Certificate Authority',
'exp' => new DateTime($expiration),
]);
}
return $sites->all();
} }
public function isSecured(string $site): bool public function isSecured(string $site): bool
@@ -502,8 +517,11 @@ public function secure(string $url, ?string $siteConf = null, int $certificateEx
/** /**
* Renews all domains with a trusted TLS certificate. * Renews all domains with a trusted TLS certificate.
*/ */
public function renew($expireIn = 368): void public function renew($expireIn = 368, $ca = false): void
{ {
if ($ca) {
$this->removeCa();
}
collect($this->securedWithDates())->each(function ($row) use ($expireIn) { collect($this->securedWithDates())->each(function ($row) use ($expireIn) {
$url = $this->domain($row['site']); $url = $this->domain($row['site']);

10
cli/app.php
View File

@@ -285,9 +285,9 @@ function (ConsoleCommandEvent $event) {
/** /**
* Display all of the currently secured sites. * Display all of the currently secured sites.
*/ */
$app->command('secured [--expiring] [--days=]', function (OutputInterface $output, $expiring = null, $days = 60) { $app->command('secured [--expiring] [--days=] [--ca]', function (OutputInterface $output, $expiring = null, $days = 60, $ca = null) {
$now = (new Datetime)->add(new DateInterval('P'.$days.'D')); $now = (new Datetime)->add(new DateInterval('P'.$days.'D'));
$sites = collect(Site::securedWithDates()) $sites = collect(Site::securedWithDates($ca))
->when($expiring, fn ($collection) => $collection->filter(fn ($row) => $row['exp'] < $now)) ->when($expiring, fn ($collection) => $collection->filter(fn ($row) => $row['exp'] < $now))
->map(function ($row) { ->map(function ($row) {
return [ return [
@@ -301,16 +301,18 @@ function (ConsoleCommandEvent $event) {
})->descriptions('Display all of the currently secured sites', [ })->descriptions('Display all of the currently secured sites', [
'--expiring' => 'Limits the results to only sites expiring within the next 60 days.', '--expiring' => 'Limits the results to only sites expiring within the next 60 days.',
'--days' => 'To be used with --expiring. Limits the results to only sites expiring within the next X days. Default is set to 60.', '--days' => 'To be used with --expiring. Limits the results to only sites expiring within the next X days. Default is set to 60.',
'--ca' => 'Include the Certificate Authority certificate in the list of site certificates.',
]); ]);
/** /**
* Renews all domains with a trusted TLS certificate. * Renews all domains with a trusted TLS certificate.
*/ */
$app->command('renew [--expireIn=]', function (OutputInterface $output, $expireIn = 368) { $app->command('renew [--expireIn=] [--ca]', function (OutputInterface $output, $expireIn = 368, $ca = null) {
Site::renew($expireIn); Site::renew($expireIn, $ca);
Nginx::restart(); Nginx::restart();
})->descriptions('Renews all domains with a trusted TLS certificate.', [ })->descriptions('Renews all domains with a trusted TLS certificate.', [
'--expireIn' => 'The amount of days the self signed certificate is valid for. Default is set to "368"', '--expireIn' => 'The amount of days the self signed certificate is valid for. Default is set to "368"',
'--ca' => 'Renew the Certificate Authority certificate before renewing the site certificates.',
]); ]);
/** /**