Dead code removed: - Module.php: remove addIPv4() method (no endpoint, feature removed per CLAUDE.md) - Curl.php: remove useCookies(), setLog() (security risk — wrote tokens to web-accessible CURL.log), head(), getHeadersData() — all unused - module.css: remove .vf-button, .vf-button-small (never referenced in DOM) - module.css: remove vestigial #vf-data-server-traffic-sep rule - module.css: merge duplicate #vf-server-info-error declarations - publish-release.yml: remove dead version.json generation step (nothing reads it) Fixes: - AdminHTML.php: update stale cache version strings 20260207 → 20260319 - hooks.php: update stale keygen.js version string - hooks.php: remove unused `use WHMCS\User\User` import - ConfigureService.php: remove unused `use JsonException` import - module.css: fix .vf-os-details class selector → #vf-os-details ID selector - client.php + admin.php: reuse existing $vf instead of new Module() - Module.php: use Cache::forget() instead of forgetPattern() for known key (forgetPattern is a no-op on filesystem cache fallback) Workflow: - Rewrite publish-release.yml: tag-based triggers only (no automatic releases) - Triggers on push of v* tags, creates GitHub release with auto-generated notes - Uses softprops/action-gh-release@v2 — compatible with both Gitea and GitHub Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
227 lines
6.1 KiB
PHP
227 lines
6.1 KiB
PHP
<?php
|
|
|
|
namespace WHMCS\Module\Server\VirtFusionDirect;
|
|
|
|
use WHMCS\Database\Capsule as DB;
|
|
use WHMCS\User\User;
|
|
|
|
class ConfigureService extends Module
|
|
{
|
|
/**
|
|
* @var array|false $cp
|
|
*/
|
|
private array|bool $cp;
|
|
|
|
public function __construct()
|
|
{
|
|
parent::__construct();
|
|
$this->cp = $this->getCP(false, true);
|
|
}
|
|
|
|
/**
|
|
* @param string $packageName
|
|
* @return int|null
|
|
* @throws JsonException
|
|
*/
|
|
public function fetchPackageId(string $packageName): ?int
|
|
{
|
|
$cacheKey = 'pkg_name:' . md5($packageName);
|
|
$cached = Cache::get($cacheKey);
|
|
if ($cached !== null) {
|
|
return $cached;
|
|
}
|
|
|
|
if (!$this->cp) return null;
|
|
|
|
$request = $this->initCurl($this->cp['token']);
|
|
|
|
$response = $request->get(
|
|
sprintf("%s/packages", $this->cp['url'])
|
|
);
|
|
|
|
$packages = $this->decodeResponseFromJson($response);
|
|
|
|
foreach ($packages['data'] as $package) {
|
|
if ($package['name'] === $packageName && $package['enabled'] === true) {
|
|
Cache::set($cacheKey, $package['id'], 600);
|
|
return $package['id'];
|
|
}
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
|
|
/**
|
|
* @param int $productId
|
|
* @return int|null
|
|
*/
|
|
public function fetchPackageByDbId(int $productId): ?int
|
|
{
|
|
$product = DB::table('tblproducts')->where('id', $productId)->first();
|
|
|
|
if (is_null($product)) {
|
|
return null;
|
|
}
|
|
|
|
return (int)$product->configoption2;
|
|
}
|
|
|
|
/**
|
|
* @param int $serverPackageId
|
|
* @return array|null
|
|
* @throws JsonException
|
|
*/
|
|
public function fetchTemplates(?int $serverPackageId): ?array
|
|
{
|
|
if (is_null($serverPackageId)) {
|
|
return null;
|
|
}
|
|
|
|
$cacheKey = 'tpl:' . $serverPackageId;
|
|
$cached = Cache::get($cacheKey);
|
|
if ($cached !== null) {
|
|
return $cached;
|
|
}
|
|
|
|
if (!$this->cp) return null;
|
|
|
|
$request = $this->initCurl($this->cp['token']);
|
|
|
|
$response = $request->get(
|
|
sprintf("%s/media/templates/fromServerPackageSpec/%d", $this->cp['url'], $serverPackageId)
|
|
);
|
|
|
|
$result = $this->decodeResponseFromJson($response);
|
|
Cache::set($cacheKey, $result, 600);
|
|
return $result;
|
|
}
|
|
|
|
/**
|
|
* @param User|null $user
|
|
* @return array|null
|
|
* @throws JsonException
|
|
*/
|
|
public function getUserSshKeys(?User $user): ?array
|
|
{
|
|
if (is_null($user)) {
|
|
return null;
|
|
}
|
|
|
|
if (!$this->cp) return null;
|
|
|
|
$request = $this->initCurl($this->cp['token']);
|
|
|
|
$vfUser = $this->getVFUserDetails($user['id']);
|
|
|
|
if (!$vfUser) return null;
|
|
|
|
$response = $request->get(
|
|
sprintf("%s/ssh_keys/user/%d", $this->cp['url'], $vfUser['id'])
|
|
);
|
|
|
|
return $this->decodeResponseFromJson($response);
|
|
}
|
|
|
|
/**
|
|
* @param int $id
|
|
* @return array|null
|
|
* @throws JsonException
|
|
*/
|
|
public function getVFUserDetails(int $id): ?array
|
|
{
|
|
if (!$this->cp) return null;
|
|
|
|
$request = $this->initCurl($this->cp['token']);
|
|
|
|
$response = $this->decodeResponseFromJson($request->get(
|
|
sprintf("%s/users/%d/byExtRelation", $this->cp['url'], $id)
|
|
));
|
|
|
|
return isset($response['msg']) && $response['msg'] === "ext_relation_id not found" ? null : $response['data'];
|
|
}
|
|
|
|
/**
|
|
* @param int $id
|
|
* @param array $vars
|
|
* @param int|null $vfUserId VirtFusion user ID (for creating SSH keys from raw public key)
|
|
* @return bool
|
|
*/
|
|
public function initServerBuild(int $id, array $vars, ?int $vfUserId = null): bool
|
|
{
|
|
if (!$this->cp) return false;
|
|
|
|
$request = $this->initCurl($this->cp['token']);
|
|
|
|
// Generate a hostname with sufficient entropy to avoid collisions
|
|
$hostname = 'vps-' . bin2hex(random_bytes(4));
|
|
|
|
$sshKeyValue = $vars['customfields']['Initial SSH Key'] ?? null;
|
|
$sshKeyId = null;
|
|
|
|
if (!empty($sshKeyValue)) {
|
|
if (is_numeric($sshKeyValue)) {
|
|
// Existing SSH key ID
|
|
$sshKeyId = (int) $sshKeyValue;
|
|
} elseif (preg_match('/^ssh-/', $sshKeyValue) && $vfUserId) {
|
|
// Raw public key — create it via API
|
|
$sshKeyId = $this->createUserSshKey($vfUserId, $sshKeyValue);
|
|
}
|
|
}
|
|
|
|
$inputData = [
|
|
"operatingSystemId" => $vars['customfields']['Initial Operating System'] ?? null,
|
|
"name" => $hostname,
|
|
'email' => true
|
|
];
|
|
|
|
if ($sshKeyId) {
|
|
$inputData['sshKeys'] = [$sshKeyId];
|
|
}
|
|
|
|
$request->addOption(CURLOPT_POSTFIELDS, json_encode($inputData));
|
|
|
|
$response = $request->post(
|
|
sprintf("%s/servers/%d/build", $this->cp['url'], $id)
|
|
);
|
|
|
|
$httpCode = $request->getRequestInfo('http_code');
|
|
Log::insert(__FUNCTION__, $request->getRequestInfo(), $response);
|
|
|
|
return ($httpCode == 200 || $httpCode == 201);
|
|
}
|
|
|
|
/**
|
|
* Create an SSH key for a VirtFusion user from a raw public key string.
|
|
*
|
|
* @param int $userId VirtFusion user ID
|
|
* @param string $publicKey Raw SSH public key (ssh-rsa ..., ssh-ed25519 ..., etc.)
|
|
* @return int|null Created key ID or null on failure
|
|
*/
|
|
public function createUserSshKey(int $userId, string $publicKey): ?int
|
|
{
|
|
if (!$this->cp) return null;
|
|
|
|
$request = $this->initCurl($this->cp['token']);
|
|
|
|
$keyData = [
|
|
'userId' => $userId,
|
|
'name' => 'WHMCS-' . date('Y-m-d'),
|
|
'publicKey' => trim($publicKey),
|
|
];
|
|
|
|
$request->addOption(CURLOPT_POSTFIELDS, json_encode($keyData));
|
|
$response = $request->post($this->cp['url'] . '/ssh_keys');
|
|
|
|
Log::insert(__FUNCTION__, $request->getRequestInfo(), $response);
|
|
|
|
$httpCode = $request->getRequestInfo('http_code');
|
|
if ($httpCode == 200 || $httpCode == 201) {
|
|
$data = json_decode($response, true);
|
|
return $data['data']['id'] ?? null;
|
|
}
|
|
|
|
return null;
|
|
}
|
|
}
|