mirror of
https://github.com/cmur2/dyndnsd.git
synced 2025-08-08 08:33:56 +02:00
Compare commits
20 Commits
dependabot
...
master
Author | SHA1 | Date | |
---|---|---|---|
![]() |
5e6f0e1e33 | ||
![]() |
01175ec8f9 | ||
![]() |
8d2c2f9c90 | ||
![]() |
d3522e2c92 | ||
![]() |
d92ee500c9 | ||
0ddb87cc57 | |||
685854aad3 | |||
![]() |
3825f57521 | ||
![]() |
bf8d1d5bbe | ||
![]() |
4becd05aa9 | ||
![]() |
60fdaf9a94 | ||
![]() |
8ad610ceb3 | ||
0de309112b | |||
![]() |
066afeb866 | ||
841c6f8b79 | |||
![]() |
12c7e8996c | ||
![]() |
1055197b08 | ||
![]() |
08a705ed9a | ||
![]() |
927fec98f2 | ||
![]() |
1e36454711 |
9
.github/renovate.json5
vendored
9
.github/renovate.json5
vendored
@@ -20,6 +20,13 @@
|
|||||||
matchManagers: ["bundler"],
|
matchManagers: ["bundler"],
|
||||||
enabled: false,
|
enabled: false,
|
||||||
},
|
},
|
||||||
|
// Only quarter update since noisy/stable tools
|
||||||
|
{
|
||||||
|
matchPackageNames: [
|
||||||
|
"aquasecurity/trivy",
|
||||||
|
],
|
||||||
|
schedule: ["* 0-8 1 */3 *"],
|
||||||
|
},
|
||||||
// Commit message formats
|
// Commit message formats
|
||||||
{
|
{
|
||||||
matchDatasources: ["docker"],
|
matchDatasources: ["docker"],
|
||||||
@@ -33,7 +40,7 @@
|
|||||||
customManagers: [
|
customManagers: [
|
||||||
{
|
{
|
||||||
customType: "regex",
|
customType: "regex",
|
||||||
fileMatch: ["\.rb$", "^Rakefile$"],
|
managerFilePatterns: ["/.rb$/", "/^Rakefile$/"],
|
||||||
matchStrings: [
|
matchStrings: [
|
||||||
"renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)\\s.*_version = '(?<currentValue>.*)'\\s"
|
"renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)\\s.*_version = '(?<currentValue>.*)'\\s"
|
||||||
]
|
]
|
||||||
|
1
.github/workflows/ci.yml
vendored
1
.github/workflows/ci.yml
vendored
@@ -18,7 +18,6 @@ jobs:
|
|||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
ruby-version:
|
ruby-version:
|
||||||
- '3.0'
|
|
||||||
- '3.1'
|
- '3.1'
|
||||||
- '3.2'
|
- '3.2'
|
||||||
- '3.3'
|
- '3.3'
|
||||||
|
@@ -1,4 +1,4 @@
|
|||||||
require:
|
plugins:
|
||||||
- rubocop-rake
|
- rubocop-rake
|
||||||
- rubocop-rspec
|
- rubocop-rspec
|
||||||
|
|
||||||
|
4
Rakefile
4
Rakefile
@@ -16,7 +16,7 @@ end
|
|||||||
hadolint_version = 'v2.12.0'
|
hadolint_version = 'v2.12.0'
|
||||||
|
|
||||||
# renovate: datasource=github-tags depName=aquasecurity/trivy
|
# renovate: datasource=github-tags depName=aquasecurity/trivy
|
||||||
trivy_version = 'v0.59.1'
|
trivy_version = 'v0.61.0'
|
||||||
|
|
||||||
namespace :docker do
|
namespace :docker do
|
||||||
ci_image = 'cmur2/dyndnsd:ci'
|
ci_image = 'cmur2/dyndnsd:ci'
|
||||||
@@ -69,7 +69,7 @@ end
|
|||||||
namespace :bundle do
|
namespace :bundle do
|
||||||
desc 'Check for vulnerabilities with bundler-audit'
|
desc 'Check for vulnerabilities with bundler-audit'
|
||||||
task :audit do
|
task :audit do
|
||||||
sh 'bundler-audit check --ignore GHSA-vvfq-8hwr-qm4m'
|
sh 'bundler-audit check --ignore GHSA-vvfq-8hwr-qm4m' if !RUBY_VERSION.start_with?('3.0')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@@ -1,11 +1,11 @@
|
|||||||
FROM alpine:3.21.2
|
FROM alpine:3.22.1
|
||||||
|
|
||||||
EXPOSE 5353 8080
|
EXPOSE 5353 8080
|
||||||
|
|
||||||
ARG DYNDNSD_VERSION
|
ARG DYNDNSD_VERSION
|
||||||
|
|
||||||
RUN apk --no-cache add openssl ca-certificates && \
|
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 && \
|
apk --no-cache add --virtual .build-deps linux-headers ruby-dev build-base tzdata && \
|
||||||
gem install --no-document dyndnsd -v ${DYNDNSD_VERSION} && \
|
gem install --no-document dyndnsd -v ${DYNDNSD_VERSION} && \
|
||||||
rm -rf /usr/lib/ruby/gems/*/cache/ && \
|
rm -rf /usr/lib/ruby/gems/*/cache/ && \
|
||||||
|
@@ -1,11 +1,11 @@
|
|||||||
FROM alpine:3.21.2
|
FROM alpine:3.22.1
|
||||||
|
|
||||||
EXPOSE 5353 8080
|
EXPOSE 5353 8080
|
||||||
|
|
||||||
COPY pkg/dyndnsd-*.gem /tmp/dyndnsd.gem
|
COPY pkg/dyndnsd-*.gem /tmp/dyndnsd.gem
|
||||||
|
|
||||||
RUN apk --no-cache add openssl ca-certificates && \
|
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 && \
|
apk --no-cache add --virtual .build-deps linux-headers ruby-dev build-base tzdata && \
|
||||||
gem install --no-document /tmp/dyndnsd.gem && \
|
gem install --no-document /tmp/dyndnsd.gem && \
|
||||||
rm -rf /usr/lib/ruby/gems/*/cache/ && \
|
rm -rf /usr/lib/ruby/gems/*/cache/ && \
|
||||||
|
@@ -28,9 +28,9 @@ Gem::Specification.new do |s|
|
|||||||
s.required_ruby_version = '>= 3.0'
|
s.required_ruby_version = '>= 3.0'
|
||||||
|
|
||||||
s.add_dependency 'async', '~> 1.31.0'
|
s.add_dependency 'async', '~> 1.31.0'
|
||||||
s.add_dependency 'async-dns', '>= 1.3', '< 1.5'
|
s.add_dependency 'async-dns', '~> 1.3.0'
|
||||||
s.add_dependency 'base64', '~> 0.2.0' # needed for async
|
s.add_dependency 'base64', '~> 0.2.0' # needed for async
|
||||||
s.add_dependency 'logger', '~> 1.6.0'
|
s.add_dependency 'logger', '>= 1.6', '< 1.8'
|
||||||
s.add_dependency 'metriks'
|
s.add_dependency 'metriks'
|
||||||
s.add_dependency 'opentelemetry-exporter-jaeger', '~> 0.22.0'
|
s.add_dependency 'opentelemetry-exporter-jaeger', '~> 0.22.0'
|
||||||
s.add_dependency 'opentelemetry-instrumentation-rack', '~> 0.22.0'
|
s.add_dependency 'opentelemetry-instrumentation-rack', '~> 0.22.0'
|
||||||
@@ -44,8 +44,8 @@ Gem::Specification.new do |s|
|
|||||||
s.add_development_dependency 'rack-test'
|
s.add_development_dependency 'rack-test'
|
||||||
s.add_development_dependency 'rake'
|
s.add_development_dependency 'rake'
|
||||||
s.add_development_dependency 'rspec'
|
s.add_development_dependency 'rspec'
|
||||||
s.add_development_dependency 'rubocop', '~> 1.71.0'
|
s.add_development_dependency 'rubocop', '~> 1.79.1'
|
||||||
s.add_development_dependency 'rubocop-rake', '~> 0.6.0'
|
s.add_development_dependency 'rubocop-rake', '~> 0.7.1'
|
||||||
s.add_development_dependency 'rubocop-rspec', '~> 3.4.0'
|
s.add_development_dependency 'rubocop-rspec', '~> 3.6.0'
|
||||||
s.add_development_dependency 'solargraph', '~> 0.49.0'
|
s.add_development_dependency 'solargraph', '~> 0.55.0'
|
||||||
end
|
end
|
||||||
|
@@ -138,7 +138,7 @@ module Dyndnsd
|
|||||||
# @param params [Hash{String => String}]
|
# @param params [Hash{String => String}]
|
||||||
# @return [Array<String>]
|
# @return [Array<String>]
|
||||||
def extract_v4_and_v6_address(params)
|
def extract_v4_and_v6_address(params)
|
||||||
return [] if !(params['myip'])
|
return [] if !params['myip']
|
||||||
begin
|
begin
|
||||||
IPAddr.new(params['myip'], Socket::AF_INET)
|
IPAddr.new(params['myip'], Socket::AF_INET)
|
||||||
IPAddr.new(params['myip6'], Socket::AF_INET6)
|
IPAddr.new(params['myip6'], Socket::AF_INET6)
|
||||||
@@ -207,7 +207,7 @@ module Dyndnsd
|
|||||||
params = Rack::Utils.parse_query(env['QUERY_STRING'])
|
params = Rack::Utils.parse_query(env['QUERY_STRING'])
|
||||||
|
|
||||||
# require hostname parameter
|
# 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(',')
|
hostnames = params['hostname'].split(',')
|
||||||
|
|
||||||
|
@@ -89,7 +89,7 @@ module Dyndnsd
|
|||||||
# @return [Array{Array{Object}}]
|
# @return [Array{Array{Object}}]
|
||||||
def self.parse_endpoints(endpoint_list)
|
def self.parse_endpoints(endpoint_list)
|
||||||
endpoint_list.map { |addr_string| addr_string.split('@') }
|
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 } }
|
.map { |addr| [:tcp, :udp].map { |type| [type] + addr } }
|
||||||
.flatten(1)
|
.flatten(1)
|
||||||
end
|
end
|
||||||
|
Reference in New Issue
Block a user