sendnrw/fritzbox_dyndns
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hinzufügen einer Logging-Funktion
All checks were successful
release-tag / release-image (push) Successful in 44s
Details

Browse Source
This commit is contained in:
jbergner
2025-01-16 01:36:55 +01:00
parent ed93d04d7e
commit 0cb44ad9ba
1 changed files with 66 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
main.go
View File

@@ -22,6 +22,7 @@ type DB map[string]dns_entry
var D map[string]dns_entry
var DEBUG bool = false
var ERRORLOG_FILE string = "error.log"
type dns_entry struct {
Dns string `json:"dns"`
@@ -37,14 +38,14 @@ func writeToFile(filename string, data DB) error {
// JSON konvertieren
jsonData, err := json.MarshalIndent(data, "", " ")
if err != nil {
fmt.Println("!", "Fehler beim Serialisieren: ", err)
WriteLog("!", "Fehler beim Serialisieren: ", err)
return err
}
// Datei öffnen/erstellen
err = os.WriteFile(filename, jsonData, 0644)
if err != nil {
fmt.Println("!", "Fehler beim Schreiben der Datei: ", err)
WriteLog("!", "Fehler beim Schreiben der Datei: ", err)
return err
}
@@ -56,7 +57,7 @@ func readFromFile(filename string) (DB, error) {
// Datei lesen
jsonData, err := os.ReadFile(filename)
if err != nil {
fmt.Println("!", "Fehler beim Lesen der Datei: ", err)
WriteLog("!", "Fehler beim Lesen der Datei: ", err)
return nil, err
}
@@ -64,7 +65,7 @@ func readFromFile(filename string) (DB, error) {
var data DB
err = json.Unmarshal(jsonData, &data)
if err != nil {
fmt.Println("!", "Fehler beim Parsen von JSON: ", err)
WriteLog("!", "Fehler beim Parsen von JSON: ", err)
return nil, err
}
@@ -130,7 +131,7 @@ func handler(w http.ResponseWriter, r *http.Request) {
if strings.EqualFold(Dns, "") || strings.EqualFold(Ip, "") || strings.EqualFold(User, "") || strings.EqualFold(Token, "") {
/* strings.ToLower(Dns) != strings.ToLower("") && strings.ToLower(Ip) != strings.ToLower("") && strings.ToLower(User) != strings.ToLower("") && strings.ToLower(Token) != strings.ToLower("")*/
fmt.Println("!", "Eintrag unvollständig: ", D[Dns])
WriteLog("!", "Eintrag unvollständig: ", D[Dns])
w.WriteHeader(200)
w.Write([]byte("nochg"))
@@ -139,33 +140,33 @@ func handler(w http.ResponseWriter, r *http.Request) {
if entry, exists := D[Dns+"."]; exists {
if User == entry.User && VerifyToken(Token, entry.Token) {
D[Dns+"."] = dns_entry{Dns: Dns, Ipv4: Ip, Ipv6: Ip6, User: User, Token: entry.Token, LastSeen: time.Now().String()}
fmt.Println("~", "Eintrag aktualisiert: ", entry, D[Dns+"."])
WriteLog("~", "Eintrag aktualisiert: ", entry, D[Dns+"."])
// Datei speichern
filename := "/data/data.json"
err := writeToFile(filename, D)
if err != nil {
fmt.Println("!", "Fehler beim Schreiben:", err)
WriteLog("!", "Fehler beim Schreiben:", err)
return
}
fmt.Println("~", "Daten erfolgreich in Datei geschrieben.")
WriteLog("~", "Daten erfolgreich in Datei geschrieben.")
w.WriteHeader(200)
w.Write([]byte("good"))
} else {
fmt.Println("!", "Eintrag aktualisieren abgelehnt (Benutzer/Passwort ungültig): ", entry, D[Dns])
WriteLog("!", "Eintrag aktualisieren abgelehnt (Benutzer/Passwort ungültig): ", entry, D[Dns])
w.WriteHeader(200)
w.Write([]byte("nochg"))
}
} else {
D[Dns+"."] = dns_entry{Dns: Dns, Ipv4: Ip, Ipv6: Ip6, User: User, Token: HashToken(Token), LastSeen: time.Now().String()}
fmt.Println("~", "Eintrag erstellt: ", entry, D[Dns+"."])
WriteLog("~", "Eintrag erstellt: ", entry, D[Dns+"."])
// Datei speichern
filename := "/data/data.json"
err := writeToFile(filename, D)
if err != nil {
fmt.Println("!", "Fehler beim Schreiben:", err)
WriteLog("!", "Fehler beim Schreiben:", err)
return
}
fmt.Println("~", "Daten erfolgreich in Datei geschrieben.")
WriteLog("~", "Daten erfolgreich in Datei geschrieben.")
w.WriteHeader(200)
w.Write([]byte("good"))
}
@@ -173,13 +174,35 @@ func handler(w http.ResponseWriter, r *http.Request) {
}
var SysLog = []string{}
func WriteLog(a ...any) error {
if DEBUG {
WriteLog(time.Now().String(), a)
}
SysLog = append(SysLog, fmt.Sprintf("%s %s", time.Now().String(), a))
// JSON konvertieren
jsonData, err := json.MarshalIndent(SysLog, "", " ")
if err != nil {
WriteLog("!", "Fehler beim Serialisieren: ", err)
return err
}
// Datei öffnen/erstellen
err = os.WriteFile(ERRORLOG_FILE, jsonData, 0644)
if err != nil {
WriteLog("!", "Fehler beim Schreiben der Datei: ", err)
return err
}
return nil
}
func handlerIP(w http.ResponseWriter, r *http.Request) {
remoteIP := r.Header.Get("X-Forwarded-For")
if remoteIP == "" {
remoteIP = r.RemoteAddr // Fallback, wenn kein Header gesetzt ist
}
if DEBUG {
fmt.Println("~", "Remote-IP:", remoteIP)
WriteLog("~", "Remote-IP:", remoteIP)
}
w.WriteHeader(200)
w.Write([]byte(remoteIP))
@@ -195,7 +218,7 @@ func handleDNSRequest(w dns.ResponseWriter, r *dns.Msg) {
for _, q := range r.Question {
if strings.ToLower(q.Name) != q.Name {
if DEBUG {
fmt.Println("!", "handleDNSRequest", "case dns.TypeANY", "strings.ToLower(q.Name) != q.Name", strings.ToLower(q.Name), q.Name)
WriteLog("!", "handleDNSRequest", "case dns.TypeANY", "strings.ToLower(q.Name) != q.Name", strings.ToLower(q.Name), q.Name)
}
}
switch q.Qtype {
@@ -205,17 +228,17 @@ func handleDNSRequest(w dns.ResponseWriter, r *dns.Msg) {
rr, err := dns.NewRR(strings.ToLower(q.Name) + " A " + ip.Ipv4)
if err == nil {
if DEBUG {
fmt.Println("~", "handleDNSRequest", "case dns.TypeA", "D[q.Name]", D[strings.ToLower(q.Name)], "q.Name", strings.ToLower(q.Name))
WriteLog("~", "handleDNSRequest", "case dns.TypeA", "D[q.Name]", D[strings.ToLower(q.Name)], "q.Name", strings.ToLower(q.Name))
}
msg.Answer = append(msg.Answer, rr)
} else {
if DEBUG {
fmt.Println("!", "handleDNSRequest", "case dns.TypeA", "IPv4", "error", err)
WriteLog("!", "handleDNSRequest", "case dns.TypeA", "IPv4", "error", err)
}
}
} else {
if DEBUG {
fmt.Println("!", "handleDNSRequest", "case dns.TypeA", "not found in D", strings.ToLower(q.Name))
WriteLog("!", "handleDNSRequest", "case dns.TypeA", "not found in D", strings.ToLower(q.Name))
}
}
@@ -226,17 +249,17 @@ func handleDNSRequest(w dns.ResponseWriter, r *dns.Msg) {
rr, err := dns.NewRR(strings.ToLower(q.Name) + " AAAA " + ip.Ipv6)
if err == nil {
if DEBUG {
fmt.Println("~", "handleDNSRequest", "case dns.TypeAAAA", "D[q.Name]", D[strings.ToLower(q.Name)], "q.Name", strings.ToLower(q.Name))
WriteLog("~", "handleDNSRequest", "case dns.TypeAAAA", "D[q.Name]", D[strings.ToLower(q.Name)], "q.Name", strings.ToLower(q.Name))
}
msg.Answer = append(msg.Answer, rr)
} else {
if DEBUG {
fmt.Println("!", "handleDNSRequest", "case dns.TypeAAAA", "IPv6", "error", err)
WriteLog("!", "handleDNSRequest", "case dns.TypeAAAA", "IPv6", "error", err)
}
}
} else {
if DEBUG {
fmt.Println("!", "handleDNSRequest", "case dns.TypeAAAA", "not found in D", strings.ToLower(q.Name))
WriteLog("!", "handleDNSRequest", "case dns.TypeAAAA", "not found in D", strings.ToLower(q.Name))
}
}
case dns.TypePTR:
@@ -246,12 +269,12 @@ func handleDNSRequest(w dns.ResponseWriter, r *dns.Msg) {
rr, err := dns.NewRR(strings.ToLower(q.Name) + " PTR " + a)
if err == nil {
if DEBUG {
fmt.Println("~", "handleDNSRequest", "case dns.TypePTR", "IPv4", "found match", a, b)
WriteLog("~", "handleDNSRequest", "case dns.TypePTR", "IPv4", "found match", a, b)
}
msg.Answer = append(msg.Answer, rr)
} else {
if DEBUG {
fmt.Println("!", "handleDNSRequest", "case dns.TypePTR", "IPv4", "error", err)
WriteLog("!", "handleDNSRequest", "case dns.TypePTR", "IPv4", "error", err)
}
}
}
@@ -261,19 +284,19 @@ func handleDNSRequest(w dns.ResponseWriter, r *dns.Msg) {
rr, err := dns.NewRR(strings.ToLower(q.Name) + " PTR " + a)
if err == nil {
if DEBUG {
fmt.Println("~", "handleDNSRequest", "case dns.TypePTR", "IPv6", "found match", a, b)
WriteLog("~", "handleDNSRequest", "case dns.TypePTR", "IPv6", "found match", a, b)
}
msg.Answer = append(msg.Answer, rr)
} else {
if DEBUG {
fmt.Println("!", "handleDNSRequest", "case dns.TypePTR", "IPv6", "error", err)
WriteLog("!", "handleDNSRequest", "case dns.TypePTR", "IPv6", "error", err)
}
}
}
}
default:
if DEBUG {
fmt.Println("+", "unhandledDNSRequest", r.Question, strings.ToLower(q.Name), q.Qclass, q.Qtype)
WriteLog("+", "unhandledDNSRequest", r.Question, strings.ToLower(q.Name), q.Qclass, q.Qtype)
}
}
}
@@ -283,15 +306,15 @@ func handleDNSRequest(w dns.ResponseWriter, r *dns.Msg) {
}
func prepareExit() {
fmt.Println("~", "Running exit tasks...")
WriteLog("~", "Running exit tasks...")
fmt.Println("~", "Exit completed.")
WriteLog("~", "Exit completed.")
}
func StopServer(e error) {
fmt.Println("~", "Stopping server...")
WriteLog("~", "Stopping server...")
prepareExit()
fmt.Println("~", "Server stopped!")
WriteLog("~", "Server stopped!")
}
func main() {
@@ -300,22 +323,24 @@ func main() {
HTTP_TLS := os.Getenv("HTTP_TLS") /* 1/0 */
HTTP_TLS_PRIVATEKEY := os.Getenv("HTTP_TLS_PRIVATEKEY")
HTTP_TLS_CERTIFICATE := os.Getenv("HTTP_TLS_CERTIFICATE")
ERRORLOG_FILE = os.Getenv("ERRORLOG_FILE")
if os.Getenv("DEBUG") == "1" {
DEBUG = true
fmt.Println("~", "Debug mode enabled.")
WriteLog("~", "Debug mode enabled.")
}
if strings.EqualFold(HTTP_TLS, "") || strings.EqualFold(HTTP_PORT, "") || strings.EqualFold(HTTP_TLS_PRIVATEKEY, "") || strings.EqualFold(HTTP_TLS_CERTIFICATE, "") {
fmt.Println("~", "No port or mode defined. Fallback to TLS=0 & Port=8080")
fmt.Println("~", "ENV's: [HTTP_PORT=8080|443], [HTTP_TLS=0|1],[HTTP_TLS_PRIVATEKEY=#],[HTTP_TLS_CERTIFICATE=#]")
fmt.Println("~", "Remember to set unused ENVs like [HTTP_TLS_PRIVATEKEY] or [HTTP_TLS_CERTIFICATE] to '#'")
WriteLog("~", "No port or mode defined. Fallback to TLS=0 & Port=8080")
WriteLog("~", "ENV's: [HTTP_PORT=8080|443], [HTTP_TLS=0|1],[HTTP_TLS_PRIVATEKEY=#],[HTTP_TLS_CERTIFICATE=#]")
WriteLog("~", "Remember to set unused ENVs like [HTTP_TLS_PRIVATEKEY] or [HTTP_TLS_CERTIFICATE] to '#'")
HTTP_PORT = "8080"
HTTP_TLS = "0"
HTTP_TLS_CERTIFICATE = ""
HTTP_TLS_PRIVATEKEY = ""
ERRORLOG_FILE = "error.log"
} else {
fmt.Println("~", "Port and mode defined.")
WriteLog("~", "Port and mode defined.")
}
// Signal-Kanal einrichten
@@ -325,7 +350,7 @@ func main() {
// Goroutine, die auf Signale wartet
go func() {
<-stop
fmt.Println("~", "Received stop signal")
WriteLog("~", "Received stop signal")
prepareExit()
os.Exit(0)
}()
@@ -335,9 +360,9 @@ func main() {
filename := "/data/data.json"
readData, err := readFromFile(filename)
if err != nil {
fmt.Println("!", "Fehler beim Lesen:", err)
WriteLog("!", "Fehler beim Lesen:", err)
} else {
fmt.Println("~", "Daten erfolgreich aus Datei gelesen.")
WriteLog("~", "Daten erfolgreich aus Datei gelesen.")
D = readData
}
@@ -366,18 +391,18 @@ func main() {
/* HTTP-PART */
fmt.Println("~", "Server listening on port :"+HTTP_PORT)
WriteLog("~", "Server listening on port :"+HTTP_PORT)
if HTTP_TLS == "0" {
fmt.Println("~", "Protocol is http (insecure)")
WriteLog("~", "Protocol is http (insecure)")
StopServer(http.ListenAndServe(":"+HTTP_PORT, nil))
}
if HTTP_TLS == "1" {
fmt.Println("~", "Protocol is https (secure)")
WriteLog("~", "Protocol is https (secure)")
StopServer(http.ListenAndServeTLS(":"+HTTP_PORT, HTTP_TLS_CERTIFICATE, HTTP_TLS_PRIVATEKEY, nil))
}
/*srv_err := http.ListenAndServe(":8080", nil)
if srv_err != nil {
fmt.Println("Starten des Servers fehlgeschlagen!", srv_err)
WriteLog("Starten des Servers fehlgeschlagen!", srv_err)
}*/
}