mirror of
https://github.com/cmur2/dyndnsd.git
synced 2025-08-08 08:33:56 +02:00
Compare commits
66 Commits
Author | SHA1 | Date | |
---|---|---|---|
65f8dbb21b | |||
![]() |
6b6f6cf3a4 | ||
![]() |
9af4f03013 | ||
![]() |
b77c3b0996 | ||
![]() |
600cbeb453 | ||
![]() |
b2d369cc4c | ||
![]() |
31e73c7c4a | ||
![]() |
52874542a7 | ||
![]() |
1daf68376d | ||
![]() |
b5f5fa9105 | ||
![]() |
ea1d4baa04 | ||
![]() |
944d3fbc5d | ||
![]() |
78721c5b15 | ||
![]() |
fce992b842 | ||
![]() |
a2a51d63ac | ||
![]() |
b19213d099 | ||
![]() |
ede79802d3 | ||
![]() |
d4483b02a2 | ||
![]() |
1fbad10a24 | ||
![]() |
da28c76a68 | ||
![]() |
e5c66824ab | ||
3d787a46ea | |||
3a5b1bcb27 | |||
![]() |
d066b3ecee | ||
![]() |
71b0fda5ee | ||
b1e948a2dc | |||
![]() |
e22035919b | ||
![]() |
1ffd1de964 | ||
![]() |
39c7dc7837 | ||
![]() |
7528e8084e | ||
![]() |
343a56a6ba | ||
![]() |
6111edc067 | ||
![]() |
0e0d9dfc86 | ||
fadaf4840c | |||
![]() |
9281e6958b | ||
![]() |
ec1e836a89 | ||
![]() |
d80268c1b8 | ||
![]() |
d04e039b2a | ||
![]() |
c14618c503 | ||
![]() |
0e700e8b7b | ||
![]() |
d256c86420 | ||
![]() |
a589148d9e | ||
![]() |
232b3f32a2 | ||
![]() |
3c83eb4347 | ||
![]() |
800618f434 | ||
![]() |
1e61a12b48 | ||
![]() |
7bcaf18f7e | ||
![]() |
c0d69f591f | ||
![]() |
2228e742cf | ||
![]() |
e7f528377b | ||
![]() |
537682804f | ||
![]() |
7ffab915ac | ||
![]() |
d515a87640 | ||
![]() |
4a7eba5ad6 | ||
![]() |
52bb8ee9d2 | ||
![]() |
eb1d88807b | ||
![]() |
7c2104b0ce | ||
4237d35fcc | |||
![]() |
451ed20f5d | ||
![]() |
a2879c6c9a | ||
![]() |
f882381f9d | ||
![]() |
fb536da665 | ||
![]() |
49b7b07b52 | ||
![]() |
2854155db2 | ||
![]() |
b40c6f8c30 | ||
![]() |
44605f0f04 |
2
.github/renovate.json5
vendored
2
.github/renovate.json5
vendored
@@ -26,7 +26,7 @@
|
||||
commitMessagePrefix: "docker: ",
|
||||
},
|
||||
{
|
||||
matchDatasources: ["github-actions"],
|
||||
matchManagers: ["github-actions"],
|
||||
commitMessagePrefix: "ci: ",
|
||||
},
|
||||
],
|
||||
|
6
.github/workflows/cd.yml
vendored
6
.github/workflows/cd.yml
vendored
@@ -33,16 +33,16 @@ jobs:
|
||||
|
||||
# https://github.com/marketplace/actions/build-and-push-docker-images
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v1
|
||||
uses: docker/setup-buildx-action@v2
|
||||
|
||||
- name: Login to Docker Hub
|
||||
uses: docker/login-action@v1
|
||||
uses: docker/login-action@v2
|
||||
with:
|
||||
username: cmur2
|
||||
password: ${{ secrets.DOCKER_TOKEN }}
|
||||
|
||||
- name: Build and push Docker image for dyndnsd ${{ env.DYNDNSD_VERSION }}
|
||||
uses: docker/build-push-action@v2
|
||||
uses: docker/build-push-action@v3
|
||||
with:
|
||||
context: docker
|
||||
build-args: |
|
||||
|
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
@@ -17,8 +17,6 @@ jobs:
|
||||
strategy:
|
||||
matrix:
|
||||
ruby-version:
|
||||
- '2.5'
|
||||
- '2.6'
|
||||
- '2.7'
|
||||
- '3.0'
|
||||
- '3.1'
|
||||
|
@@ -3,7 +3,7 @@ require:
|
||||
- rubocop-rspec
|
||||
|
||||
AllCops:
|
||||
TargetRubyVersion: '2.5'
|
||||
TargetRubyVersion: '2.7'
|
||||
NewCops: enable
|
||||
|
||||
Gemspec/RequireMFA:
|
||||
|
52
CHANGELOG.md
52
CHANGELOG.md
@@ -1,5 +1,57 @@
|
||||
# Changelog
|
||||
|
||||
## 3.7.3 (December 29th, 2022)
|
||||
|
||||
OTHER:
|
||||
|
||||
- update base of Docker image to Alpine 3.17.0 (from 3.16.2 before)
|
||||
|
||||
## 3.7.2 (November 10th, 2022)
|
||||
|
||||
OTHER:
|
||||
|
||||
- re-release 3.7.1 to rebuild Docker image with security vulnerabilities fixes
|
||||
|
||||
## 3.7.1 (September 20th, 2022)
|
||||
|
||||
IMPROVEMENTS:
|
||||
|
||||
- fix [TypeError](https://github.com/cmur2/dyndnsd/issues/205) when user has no hosts configured
|
||||
|
||||
## 3.7.0 (September 16th, 2022)
|
||||
|
||||
IMPROVEMENTS:
|
||||
|
||||
- Update to Rack 3
|
||||
|
||||
## 3.6.2 (August 11th, 2022)
|
||||
|
||||
OTHER:
|
||||
|
||||
- update base of Docker image to Alpine 3.16.2 (from 3.16.1 before)
|
||||
|
||||
## 3.6.1 (July 21st, 2022)
|
||||
|
||||
OTHER:
|
||||
|
||||
- update base of Docker image to Alpine 3.16.1 (from 3.16.0 before)
|
||||
|
||||
## 3.6.0 (June 2nd, 2022)
|
||||
|
||||
IMPROVEMENTS:
|
||||
|
||||
- Drop EOL Ruby 2.6 and lower support, now minimum version supported is Ruby 2.7
|
||||
|
||||
OTHER:
|
||||
|
||||
- update base of Docker image to Alpine 3.16 (from 3.15.7 before)
|
||||
|
||||
## 3.5.3 (May 5th, 2022)
|
||||
|
||||
OTHER:
|
||||
|
||||
- re-release 3.5.2 to rebuild Docker image with security vulnerabilities fixes
|
||||
|
||||
## 3.5.2 (April 7th, 2022)
|
||||
|
||||
OTHER:
|
||||
|
4
Rakefile
4
Rakefile
@@ -22,10 +22,10 @@ namespace :solargraph do
|
||||
end
|
||||
|
||||
# renovate: datasource=github-tags depName=hadolint/hadolint
|
||||
hadolint_version = 'v2.10.0'
|
||||
hadolint_version = 'v2.12.0'
|
||||
|
||||
# renovate: datasource=github-tags depName=aquasecurity/trivy
|
||||
trivy_version = 'v0.25.3'
|
||||
trivy_version = 'v0.35.0'
|
||||
|
||||
namespace :docker do
|
||||
ci_image = 'cmur2/dyndnsd:ci'
|
||||
|
@@ -1,4 +1,4 @@
|
||||
FROM alpine:3.15.4
|
||||
FROM alpine:3.17.0
|
||||
|
||||
EXPOSE 5353 8080
|
||||
|
||||
|
@@ -1,4 +1,4 @@
|
||||
FROM alpine:3.15.4
|
||||
FROM alpine:3.17.0
|
||||
|
||||
EXPOSE 5353 8080
|
||||
|
||||
|
@@ -25,15 +25,16 @@ Gem::Specification.new do |s|
|
||||
s.executables = ['dyndnsd']
|
||||
s.extra_rdoc_files = Dir['README.md', 'CHANGELOG.md', 'LICENSE']
|
||||
|
||||
s.required_ruby_version = '>= 2.5'
|
||||
s.required_ruby_version = '>= 2.7'
|
||||
|
||||
s.add_runtime_dependency 'async', '~> 1.30.0'
|
||||
s.add_runtime_dependency 'async-dns', '~> 1.3.0'
|
||||
s.add_runtime_dependency 'metriks'
|
||||
s.add_runtime_dependency 'opentelemetry-exporter-jaeger', '~> 0.20.0'
|
||||
s.add_runtime_dependency 'opentelemetry-instrumentation-rack', '~> 0.20.0'
|
||||
s.add_runtime_dependency 'opentelemetry-sdk', '~> 1.0.0.rc2'
|
||||
s.add_runtime_dependency 'rack', '~> 2.0'
|
||||
s.add_runtime_dependency 'opentelemetry-exporter-jaeger', '~> 0.22.0'
|
||||
s.add_runtime_dependency 'opentelemetry-instrumentation-rack', '~> 0.22.0'
|
||||
s.add_runtime_dependency 'opentelemetry-sdk', '~> 1.2.0'
|
||||
s.add_runtime_dependency 'rack', '~> 3.0'
|
||||
s.add_runtime_dependency 'rackup'
|
||||
s.add_runtime_dependency 'webrick', '>= 1.6.1'
|
||||
|
||||
s.add_development_dependency 'bundler'
|
||||
@@ -41,8 +42,8 @@ Gem::Specification.new do |s|
|
||||
s.add_development_dependency 'rack-test'
|
||||
s.add_development_dependency 'rake'
|
||||
s.add_development_dependency 'rspec'
|
||||
s.add_development_dependency 'rubocop', '~> 1.26.0'
|
||||
s.add_development_dependency 'rubocop', '~> 1.41.0'
|
||||
s.add_development_dependency 'rubocop-rake', '~> 0.6.0'
|
||||
s.add_development_dependency 'rubocop-rspec', '~> 2.9.0'
|
||||
s.add_development_dependency 'solargraph', '~> 0.44.0'
|
||||
s.add_development_dependency 'rubocop-rspec', '~> 2.16.0'
|
||||
s.add_development_dependency 'solargraph', '~> 0.48.0'
|
||||
end
|
||||
|
@@ -7,6 +7,7 @@ require 'ipaddr'
|
||||
require 'json'
|
||||
require 'yaml'
|
||||
require 'rack'
|
||||
require 'rackup'
|
||||
require 'metriks'
|
||||
require 'opentelemetry/instrumentation/rack'
|
||||
require 'opentelemetry/sdk'
|
||||
@@ -214,10 +215,11 @@ module Dyndnsd
|
||||
invalid_hostnames = hostnames.select { |h| !Helper.fqdn_valid?(h, @domain) }
|
||||
return [422, {'X-DynDNS-Response' => 'hostname_malformed'}, []] if invalid_hostnames.any?
|
||||
|
||||
# we can trust this information since user was authorized by middleware
|
||||
user = env['REMOTE_USER']
|
||||
|
||||
# check for hostnames that the user does not own
|
||||
forbidden_hostnames = hostnames - @users[user]['hosts']
|
||||
forbidden_hostnames = hostnames - @users[user].fetch('hosts', [])
|
||||
return [422, {'X-DynDNS-Response' => 'host_forbidden'}, []] if forbidden_hostnames.any?
|
||||
|
||||
if params['offline'] == 'YES'
|
||||
@@ -259,10 +261,10 @@ module Dyndnsd
|
||||
# @return [void]
|
||||
private_class_method def self.setup_traps
|
||||
Signal.trap('INT') do
|
||||
Rack::Handler::WEBrick.shutdown
|
||||
Rackup::Handler::WEBrick.shutdown
|
||||
end
|
||||
Signal.trap('TERM') do
|
||||
Rack::Handler::WEBrick.shutdown
|
||||
Rackup::Handler::WEBrick.shutdown
|
||||
end
|
||||
end
|
||||
|
||||
@@ -350,7 +352,7 @@ module Dyndnsd
|
||||
|
||||
app = OpenTelemetry::Instrumentation::Rack::Middlewares::TracerMiddleware.new(app)
|
||||
|
||||
Rack::Handler::WEBrick.run app, Host: config['host'], Port: config['port']
|
||||
Rackup::Handler::WEBrick.run app, Host: config['host'], Port: config['port']
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@@ -1,5 +1,5 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
module Dyndnsd
|
||||
VERSION = '3.5.2'
|
||||
VERSION = '3.7.3'
|
||||
end
|
||||
|
@@ -15,6 +15,9 @@ describe Dyndnsd::Daemon do
|
||||
'test' => {
|
||||
'password' => 'secret',
|
||||
'hosts' => ['foo.example.org', 'bar.example.org']
|
||||
},
|
||||
'test2' => {
|
||||
'password' => 'ihavenohosts'
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -99,6 +102,14 @@ describe Dyndnsd::Daemon do
|
||||
expect(last_response.body).to eq('notfqdn')
|
||||
end
|
||||
|
||||
it 'rejects request if user does not own any hostnames' do
|
||||
authorize 'test2', 'ihavenohosts'
|
||||
|
||||
get '/nic/update?hostname=doesnotexisthost.example.org'
|
||||
expect(last_response).to be_ok
|
||||
expect(last_response.body).to eq('nohost')
|
||||
end
|
||||
|
||||
it 'rejects request if user does not own one hostname' do
|
||||
authorize 'test', 'secret'
|
||||
|
||||
|
Reference in New Issue
Block a user