lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-20 03:16:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

OpenVPN client export, add list accounts (certificates) and associated users endpoint for https://github.com/opnsense/core/issues/2787

Browse Source 
The legacy code populated a list of users and certificates, where the user only seems to be used to prefix some content and filter on server type, it seems more obvious to just export related certs for the requested server and show which users it connects to.
This commit is contained in:
Ad Schellevis 2018-10-10 18:43:13 +02:00
parent 3a5874309e
commit 06ad789c29
1 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/opnsense/mvc/app/controllers/OPNsense/OpenVPN/Api/ExportController.php
View File

@ -53,7 +53,21 @@ class ExportController extends ApiControllerBase
}
}
}
}
/**
* find server by vpnid
* @param string $vpnid reference
* @return mixed|null
*/
private function findServer($vpnid)
{
foreach ($this->servers() as $server) {
if ((string)$server->vpnid == $vpnid) {
return $server;
}
}
return null;
}
/**
@ -78,12 +92,38 @@ class ExportController extends ApiControllerBase
/**
* list configured accounts
* @param string $server handle
* @param string $vpnid server handle
* @return array list of configured accounts
*/
public function accountsAction($server)
public function accountsAction($vpnid)
{
return array();
$result = array();
$server = $this->findServer($vpnid);
if ($server !== null) {
// collect certificates for this server's ca
if (isset(Config::getInstance()->object()->cert)) {
foreach (Config::getInstance()->object()->cert as $cert) {
if (isset($cert->refid) && isset($cert->caref) && (string)$server->caref == $cert->caref) {
$result[(string)$cert->refid] = array(
"description" => (string)$cert->descr,
"users" => array()
);
}
}
}
// collect linked users
foreach (Config::getInstance()->object()->system->user as $user) {
if (isset($user->cert)) {
foreach ($user->cert as $cert) {
if (!empty($result[(string)$cert])) {
$result[(string)$cert]['users'][] = (string)$user->name;
}
}
}
}
}
return $result;
}
/**