Boyscouting

paragonie-security · paragonie-security · commit 0fc36c9e8a15 · 2022-01-17T16:12:14.000-05:00
diff --git a/bin/allow-null-prevhash.php b/bin/allow-null-prevhash.php
@@ -25,7 +25,6 @@
     (string) \file_get_contents($root . '/local/settings.json'),
     true
 );
-/** @var EasyDB $db */
 $db = Factory::create(
     $settings['database']['dsn'],
     $settings['database']['username'] ?? '',
diff --git a/bin/change-replica-source-publickey.php b/bin/change-replica-source-publickey.php
@@ -13,11 +13,8 @@
     EasyDB,
     Factory
 };
-use GuzzleHttp\Client;
 use ParagonIE\Chronicle\Chronicle;
 use ParagonIE\Chronicle\Exception\InstanceNotFoundException;
-use ParagonIE\ConstantTime\Base64UrlSafe;
-use ParagonIE\Sapient\CryptographyKeys\SigningPublicKey;
 
 $root = \dirname(__DIR__);
 /** @psalm-suppress UnresolvableInclude */
@@ -43,8 +40,6 @@
 Chronicle::setDatabase($db);
 
 /**
- * @var Getopt
- *
  * This defines the Command Line options.
  */
 $getopt = new GetOpt([
diff --git a/bin/create-client.php b/bin/create-client.php
@@ -46,7 +46,7 @@
  *
  * These two are equivalent:
  *     php create-client.php -p foo
- *     php create-client php --public=key=foo
+ *     php create-client.php --publickey=foo
  */
 $getopt = new Getopt([
     new Option('p', 'publickey', Getopt::REQUIRED_ARGUMENT),
diff --git a/bin/cross-sign.php b/bin/cross-sign.php
@@ -42,8 +42,6 @@
 );
 
 /**
- * @var GetOpt $getopt
- *
  * This defines the Command Line options.
  */
 $getopt = new GetOpt([
@@ -113,7 +111,6 @@
 }
 if (is_string($publicKey)) {
     try {
-        /** @var SigningPublicKey $publicKeyObj */
         $publicKeyObj = new SigningPublicKey(
             Base64UrlSafe::decode($publicKey)
         );
@@ -173,7 +170,6 @@
 
 // Write to database...
 $db->beginTransaction();
-/** @var string $table */
 $table = Chronicle::getTableName('xsign_targets');
 if ($db->exists('SELECT * FROM ' . $table . ' WHERE name = ?', $name)) {
     // Update an existing cross-sign target
diff --git a/bin/fix-nulls.php b/bin/fix-nulls.php
@@ -1,10 +1,7 @@
 <?php
 declare(strict_types=1);
 
-use ParagonIE\EasyDB\{
-    EasyDB,
-    Factory
-};
+use ParagonIE\EasyDB\Factory;
 
 $root = \dirname(__DIR__);
 /** @psalm-suppress UnresolvableInclude */
@@ -21,7 +18,6 @@
     true
 );
 
-/** @var EasyDB $db */
 $db = Factory::create(
     $settings['database']['dsn'],
     $settings['database']['username'] ?? '',
diff --git a/bin/install.php b/bin/install.php
@@ -7,13 +7,11 @@
 };
 use ParagonIE\Sapient\CryptographyKeys\SigningSecretKey;
 
-/** @var string $root */
 $root = \dirname(__DIR__);
 /** @psalm-suppress UnresolvableInclude */
 require_once $root . '/cli-autoload.php';
 
 // Generate a signing key.
-/** @var SigningSecretKey $signingKey */
 $signingKey = SigningSecretKey::generate();
 
 // Store the signing key:
@@ -23,8 +21,6 @@
 );
 
 /**
- * @var Getopt $getopt
- *
  * This defines the Command Line options.
  *
  * These are many examples:
diff --git a/bin/keygen.php b/bin/keygen.php
@@ -8,10 +8,9 @@
 require_once $root . '/cli-autoload.php';
 
 /* This generates a new secret key from your kernel's CSPRNG */
-/** @var SigningSecretKey $signingSecretKey */
 $signingSecretKey = SigningSecretKey::generate();
 
-echo (string) json_encode(
+echo json_encode(
     [
         'secret-key' => $signingSecretKey->getString(),
         'public-key' => $signingSecretKey->getPublicKey()->getString()
diff --git a/bin/make-tables.php b/bin/make-tables.php
@@ -5,6 +5,7 @@
     GetOpt,
     Option
 };
+use Slim\App;
 use ParagonIE\Chronicle\Chronicle;
 use ParagonIE\Chronicle\Exception\InstanceNotFoundException;
 
@@ -16,9 +17,8 @@
 
 /**
  * @var array $settings
- * @var \Slim\App $app
  */
-$app = new \Slim\App($settings);
+$app = new App($settings);
 
 if (!isset($app)) {
     throw new Error('Variable $app is not defined');
@@ -54,7 +54,6 @@
     exit(1);
 }
 
-/** @var \ParagonIE\EasyDB\EasyDB $db */
 $db = ParagonIE\EasyDB\Factory::create(
     $settings['database']['dsn'],
     $settings['database']['username'] ?? null,
diff --git a/bin/replicate.php b/bin/replicate.php
@@ -27,12 +27,11 @@
     exit(1);
 }
 
-/** @var array<string, string> $settings */
+/** @var array<string, string|string[]> $settings */
 $settings = \json_decode(
     (string) \file_get_contents($root . '/local/settings.json'),
     true
 );
-/** @var EasyDB $db */
 $db = Factory::create(
     $settings['database']['dsn'],
     $settings['database']['username'] ?? '',
@@ -42,8 +41,6 @@
 Chronicle::setDatabase($db);
 
 /**
- * @var Getopt
- *
  * This defines the Command Line options.
  */
 $getopt = new GetOpt([
diff --git a/bin/scheduled-tasks.php b/bin/scheduled-tasks.php
@@ -22,7 +22,6 @@
     true
 );
 
-/** @var EasyDB $db */
 $db = Factory::create(
     $settings['database']['dsn'],
     $settings['database']['username'] ?? '',
diff --git a/bin/write_file.php b/bin/write_file.php
@@ -1,6 +1,7 @@
 <?php
 declare(strict_types=1);
 
+use ParagonIE\Chronicle\Chronicle;
 use ParagonIE\EasyDB\{
     EasyDB,
     Factory
@@ -22,11 +23,9 @@
     exit(1);
 }
 
-/** @var string $filePath */
-$filePath = (string) $v[1];
-/** @var string $keyFilePath */
-$keyFilePath = (string) ($argc > 2
-    ? (string) $v[2]
+$filePath = $v[1];
+$keyFilePath = ($argc > 2
+    ? $v[2]
     : $root . '/local/client.key'
 );
 
@@ -41,14 +40,13 @@
     true
 );
 
-/** @var EasyDB $db */
 $db = Factory::create(
     $settings['database']['dsn'],
     $settings['database']['username'] ?? '',
     $settings['database']['password'] ?? '',
     $settings['database']['options'] ?? []
 );
-\ParagonIE\Chronicle\Chronicle::setDatabase($db);
+Chronicle::setDatabase($db);
 
 if (!\is_readable($filePath)) {
     echo 'File not readable (or doesn\'t exist): ', $filePath, PHP_EOL;
@@ -68,13 +66,12 @@
     true
 );
 
-/** @var string $signature */
 $signature = \sodium_crypto_sign_detached(
     $fileContents,
     Base64UrlSafe::decode($keyFile['secret-key'])
 );
 
-\ParagonIE\Chronicle\Chronicle::extendBlakechain(
+Chronicle::extendBlakechain(
     $fileContents,
     Base64UrlSafe::encode($signature),
     new SigningPublicKey(Base64UrlSafe::decode($keyFile['public-key']))
diff --git a/src/routes.php b/src/routes.php
@@ -5,6 +5,7 @@
 use ParagonIE\Chronicle\Handlers\{
     Index,
     Lookup,
+    Mirrors,
     Publish,
     Register,
     Replica,
@@ -56,6 +57,7 @@
     $self->get('/since/{hash}', 'lookup.since');
     $self->get('/export/{page:[0-9]+}', 'lookup.export');
     $self->get('/export', 'lookup.export');
+    $self->get('/mirrors', 'mirrors');
     $self->get('/replica/{source}/lasthash', 'replica.lasthash');
     $self->get('/replica/{source}/lookup/{hash}', 'replica.hash');
     $self->get('/replica/{source}/since/{hash}/{page:[0-9]+}', 'replica.since');
@@ -118,6 +120,9 @@
 $container['lookup.export'] = function () {
     return new Lookup('export');
 };
+$container['mirrors'] = function () {
+    return new Mirrors();
+};
 $container['replica.lasthash'] = function () {
     return new Replica('lasthash');
 };

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@`
`46`	`46`	`*`
`47`	`47`	`* These two are equivalent:`
`48`	`48`	`* php create-client.php -p foo`
`49`		`- * php create-client php --public=key=foo`
	`49`	`+ * php create-client.php --publickey=foo`
`50`	`50`	`*/`
`51`	`51`	`$getopt = new Getopt([`
`52`	`52`	`new Option('p', 'publickey', Getopt::REQUIRED_ARGUMENT),`