daxi20/acmeclient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve server correctly

Browse Source
This commit is contained in:
Niklas Keller
2016-03-12 17:14:52 +01:00
parent 057e42d96a
commit a82d601e85
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Commands/Revoke.php
View File

@@ -28,7 +28,7 @@ class Revoke implements Command {
private function doExecute(Manager $args) { private function doExecute(Manager $args) {
$keyStore = new KeyStore(dirname(dirname(__DIR__)) . "/data"); $keyStore = new KeyStore(dirname(dirname(__DIR__)) . "/data");
$server = $args->get("server"); $server = \Kelunik\AcmeClient\resolveServer($args->get("server"));
$keyFile = \Kelunik\AcmeClient\serverToKeyname($server); $keyFile = \Kelunik\AcmeClient\serverToKeyname($server);
$keyPair = (yield $keyStore->get("accounts/{$keyFile}.pem")); $keyPair = (yield $keyStore->get("accounts/{$keyFile}.pem"));

9
src/Commands/Setup.php
View File

@@ -33,7 +33,7 @@ class Setup implements Command {
$email = $args->get("email"); $email = $args->get("email");
yield \Amp\resolve($this->checkEmail($email)); yield \Amp\resolve($this->checkEmail($email));
$server = $args->get("server"); $server = \Kelunik\AcmeClient\resolveServer($args->get("server"));
$keyFile = \Kelunik\AcmeClient\serverToKeyname($server); $keyFile = \Kelunik\AcmeClient\serverToKeyname($server);
$path = "accounts/{$keyFile}.pem"; $path = "accounts/{$keyFile}.pem";
@@ -58,15 +58,10 @@ class Setup implements Command {
$acme = new AcmeService(new AcmeClient($server, $keyPair), $keyPair); $acme = new AcmeService(new AcmeClient($server, $keyPair), $keyPair);
$this->logger->info("Registering with ACME server " . substr($server, 8) . " ..."); $this->logger->info("Registering with ACME server " . substr($server, 8) . " ...");
/** @var Registration $registration */ /** @var Registration $registration */
$registration = (yield $acme->register($email)); $registration = (yield $acme->register($email));
$this->logger->notice("Registration successful with the following contact information: " . implode(", ", $registration->getContact())); $this->logger->notice("Registration successful with the following contact information: " . implode(", ", $registration->getContact()));
yield \Amp\File\put(dirname(dirname(__DIR__)) . "/data/account/config.json", json_encode([
"version" => 1,
"server" => $server,
"email" => $email,
], JSON_PRETTY_PRINT) . "\n");
} }
private function checkEmail($email) { private function checkEmail($email) {