mirror of
https://github.com/FOSSBilling/FOSSBilling.git
synced 2026-11-05 03:27:33 +09:00
* Fix WHM activation failing when package already exists (#4560) - Request listpkgs with want=all and parse both legacy package and modern data.pkg shapes - On addpkg already-exists, sync via editpkg and continue; only block activation on other errors - Include WHM reason in Server_Exception and fix placeholder keys * Add WHM API terms to spellcheck dictionary * Address review: use typed exception for WHM already-exists, keep reasons out of API errors - Add Server_PackageExistsException; request() now throws generic messages and translates already-exists at the WHM boundary - checkPackageExists() catches the typed exception instead of matching getMessage() * Fix Rector findings: remove unused catch variable and setAccessible call * Handle modern WHM metadata.result failures in Whm::request --------- Co-authored-by: opencode <opencode@localhost>
264 lines
11 KiB
PHP
264 lines
11 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
use Symfony\Component\HttpClient\MockHttpClient;
|
|
use Symfony\Component\HttpClient\Response\MockResponse;
|
|
use Symfony\Contracts\HttpClient\HttpClientInterface;
|
|
|
|
function createWhmManager(HttpClientInterface $httpClient): Server_Manager_Whm
|
|
{
|
|
return new class(['host' => 'whm.example.com', 'username' => 'admin', 'password' => 'secret'], $httpClient) extends Server_Manager_Whm {
|
|
public function __construct(array $options, private readonly HttpClientInterface $httpClient)
|
|
{
|
|
parent::__construct($options);
|
|
}
|
|
|
|
public function getHttpClient(): HttpClientInterface
|
|
{
|
|
return $this->httpClient;
|
|
}
|
|
};
|
|
}
|
|
|
|
function createWhmAccount(Server_Package $package, bool $reseller): Server_Account
|
|
{
|
|
return (new Server_Account())
|
|
->setUsername('example')
|
|
->setDomain('example.com')
|
|
->setPassword('secret')
|
|
->setClient((new Server_Client())->setEmail('client@example.com'))
|
|
->setPackage($package)
|
|
->setReseller($reseller);
|
|
}
|
|
|
|
function actionOf(array $request): string
|
|
{
|
|
return basename((string) parse_url($request['url'], PHP_URL_PATH));
|
|
}
|
|
|
|
function createWhmAccountCreationClient(array &$requests): MockHttpClient
|
|
{
|
|
return new MockHttpClient(function (string $method, string $url, array $options) use (&$requests): MockResponse {
|
|
$requests[] = ['method' => $method, 'url' => $url, 'options' => $options];
|
|
|
|
if (str_contains($url, 'listpkgs')) {
|
|
return new MockResponse(json_encode(['package' => []]));
|
|
}
|
|
|
|
if (str_contains($url, 'createacct')) {
|
|
return new MockResponse(json_encode(['result' => [['status' => 1]]]));
|
|
}
|
|
|
|
return new MockResponse(json_encode(['status' => 1]));
|
|
});
|
|
}
|
|
|
|
test('createAccount sets up the reseller but does not touch the ACL list when the plan has no acl custom value', function (): void {
|
|
$requests = [];
|
|
$manager = createWhmManager(createWhmAccountCreationClient($requests));
|
|
$account = createWhmAccount(new Server_Package(), true);
|
|
|
|
expect($manager->createAccount($account))->toBeTrue();
|
|
|
|
$actions = array_map(actionOf(...), $requests);
|
|
|
|
// Calling "setacls" with an empty acllist would strip the initial privileges "setupreseller"
|
|
// just granted, so it must be skipped when the plan has no 'acl' custom value.
|
|
expect($actions)->toBe(['listpkgs', 'addpkg', 'createacct', 'setupreseller'])
|
|
->and($actions)->not->toContain('setacls');
|
|
});
|
|
|
|
test('createAccount assigns the plan\'s acl custom value to the reseller via setacls', function (): void {
|
|
$requests = [];
|
|
$manager = createWhmManager(createWhmAccountCreationClient($requests));
|
|
$package = (new Server_Package())->setCustomValues(['acl' => 'reseller_basic']);
|
|
$account = createWhmAccount($package, true);
|
|
|
|
expect($manager->createAccount($account))->toBeTrue();
|
|
|
|
$actions = array_map(actionOf(...), $requests);
|
|
expect($actions)->toBe(['listpkgs', 'addpkg', 'createacct', 'setupreseller', 'setacls']);
|
|
|
|
$setaclsRequest = $requests[array_search('setacls', $actions, true)];
|
|
parse_str((string) $setaclsRequest['options']['body'], $fields);
|
|
|
|
expect($fields)->toMatchArray([
|
|
'reseller' => 'example',
|
|
'acllist' => 'reseller_basic',
|
|
]);
|
|
});
|
|
|
|
test('synchronizeAccount casts the suspended flag to bool', function (): void {
|
|
$client = new MockHttpClient(fn (): MockResponse => new MockResponse(json_encode([
|
|
'acct' => [
|
|
['suspended' => 1, 'domain' => 'example.com', 'user' => 'example', 'ip' => '1.2.3.4'],
|
|
],
|
|
])));
|
|
$manager = createWhmManager($client);
|
|
$account = createWhmAccount(new Server_Package(), false);
|
|
|
|
$updated = $manager->synchronizeAccount($account);
|
|
|
|
expect($updated->getSuspended())->toBeTrue();
|
|
});
|
|
|
|
test('createAccount never calls setupreseller or setacls for a non-reseller account', function (): void {
|
|
$requests = [];
|
|
$manager = createWhmManager(createWhmAccountCreationClient($requests));
|
|
$package = (new Server_Package())->setCustomValues(['acl' => 'reseller_basic']);
|
|
$account = createWhmAccount($package, false);
|
|
|
|
expect($manager->createAccount($account))->toBeTrue();
|
|
|
|
$actions = array_map(actionOf(...), $requests);
|
|
expect($actions)->toBe(['listpkgs', 'addpkg', 'createacct']);
|
|
});
|
|
|
|
test('createAccount skips addpkg when the package is already listed (legacy format)', function (): void {
|
|
$requests = [];
|
|
$client = new MockHttpClient(function (string $method, string $url, array $options) use (&$requests): MockResponse {
|
|
$requests[] = ['method' => $method, 'url' => $url, 'options' => $options];
|
|
|
|
if (str_contains($url, 'listpkgs')) {
|
|
return new MockResponse(json_encode(['package' => [['name' => 'admin_FOSSBilling']]]));
|
|
}
|
|
|
|
if (str_contains($url, 'createacct')) {
|
|
return new MockResponse(json_encode(['result' => [['status' => 1]]]));
|
|
}
|
|
|
|
return new MockResponse(json_encode(['status' => 1]));
|
|
});
|
|
$manager = createWhmManager($client);
|
|
$account = createWhmAccount(new Server_Package(), false);
|
|
|
|
expect($manager->createAccount($account))->toBeTrue();
|
|
|
|
$actions = array_map(actionOf(...), $requests);
|
|
expect($actions)->toBe(['listpkgs', 'createacct']);
|
|
});
|
|
|
|
test('createAccount skips addpkg when listpkgs uses the modern data.pkg format', function (): void {
|
|
$requests = [];
|
|
$client = new MockHttpClient(function (string $method, string $url, array $options) use (&$requests): MockResponse {
|
|
$requests[] = ['method' => $method, 'url' => $url, 'options' => $options];
|
|
|
|
if (str_contains($url, 'listpkgs')) {
|
|
return new MockResponse(json_encode(['data' => ['pkg' => [['name' => 'admin_FOSSBilling']]]]));
|
|
}
|
|
|
|
if (str_contains($url, 'createacct')) {
|
|
return new MockResponse(json_encode(['result' => [['status' => 1]]]));
|
|
}
|
|
|
|
return new MockResponse(json_encode(['status' => 1]));
|
|
});
|
|
$manager = createWhmManager($client);
|
|
$account = createWhmAccount(new Server_Package(), false);
|
|
|
|
expect($manager->createAccount($account))->toBeTrue();
|
|
|
|
$actions = array_map(actionOf(...), $requests);
|
|
expect($actions)->toBe(['listpkgs', 'createacct']);
|
|
});
|
|
|
|
test('createAccount updates the existing package via editpkg when addpkg reports already exists (see #4560)', function (): void {
|
|
$requests = [];
|
|
$client = new MockHttpClient(function (string $method, string $url, array $options) use (&$requests): MockResponse {
|
|
$requests[] = ['method' => $method, 'url' => $url, 'options' => $options];
|
|
|
|
if (str_contains($url, 'listpkgs')) {
|
|
return new MockResponse(json_encode(['package' => []]));
|
|
}
|
|
|
|
if (str_contains($url, 'addpkg')) {
|
|
return new MockResponse(json_encode(['result' => [['status' => 0, 'statusmsg' => '(XID n25fcu) The package "admin_FOSSBilling" already exists. If you wish to make changes, please edit the package.']]]));
|
|
}
|
|
|
|
if (str_contains($url, 'editpkg')) {
|
|
return new MockResponse(json_encode(['status' => 1]));
|
|
}
|
|
|
|
if (str_contains($url, 'createacct')) {
|
|
return new MockResponse(json_encode(['result' => [['status' => 1]]]));
|
|
}
|
|
|
|
return new MockResponse(json_encode(['status' => 1]));
|
|
});
|
|
$manager = createWhmManager($client);
|
|
$account = createWhmAccount(new Server_Package(), false);
|
|
|
|
expect($manager->createAccount($account))->toBeTrue();
|
|
|
|
$actions = array_map(actionOf(...), $requests);
|
|
expect($actions)->toBe(['listpkgs', 'addpkg', 'editpkg', 'createacct']);
|
|
});
|
|
|
|
test('createAccount still creates the account when editpkg also fails after already-exists (see #4560)', function (): void {
|
|
$requests = [];
|
|
$client = new MockHttpClient(function (string $method, string $url, array $options) use (&$requests): MockResponse {
|
|
$requests[] = ['method' => $method, 'url' => $url, 'options' => $options];
|
|
|
|
if (str_contains($url, 'listpkgs')) {
|
|
return new MockResponse(json_encode(['package' => []]));
|
|
}
|
|
|
|
if (str_contains($url, 'addpkg')) {
|
|
return new MockResponse(json_encode(['result' => [['status' => 0, 'statusmsg' => '(XID n25fcu) The package "admin_FOSSBilling" already exists.']]]));
|
|
}
|
|
|
|
if (str_contains($url, 'editpkg')) {
|
|
return new MockResponse(json_encode(['result' => [['status' => 0, 'statusmsg' => 'Permission denied']]]));
|
|
}
|
|
|
|
if (str_contains($url, 'createacct')) {
|
|
return new MockResponse(json_encode(['result' => [['status' => 1]]]));
|
|
}
|
|
|
|
return new MockResponse(json_encode(['status' => 1]));
|
|
});
|
|
$manager = createWhmManager($client);
|
|
$account = createWhmAccount(new Server_Package(), false);
|
|
|
|
expect($manager->createAccount($account))->toBeTrue();
|
|
|
|
$actions = array_map(actionOf(...), $requests);
|
|
expect($actions)->toBe(['listpkgs', 'addpkg', 'editpkg', 'createacct']);
|
|
});
|
|
|
|
test('createAccount rethrows addpkg failures unrelated to already-exists', function (): void {
|
|
$client = new MockHttpClient(function (string $method, string $url): MockResponse {
|
|
if (str_contains($url, 'listpkgs')) {
|
|
return new MockResponse(json_encode(['package' => []]));
|
|
}
|
|
|
|
if (str_contains($url, 'addpkg')) {
|
|
return new MockResponse(json_encode(['result' => [['status' => 0, 'statusmsg' => 'Invalid quota value']]]));
|
|
}
|
|
|
|
return new MockResponse(json_encode(['status' => 1]));
|
|
});
|
|
$manager = createWhmManager($client);
|
|
$account = createWhmAccount(new Server_Package(), false);
|
|
|
|
// The WHM reason stays in the logs; API callers only see the generic message.
|
|
expect(fn () => $manager->createAccount($account))->toThrow(Server_Exception::class, 'Failed to addpkg on the cPanel server');
|
|
});
|
|
|
|
test('addpkg already-exists does not leak the WHM reason to callers', function (): void {
|
|
$client = new MockHttpClient(fn (string $method, string $url): MockResponse => new MockResponse(json_encode(['result' => [['status' => 0, 'statusmsg' => '(XID n25fcu) The package "admin_FOSSBilling" already exists.']]])));
|
|
$manager = createWhmManager($client);
|
|
|
|
// Directly verify the typed exception carries the generic message, not the WHM reason.
|
|
$ref = new ReflectionMethod($manager, 'request');
|
|
|
|
try {
|
|
$ref->invoke($manager, 'addpkg', ['name' => 'admin_FOSSBilling']);
|
|
expect(false)->toBeTrue('Expected Server_PackageExistsException was not thrown');
|
|
} catch (Server_PackageExistsException $e) {
|
|
expect($e->getMessage())->not->toContain('already exists')
|
|
->and($e->getMessage())->toContain('Failed to addpkg');
|
|
}
|
|
});
|