jostreff/nsedit
1
0
Fork 0
mirror of https://github.com/tuxis-ie/nsedit.git synced 2025-04-19 20:09:14 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #10 from tuxis-ie/3.4-api-auth

Browse source 
Implement auth-autodetection
This commit is contained in:
Tuxis Internet Engineering V.O.F. 2014-11-21 11:13:56 +01:00
commit 2939dbfca8
3 changed files with 33 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
includes/config.inc.php-dist
View file

@ -7,6 +7,12 @@ $apiport = '8081'; # The port of the PowerDNS API
$apisid = 'localhost'; # PowerDNS's :server_id $apisid = 'localhost'; # PowerDNS's :server_id
$allowzoneadd = FALSE; # Allow normal users to add zones $allowzoneadd = FALSE; # Allow normal users to add zones
# The first versions of the PowerDNS API used the standard webserver password
# for authentication, newer versions use an X-API-Key mechanism. NSEdit tries
# to autodetect the method you should use, but that does affect performance.
# For optimal performance, configure the right method.
# (Should be 'auto', 'xapikey' or 'userpass')
$authmethod = 'auto';
# If you configure this, nsedit will try to authenticate via WeFact too. # If you configure this, nsedit will try to authenticate via WeFact too.
# Debtors will be added to the sqlitedatabase with their crypted password. # Debtors will be added to the sqlitedatabase with their crypted password.
@ -46,7 +52,12 @@ $defaults['secondaryns'] = 'unconfigured.secondaryns'; # The value of the secon
$defaults['ttl'] = 3600; # Default TTL for records $defaults['ttl'] = 3600; # Default TTL for records
$defaults['priority'] = 0; # Default for priority in records $defaults['priority'] = 0; # Default for priority in records
$blocklogin = FALSE;
if (!preg_match('/^(xapikey|userpass|auto)$/', $authmethod)) {
$errormsg = "The value for $authmethod is incorrect in your config";
$blocklogin = TRUE;
}
/* No need to change stuf below */ /* No need to change stuf below */

4
index.php
View file

@ -4,6 +4,8 @@ include_once('includes/config.inc.php');
include_once('includes/session.inc.php'); include_once('includes/session.inc.php');
include_once('includes/misc.inc.php'); include_once('includes/misc.inc.php');
global $errormsg, $blocklogin;
if (isset($_GET['logout']) or isset($_POST['logout'])) { if (isset($_GET['logout']) or isset($_POST['logout'])) {
logout(); logout();
header("Location: index.php"); header("Location: index.php");
@ -71,7 +73,7 @@ if (!is_logged_in()) {
?> ?>
<tr> <tr>
<td></td> <td></td>
<td><input type="submit" name="submit" value="Log me in!"></td> <td><input type="submit" name="submit" value="Log me in!" <?php if ($blocklogin === TRUE)) { echo "disabled"; }; ?>></td>
</tr> </tr>
</table> </table>
<input type="hidden" name="formname" value="loginform"> <input type="hidden" name="formname" value="loginform">

21
zones.php
View file

@ -11,12 +11,29 @@ if (!is_csrf_safe()) {
} }
function api_request($path, $opts = null, $type = null) { function api_request($path, $opts = null, $type = null) {
global $apisid, $apiuser, $apipass, $apiip, $apiport; global $apisid, $apiuser, $apipass, $apiip, $apiport, $authmethod;
$url = "http://$apiip:$apiport${path}"; $url = "http://$apiip:$apiport${path}";
if ($authmethod == "auto") {
$ad = curl_init();
curl_setopt($ad, CURLOPT_HTTPHEADER, array('X-API-Key: '.$apipass));
curl_setopt($ad, CURLOPT_URL, "http://$apiip:$apiport/servers/localhost/statistics");
curl_setopt($ad, CURLOPT_RETURNTRANSFER, 1);
curl_exec($ad);
if (curl_getinfo($ad, CURLINFO_HTTP_CODE) == 401) {
$authmethod = 'userpass';
} else {
$authmethod = 'xapikey';
}
}
$ch = curl_init(); $ch = curl_init();
curl_setopt($ch, CURLOPT_USERPWD, "$apiuser:$apipass"); if ($authmethod == "xapikey") {
curl_setopt($ch, CURLOPT_HTTPHEADER, array('X-API-Key: '.$apipass));
} else {
curl_setopt($ch, CURLOPT_USERPWD, "$apiuser:$apipass");
}
curl_setopt($ch, CURLOPT_URL, $url); curl_setopt($ch, CURLOPT_URL, $url);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
if ($opts) { if ($opts) {