upstream/opnsense-plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2026-02-03 20:40:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

dns/ddclient: sync with master

Browse source
This commit is contained in:
Franco Fichtner 2024-07-11 07:45:15 +02:00
parent 2af1b43e91
commit 7054a09ec6
9 changed files with 106 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dns/ddclient/Makefile
View file

@ -1,6 +1,5 @@
PLUGIN_NAME= ddclient
PLUGIN_VERSION= 1.21
PLUGIN_REVISION= 2
PLUGIN_VERSION= 1.22
PLUGIN_DEPENDS= ddclient py${PLUGIN_PYTHON}-boto3
PLUGIN_COMMENT= Dynamic DNS client
PLUGIN_MAINTAINER= ad@opnsense.org

5
dns/ddclient/pkg-descr
View file

@ -6,6 +6,11 @@ WWW: https://github.com/ddclient/ddclient
Plugin Changelog
================
1.22
* Add gandi support
* Optionally support descriptive values for account selection when using native backend
1.21
* Add Netcup support (contributed by Ingo Lafrenz)

12
dns/ddclient/src/opnsense/mvc/app/models/OPNsense/DynDNS/DynDNS.php
View file

@ -28,13 +28,13 @@
namespace OPNsense\DynDNS;
use Phalcon\Messages\Message;
use OPNsense\Base\BaseModel;
use OPNsense\Base\BaseModel;
use OPNsense\Base\Messages\Message;
/**
* Class DynDNS
* @package OPNsense\DynDNS
*/
/**
* Class DynDNS
* @package OPNsense\DynDNS
*/
class DynDNS extends BaseModel
{
public function performValidation($validateFullModel = false)

5
dns/ddclient/src/opnsense/mvc/app/models/OPNsense/DynDNS/FieldTypes/ServiceField.php
View file

@ -42,9 +42,8 @@ class ServiceField extends BaseListField
if ((string)$this->getParentModel()->general->backend == 'opnsense') {
$supported = json_decode((new Backend())->configdRun("ddclient opnbackend supported"), true);
if (!empty($supported)) {
foreach ($supported as $srv) {
self::$internalCacheOptionList[$srv] = $srv;
}
self::$internalCacheOptionList = $supported;
asort(self::$internalCacheOptionList, SORT_NATURAL | SORT_FLAG_CASE);
}
}
}

2
dns/ddclient/src/opnsense/scripts/ddclient/lib/account/__init__.py
View file

@ -61,7 +61,7 @@ class BaseAccount:
@staticmethod
def known_services():
return []
return {}
@property
def id(self):

2
dns/ddclient/src/opnsense/scripts/ddclient/lib/account/azure.py
View file

@ -82,7 +82,7 @@ class Azure(BaseAccount):
@staticmethod
def known_services():
return Azure._services
return {'azure': 'Microsoft Azure'}
@staticmethod
def match(account):

10
dns/ddclient/src/opnsense/scripts/ddclient/lib/account/cloudflare.py
View file

@ -42,7 +42,7 @@ class Cloudflare(BaseAccount):
@staticmethod
def known_services():
return Cloudflare._services.keys()
return {'cloudflare': 'Cloudflare'}
@staticmethod
def match(account):
@ -51,13 +51,7 @@ class Cloudflare(BaseAccount):
def execute(self):
if super().execute():
# IPv4/IPv6
recordType = None
if str(self.current_address).find(':') > 1:
#IPv6
recordType = "AAAA"
else:
#IPv4
recordType = "A"
recordType = "AAAA" if str(self.current_address).find(':') > 1 else "A"
# get ZoneID
url = "https://%s/client/v4/zones" % self._services[self.settings.get('service')]

81
dns/ddclient/src/opnsense/scripts/ddclient/lib/account/gandi.py Executable file
View file

@ -0,0 +1,81 @@
"""
Copyright (c) 2024 Thomas Cekal <thomas@cekal.org>
Copyright (c) 2024 Ad Schellevis <ad@opnsense.org>
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
"""
import json
import syslog
import requests
from . import BaseAccount
class Gandi(BaseAccount):
_services = {
'gandi': 'api.gandi.net'
}
def __init__(self, account: dict):
super().__init__(account)
@staticmethod
def known_services():
return Gandi._services.keys()
@staticmethod
def match(account):
return account.get('service') in Gandi._services
def execute(self):
if super().execute():
# IPv4/IPv6
recordType = "AAAA" if str(self.current_address).find(':') > 1 else "A"
# Use bearer (api key) authentication
url = "https://api.gandi.net/v5/livedns/domains/" + self.settings.get('zone') + "/records/" + self.settings.get('hostnames') + "/" + recordType
payload = "{\"rrset_values\":[\"" + self.current_address + "\"],\"rrset_ttl\":300}"
headers = {
'authorization': "Bearer " + self.settings.get('password'),
'content-type': "application/json",
'User-Agent': 'OPNsense-dyndns'
}
# Send IP address update
req = requests.request("PUT", url, data=payload, headers=headers)
if 200 <= req.status_code < 300:
if self.is_verbose:
syslog.syslog(
syslog.LOG_NOTICE,
"Account %s set new ip %s [%s]" % (self.description, self.current_address, req.text.strip())
)
self.update_state(address=self.current_address, status=req.text.split()[0] if req.text else '')
return True
else:
syslog.syslog(
syslog.LOG_ERR,
"Account %s failed to set new ip %s [%d - %s]" % (
self.description, self.current_address, req.status_code, req.text.replace('\n', '')
)
)
return False

9
dns/ddclient/src/opnsense/scripts/ddclient/lib/poller.py
View file

@ -63,9 +63,14 @@ class AccountFactory:
return handler(account)
def known_services(self):
all_services = []
all_services = {}
for handler in self._account_classes:
all_services += handler.known_services()
data = handler.known_services()
if type(data) is dict:
all_services.update(data)
else:
for item in data:
all_services[item] = item
return all_services