diff --git a/dns/dnsManager.py b/dns/dnsManager.py index d5245d1f7..11121340b 100755 --- a/dns/dnsManager.py +++ b/dns/dnsManager.py @@ -15,10 +15,20 @@ from .models import Domains,Records from re import match,I,M from plogical.mailUtilities import mailUtilities from plogical.acl import ACLManager +import CloudFlare +import re +from plogical.CyberCPLogFileWriter import CyberCPLogFileWriter as logging class DNSManager: defaultNameServersPath = '/home/cyberpanel/defaultNameservers' + def loadCFKeys(self): + cfFile = '%s%s' % (DNS.CFPath, self.admin.userName) + data = open(cfFile, 'r').readlines() + self.email = data[0].rstrip('\n') + self.key = data[1].rstrip('\n') + + def loadDNSHome(self, request = None, userID = None): try: admin = Administrator.objects.get(pk=userID) @@ -625,4 +635,105 @@ class DNSManager: except BaseException as msg: final_dic = {'status': 0, 'error_message': str(msg)} final_json = json.dumps(final_dic) + return HttpResponse(final_json) + + def getCurrentRecordsForDomainCloudFlare(self, userID = None, data = None): + try: + + currentACL = ACLManager.loadedACL(userID) + + if ACLManager.currentContextPermission(currentACL, 'addDeleteRecords') == 0: + return ACLManager.loadErrorJson('fetchStatus', 0) + + + zoneDomain = data['selectedZone'] + currentSelection = data['currentSelection'] + + admin = Administrator.objects.get(pk=userID) + self.admin = admin + + if ACLManager.checkOwnershipZone(zoneDomain, admin, currentACL) == 1: + pass + else: + return ACLManager.loadErrorJson() + + self.loadCFKeys() + + params = {'name': zoneDomain, 'per_page':50} + cf = CloudFlare.CloudFlare(email=self.email,token=self.key) + + try: + zones = cf.zones.get(params=params) + except CloudFlare.CloudFlareAPIError as e: + final_json = json.dumps({'status': 0, 'fetchStatus': 0, 'error_message': str(e), "data": '[]'}) + return HttpResponse(final_json) + + # there should only be one zone + + if len(zones) == 0: + final_json = json.dumps({'status': 1, 'fetchStatus': 1, 'error_message': '', "data": '[]'}) + return HttpResponse(final_json) + + for zone in sorted(zones, key=lambda v: v['name']): + zone_name = zone['name'] + zone_id = zone['id'] + + fetchType = "" + + if currentSelection == 'aRecord': + fetchType = 'A' + elif currentSelection == 'aaaaRecord': + fetchType = 'AAAA' + elif currentSelection == 'cNameRecord': + fetchType = 'CNAME' + elif currentSelection == 'mxRecord': + fetchType = 'MX' + elif currentSelection == 'txtRecord': + fetchType = 'TXT' + elif currentSelection == 'spfRecord': + fetchType = 'SPF' + elif currentSelection == 'nsRecord': + fetchType = 'NS' + elif currentSelection == 'soaRecord': + fetchType = 'SOA' + elif currentSelection == 'srvRecord': + fetchType = 'SRV' + elif currentSelection == 'caaRecord': + fetchType = 'CAA' + + try: + dns_records = cf.zones.dns_records.get(zone_id, params={'per_page':50, 'type':fetchType}) + except CloudFlare.exceptions.CloudFlareAPIError as e: + final_json = json.dumps({'status': 0, 'fetchStatus': 0, 'error_message': str(e), "data": '[]'}) + return HttpResponse(final_json) + + prog = re.compile('\.*' + zone_name + '$') + dns_records = sorted(dns_records, key=lambda v: prog.sub('', v['name']) + '_' + v['type']) + + json_data = "[" + checker = 0 + + for dns_record in dns_records: + dic = {'id': dns_record['id'], + 'type': dns_record['type'], + 'name': dns_record['name'], + 'content': dns_record['content'], + 'priority': '1400', + 'ttl': dns_record['ttl'] + } + + if checker == 0: + json_data = json_data + json.dumps(dic) + checker = 1 + else: + json_data = json_data + ',' + json.dumps(dic) + + + json_data = json_data + ']' + final_json = json.dumps({'status': 1, 'fetchStatus': 1, 'error_message': "None", "data": json_data}) + return HttpResponse(final_json) + + except BaseException as msg: + final_dic = {'status': 0, 'fetchStatus': 0, 'error_message': str(msg)} + final_json = json.dumps(final_dic) return HttpResponse(final_json) \ No newline at end of file diff --git a/dns/static/dns/dns.js b/dns/static/dns/dns.js index 2aa5c418f..5a4abfff4 100755 --- a/dns/static/dns/dns.js +++ b/dns/static/dns/dns.js @@ -899,7 +899,7 @@ app.controller('addModifyDNSRecordsCloudFlare', function ($scope, $http) { var selectedZone = $scope.selectedZone; - url = "/dns/getCurrentRecordsForDomain"; + url = "/dns/getCurrentRecordsForDomainCloudFlare"; var data = { selectedZone: selectedZone, diff --git a/dns/templates/dns/addDeleteDNSRecordsCloudFlare.html b/dns/templates/dns/addDeleteDNSRecordsCloudFlare.html index aa2e1f332..2bcb91627 100755 --- a/dns/templates/dns/addDeleteDNSRecordsCloudFlare.html +++ b/dns/templates/dns/addDeleteDNSRecordsCloudFlare.html @@ -410,10 +410,8 @@ - - + - @@ -422,9 +420,8 @@ - - + diff --git a/dns/urls.py b/dns/urls.py index 2dda84b8f..7cf318bc7 100755 --- a/dns/urls.py +++ b/dns/urls.py @@ -12,11 +12,13 @@ urlpatterns = [ # JS Functions url(r'^NSCreation',views.NSCreation,name="NSCreation"), url(r'^zoneCreation', views.zoneCreation, name='zoneCreation'), - url(r'^getCurrentRecordsForDomain',views.getCurrentRecordsForDomain,name='getCurrentRecordsForDomain'), + url(r'^getCurrentRecordsForDomain$',views.getCurrentRecordsForDomain,name='getCurrentRecordsForDomain'), url(r'^addDNSRecord',views.addDNSRecord,name='addDNSRecord'), url(r'^deleteDNSRecord',views.deleteDNSRecord,name='deleteDNSRecord'), url(r'^deleteDNSZone',views.deleteDNSZone,name='deleteDNSZone'), url(r'^submitZoneDeletion',views.submitZoneDeletion,name='submitZoneDeletion'), url(r'^saveNSConfigurations$', views.saveNSConfigurations, name='saveNSConfigurations'), url(r'^saveCFConfigs$', views.saveCFConfigs, name='saveCFConfigs'), + + url(r'^getCurrentRecordsForDomainCloudFlare$', views.getCurrentRecordsForDomainCloudFlare, name='getCurrentRecordsForDomainCloudFlare'), ] \ No newline at end of file diff --git a/dns/views.py b/dns/views.py index f5b8b2c12..b95f23182 100755 --- a/dns/views.py +++ b/dns/views.py @@ -190,4 +190,10 @@ def saveCFConfigs(request): - +def getCurrentRecordsForDomainCloudFlare(request): + try: + userID = request.session['userID'] + dm = DNSManager() + return dm.getCurrentRecordsForDomainCloudFlare(userID, json.loads(request.body)) + except KeyError: + return redirect(loadLoginPage) diff --git a/plogical/dnsUtilities.py b/plogical/dnsUtilities.py index afa07d2e4..4963f953e 100755 --- a/plogical/dnsUtilities.py +++ b/plogical/dnsUtilities.py @@ -37,9 +37,6 @@ class DNS: ipData = f.read() ipAddress = ipData.split('\n', 1)[0] - #cf = CloudFlare.CloudFlare(email='help@cyberhosting.org',token='5c033412c01a5bf8c1979182ea500057690d7') - #zone_info = cf.zones.post(data={'jump_start': False, 'name': domain}) - import tldextract extractDomain = tldextract.extract(domain)
{% trans "ID" %}
{% trans "Name" %} {% trans "Type" %}{% trans "Name" %} {% trans "TTL" %} {% trans "Value" %} {% trans "Priority" %}