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.

Sign up for GitHub

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

Add the ability to renew the Certificate Authority certificate #1498

Merged
merged 2 commits into from
Dec 10, 2024
Merged

Add the ability to renew the Certificate Authority certificate #1498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
072859e
add the ability to renew the CA when renewing all certs
adrum Nov 15, 2024
3c0015c
add the ability to see the Certificate Authority expiration date
adrum Nov 15, 2024
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
26 changes: 22 additions & 4 deletions cli/Valet/Site.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,9 +437,9 @@ public function secured(): array
/**
* 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';

$expiration = $this->cli->run("openssl x509 -enddate -noout -in $filePath");
Expand All @@ -450,7 +450,22 @@ public function securedWithDates(): array
'site' => $site,
'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
Expand Down Expand Up @@ -502,8 +517,11 @@ public function secure(string $url, ?string $siteConf = null, int $certificateEx
/**
* 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) {
$url = $this->domain($row['site']);

Expand Down
10 changes: 6 additions & 4 deletions cli/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,9 +285,9 @@ function (ConsoleCommandEvent $event) {
/**
* 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'));
$sites = collect(Site::securedWithDates())
$sites = collect(Site::securedWithDates($ca))
->when($expiring, fn ($collection) => $collection->filter(fn ($row) => $row['exp'] < $now))
->map(function ($row) {
return [
Expand All @@ -301,16 +301,18 @@ function (ConsoleCommandEvent $event) {
})->descriptions('Display all of the currently secured sites', [
'--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.',
'--ca' => 'Include the Certificate Authority certificate in the list of site certificates.',
]);

/**
* Renews all domains with a trusted TLS certificate.
*/
$app->command('renew [--expireIn=]', function (OutputInterface $output, $expireIn = 368) {
Site::renew($expireIn);
$app->command('renew [--expireIn=] [--ca]', function (OutputInterface $output, $expireIn = 368, $ca = null) {
Site::renew($expireIn, $ca);
Nginx::restart();
})->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"',
'--ca' => 'Renew the Certificate Authority certificate before renewing the site certificates.',
]);

/**
Expand Down