cwinfo/powerdns-admin
5
0
Fork 0
mirror of https://github.com/cwinfo/powerdns-admin.git synced 2024-11-12 16:40:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix for updates on pdns 4.0.0-rc2+ and remove flask.ext deprecation warnings

Browse Source
This commit is contained in:
CaptainQwark 2016-07-01 21:41:41 +02:00
parent e32186409a
commit 9db71eaef5
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/lib/utils.py
View File

@ -64,6 +64,9 @@ def fetch_json(remote_url, method='GET', data=None, params=None, headers=None):
if method == "DELETE": if method == "DELETE":
return True return True
if r.status_code == 204:
return {}
try: try:
assert('json' in r.headers['content-type']) assert('json' in r.headers['content-type'])
except Exception as e: except Exception as e:

8
app/models.py
View File

@ -10,7 +10,7 @@ import onetimepass
from datetime import datetime from datetime import datetime
from distutils.version import StrictVersion from distutils.version import StrictVersion
from flask.ext.login import AnonymousUserMixin from flask_login import AnonymousUserMixin
from app import app, db from app import app, db
from lib import utils from lib import utils
@ -720,7 +720,7 @@ class Record(object):
if check: if check:
r = check[0] r = check[0]
if r['type'] in ('A', 'AAAA' ,'CNAME'): if r['type'] in ('A', 'AAAA' ,'CNAME'):
return {'status': 'error', 'msg': 'Record might was already exist with type "A", "AAAA", "CNAME"'} return {'status': 'error', 'msg': 'Record already exists with type "A", "AAAA" or "CNAME"'}
# continue if the record is ready to be added # continue if the record is ready to be added
headers = {} headers = {}
@ -896,10 +896,10 @@ class Record(object):
headers = {} headers = {}
headers['X-API-Key'] = PDNS_API_KEY headers['X-API-Key'] = PDNS_API_KEY
jdata1 = utils.fetch_json(urlparse.urljoin(PDNS_STATS_URL, API_EXTENDED_URL + '/servers/localhost/zones/%s' % domain), headers=headers, method='PATCH', data=postdata_for_delete) jdata1 = utils.fetch_json(urlparse.urljoin(PDNS_STATS_URL, API_EXTENDED_URL + '/servers/localhost/zones/%s' % domain), headers=headers, method='PATCH', data=postdata_for_delete)
logging.debug('jdata1: ', jdata1) # logging.debug('jdata1: ', jdata1)
jdata2 = utils.fetch_json(urlparse.urljoin(PDNS_STATS_URL, API_EXTENDED_URL + '/servers/localhost/zones/%s' % domain), headers=headers, method='PATCH', data=postdata_for_new) jdata2 = utils.fetch_json(urlparse.urljoin(PDNS_STATS_URL, API_EXTENDED_URL + '/servers/localhost/zones/%s' % domain), headers=headers, method='PATCH', data=postdata_for_new)
logging.debug('jdata2: ', jdata2) # logging.debug('jdata2: ', jdata2)
if 'error' in jdata2.keys(): if 'error' in jdata2.keys():
logging.error('Cannot apply record changes.') logging.error('Cannot apply record changes.')

2
app/views.py
View File

@ -6,7 +6,7 @@ import pyqrcode
import base64 import base64
from functools import wraps from functools import wraps
from flask.ext.login import login_user, logout_user, current_user, login_required from flask_login import login_user, logout_user, current_user, login_required
from flask import Flask, g, request, make_response, jsonify, render_template, session, redirect, url_for, send_from_directory from flask import Flask, g, request, make_response, jsonify, render_template, session, redirect, url_for, send_from_directory
from werkzeug import secure_filename from werkzeug import secure_filename