mirrors/flexisip-account-manager
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/flexisip-account-manager.git synced 2026-01-17 10:08:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix FLEXIAPI-430 Handle empty string in JWT_SIP_IDENTIFIER and fallback to sip_identity

Browse source
This commit is contained in:
Timothée Jaussoin 2026-01-06 15:23:41 +01:00
parent 06dc357524
commit f883c3cee7
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flexiapi/app/Http/Middleware/AuthenticateJWT.php
View file

@ -76,9 +76,11 @@ class AuthenticateJWT
} }
$account = null; $account = null;
$identifierKey = config('services.jwt.sip_identifier');
if ($identifierKey == '') $identifierKey = 'sip_identity';
if ($token->claims()->has(config('services.jwt.sip_identifier'))) { if ($token->claims()->has($identifierKey)) {
list($username, $domain) = parseSIP($token->claims()->get(config('services.jwt.sip_identifier'))); list($username, $domain) = parseSIP($token->claims()->get($identifierKey));
$account = Account::withoutGlobalScopes() $account = Account::withoutGlobalScopes()
->where('username', $username) ->where('username', $username)

14
flexiapi/tests/Feature/AccountJWTAuthenticationTest.php
View file

@ -93,6 +93,20 @@ class AccountJWTAuthenticationTest extends TestCase
$this->checkToken($token); $this->checkToken($token);
// Handle JWT_SIP_IDENTIFIER=
config()->set('services.jwt.sip_identifier', '');
$token = (new JwtFacade(null, $clock))->issue(
new Sha256(),
InMemory::plainText($this->serverPrivateKeyPem),
static fn (
Builder $builder,
DateTimeImmutable $issuedAt
): Builder => $builder->withClaim('sip_identity', 'sip:' . $password->account->username . '@' . $password->account->domain)
);
$this->checkToken($token);
// Custom SIP identifier // Custom SIP identifier
$otherIdentifier = 'sip_other_identifier'; $otherIdentifier = 'sip_other_identifier';
config()->set('services.jwt.sip_identifier', $otherIdentifier); config()->set('services.jwt.sip_identifier', $otherIdentifier);