tracer
/
bindAPI
3
0
Fork 0
Code Issues 2 Pull Requests Projects Releases 15 Wiki Activity

Compare commits

base: tracer:c8cb2049a07c9817a682825aeb74669c578e1694
Branches Tags
tracer:master
tracer:codeAnalysis
tracer:symfony
tracer:1.1.2
tracer:1.1.1
tracer:1.1.0
tracer:1.0.9
tracer:1.0.8
tracer:1.0.7
tracer:1.0.6
tracer:1.0.5
tracer:1.0.4
tracer:1.0.3
tracer:1.02
tracer:1.0.2
tracer:1.0.1
tracer:1.0.0
tracer:rc2
tracer:0.99-rc1
..
compare: tracer:0a67c168628698c4121fcec11872c3ec8534ecf6
Branches Tags
tracer:master
tracer:codeAnalysis
tracer:symfony
tracer:1.1.2
tracer:1.1.1
tracer:1.1.0
tracer:1.0.9
tracer:1.0.8
tracer:1.0.7
tracer:1.0.6
tracer:1.0.5
tracer:1.0.4
tracer:1.0.3
tracer:1.02
tracer:1.0.2
tracer:1.0.1
tracer:1.0.0
tracer:rc2
tracer:0.99-rc1

No commits in common. "c8cb2049a07c9817a682825aeb74669c578e1694" and "0a67c168628698c4121fcec11872c3ec8534ecf6" have entirely different histories.
c8cb2049a0 ... 0a67c16862

2 changed files with 108 additions and 116 deletions
Show Stats Expand all files Collapse all files

3
public/openapi/bindapi.json
View File

@ -94,9 +94,6 @@
"200": { "200": {
"description": "OK" "description": "OK"
}, },
"204": {
"description": "No Content"
},
"401": { "401": {
"description": "API key is missing or invalid." "description": "API key is missing or invalid."
}, },

205
src/Controller/RequestController.php
View File

