From 768fcc938dc3b656ced7df508d3a6ec95dd795c0 Mon Sep 17 00:00:00 2001
From: Vishal Dalwadi <51291657+VishalDalwadi@users.noreply.github.com>
Date: Mon, 9 Feb 2026 02:50:08 -0800
Subject: [PATCH] Fixes: V1.5.0 Don't store default domain in dns record
(#3849)
* fix(go): send match domains and search domains for igws;
* fix(go): use correct datatypes for coordinates;
* fix(go): don't store default domain in dns record;
* feat(go): remove back to login button;
* feat(go): update images;
---
README.md | 2 +-
controllers/dns.go | 6 ------
logic/dns.go | 4 ++++
pro/auth/error.go | 3 +--
pro/auth/templates.go | 4 ++--
pro/email/utils.go | 2 +-
6 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/README.md b/README.md
index 8b1f06fb..0dd5b03a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
- 
+ 
diff --git a/controllers/dns.go b/controllers/dns.go
index de2a9bca..a8a7e16c 100644
--- a/controllers/dns.go
+++ b/controllers/dns.go
@@ -6,7 +6,6 @@ import (
"errors"
"fmt"
"net/http"
- "strings"
"time"
"github.com/google/uuid"
@@ -478,11 +477,6 @@ func createDNS(w http.ResponseWriter, r *http.Request) {
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
return
}
- // check if default domain is appended if not append
- if logic.GetDefaultDomain() != "" &&
- !strings.HasSuffix(entry.Name, logic.GetDefaultDomain()) {
- entry.Name += "." + logic.GetDefaultDomain()
- }
entry, err = logic.CreateDNS(entry)
if err != nil {
logger.Log(0, r.Header.Get("user"),
diff --git a/logic/dns.go b/logic/dns.go
index 94a733f3..80b824eb 100644
--- a/logic/dns.go
+++ b/logic/dns.go
@@ -290,6 +290,7 @@ func GetCustomDNS(network string) ([]models.DNSEntry, error) {
if err != nil {
return dns, err
}
+ defaultDomain := GetDefaultDomain()
for _, value := range collection { // filter for entries based on network
var entry models.DNSEntry
if err := json.Unmarshal([]byte(value), &entry); err != nil {
@@ -297,6 +298,9 @@ func GetCustomDNS(network string) ([]models.DNSEntry, error) {
}
if entry.Network == network {
+ if defaultDomain != "" {
+ entry.Name = fmt.Sprintf("%s.%s", entry.Name, defaultDomain)
+ }
dns = append(dns, entry)
}
}
diff --git a/pro/auth/error.go b/pro/auth/error.go
index 0ecd276f..2fcc35ee 100644
--- a/pro/auth/error.go
+++ b/pro/auth/error.go
@@ -82,12 +82,11 @@ var htmlBaseTemplate = `
%s
-