mirror of
https://github.com/rekryt/iplist.git
synced 2025-10-13 00:49:36 +03:00
feat: custom output text format
This commit is contained in:
@@ -57,7 +57,7 @@ abstract class AbstractIPListController extends AbstractController {
|
||||
*/
|
||||
protected function getGroups(): array {
|
||||
$groups = [];
|
||||
foreach ($this->service->sites as $siteEntity) {
|
||||
foreach ($this->getSites() as $siteEntity) {
|
||||
$groups[$siteEntity->group][$siteEntity->name] = $siteEntity;
|
||||
}
|
||||
return $groups;
|
||||
|
@@ -3,6 +3,7 @@
|
||||
namespace OpenCCK\App\Controller;
|
||||
|
||||
use OpenCCK\Domain\Factory\SiteFactory;
|
||||
use OpenCCK\Domain\Helper\IP4Helper;
|
||||
|
||||
/**
|
||||
* @see https://help.keenetic.com/hc/ru/articles/213966749-%D0%94%D0%BE%D0%B1%D0%B0%D0%B2%D0%BB%D0%B5%D0%BD%D0%B8%D0%B5-%D1%81%D1%82%D0%B0%D1%82%D0%B8%D1%87%D0%B5%D1%81%D0%BA%D0%B8%D1%85-%D0%BC%D0%B0%D1%80%D1%88%D1%80%D1%83%D1%82%D0%BE%D0%B2-%D0%B8%D0%B7-%D1%84%D0%B0%D0%B9%D0%BB%D0%B0-bat-%D0%B2-%D0%B8%D0%BD%D1%82%D0%B5%D1%80%D0%BD%D0%B5%D1%82-%D1%86%D0%B5%D0%BD%D1%82%D1%80-%D0%B4%D0%BB%D1%8F-%D0%B2%D0%B5%D1%80%D1%81%D0%B8%D0%B9-NDMS-2-11-%D0%B8-%D0%B1%D0%BE%D0%BB%D0%B5%D0%B5-%D1%80%D0%B0%D0%BD%D0%BD%D0%B8%D1%85
|
||||
@@ -39,27 +40,9 @@ class BatController extends AbstractIPListController {
|
||||
"\n",
|
||||
array_map(function (string $item) {
|
||||
$parts = explode('/', $item);
|
||||
$mask = $this->formatShortIpMask($parts[1] ?? '');
|
||||
$mask = IP4Helper::formatShortIpMask($parts[1] ?? '');
|
||||
return 'route add ' . $parts[0] . ' mask ' . $mask . ' 0.0.0.0';
|
||||
}, $response)
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $mask
|
||||
* @return string
|
||||
*/
|
||||
private function formatShortIpMask(string $mask): string {
|
||||
if ($mask == '') {
|
||||
$mask = '32';
|
||||
}
|
||||
$binaryMask = str_repeat('1', $mask) . str_repeat('0', 32 - $mask);
|
||||
$octets = [];
|
||||
|
||||
for ($i = 0; $i < 4; $i++) {
|
||||
$octets[] = bindec(substr($binaryMask, $i * 8, 8));
|
||||
}
|
||||
|
||||
return implode('.', $octets);
|
||||
}
|
||||
}
|
||||
|
104
src/App/Controller/CustomController.php
Normal file
104
src/App/Controller/CustomController.php
Normal file
@@ -0,0 +1,104 @@
|
||||
<?php
|
||||
|
||||
namespace OpenCCK\App\Controller;
|
||||
|
||||
use OpenCCK\Domain\Entity\Site;
|
||||
use OpenCCK\Domain\Factory\SiteFactory;
|
||||
use OpenCCK\Domain\Helper\IP4Helper;
|
||||
use OpenCCK\Domain\Helper\IP6Helper;
|
||||
|
||||
class CustomController extends AbstractIPListController {
|
||||
/**
|
||||
* @return string
|
||||
*/
|
||||
public function getBody(): string {
|
||||
$this->setHeaders(['content-type' => 'text/plain']);
|
||||
|
||||
$sites = SiteFactory::normalizeArray($this->request->getQueryParameters()['site'] ?? []);
|
||||
$data = $this->request->getQueryParameter('data') ?? '';
|
||||
$template = $this->request->getQueryParameter('template') ?? '';
|
||||
if ($data == '') {
|
||||
return "# Error: The 'data' GET parameter is required in the URL to access this page";
|
||||
}
|
||||
if ($template == '') {
|
||||
return "# Error: The 'template' GET parameter is required in the URL to access this page";
|
||||
}
|
||||
|
||||
$response = [];
|
||||
foreach ($this->getGroups() as $groupName => $groupSites) {
|
||||
if (count($sites)) {
|
||||
$groupSites = array_filter($groupSites, fn(Site $siteEntity) => in_array($siteEntity->name, $sites));
|
||||
}
|
||||
if (!count($groupSites)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$items = [];
|
||||
foreach ($groupSites as $siteName => $siteEntity) {
|
||||
$items = array_merge(
|
||||
$items,
|
||||
$this->generateList(
|
||||
$siteEntity,
|
||||
SiteFactory::normalizeArray(
|
||||
$siteEntity->{$data},
|
||||
in_array($data, ['ip4', 'ip6', 'cidr4', 'cidr6'])
|
||||
),
|
||||
$data,
|
||||
$template
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
$response = array_merge($response, $items);
|
||||
}
|
||||
|
||||
return implode("\n", $response);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Site $siteEntity
|
||||
* @param array $dataArray
|
||||
* @param string $data
|
||||
* @param string $template
|
||||
* @return array
|
||||
*/
|
||||
private function generateList(Site $siteEntity, array $dataArray, string $data, string $template): array {
|
||||
$items = [];
|
||||
foreach ($dataArray as $item) {
|
||||
$patterns = [
|
||||
'group' => $siteEntity->group,
|
||||
'site' => $siteEntity->name,
|
||||
'data' => $item,
|
||||
];
|
||||
switch ($data) {
|
||||
case 'ip4':
|
||||
$patterns['shortmask'] = '32';
|
||||
$patterns['mask'] = IP4Helper::formatShortIpMask($patterns['shortmask']);
|
||||
break;
|
||||
case 'ip6':
|
||||
$patterns['shortmask'] = '128';
|
||||
$patterns['mask'] = IP6Helper::formatShortIpMask($patterns['shortmask']);
|
||||
break;
|
||||
case 'cidr4':
|
||||
$parts = explode('/', $item);
|
||||
$patterns['shortmask'] = $parts[1];
|
||||
$patterns['mask'] = IP4Helper::formatShortIpMask($patterns['shortmask']);
|
||||
break;
|
||||
case 'cidr6':
|
||||
$parts = explode('/', $item);
|
||||
$patterns['shortmask'] = $parts[1];
|
||||
$patterns['mask'] = IP6Helper::formatShortIpMask($patterns['shortmask']);
|
||||
break;
|
||||
case 'domains':
|
||||
break;
|
||||
}
|
||||
|
||||
$result = $template;
|
||||
foreach ($patterns as $key => $value) {
|
||||
$result = str_replace('{' . $key . '}', $value, $result);
|
||||
}
|
||||
$items[] = $result;
|
||||
}
|
||||
return $items;
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user