project: update aquasecurity/trivy to v0.61.1

Updates the requirements on [rubocop](https://github.com/rubocop/rubocop) to permit the latest version.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.76.1...v1.77.0)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-version: 1.77.0
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/renovate.json5

@@ -20,6 +20,13 @@
       matchManagers: ["bundler"],
       enabled: false,
     },
+    // Only quarter update since noisy/stable tools
+    {
+      matchPackageNames: [
+        "aquasecurity/trivy",
+      ],
+      schedule: ["* 0-8 1 */3 *"],
+    },
     // Commit message formats
     {
       matchDatasources: ["docker"],
@@ -33,7 +40,7 @@
   customManagers: [
     {
       customType: "regex",
-      fileMatch: ["\.rb$", "^Rakefile$"],
+      managerFilePatterns: ["/.rb$/", "/^Rakefile$/"],
       matchStrings: [
         "renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)\\s.*_version = '(?<currentValue>.*)'\\s"
       ]

.github/workflows/cd.yml

@@ -42,7 +42,7 @@ jobs:
         password: ${{ secrets.DOCKER_TOKEN }}
 
     - name: Build and push Docker image for dyndnsd ${{ env.DYNDNSD_VERSION }}
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         context: docker
         build-args: |

.github/workflows/ci.yml

@@ -18,10 +18,10 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version:
-        - '3.0'
         - '3.1'
         - '3.2'
         - '3.3'
+        - '3.4'
     steps:
     - uses: actions/checkout@v4
     - name: Set up Ruby ${{ matrix.ruby-version }}

.rubocop.yml

@@ -1,4 +1,4 @@
-require:
+plugins:
 - rubocop-rake
 - rubocop-rspec
 

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 3.11.0
+
+IMPROVEMENTS:
+
+- add Ruby 3.4 support
+
 ## 3.10.0
 
 IMPROVEMENTS:

README.md

@@ -1,6 +1,6 @@
 # dyndnsd.rb
 
-![ci](https://github.com/cmur2/dyndnsd/workflows/ci/badge.svg) [![Dependencies](https://badges.depfu.com/badges/4f25da8493f7a29f652ac892fbf9227b/overview.svg)](https://depfu.com/github/cmur2/dyndnsd)
+![ci](https://github.com/cmur2/dyndnsd/workflows/ci/badge.svg)
 
 A small, lightweight and extensible DynDNS server written with Ruby and Rack.
 

Rakefile

@@ -3,11 +3,9 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
-require 'bundler/audit/task'
 
 RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new
-Bundler::Audit::Task.new
 
 desc 'Run experimental solargraph type checker'
 task :solargraph do
@@ -18,7 +16,7 @@ end
 hadolint_version = 'v2.12.0'
 
 # renovate: datasource=github-tags depName=aquasecurity/trivy
-trivy_version = 'v0.50.4'
+trivy_version = 'v0.61.1'
 
 namespace :docker do
   ci_image = 'cmur2/dyndnsd:ci'
@@ -50,7 +48,7 @@ namespace :docker do
       chmod a+w e2e/db.json
     SCRIPT
     sh "docker run -d --name=dyndnsd-ci -v $(pwd)/e2e:/etc/dyndnsd -p 8080:8080 -p 5353:5353 #{ci_image}"
-    sh 'sleep 1'
+    sh 'sleep 5'
     puts '----------------------------------------'
     # `dig` needs `sudo apt-get install -y -q dnsutils`
     sh <<~SCRIPT
@@ -68,7 +66,14 @@ namespace :docker do
   end
 end
 
-task default: [:rubocop, :spec, 'bundle:audit', :solargraph]
+namespace :bundle do
+  desc 'Check for vulnerabilities with bundler-audit'
+  task :audit do
+    sh 'bundler-audit check --ignore GHSA-vvfq-8hwr-qm4m' if !RUBY_VERSION.start_with?('3.0')
+  end
+end
+
+task default: [:rubocop, :spec, 'bundle:audit']
 
 desc 'Run all tasks desired for CI'
 task ci: [:default, 'docker:lint', :build, 'docker:build', 'docker:e2e']

docker/Dockerfile

@@ -1,11 +1,11 @@
-FROM alpine:3.19.1
+FROM alpine:3.22.0
 
 EXPOSE 5353 8080
 
 ARG DYNDNSD_VERSION
 
 RUN apk --no-cache add openssl ca-certificates && \
-    apk --no-cache add ruby ruby-etc ruby-io-console ruby-json ruby-webrick && \
+    apk --no-cache add ruby ruby-webrick && \
     apk --no-cache add --virtual .build-deps linux-headers ruby-dev build-base tzdata && \
     gem install --no-document dyndnsd -v ${DYNDNSD_VERSION} && \
     rm -rf /usr/lib/ruby/gems/*/cache/ && \

docker/ci/Dockerfile

@@ -1,11 +1,11 @@
-FROM alpine:3.19.1
+FROM alpine:3.22.0
 
 EXPOSE 5353 8080
 
 COPY pkg/dyndnsd-*.gem /tmp/dyndnsd.gem
 
 RUN apk --no-cache add openssl ca-certificates && \
-    apk --no-cache add ruby ruby-etc ruby-io-console ruby-json ruby-webrick && \
+    apk --no-cache add ruby ruby-webrick && \
     apk --no-cache add --virtual .build-deps linux-headers ruby-dev build-base tzdata && \
     gem install --no-document /tmp/dyndnsd.gem && \
     rm -rf /usr/lib/ruby/gems/*/cache/ && \

dyndnsd.gemspec

@@ -27,23 +27,25 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 3.0'
 
-  s.add_runtime_dependency 'async', '~> 1.31.0'
+  s.add_dependency 'async', '~> 1.31.0'
-  s.add_runtime_dependency 'async-dns', '~> 1.3.0'
+  s.add_dependency 'async-dns', '~> 1.3.0'
-  s.add_runtime_dependency 'metriks'
+  s.add_dependency 'base64', '~> 0.2.0' # needed for async
-  s.add_runtime_dependency 'opentelemetry-exporter-jaeger', '~> 0.22.0'
+  s.add_dependency 'logger', '>= 1.6', '< 1.8'
-  s.add_runtime_dependency 'opentelemetry-instrumentation-rack', '~> 0.22.0'
+  s.add_dependency 'metriks'
-  s.add_runtime_dependency 'opentelemetry-sdk', '>= 1.2', '< 1.5'
+  s.add_dependency 'opentelemetry-exporter-jaeger', '~> 0.22.0'
-  s.add_runtime_dependency 'rack', '~> 3.0'
+  s.add_dependency 'opentelemetry-instrumentation-rack', '~> 0.22.0'
-  s.add_runtime_dependency 'rackup', '~> 2'
+  s.add_dependency 'opentelemetry-sdk', '~> 1.2.0'
-  s.add_runtime_dependency 'webrick', '>= 1.6.1'
+  s.add_dependency 'rack', '~> 3.0'
+  s.add_dependency 'rackup', '~> 2'
+  s.add_dependency 'webrick', '>= 1.6.1'
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'bundler-audit', '~> 0.9.0'
   s.add_development_dependency 'rack-test'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rubocop', '~> 1.61.0'
+  s.add_development_dependency 'rubocop', '~> 1.77.0'
-  s.add_development_dependency 'rubocop-rake', '~> 0.6.0'
+  s.add_development_dependency 'rubocop-rake', '~> 0.7.1'
-  s.add_development_dependency 'rubocop-rspec', '~> 2.26.1'
+  s.add_development_dependency 'rubocop-rspec', '~> 3.6.0'
-  s.add_development_dependency 'solargraph', '~> 0.50.0'
+  s.add_development_dependency 'solargraph', '~> 0.55.0'
 end

lib/dyndnsd.rb

@@ -138,7 +138,7 @@ module Dyndnsd
     # @param params [Hash{String => String}]
     # @return [Array<String>]
     def extract_v4_and_v6_address(params)
-      return [] if !(params['myip'])
+      return [] if !params['myip']
       begin
         IPAddr.new(params['myip'], Socket::AF_INET)
         IPAddr.new(params['myip6'], Socket::AF_INET6)
@@ -207,7 +207,7 @@ module Dyndnsd
       params = Rack::Utils.parse_query(env['QUERY_STRING'])
 
       # require hostname parameter
-      return [422, {'X-DynDNS-Response' => 'hostname_missing'}, []] if !(params['hostname'])
+      return [422, {'X-DynDNS-Response' => 'hostname_missing'}, []] if !params['hostname']
 
       hostnames = params['hostname'].split(',')
 

lib/dyndnsd/updater/zone_transfer_server.rb

@@ -89,7 +89,7 @@ module Dyndnsd
       # @return [Array{Array{Object}}]
       def self.parse_endpoints(endpoint_list)
         endpoint_list.map { |addr_string| addr_string.split('@') }
-                     .map { |addr_parts| [addr_parts[0], addr_parts[1].to_i || 53] }
+                     .map { |addr_parts| [addr_parts[0], addr_parts[1]&.to_i || 53] }
                      .map { |addr| [:tcp, :udp].map { |type| [type] + addr } }
                      .flatten(1)
       end