Skip to content

fix subdomain edit and improved error handling #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Boy132 merged 3 commits into from
Jan 26, 2026
Merged

fix subdomain edit and improved error handling #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0b827e
fix subdomain edit and improved error handling
TinyMemoria Jan 26, 2026
a584e79
changed variable to camelCase and response handling
TinyMemoria Jan 26, 2026
10ac7c5
cleanup
Boy132 Jan 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 33 additions & 22 deletions subdomains/src/Models/Subdomain.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,27 +62,6 @@ public function upsertOnCloudflare(): void
throw new Exception('Server has no allocation');
}

// @phpstan-ignore staticMethod.notFound
$response = Http::cloudflare()->get("zones/{$this->domain->cloudflare_id}/dns_records/$this->cloudflare_id", ['search' => $this->name])->json();

if ($response['success']) {
if (!empty($response['result'])) {
throw new Exception('A subdomain with that name already exists');
}
} else {
if ($response['errors'] && count($response['errors']) > 0) {
throw new Exception($response['errors'][0]['message']);
}
}

$payload = [
'name' => $this->name,
'type' => $this->record_type,
'comment' => 'Created by Pelican Subdomains plugin',
'content' => $this->server->allocation->ip,
'proxied' => false,
];

if ($this->record_type === 'SRV') {
$srvTarget = $this->server->node->srv_target; // @phpstan-ignore property.notFound

Expand All @@ -96,8 +75,10 @@ public function upsertOnCloudflare(): void
throw new Exception('Server has no SRV type');
}

$searchName = "$srvServiceType->value.$this->name";

$payload = [
'name' => "$srvServiceType->value.$this->name",
'name' => $searchName,
'type' => $this->record_type,
'comment' => 'Created by Pelican Subdomains plugin',
'data' => [
Expand All @@ -112,6 +93,36 @@ public function upsertOnCloudflare(): void
if ($this->server->allocation->ip === '0.0.0.0' || $this->server->allocation->ip === '::') {
throw new Exception('Server has invalid allocation ip (0.0.0.0 or ::)');
}

$searchName = $this->name;

$payload = [
'name' => $searchName,
'type' => $this->record_type,
'comment' => 'Created by Pelican Subdomains plugin',
'content' => $this->server->allocation->ip,
'proxied' => false,
];
}

// @phpstan-ignore staticMethod.notFound
$searchResponse = Http::cloudflare()->get("zones/{$this->domain->cloudflare_id}/dns_records", [
'name' => $searchName,
'type' => $this->record_type,
])->json();

if ($searchResponse['success']) {
$results = $searchResponse['result'] ?? [];

foreach ($results as $record) {
if ($record['id'] !== $this->cloudflare_id) {
throw new Exception('A subdomain with that name already exists');
}
}
} else {
if ($searchResponse['errors'] && count($searchResponse['errors']) > 0) {
throw new Exception($searchResponse['errors'][0]['message']);
}
}

if ($this->cloudflare_id) {
Expand Down
16 changes: 13 additions & 3 deletions subdomains/src/Services/SubdomainService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,23 @@ class SubdomainService
*/
public function handle(array $data, ?Subdomain $subdomain = null): Subdomain
{
$subdomain ??= Subdomain::create($data);
$subdomain->update($data);
$newSubdomain = true;

if (is_null($subdomain)) {
$subdomain = Subdomain::create($data);
} else {
$subdomain->update($data);
$newSubdomain = false;
}

$subdomain->refresh();

try {
$subdomain->upsertOnCloudflare();
} catch (Exception $exception) {
$subdomain->delete();
if ($newSubdomain) {
$subdomain->delete();
}

throw $exception;
}
Expand Down