From f6c1c7fcdc575b0f2c889dc33256ebeb60f151b4 Mon Sep 17 00:00:00 2001 From: usmannasir Date: Tue, 23 Jan 2024 19:29:41 +0500 Subject: [PATCH] bug fix in dmarc ref: https://github.com/usmannasir/cyberpanel/issues/1191#issue-2095331015 --- dns/dnsManager.py | 12 ++++++++++++ plogical/dnsUtilities.py | 6 +++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dns/dnsManager.py b/dns/dnsManager.py index 71a519d4c..d3b366376 100755 --- a/dns/dnsManager.py +++ b/dns/dnsManager.py @@ -171,6 +171,18 @@ class DNSManager: finalData['domainsList'] = [] import tldextract + command = 'chown cyberpanel:cyberpanel -R /usr/local/CyberCP/lib/python3.6/site-packages/tldextract/.suffix_cache' + ProcessUtilities.executioner(command) + + command = 'chown cyberpanel:cyberpanel -R /usr/local/CyberCP/lib/python3.8/site-packages/tldextract/.suffix_cache' + ProcessUtilities.executioner(command) + + command = 'chown cyberpanel:cyberpanel -R /usr/local/CyberCP/lib/python*/site-packages/tldextract/.suffix_cache' + ProcessUtilities.executioner(command, None, True) + + command = 'chown cyberpanel:cyberpanel -R /usr/local/CyberCP/lib/python3.8/site-packages/tldextract/.suffix_cache' + ProcessUtilities.executioner(command) + for items in tempList: extractDomain = tldextract.extract(items) subDomain = extractDomain.subdomain diff --git a/plogical/dnsUtilities.py b/plogical/dnsUtilities.py index 23506ed6b..b07cb6573 100755 --- a/plogical/dnsUtilities.py +++ b/plogical/dnsUtilities.py @@ -317,7 +317,7 @@ class DNS: # auth=1) # record.save() - DNS.createDNSRecord(zone, "_dmarc." + topLevelDomain, "TXT", "v=DMARC1; p=none", 0, 3600) + DNS.createDNSRecord(zone, "_dmarc." + topLevelDomain, "TXT", "v=DMARC1; p=none;", 0, 3600) # record = Records(domainOwner=zone, # domain_id=zone.id, @@ -462,7 +462,7 @@ class DNS: # auth=1) # record.save() - DNS.createDNSRecord(zone, "_dmarc." + topLevelDomain, "TXT", "v=DMARC1; p=none", 0, 3600) + DNS.createDNSRecord(zone, "_dmarc." + topLevelDomain, "TXT", "v=DMARC1; p=none;", 0, 3600) # record = Records(domainOwner=zone, # domain_id=zone.id, @@ -541,7 +541,7 @@ class DNS: # auth=1) # record.save() - DNS.createDNSRecord(zone, "_dmarc." + actualSubDomain, "TXT", "v=DMARC1; p=none", 0, 3600) + DNS.createDNSRecord(zone, "_dmarc." + actualSubDomain, "TXT", "v=DMARC1; p=none;", 0, 3600) # record = Records(domainOwner=zone, # domain_id=zone.id,