zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2026-04-22 16:07:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes: V1.5.0 Don't store default domain in dns record (#3849)

Browse Source 
* 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;
This commit is contained in:
Vishal Dalwadi
2026-02-09 02:50:08 -08:00
committed by GitHub
parent 743c3924b0
commit 768fcc938d
6 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+1 -1
View File
@@ -1,7 +1,7 @@
<p align="center">
<a href="https://netmaker.io">
<img src="https://raw.githubusercontent.com/gravitl/netmaker-docs/master/images/netmaker-github/netmaker-teal.png" width="50%"><break/>
<img src="https://media.netmaker.io/logos/netmaker-logo-full-dark.svg" width="50%"><break/>
</a>
</p>
controllers/dns.go
-6
View File
@@ -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"),
logic/dns.go
+4
View File
@@ -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)
}
}
pro/auth/error.go
+1 -2
View File
@@ -82,12 +82,11 @@ var htmlBaseTemplate = `<!DOCTYPE html>
<body>
<img
src="https://raw.githubusercontent.com/gravitl/netmaker-docs/master/images/netmaker-github/netmaker-teal.png"
src="https://media.netmaker.io/logos/netmaker-logo-full-light-1.svg"
alt="netmaker logo"
id="logo"
>
%s
<button class="back-to-login-btn" onClick="redirect()" role="button">Back To Login</button>
</body>
</html>`
pro/auth/templates.go
+2 -2
View File
@@ -56,7 +56,7 @@ var ssoCallbackTemplate = template.Must(
<body>
<img
src="https://raw.githubusercontent.com/gravitl/netmaker-docs/master/images/netmaker-github/netmaker-teal.png"
src="https://media.netmaker.io/logos/netmaker-logo-full-light-1.svg"
alt="netmaker logo"
id="logo"
>
@@ -110,7 +110,7 @@ var ssoErrCallbackTemplate = template.Must(
<body>
<img
src="https://raw.githubusercontent.com/gravitl/netmaker-docs/master/images/netmaker-github/netmaker-teal.png"
src="https://media.netmaker.io/logos/netmaker-logo-full-light-1.svg"
alt="netmaker logo"
id="logo"
>
pro/email/utils.go
+1 -1
View File
@@ -4,7 +4,7 @@ import "strings"
// mail related images hosted on github
var (
netmakerLogoTeal = "https://raw.githubusercontent.com/gravitl/netmaker/netmaker_logos/img/logos/netmaker-logo-2.png"
netmakerLogoTeal = "https://media.netmaker.io/logos/netmaker-logo-full-light-1.svg"
)
type EmailBodyBuilder interface {