release: 3.7.1

CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## 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:

Rakefile

@@ -25,7 +25,7 @@ end
 hadolint_version = 'v2.10.0'
 
 # renovate: datasource=github-tags depName=aquasecurity/trivy
-trivy_version = 'v0.30.1'
+trivy_version = 'v0.31.3'
 
 namespace :docker do
   ci_image = 'cmur2/dyndnsd:ci'

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.16.1
+FROM alpine:3.16.2
 
 EXPOSE 5353 8080
 

docker/ci/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.16.1
+FROM alpine:3.16.2
 
 EXPOSE 5353 8080
 

dyndnsd.gemspec

@@ -30,10 +30,11 @@ Gem::Specification.new do |s|
   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.21.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.21.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.31.0'
+  s.add_development_dependency 'rubocop', '~> 1.36.0'
   s.add_development_dependency 'rubocop-rake', '~> 0.6.0'
-  s.add_development_dependency 'rubocop-rspec', '~> 2.12.0'
-  s.add_development_dependency 'solargraph', '~> 0.45.0'
+  s.add_development_dependency 'rubocop-rspec', '~> 2.13.1'
+  s.add_development_dependency 'solargraph', '~> 0.46.0'
 end

lib/dyndnsd.rb

@@ -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

lib/dyndnsd/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dyndnsd
-  VERSION = '3.6.1'
+  VERSION = '3.7.1'
 end

spec/dyndnsd/daemon_spec.rb

@@ -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'