Skip to content

Commit

Permalink
Validates JWK before LittleJWT is created in Container
Browse files Browse the repository at this point in the history
  • Loading branch information
little-apps committed Jun 1, 2024
1 parent 28104b8 commit 9cbd7f7
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 3 deletions.
26 changes: 26 additions & 0 deletions src/Factories/LittleJWTBuilder.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?php

namespace LittleApps\LittleJWT\Factories;

use Illuminate\Contracts\Foundation\Application;
use LittleApps\LittleJWT\JWK\JsonWebKey;
use LittleApps\LittleJWT\LittleJWT;
use LittleApps\LittleJWT\JWK\JWKValidator;

class LittleJWTBuilder
{
/**
* Creates LittleJWT instance.
*
* @param Application $app Application container
* @param JsonWebKey $jwk JWK to sign and verify JWTs with.
* @param boolean $validateJwk If true, validates JWK (default: true)
* @return static
*/
public static function create(Application $app, JsonWebKey $jwk, bool $validateJwk = true): LittleJWT {
if ($validateJwk)
JWKValidator::validate($jwk);

return new LittleJWT($app, $jwk);
}
}
5 changes: 2 additions & 3 deletions src/ServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use Illuminate\Support\Facades\Response as ResponseFactory;
use LittleApps\LittleJWT\Blacklist\BlacklistManager;
use LittleApps\LittleJWT\Factories\KeyBuilder;
use LittleApps\LittleJWT\Factories\LittleJWTBuilder;
use LittleApps\LittleJWT\Factories\OpenSSLBuilder;
use LittleApps\LittleJWT\Factories\ValidatableBuilder;
use LittleApps\LittleJWT\Guards\Adapters;
Expand Down Expand Up @@ -85,15 +86,13 @@ public function packageBooted()
protected function registerCore()
{
$this->app->singleton(LittleJWT::class, function (Container $app) {
return new LittleJWT($app, $app->make(JsonWebKey::class));
return LittleJWTBuilder::create($app, $app->make(JsonWebKey::class));
});

$this->app->bind(JsonWebKey::class, function (Container $app) {
$config = $app->config->get('littlejwt.key', []);
$jwk = KeyBuilder::buildFromConfig($config);

JWKValidator::validate($jwk);

return $jwk;
});

Expand Down

0 comments on commit 9cbd7f7

Please sign in to comment.