mirror of
https://github.com/cmur2/dyndnsd.git
synced 2025-12-14 13:48:10 +01:00
Compare commits
4 Commits
dependabot
...
v3.12.0
| Author | SHA1 | Date | |
|---|---|---|---|
| 627b1c4dc5 | |||
| da79ef902d | |||
| 8589cf801f | |||
|
|
c743c778bc |
@@ -1,5 +1,11 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 3.12.0 (December 4th, 2025)
|
||||||
|
|
||||||
|
IMPROVEMENTS:
|
||||||
|
|
||||||
|
- regex instead of hosts list can be used for hostname ownership
|
||||||
|
|
||||||
## 3.11.0 (October 2nd, 2025)
|
## 3.11.0 (October 2nd, 2025)
|
||||||
|
|
||||||
IMPROVEMENTS:
|
IMPROVEMENTS:
|
||||||
|
|||||||
31
README.md
31
README.md
@@ -307,6 +307,37 @@ users:
|
|||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
|
### Matching with a regular expression
|
||||||
|
|
||||||
|
Instead of relying on `hosts`, you can use `regex` to employ a regular expression, which is very useful for avoiding having to repeatedly edit the configuration file to register a new host name.
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
host: "0.0.0.0"
|
||||||
|
port: 5354
|
||||||
|
username: "dyndnsd"
|
||||||
|
group: "dyndnsd"
|
||||||
|
db: "/dyndnsd/db.json"
|
||||||
|
debug: false
|
||||||
|
domain: "dyn.dc-air.home.arpa"
|
||||||
|
updater:
|
||||||
|
name: "command_with_bind_zone"
|
||||||
|
params:
|
||||||
|
zone_file: "/nsd/zones/static/dyn.dc-air.home.arpa.zone"
|
||||||
|
command: "doas service nsd reload"
|
||||||
|
ttl: "5m"
|
||||||
|
dns: "ns.dc-air.home.arpa."
|
||||||
|
email_addr: "admin.example.org"
|
||||||
|
users:
|
||||||
|
myuser:
|
||||||
|
password: "superhypermegas3kurepassword1234"
|
||||||
|
regex: '^[a-z][0-9]\.dyn\.dc\-air\.home\.arpa$'
|
||||||
|
```
|
||||||
|
|
||||||
|
However, when using `regex`, `hosts` is simply ignored if defined, so you must choose one or the other. Recommendation: use `regex` for scripts or programs and `hosts` for regular users.
|
||||||
|
|
||||||
|
**Note**: Please note that when dyndnsd evaluates the regular expression, the `Regexp::EXTENDED` and `Regexp::IGNORECASE` options are used.
|
||||||
|
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
dyndnsd.rb is licensed under the Apache License, Version 2.0. See LICENSE for more information.
|
dyndnsd.rb is licensed under the Apache License, Version 2.0. See LICENSE for more information.
|
||||||
|
|||||||
@@ -218,9 +218,22 @@ module Dyndnsd
|
|||||||
# we can trust this information since user was authorized by middleware
|
# we can trust this information since user was authorized by middleware
|
||||||
user = env['REMOTE_USER']
|
user = env['REMOTE_USER']
|
||||||
|
|
||||||
# check for hostnames that the user does not own
|
if @users[user].key?('regex')
|
||||||
forbidden_hostnames = hostnames - @users[user].fetch('hosts', [])
|
pattern = @users[user].fetch('regex')
|
||||||
return [422, {'X-DynDNS-Response' => 'host_forbidden'}, []] if forbidden_hostnames.any?
|
begin
|
||||||
|
regex = Regexp.new(pattern, Regexp::IGNORECASE | Regexp::EXTENDED)
|
||||||
|
rescue RegexpError => e
|
||||||
|
Dyndnsd.logger.warn "Invalid regex pattern '#{pattern}': #{e.message}"
|
||||||
|
return [422, {'X-DynDNS-Response' => 'host_forbidden'}, []]
|
||||||
|
end
|
||||||
|
# check for hostnames that match the regex
|
||||||
|
matches = hostnames.any? { |str| regex.match?(str) }
|
||||||
|
return [422, {'X-DynDNS-Response' => 'host_forbidden'}, []] if !matches
|
||||||
|
else
|
||||||
|
# check for hostnames that the user does not own
|
||||||
|
forbidden_hostnames = hostnames - @users[user].fetch('hosts', [])
|
||||||
|
return [422, {'X-DynDNS-Response' => 'host_forbidden'}, []] if forbidden_hostnames.any?
|
||||||
|
end
|
||||||
|
|
||||||
if params['offline'] == 'YES'
|
if params['offline'] == 'YES'
|
||||||
myips = []
|
myips = []
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
module Dyndnsd
|
module Dyndnsd
|
||||||
VERSION = '3.11.0'
|
VERSION = '3.12.0'
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -18,6 +18,10 @@ describe Dyndnsd::Daemon do
|
|||||||
},
|
},
|
||||||
'test2' => {
|
'test2' => {
|
||||||
'password' => 'ihavenohosts'
|
'password' => 'ihavenohosts'
|
||||||
|
},
|
||||||
|
'test3' => {
|
||||||
|
'password' => 'superhypermegas3kurepassword1234',
|
||||||
|
'regex' => '^[a-z0-9]+-test3\.example\.org$'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -74,6 +78,22 @@ describe Dyndnsd::Daemon do
|
|||||||
expect(last_response.body).to eq("good 2001:db8::1\ngood 2001:db8::1")
|
expect(last_response.body).to eq("good 2001:db8::1\ngood 2001:db8::1")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'supports regex matches for hostnames' do
|
||||||
|
authorize 'test3', 'superhypermegas3kurepassword1234'
|
||||||
|
|
||||||
|
get '/nic/update?hostname=abc123-test3.example.org&myip=1.2.3.4'
|
||||||
|
expect(last_response).to be_ok
|
||||||
|
expect(last_response.body).to eq('good 1.2.3.4')
|
||||||
|
|
||||||
|
get '/nic/update?hostname=foo-test3.example.org,bar-test3.example.org&myip=2001:db8::1'
|
||||||
|
expect(last_response).to be_ok
|
||||||
|
expect(last_response.body).to eq("good 2001:db8::1\ngood 2001:db8::1")
|
||||||
|
|
||||||
|
get '/nic/update?hostname=abc123.example.org'
|
||||||
|
expect(last_response).to be_ok
|
||||||
|
expect(last_response.body).to eq('nohost')
|
||||||
|
end
|
||||||
|
|
||||||
it 'rejects request if one hostname is invalid' do
|
it 'rejects request if one hostname is invalid' do
|
||||||
authorize 'test', 'secret'
|
authorize 'test', 'secret'
|
||||||
|
|
||||||
@@ -120,6 +140,10 @@ describe Dyndnsd::Daemon do
|
|||||||
get '/nic/update?hostname=foo.example.org,notmyhost.example.org'
|
get '/nic/update?hostname=foo.example.org,notmyhost.example.org'
|
||||||
expect(last_response).to be_ok
|
expect(last_response).to be_ok
|
||||||
expect(last_response.body).to eq('nohost')
|
expect(last_response.body).to eq('nohost')
|
||||||
|
|
||||||
|
get '/nic/update?hostname=abc123-test3.example.org'
|
||||||
|
expect(last_response).to be_ok
|
||||||
|
expect(last_response.body).to eq('nohost')
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'updates a host on IP change' do
|
it 'updates a host on IP change' do
|
||||||
|
|||||||
Reference in New Issue
Block a user