bao/portal-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
baodev0
2026-07-23 10:51:58 +07:00
parent c13ff0229d
commit 1459fd49a3
7 changed files with 47 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Api/Admin/VCenter/VCenterController.php
+1 -6
View File
@@ -80,12 +80,7 @@ class VCenterController extends Controller
return response()->json([
'error' => false,
'data' => preg_replace(
'#^wss://[^/]+#',
'wss://' . self::CONSOLE_HOST,
$ticket['data']
),
'host' => $vcenter->host,
'data' => 'wss://' . self::CONSOLE_HOST . '/ticket/' . $ticket['data']['ticket'] . '?host=' . $ticket['data']['host'],
'vmware-api-session-id' => $serviceVCenter->token,
])->cookie('vmware-api-session-id', $serviceVCenter->token, 60, '/', null, false, false);
}
app/Http/Controllers/Api/Admin/VPS/VPSController.php
+1 -4
View File
@@ -273,10 +273,7 @@ class VPSController extends Controller
return response()->json([
'error' => false,
'data' => [
'ticket' => $ticket['data'],
'host' => $vcenter->host
]
'data' => $ticket['data'],
]);
}
}
app/Http/Controllers/Api/Client/Service/ServiceController.php
+2 -3
View File
@@ -158,8 +158,6 @@ class ServiceController extends Controller
return response()->json(['error' => true, 'message' => $consoleTicket['data']]);
}
$ticket = basename(parse_url((string) $consoleTicket['data'], PHP_URL_PATH));
$this->activityLogger->log(
event: 'console_access',
logName: 'VM',
@@ -170,7 +168,8 @@ class ServiceController extends Controller
return response()->json([
'error' => false,
'message' => $ticket,
'message' => $consoleTicket['data']['ticket'],
'host' => $consoleTicket['data']['host'],
]);
}
app/Http/Services/vCenter/Client.php
+4 -1
View File
@@ -16,7 +16,10 @@ class Client
public function loginServer(Vcenter $vcenterModel): bool|string
{
$this->apiUri = 'console.tgs.com.vn';
// console.tgs.com.vn (HAProxy) only proxies WMKS console websockets
// to ESXi hosts by ?host= — the vCenter management API must be
// called directly against the vCenter's own host.
$this->apiUri = $vcenterModel->host;
$this->username = $vcenterModel->user;
$this->password = SignRSA::DecryptFunc($vcenterModel->password);
app/Http/Services/vCenter/PowerManagementService.php
+20 -1
View File
@@ -158,9 +158,28 @@ class PowerManagementService
"type" => "WEBMKS"
])->json();
if (!isset($response['error_type'])) {
// vCenter returns "wss://<esxi-host>/ticket/<id>" — the esxi
// host is only reachable through HAProxy's ?host= routing
// (see config('vmware.console_nodes')), so split it out here.
$esxiHost = parse_url((string) $response['ticket'], PHP_URL_HOST);
$ticketId = basename(parse_url((string) $response['ticket'], PHP_URL_PATH));
// Array access, not config('vmware.console_nodes.'.$esxiHost) —
// IPs contain dots, which collide with Laravel's dot notation.
$consoleHost = config('vmware.console_nodes')[$esxiHost] ?? null;
if (!$consoleHost) {
return [
'error' => true,
'data' => "Không tìm thấy console node cho ESXi host: $esxiHost",
];
}
return [
'error' => false,
'data' => $response['ticket']
'data' => [
'ticket' => $ticketId,
'host' => $consoleHost,
],
];
}
return [
config/vmware.php
+19 -1
View File
@@ -1,5 +1,23 @@
<?php
return [
'wmks_host' => env('WMKS_HOST', '10.10.10.120'),
// HAProxy (console.tgs.com.vn) routes WMKS console websockets to the
// ESXi host that owns the ticket via the `?host=` query param — see
// ha-proxy.md. This maps each ESXi IP to the domain HAProxy matches on.
'console_nodes' => [
'10.10.10.125' => 'consolenode125.tgs.com.vn',
'10.10.10.121' => 'consolenode121.tgs.com.vn',
'192.168.99.90' => 'consoleviettel90.tgs.com.vn',
'192.168.99.91' => 'consoleviettel91.tgs.com.vn',
'103.42.57.35' => 'consolenode35.tgs.com.vn',
'103.42.57.36' => 'consolenode36.tgs.com.vn',
'103.42.57.37' => 'consolenode37.tgs.com.vn',
'10.10.10.126' => 'consolenode126.tgs.com.vn',
'10.10.10.127' => 'consolenode127.tgs.com.vn',
'10.10.10.128' => 'consolenode128.tgs.com.vn',
'10.10.10.129' => 'consolenode129.tgs.com.vn',
'10.10.10.130' => 'consolenode130.tgs.com.vn',
'10.10.10.101' => 'consolenode101.tgs.com.vn',
'10.10.10.120' => 'consolenode120.tgs.com.vn',
],
];
routes/api.php
-1
View File
@@ -734,7 +734,6 @@ Route::prefix('v1')
->json([
'error' => false,
'data' => $ConsoleTicket['data'],
'host' => $vcenter->host,
'vmware-api-session-id' => $serviceVCenter->token,
])
->cookie('vmware-api-session-id', $serviceVCenter->token, 60, '/', null, false, false);