@ -57,7 +57,7 @@ class RequestController
private DomainController $domainController; private DomainController $domainController;
private DomainRepository $domainRepository; private DomainRepository $domainRepository;
private PanelRepository $panelRepository; private PanelRepository $panelRepository;
private DynDNSRepository $dynDNSRepository; private DynDNSRepository $DynDNSRepository;
private Container $container; private Container $container;
private string $header; private string $header;
private array $result; private array $result;
@ -561,21 +561,20 @@ class RequestController
$this->header = '404 Not Found'; $this->header = '404 Not Found';
$this->message = 'Domain ' . $domainName . ' not found'; $this->message = 'Domain ' . $domainName . ' not found';
} else { } else {
// check if address has changed // check if address has changed
if ($dynDNS = $this->dynDNSRepository->findByName(name: $host)) { if ($dynDNS = $this->dynDNSRepository->findByName(name: $host)) {
if ($this->config['debug']) { echo 'found host';
$this->log->debug(message: 'found host: ' . $host); print_r($dynDNS);
$this->log->debug(message: "a: $a");
$this->log->debug(message: "aaaa: $aaaa"); print("a: $a");
} print("aaaa: $aaaa");
$ipChanged = false; $ipChanged = false;
if (!empty($a)) { if (!empty($a)) {
if ($a != $dynDNS->getA()) { if ($a != $dynDNS->getA()) {
if ($this->config['debug']) { echo $a . '!=' . $dynDNS->getA();
$this->log->debug(message: $a . ' != ' . $dynDNS->getA());
}
$dynDNS->setA(a: $a); $dynDNS->setA(a: $a);
$ipChanged = true; $ipChanged = true;
} }
@ -583,129 +582,125 @@ class RequestController
if (!empty($aaaa)) { if (!empty($aaaa)) {
if ($aaaa != $dynDNS->getAaaa()) { if ($aaaa != $dynDNS->getAaaa()) {
if ($this->config['debug']) {
$this->log->debug(message: $aaaa . ' != ' . $dynDNS->getAaaa());
}
$dynDNS->setAaaa(aaaa: $aaaa); $dynDNS->setAaaa(aaaa: $aaaa);
$ipChanged = true; $ipChanged = true;
} }
} }
if ($ipChanged) { if (!$ipChanged) {
$this->header = '304 Not Modified';
$this->message = 'Not modified';
} else {
$this->dynDNSRepository->update(dynDNS: $dynDNS); $this->dynDNSRepository->update(dynDNS: $dynDNS);
} }
} else { } else {
$dynDNS = new DynDNS(name: $host, a: $a, aaaa: $aaaa); $dynDNS = new DynDNS(name: $host, a: $a, aaaa: $aaaa);
$this->dynDNSRepository->insert(dynDNS: $dynDNS); $this->dynDNSRepository->insert(dynDNS: $dynDNS);
$ipChanged = true;
} }
if ($ipChanged) { $panel = $this->panelRepository->findByName(name: $domain->getPanel());
$panel = $this->panelRepository->findByName(name: $domain->getPanel());
if (!empty($panel->getAaaa())) { if (!empty($panel->getAaaa())) {
$domainData = $this->apiController->sendCommand( $domainData = $this->apiController->sendCommand(
requestType: 'GET', requestType: 'GET',
serverName : $panel->getName(), serverName : $panel->getName(),
versionIP : 6, versionIP : 6,
apiKey : $panel->getApikey(), apiKey : $panel->getApikey(),
command : 'domains/name/' . $domainName, command : 'domains/name/' . $domainName,
serverType : 'panel'); serverType : 'panel');
} else { } else {
$domainData = $this->apiController->sendCommand( $domainData = $this->apiController->sendCommand(
requestType: 'GET', requestType: 'GET',
serverName : $panel->getName(), serverName : $panel->getName(),
versionIP : 4, versionIP : 4,
apiKey : $panel->getApikey(), apiKey : $panel->getApikey(),
command : 'domains/name/' . $domainName, command : 'domains/name/' . $domainName,
serverType : 'panel'); serverType : 'panel');
} }
$domainDecodedData = json_decode(json: $domainData['data']); $domainDecodedData = json_decode(json: $domainData['data']);
$domainID = $domainDecodedData->id; $domainID = $domainDecodedData->id;
if (!empty($panel->getAaaa())) { if (!empty($panel->getAaaa())) {
$dnsData = $this->apiController->sendCommand( $dnsData = $this->apiController->sendCommand(
requestType: 'GET', requestType: 'GET',
serverName : $panel->getName(), serverName : $panel->getName(),
versionIP : 6, versionIP : 6,
apiKey : $panel->getApikey(), apiKey : $panel->getApikey(),
command : 'dns/' . $domainID, command : 'dns/' . $domainID,
serverType : 'panel'); serverType : 'panel');
} else { } else {
$dnsData = $this->apiController->sendCommand( $dnsData = $this->apiController->sendCommand(
requestType: 'GET', requestType: 'GET',
serverName : $panel->getName(), serverName : $panel->getName(),
versionIP : 4, versionIP : 4,
apiKey : $panel->getApikey(), apiKey : $panel->getApikey(),
command : 'dns/' . $domainID, command : 'dns/' . $domainID,
serverType : 'panel'); serverType : 'panel');
} }
$dnsDataDecoded = json_decode(json: $dnsData['data']); $dnsDataDecoded = json_decode(json: $dnsData['data']);
$soa = $dnsDataDecoded->records->soa; $soa = $dnsDataDecoded->records->soa;
$others = $dnsDataDecoded->records->other; $others = $dnsDataDecoded->records->other;
$hostFound = false; $hostFound = false;
$updateHost = function (object $host) use ($hostName, $a, $aaaa, &$hostFound) { $updateHost = function (object $host) use ($hostName, $a, $aaaa, &$hostFound) {
if ($host->host == $hostName) { if ($host->host == $hostName) {
$hostFound = true; $hostFound = true;
if ($host->type == 'A') { if ($host->type == 'A') {
if (!empty($a)) { if (!empty($a)) {
$host->value = $a; $host->value = $a;
} }
} else { } else {
if (!empty($aaaa)) { if (!empty($aaaa)) {
$host->value = $aaaa; $host->value = $aaaa;
}
} }
} }
}; }
};
array_map(callback: $updateHost, array: $others); array_map(callback: $updateHost, array: $others);
if ($hostFound) { if ($hostFound) {
$newDnsData = json_encode(value: [ $newDnsData = json_encode(value: [
'records' => [ 'records' => [
'soa' => $soa, 'soa' => $soa,
'other' => $others 'other' => $others
] ]
]); ]);
if (!empty($panel->getAaaa())) { if (!empty($panel->getAaaa())) {
$result = $this->apiController->sendCommand( $result = $this->apiController->sendCommand(
requestType: 'PUT', requestType: 'PUT',
serverName : $panel->getName(), serverName : $panel->getName(),
versionIP : 6, versionIP : 6,
apiKey : $panel->getApikey(), apiKey : $panel->getApikey(),
command : 'dns/' . $domainID, command : 'dns/' . $domainID,
serverType : 'panel', serverType : 'panel',
body : json_decode(json: $newDnsData, associative: true) body : json_decode(json: $newDnsData, associative: true)
); );
} else {
$result = $this->apiController->sendCommand(
requestType: 'PUT',
serverName : $panel->getName(),
versionIP : 4,
apiKey : $panel->getApikey(),
command : 'dns/' . $domainID,
serverType : 'panel',
body : json_decode(json: $newDnsData, associative: true)
);
}
if ($result['header'] == 200) {
$this->header = '200 OK';
$this->message = 'DynDNS host successfully updated';
}
} else { } else {
$this->header = '404 Not Found'; $result = $this->apiController->sendCommand(
$this->message = 'Host ' . $hostName . ' not found'; requestType: 'PUT',
serverName : $panel->getName(),
versionIP : 4,
apiKey : $panel->getApikey(),
command : 'dns/' . $domainID,
serverType : 'panel',
body : json_decode(json: $newDnsData, associative: true)
);
}
if ($result['header'] == 200) {
$this->header = '200 OK';
$this->message = 'DynDNS host successfully updated';
} }
} else { } else {
$this->header = '204 No content'; $this->header = '404 Not Found';
$this->message = 'No content'; $this->message = 'Host ' . $hostName . ' not found';
} }
} }
} }