mirror of https://github.com/cmur2/dyndnsd.git
Compare commits
285 Commits
Author | SHA1 | Date |
---|---|---|
dependabot[bot] | 581885daa0 | |
dependabot[bot] | 267a96bf73 | |
renovate[bot] | 44a4a28094 | |
Christian Nicolai | 3f962fa3bb | |
Christian Nicolai | 1171e0cb92 | |
cn | 6a933194f3 | |
cn | e546d03d9f | |
renovate[bot] | 65d52675c9 | |
renovate[bot] | 636d6f6379 | |
renovate[bot] | 26381244aa | |
depfu[bot] | d51937c68b | |
renovate[bot] | dbc4073b66 | |
renovate[bot] | d83f8d8e69 | |
cn | 95acdcbc70 | |
renovate[bot] | 38fdf44c1f | |
depfu[bot] | e3d57ea3aa | |
renovate[bot] | 90166c8ef2 | |
depfu[bot] | 98b413eb6b | |
renovate[bot] | 43df61b819 | |
renovate[bot] | 8ee945ed31 | |
depfu[bot] | 1ae0642541 | |
depfu[bot] | be33b1917a | |
renovate[bot] | e6c9773b8e | |
renovate[bot] | 5a54dbe0c7 | |
depfu[bot] | aa20275888 | |
renovate[bot] | 049e14afa5 | |
depfu[bot] | 54544b75d1 | |
renovate[bot] | 3274741721 | |
depfu[bot] | 8d8a85a78f | |
renovate[bot] | cdfe350828 | |
renovate[bot] | 337c86f47b | |
renovate[bot] | 20d359f328 | |
renovate[bot] | 4cf6591f38 | |
renovate[bot] | 5a9244694a | |
depfu[bot] | 015ee60420 | |
renovate[bot] | 2d4b94c129 | |
renovate[bot] | aefd59aea8 | |
depfu[bot] | 10fd5699ac | |
renovate[bot] | ecf425dd61 | |
Christian Nicolai | 70ad2148b9 | |
renovate[bot] | 93e252443a | |
renovate[bot] | d9f0119ab8 | |
depfu[bot] | bf225b8e6a | |
depfu[bot] | 6a9e05fb97 | |
renovate[bot] | bc4210d5ce | |
Christian Nicolai | a54235fcf2 | |
renovate[bot] | be87ba8f31 | |
depfu[bot] | 5e947316f6 | |
cn | c71b23d35e | |
cn | 2258edaae6 | |
depfu[bot] | f8878077cf | |
renovate[bot] | 2deb5f3337 | |
renovate[bot] | ca92b894cb | |
Christian Nicolai | e45902f5cf | |
Christian Nicolai | 9ae88964ec | |
Christian Nicolai | 90ae7543d7 | |
Christian Nicolai | 37413bcd3b | |
renovate[bot] | 7af351c384 | |
depfu[bot] | 68dac5c6f3 | |
renovate[bot] | c7130c7ee4 | |
renovate[bot] | 3c3c1fcb24 | |
depfu[bot] | 425318a0d1 | |
depfu[bot] | c2eda1648b | |
depfu[bot] | d72cfeddd8 | |
renovate[bot] | 6463999ab4 | |
depfu[bot] | b56922c3c8 | |
renovate[bot] | 71666776b4 | |
depfu[bot] | c4e6e16afb | |
depfu[bot] | 05f86550be | |
renovate[bot] | edcd7e1e47 | |
depfu[bot] | 6f29034aef | |
cn | dd7553d5fd | |
renovate[bot] | a21f6a4cad | |
renovate[bot] | 31a7f54827 | |
renovate[bot] | d415451c8e | |
depfu[bot] | 699c907a84 | |
depfu[bot] | 1ad23c8716 | |
depfu[bot] | c538a6b07f | |
depfu[bot] | fe3f17cd02 | |
Christian Nicolai | 0e9b17cb0b | |
renovate[bot] | 0f793f92d8 | |
depfu[bot] | 0fd3833b9c | |
renovate[bot] | 5bc5977704 | |
renovate[bot] | 684d1f0578 | |
depfu[bot] | 14bac86e9d | |
renovate[bot] | 12afe16a78 | |
depfu[bot] | 75059044de | |
Christian Nicolai | 9f7ebfe59c | |
depfu[bot] | ac42413580 | |
depfu[bot] | 415bb36754 | |
cn | 481504f174 | |
renovate[bot] | d68a93a94f | |
renovate[bot] | 69d2378747 | |
depfu[bot] | ac929f65aa | |
cn | f648c28f18 | |
renovate[bot] | 2e6e69810e | |
depfu[bot] | e9398eab71 | |
cn | 65f8dbb21b | |
depfu[bot] | 6b6f6cf3a4 | |
depfu[bot] | 9af4f03013 | |
depfu[bot] | b77c3b0996 | |
depfu[bot] | 600cbeb453 | |
renovate[bot] | b2d369cc4c | |
renovate[bot] | 31e73c7c4a | |
depfu[bot] | 52874542a7 | |
renovate[bot] | 1daf68376d | |
depfu[bot] | b5f5fa9105 | |
Christian Nicolai | ea1d4baa04 | |
renovate[bot] | 944d3fbc5d | |
depfu[bot] | 78721c5b15 | |
renovate[bot] | fce992b842 | |
depfu[bot] | a2a51d63ac | |
renovate[bot] | b19213d099 | |
depfu[bot] | ede79802d3 | |
depfu[bot] | d4483b02a2 | |
renovate[bot] | 1fbad10a24 | |
depfu[bot] | da28c76a68 | |
renovate[bot] | e5c66824ab | |
cn | 3d787a46ea | |
cn | 3a5b1bcb27 | |
Christian Nicolai | d066b3ecee | |
Christian Nicolai | 71b0fda5ee | |
cn | b1e948a2dc | |
depfu[bot] | e22035919b | |
depfu[bot] | 1ffd1de964 | |
depfu[bot] | 39c7dc7837 | |
renovate[bot] | 7528e8084e | |
depfu[bot] | 343a56a6ba | |
renovate[bot] | 6111edc067 | |
depfu[bot] | 0e0d9dfc86 | |
cn | fadaf4840c | |
renovate[bot] | 9281e6958b | |
depfu[bot] | ec1e836a89 | |
depfu[bot] | d80268c1b8 | |
renovate[bot] | d04e039b2a | |
depfu[bot] | c14618c503 | |
Christian Nicolai | 0e700e8b7b | |
depfu[bot] | d256c86420 | |
renovate[bot] | a589148d9e | |
renovate[bot] | 232b3f32a2 | |
depfu[bot] | 3c83eb4347 | |
depfu[bot] | 800618f434 | |
renovate[bot] | 1e61a12b48 | |
Christian Nicolai | 7bcaf18f7e | |
Renovate Bot | c0d69f591f | |
Renovate Bot | 2228e742cf | |
depfu[bot] | e7f528377b | |
depfu[bot] | 537682804f | |
depfu[bot] | 7ffab915ac | |
Renovate Bot | d515a87640 | |
Renovate Bot | 4a7eba5ad6 | |
Renovate Bot | 52bb8ee9d2 | |
Renovate Bot | eb1d88807b | |
depfu[bot] | 7c2104b0ce | |
cn | 4237d35fcc | |
Christian Nicolai | 451ed20f5d | |
Christian Nicolai | a2879c6c9a | |
Renovate Bot | f882381f9d | |
depfu[bot] | fb536da665 | |
Renovate Bot | 49b7b07b52 | |
depfu[bot] | 2854155db2 | |
Renovate Bot | b40c6f8c30 | |
depfu[bot] | 44605f0f04 | |
Christian Nicolai | 63bf4123bd | |
Renovate Bot | 990d4617e8 | |
Renovate Bot | 0030e41a8d | |
Renovate Bot | 97a913f97c | |
Renovate Bot | b1ff774a55 | |
Renovate Bot | 683767ed8c | |
Renovate Bot | a45c1cca82 | |
Renovate Bot | 0a053ad577 | |
Renovate Bot | 51eae6da2f | |
Renovate Bot | fa1d9c7e30 | |
Renovate Bot | b56adc8b79 | |
Renovate Bot | 88c8bcefeb | |
depfu[bot] | 6c8510910a | |
Renovate Bot | 6faae0d0fd | |
Renovate Bot | 3b34e00fc3 | |
Renovate Bot | d1463cc790 | |
depfu[bot] | aea182efcb | |
Renovate Bot | 990dc14a48 | |
cn | 558445af2e | |
cn | 3f784ccaa1 | |
cn | dbc61d72fb | |
cn | 2838ad9eae | |
Christian Nicolai | 84e513b4a2 | |
Renovate Bot | 0a4a052cc9 | |
depfu[bot] | b9f0a07aba | |
depfu[bot] | cb9f6f7027 | |
cn | 12dcc3eb42 | |
cn | 90f4442e94 | |
Renovate Bot | 193997958f | |
Christian Nicolai | 9eb9849004 | |
Christian Nicolai | 4df5b8fa63 | |
Renovate Bot | 45b522f7cc | |
depfu[bot] | 817dd810e3 | |
cn | 09461aa013 | |
depfu[bot] | 367a542f74 | |
Renovate Bot | 6642d9a7a2 | |
cn | 9580f1478f | |
cn | 6c91c46378 | |
cn | e622ab292a | |
cn | 507e6a36fd | |
cn | 0a2afb1e4c | |
Renovate Bot | 6e7d4ea985 | |
cn | 809e2dd5d1 | |
cn | bdda57c4bc | |
cn | 8c5240bbf7 | |
cn | aecc55e9e7 | |
depfu[bot] | 7b8485cacc | |
Renovate Bot | 0134b7bee1 | |
depfu[bot] | fc9ef9ae31 | |
cn | 3a31315d9e | |
depfu[bot] | db8c5cd682 | |
depfu[bot] | 29c779c05d | |
depfu[bot] | 036fcbc7a0 | |
depfu[bot] | aabaa11c61 | |
depfu[bot] | 632cd2bd99 | |
depfu[bot] | 60cbe7c8c1 | |
cn | e5f82b4ef5 | |
depfu[bot] | 794d060fe6 | |
depfu[bot] | 761dbe769f | |
cn | d8dc69de8b | |
cn | 4b3302bb49 | |
Renovate Bot | 1a59d6f79a | |
Christian Nicolai | 84429c066f | |
Christian Nicolai | 9768424628 | |
Christian Nicolai | 882fcbe13b | |
Christian Nicolai | 7580e87a30 | |
Christian Nicolai | 6c1d44b388 | |
depfu[bot] | a67418653d | |
depfu[bot] | b1f9e39fc4 | |
cn | b8fd42fd85 | |
cn | e806517b18 | |
depfu[bot] | 7a2d3a90ac | |
Renovate Bot | c5929bbbbd | |
depfu[bot] | 98e6b3a711 | |
depfu[bot] | 3d4bfc0158 | |
cn | afd95a81c3 | |
Christian Nicolai | f3cc8fc03a | |
Renovate Bot | dcd4201523 | |
Renovate Bot | 781379d879 | |
depfu[bot] | 429bbff838 | |
depfu[bot] | bc97a0fc05 | |
depfu[bot] | 47a73fd149 | |
cn | fe2ef47675 | |
cn | fc0fe3c6d5 | |
depfu[bot] | d4bcac2d5b | |
depfu[bot] | 0f57c6f305 | |
Renovate Bot | 50d71f5e54 | |
depfu[bot] | 2120450659 | |
Renovate Bot | fdb3274785 | |
depfu[bot] | 5d41a1b77e | |
cn | f716afe84d | |
Christian Nicolai | b73416d775 | |
depfu[bot] | 43dd527485 | |
Renovate Bot | 2c629f8bbc | |
depfu[bot] | 1db9c4a6ee | |
Renovate Bot | b1eca52235 | |
Renovate Bot | 4987ec2264 | |
cn | ad01f9a9dd | |
cn | 6aa8c10ae0 | |
cn | 6afed2049a | |
cn | 199ccf7665 | |
cn | 7c77b7304a | |
cn | 243f679d7f | |
cn | 085f75c6dd | |
cn | 0e96359429 | |
cn | 6374837156 | |
cn | 53af02398d | |
cn | 16706071b7 | |
cn | 43f089ce70 | |
depfu[bot] | 15c3e587ff | |
depfu[bot] | b438ed097f | |
depfu[bot] | 337c779410 | |
cn | b004b4d1e7 | |
cn | 3cbc0a3f01 | |
cn | c675a347d1 | |
Christian Nicolai | 70ec21af94 | |
Christian Nicolai | 920d82f073 | |
Christian Nicolai | dee9beb4e0 | |
depfu[bot] | 08e92a0772 | |
depfu[bot] | eb1c107bf3 | |
depfu[bot] | a75d9dc5e6 | |
depfu[bot] | 3af42e4c20 |
|
@ -0,0 +1,17 @@
|
|||
{
|
||||
"problemMatcher": [
|
||||
{
|
||||
"owner": "actionlint",
|
||||
"pattern": [
|
||||
{
|
||||
"regexp": "^(?:\\x1b\\[\\d+m)?(.+?)(?:\\x1b\\[\\d+m)*:(?:\\x1b\\[\\d+m)*(\\d+)(?:\\x1b\\[\\d+m)*:(?:\\x1b\\[\\d+m)*(\\d+)(?:\\x1b\\[\\d+m)*: (?:\\x1b\\[\\d+m)*(.+?)(?:\\x1b\\[\\d+m)* \\[(.+?)\\]$",
|
||||
"file": 1,
|
||||
"line": 2,
|
||||
"column": 3,
|
||||
"message": 4,
|
||||
"code": 5
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
|
@ -0,0 +1,13 @@
|
|||
---
|
||||
version: 2
|
||||
updates:
|
||||
- package-ecosystem: "bundler"
|
||||
directory: "/"
|
||||
schedule:
|
||||
interval: "weekly"
|
||||
commit-message:
|
||||
prefix: "gems"
|
||||
labels: ["dependabot"]
|
||||
open-pull-requests-limit: 10
|
||||
pull-request-branch-name:
|
||||
separator: "-"
|
|
@ -0,0 +1,42 @@
|
|||
{
|
||||
extends: [
|
||||
"config:recommended",
|
||||
":dependencyDashboard",
|
||||
":prHourlyLimitNone",
|
||||
":prConcurrentLimitNone",
|
||||
":label(dependency-upgrade)",
|
||||
],
|
||||
schedule: ["before 8am on thursday"],
|
||||
branchPrefix: "renovate-",
|
||||
dependencyDashboardHeader: "View repository job log [here](https://app.renovatebot.com/dashboard#github/cmur2/dyndnsd).",
|
||||
separateMinorPatch: true,
|
||||
commitMessagePrefix: "project: ",
|
||||
commitMessageAction: "update",
|
||||
commitMessageTopic: "{{depName}}",
|
||||
commitMessageExtra: "to {{#if isSingleVersion}}v{{{newVersion}}}{{else}}{{{newValue}}}{{/if}}",
|
||||
packageRules: [
|
||||
// Ruby dependencies are managed by depfu
|
||||
{
|
||||
matchManagers: ["bundler"],
|
||||
enabled: false,
|
||||
},
|
||||
// Commit message formats
|
||||
{
|
||||
matchDatasources: ["docker"],
|
||||
commitMessagePrefix: "docker: ",
|
||||
},
|
||||
{
|
||||
matchManagers: ["github-actions"],
|
||||
commitMessagePrefix: "ci: ",
|
||||
},
|
||||
],
|
||||
customManagers: [
|
||||
{
|
||||
customType: "regex",
|
||||
fileMatch: ["\.rb$", "^Rakefile$"],
|
||||
matchStrings: [
|
||||
"renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)\\s.*_version = '(?<currentValue>.*)'\\s"
|
||||
]
|
||||
},
|
||||
],
|
||||
}
|
|
@ -1,3 +1,4 @@
|
|||
# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
|
||||
---
|
||||
name: cd
|
||||
|
||||
|
@ -10,17 +11,41 @@ jobs:
|
|||
release-dockerimage:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Extract dyndnsd version from tag name
|
||||
run: |
|
||||
echo "DYNDNSD_VERSION=${GITHUB_REF#refs/*/v}" >> $GITHUB_ENV
|
||||
echo "DYNDNSD_VERSION=${GITHUB_REF#refs/*/v}" >> "$GITHUB_ENV"
|
||||
|
||||
- name: Wait for dyndnsd ${{ env.DYNDNSD_VERSION }} gem to be available
|
||||
run: |
|
||||
set +e
|
||||
for retry in $(seq 1 5); do
|
||||
echo "Checking if dyndnsd $DYNDNSD_VERSION gem is retrievable from rubygems.org (try #$retry)..."
|
||||
sudo gem install dyndnsd -v "$DYNDNSD_VERSION"
|
||||
# shellcheck disable=SC2181
|
||||
if [ $? -eq 0 ]; then
|
||||
exit 0
|
||||
fi
|
||||
sleep 60
|
||||
done
|
||||
exit 1
|
||||
|
||||
# https://github.com/marketplace/actions/build-and-push-docker-images
|
||||
- name: Build and push Docker image for dyndnsd ${{ env.DYNDNSD_VERSION }}
|
||||
uses: docker/build-push-action@v1
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v3
|
||||
|
||||
- name: Login to Docker Hub
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
username: cmur2
|
||||
password: ${{ secrets.DOCKER_TOKEN }}
|
||||
repository: cmur2/dyndnsd
|
||||
path: docker
|
||||
build_args: DYNDNSD_VERSION=${{ env.DYNDNSD_VERSION }}
|
||||
tag_with_ref: true
|
||||
|
||||
- name: Build and push Docker image for dyndnsd ${{ env.DYNDNSD_VERSION }}
|
||||
uses: docker/build-push-action@v5
|
||||
with:
|
||||
context: docker
|
||||
build-args: |
|
||||
DYNDNSD_VERSION=${{ env.DYNDNSD_VERSION }}
|
||||
push: true
|
||||
tags: cmur2/dyndnsd:v${{ env.DYNDNSD_VERSION }}
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
|
||||
---
|
||||
name: ci
|
||||
|
||||
|
@ -14,19 +15,41 @@ jobs:
|
|||
build:
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
ruby-version:
|
||||
- '2.5'
|
||||
- '2.6'
|
||||
- '2.7'
|
||||
- '3.0'
|
||||
- '3.1'
|
||||
- '3.2'
|
||||
- '3.3'
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/checkout@v4
|
||||
- name: Set up Ruby ${{ matrix.ruby-version }}
|
||||
uses: ruby/setup-ruby@v1
|
||||
with:
|
||||
ruby-version: ${{ matrix.ruby-version }}
|
||||
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
|
||||
|
||||
- name: Lint and Test
|
||||
run: |
|
||||
bundle exec rake ci
|
||||
|
||||
actionlint:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Check workflow files
|
||||
run: |
|
||||
echo "::add-matcher::.github/actionlint-matcher.json"
|
||||
bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash)
|
||||
./actionlint
|
||||
|
||||
renovate-config-validator:
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: ghcr.io/renovatebot/renovate
|
||||
options: --user root
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Check Renovate config
|
||||
run: renovate-config-validator --strict
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
|
||||
---
|
||||
name: dockerhub
|
||||
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
|
||||
---
|
||||
name: vulnscan
|
||||
|
||||
|
@ -10,15 +11,14 @@ jobs:
|
|||
scan-released-dockerimages:
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
TRIVY_LIGHT: 'true'
|
||||
TRIVY_IGNORE_UNFIXED: 'true'
|
||||
TRIVY_REMOVED_PKGS: 'true'
|
||||
steps:
|
||||
- name: Install Trivy
|
||||
run: |
|
||||
mkdir -p $GITHUB_WORKSPACE/bin
|
||||
mkdir -p "$GITHUB_WORKSPACE/bin"
|
||||
echo "$GITHUB_WORKSPACE/bin" >> "$GITHUB_PATH"
|
||||
curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/master/contrib/install.sh | sh -s -- -b $GITHUB_WORKSPACE/bin
|
||||
curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/master/contrib/install.sh | sh -s -- -b "$GITHUB_WORKSPACE/bin"
|
||||
- name: Download Trivy DB
|
||||
run: |
|
||||
trivy image --download-db-only
|
||||
|
@ -36,7 +36,7 @@ jobs:
|
|||
for image in $ALL_IMAGES; do
|
||||
if [[ "$image" = cmur2/dyndnsd:v$major_version.* ]]; then
|
||||
echo -e "\nScanning newest patch release $image of major v$major_version...\n"
|
||||
if ! trivy image --skip-update --exit-code 1 "$image"; then
|
||||
if ! trivy image --skip-db-update --scanners vuln --exit-code 1 "$image"; then
|
||||
EXIT_CODE=1
|
||||
fi
|
||||
break
|
||||
|
|
|
@ -2,3 +2,5 @@
|
|||
*.lock
|
||||
pkg/*
|
||||
.yardoc
|
||||
hadolint
|
||||
trivy
|
||||
|
|
11
.rubocop.yml
11
.rubocop.yml
|
@ -3,9 +3,15 @@ require:
|
|||
- rubocop-rspec
|
||||
|
||||
AllCops:
|
||||
TargetRubyVersion: '2.5'
|
||||
TargetRubyVersion: '3.0'
|
||||
NewCops: enable
|
||||
|
||||
Gemspec/DevelopmentDependencies:
|
||||
EnforcedStyle: gemspec
|
||||
|
||||
Gemspec/RequireMFA:
|
||||
Enabled: false
|
||||
|
||||
Layout/EmptyLineAfterGuardClause:
|
||||
Enabled: false
|
||||
|
||||
|
@ -96,3 +102,6 @@ RSpec/ExampleLength:
|
|||
|
||||
RSpec/MultipleExpectations:
|
||||
Max: 20
|
||||
|
||||
RSpecRails:
|
||||
Enabled: false
|
||||
|
|
203
CHANGELOG.md
203
CHANGELOG.md
|
@ -1,5 +1,206 @@
|
|||
# Changelog
|
||||
|
||||
## 3.10.0
|
||||
|
||||
IMPROVEMENTS:
|
||||
|
||||
- add Ruby 3.3 support
|
||||
|
||||
OTHER:
|
||||
|
||||
- update base of Docker image to Alpine 3.19.0 (from 3.18.3 before)
|
||||
|
||||
## 3.9.2 (August 10th, 2023)
|
||||
|
||||
OTHER:
|
||||
|
||||
- update base of Docker image to Alpine 3.18.3 (from 3.18.2 before)
|
||||
|
||||
## 3.9.1 (July 6, 2023)
|
||||
|
||||
OTHER:
|
||||
|
||||
- update base of Docker image to Alpine 3.18.2 (from 3.18.0 before)
|
||||
|
||||
## 3.9.0 (June 8, 2023)
|
||||
|
||||
IMPROVEMENTS:
|
||||
|
||||
- Drop EOL Ruby 2.7 support, now minimum version supported is Ruby 3.0
|
||||
|
||||
## 3.8.2 (April 1st, 2023)
|
||||
|
||||
OTHER:
|
||||
|
||||
- update base of Docker image to Alpine 3.17.3 (from 3.17.2 before)
|
||||
|
||||
## 3.8.1 (March 2nd, 2023)
|
||||
|
||||
OTHER:
|
||||
|
||||
- update base of Docker image to Alpine 3.17.2 (from 3.17.1 before)
|
||||
|
||||
## 3.8.0 (January 13th, 2023)
|
||||
|
||||
IMPROVEMENTS:
|
||||
|
||||
- add Ruby 3.2 support
|
||||
|
||||
OTHER:
|
||||
|
||||
- update base of Docker image to Alpine 3.17.1 (from 3.17.0 before)
|
||||
|
||||
## 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:
|
||||
|
||||
- re-release 3.5.1 to rebuild Docker image with security vulnerabilities fixes
|
||||
|
||||
## 3.5.1 (February 17th, 2022)
|
||||
|
||||
OTHER:
|
||||
|
||||
- re-release 3.5.0 to rebuild Docker image with security vulnerabilities fixes
|
||||
|
||||
## 3.5.0 (January 8th, 2022)
|
||||
|
||||
IMPROVEMENTS:
|
||||
|
||||
- add Ruby 3.1 support
|
||||
|
||||
OTHER:
|
||||
|
||||
- update base of Docker image to Alpine 3.15 (from 3.13.7 before, **Note:** please be aware of the quirks around [Alpine 3.14](https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.14.0#faccessat2))
|
||||
|
||||
## 3.4.8 (December 11th, 2021)
|
||||
|
||||
OTHER:
|
||||
|
||||
- re-release 3.4.7 to rebuild Docker image with security vulnerabilities fixes
|
||||
|
||||
## 3.4.7 (November 19th, 2021)
|
||||
|
||||
OTHER:
|
||||
|
||||
- re-release 3.4.6 to rebuild Docker image with security vulnerabilities fixes
|
||||
|
||||
## 3.4.6 (November 19th, 2021)
|
||||
|
||||
OTHER:
|
||||
|
||||
- re-release 3.4.5 to rebuild Docker image with security vulnerabilities fixes
|
||||
|
||||
## 3.4.5 (August 26th, 2021)
|
||||
|
||||
OTHER:
|
||||
|
||||
- re-release 3.4.4 to rebuild Docker image with security vulnerabilities fixes
|
||||
|
||||
## 3.4.4 (August 26th, 2021)
|
||||
|
||||
OTHER:
|
||||
|
||||
- re-release 3.4.3 to rebuild Docker image with security vulnerabilities fixes
|
||||
|
||||
## 3.4.3 (August 20th, 2021)
|
||||
|
||||
OTHER:
|
||||
|
||||
- re-release 3.4.2 to rebuild Docker image with security vulnerabilities fixes
|
||||
|
||||
## 3.4.2 (July 30, 2021)
|
||||
|
||||
IMPROVEMENTS:
|
||||
|
||||
- move from OpenTracing to OpenTelemetry for experimental tracing feature
|
||||
|
||||
OTHER:
|
||||
|
||||
- re-release 3.4.1 to rebuild Docker image with security vulnerabilities fixes
|
||||
- adopt Renovate for dependency updates
|
||||
|
||||
## 3.4.1 (April 15, 2021)
|
||||
|
||||
OTHER:
|
||||
|
||||
- update base of Docker image to Alpine 3.13.5 to fix security vulnerabilities
|
||||
|
||||
## 3.4.0 (April 2, 2021)
|
||||
|
||||
IMPROVEMENTS:
|
||||
|
||||
- **change** Docker image to run as non-root user `65534` by default, limits attack surface for security and gives OpenShift compatibility
|
||||
|
||||
## 3.3.3 (April 1, 2021)
|
||||
|
||||
OTHER:
|
||||
|
||||
- update base of Docker image to Alpine 3.13.4 to fix security vulnerabilities
|
||||
|
||||
## 3.3.2 (February 20, 2021)
|
||||
|
||||
OTHER:
|
||||
|
||||
- update to use `docker/build-push-action@v2` for releasing Docker image in GHA
|
||||
|
||||
## 3.3.1 (February 18, 2021)
|
||||
|
||||
OTHER:
|
||||
|
||||
- update base of Docker image to Alpine 3.13.2 to fix security vulnerabilities
|
||||
|
||||
## 3.3.0 (January 18, 2021)
|
||||
|
||||
OTHER:
|
||||
|
@ -145,7 +346,7 @@ IMPROVEMENTS:
|
|||
|
||||
IMPROVEMENTS:
|
||||
|
||||
- Support dropping priviliges on startup, also affects external commands run
|
||||
- Support dropping privileges on startup, also affects external commands run
|
||||
- Add [metriks](https://github.com/eric/metriks) support for basic metrics in the process title
|
||||
- Detach from child processes running external commands to avoid zombie processes
|
||||
|
||||
|
|
46
README.md
46
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.
|
||||
|
||||
|
@ -75,7 +75,7 @@ There is an officially maintained [Docker image for dyndnsd](https://hub.docker.
|
|||
|
||||
Users can make extensions by deriving from the official Docker image or building their own.
|
||||
|
||||
The Docker image consumes the same configuration file in YAML format as the gem, inside the container it needs to be mounted/available as `/etc/dyndnsd/config.yml`. the following YAML should be used as a base and extended with user's settings:
|
||||
The Docker image consumes the same configuration file in YAML format as the gem, inside the container it needs to be mounted/available as `/etc/dyndnsd/config.yml`. The following YAML should be used as a base and extended with user's settings:
|
||||
|
||||
```yaml
|
||||
host: "0.0.0.0"
|
||||
|
@ -98,7 +98,7 @@ docker run -d --name dyndnsd \
|
|||
cmur2/dyndnsd:vX.Y.Z
|
||||
```
|
||||
|
||||
*Note*: You may need to expose more then just port 8080 e.g. if you use the `zone_transfer_server` which can be done by appending additional `-p 5353:5353` flags to the `docker run` command.
|
||||
*Note*: You may need to expose more than just port 8080 e.g. if you use the `zone_transfer_server` which can be done by appending additional `-p 5353:5353` flags to the `docker run` command.
|
||||
|
||||
|
||||
|
||||
|
@ -106,7 +106,7 @@ docker run -d --name dyndnsd \
|
|||
|
||||
By using [DNS zone transfers via AXFR (RFC5936)](https://tools.ietf.org/html/rfc5936) any secondary nameserver can retrieve the DNS zone contents from dyndnsd.rb and serve them to clients.
|
||||
To speedup propagation after changes dyndnsd.rb can issue a [DNS NOTIFY (RFC1996)](https://tools.ietf.org/html/rfc1996) to inform the nameserver that the DNS zone contents changed and should be fetched even before the time indicated in the SOA record is up.
|
||||
Currently dyndnsd.rb does not support any authentication for incoming DNS zone transfer requests so it should be isolated from the internet on these ports.
|
||||
Currently, dyndnsd.rb does not support any authentication for incoming DNS zone transfer request, so it should be isolated from the internet on these ports.
|
||||
|
||||
This approach has several advantages:
|
||||
- dyndnsd.rb can be used in *hidden primary* fashion isolated from client's DNS traffic and does not need to implement full nameserver features
|
||||
|
@ -151,7 +151,7 @@ users:
|
|||
|
||||
NSD is a nice, open source, authoritative-only, low-memory DNS server that reads BIND-style zone files (and converts them into its own database) and has a simple configuration file.
|
||||
|
||||
A feature NSD is lacking is the [Dynamic DNS update (RFC2136)](https://tools.ietf.org/html/rfc2136) functionality BIND offers but one can fake it using the following dyndnsd.rb configuration:
|
||||
A feature NSD is lacking is the [Dynamic DNS update (RFC2136)](https://tools.ietf.org/html/rfc2136) functionality BIND offers, but one can fake it using the following dyndnsd.rb configuration:
|
||||
|
||||
```yaml
|
||||
host: "0.0.0.0"
|
||||
|
@ -197,29 +197,29 @@ The update URL you want to tell your clients (humans or scripts ^^) consists of
|
|||
|
||||
where:
|
||||
|
||||
* the protocol depends on your (webserver/proxy) settings
|
||||
* USER and PASSWORD are needed for HTTP Basic Auth and valid combinations are defined in your config.yaml
|
||||
* DOMAIN should match what you defined in your config.yaml as domain but may be anything else when using a webserver as proxy
|
||||
* PORT depends on your (webserver/proxy) settings
|
||||
* HOSTNAMES is a required list of comma-separated FQDNs (they all have to end with your config.yaml domain) the user wants to update
|
||||
* MYIP is optional and the HTTP client's IP address will be used if missing
|
||||
* MYIP6 is optional but if present also requires presence of MYIP
|
||||
* the protocol depends on your (web server/proxy) settings
|
||||
* `USER` and `PASSWORD` are needed for HTTP Basic Auth and valid combinations are defined in your config.yaml
|
||||
* `DOMAIN` should match what you defined in your config.yaml as domain but may be anything else when using a web server as proxy
|
||||
* `PORT` depends on your (web server/proxy) settings
|
||||
* `HOSTNAMES` is a required list of comma-separated FQDNs (they all have to end with your config.yaml domain) the user wants to update
|
||||
* `MYIP` is optional and the HTTP client's IP address will be used if missing
|
||||
* `MYIP6` is optional but if present also requires presence of `MYIP`
|
||||
|
||||
|
||||
### IP address determination
|
||||
|
||||
The following rules apply:
|
||||
|
||||
* use any IP address provided via the myip parameter when present, or
|
||||
* use any IP address provided via the X-Real-IP header e.g. when used behind HTTP reverse proxy such as nginx, or
|
||||
* use any IP address provided via the `myip` parameter when present, or
|
||||
* use any IP address provided via the `X-Real-IP` header e.g. when used behind HTTP reverse proxy such as nginx, or
|
||||
* use any IP address used by the connecting HTTP client
|
||||
|
||||
If you want to provide an additional IPv6 address as myip6 parameter, the myip parameter containing an IPv4 address has to be present, too! No automatism is applied then.
|
||||
If you want to provide an additional IPv6 address as myip6 parameter, the `myip` parameter containing an IPv4 address has to be present, too! No automatism is applied then.
|
||||
|
||||
|
||||
### SSL, multiple listen ports
|
||||
|
||||
Use a webserver as a proxy to handle SSL and/or multiple listen addresses and ports. DynDNS.com provides HTTP on port 80 and 8245 and HTTPS on port 443.
|
||||
Use a web server as a proxy to handle SSL and/or multiple listen addresses and ports. DynDNS.com provides HTTP on port 80 and 8245 and HTTPS on port 443.
|
||||
|
||||
|
||||
### Startup
|
||||
|
@ -231,7 +231,7 @@ The [Debian 6 init.d script](docs/debian-6-init-dyndnsd) assumes that dyndnsd.rb
|
|||
|
||||
### Monitoring
|
||||
|
||||
For monitoring dyndnsd.rb uses the [metriks](https://github.com/eric/metriks) framework and exposes several metrics like the number of unauthenticated requests, requests that did (not) update a hostname, etc. By default the most important metrics are shown in the [proctitle](https://github.com/eric/metriks#proc-title-reporter) but you can also configure a [Graphite](https://graphiteapp.org/) backend for central monitoring or the [textfile_reporter](https://github.com/prometheus/node_exporter/#textfile-collector) which outputs Graphite-style metrics that are also compatible with Prometheus to a file.
|
||||
For monitoring dyndnsd.rb uses the [metriks](https://github.com/eric/metriks) framework and exposes several metrics like the number of unauthenticated requests, requests that did (not) update a hostname, etc. By default, the most important metrics are shown in the [proctitle](https://github.com/eric/metriks#proc-title-reporter, butt you can also configure a [Graphite](https://graphiteapp.org/) backend for central monitoring or the [textfile_reporter](https://github.com/prometheus/node_exporter/#textfile-collector) which outputs Graphite-style metrics that are also compatible with Prometheus to a file.
|
||||
|
||||
```yaml
|
||||
host: "0.0.0.0"
|
||||
|
@ -271,9 +271,9 @@ users:
|
|||
|
||||
### Tracing (experimental)
|
||||
|
||||
For tracing, dyndnsd.rb is instrumented using the [OpenTracing](http://opentracing.io/) framework and will emit span tracing data for the most important operations happening during the request/response cycle. Using a middleware for Rack allows handling incoming OpenTracing span information properly.
|
||||
For tracing, dyndnsd.rb is instrumented using the [OpenTelemetry](https://opentelemetry.io/docs/ruby/) framework and will emit span tracing data for the most important operations happening during the request/response cycle. Using an [instrumentation for Rack](https://github.com/open-telemetry/opentelemetry-ruby/tree/main/instrumentation/rack) allows handling incoming OpenTelemetry parent span information properly (when desired, turned off by default to reduce attack surface).
|
||||
|
||||
Currently only one OpenTracing-compatible tracer implementation named [CNCF Jaeger](https://github.com/jaegertracing/jaeger) can be configured to use with dyndnsd.rb.
|
||||
Currently, the [OpenTelemetry trace exporter](https://github.com/open-telemetry/opentelemetry-ruby/tree/main/exporter/jaeger) for [CNCF Jaeger](https://github.com/jaegertracing/jaeger) can be enabled via dyndnsd.rb configuration. Alternatively, you can also enable other exporters via the environment variable `OTEL_TRACES_EXPORTER`, e.g. `OTEL_TRACES_EXPORTER=console`.
|
||||
|
||||
```yaml
|
||||
host: "0.0.0.0"
|
||||
|
@ -282,11 +282,9 @@ db: "/opt/dyndnsd/db.json"
|
|||
domain: "dyn.example.org"
|
||||
# enable and configure tracing using the (currently only) tracer jaeger
|
||||
tracing:
|
||||
trust_incoming_span: false # default value, change to accept incoming OpenTracing spans as parents
|
||||
jaeger:
|
||||
host: 127.0.0.1 # defaults for host and port of local jaeger-agent
|
||||
port: 6831
|
||||
service_name: "my.dyndnsd.identifier"
|
||||
trust_incoming_span: false # default value, change to accept incoming OpenTelemetry spans as parents
|
||||
service_name: "my.dyndnsd.identifier" # default unset, will be populated by OpenTelemetry
|
||||
jaeger: true # enables the Jaeger AgentExporter
|
||||
# configure the updater, here we use command_with_bind_zone, params are updater-specific
|
||||
updater:
|
||||
name: "command_with_bind_zone"
|
||||
|
|
62
Rakefile
62
Rakefile
|
@ -14,19 +14,61 @@ task :solargraph do
|
|||
sh 'solargraph typecheck'
|
||||
end
|
||||
|
||||
namespace :solargraph do
|
||||
desc 'Should be run by developer once to prepare initial solargraph usage (fill caches etc.)'
|
||||
task :init do
|
||||
sh 'solargraph download-core'
|
||||
end
|
||||
end
|
||||
# renovate: datasource=github-tags depName=hadolint/hadolint
|
||||
hadolint_version = 'v2.12.0'
|
||||
|
||||
desc 'Run hadolint for Dockerfile linting'
|
||||
task :hadolint do
|
||||
sh 'docker run --rm -i hadolint/hadolint:v1.18.0 hadolint --ignore DL3018 - < docker/Dockerfile'
|
||||
# renovate: datasource=github-tags depName=aquasecurity/trivy
|
||||
trivy_version = 'v0.51.1'
|
||||
|
||||
namespace :docker do
|
||||
ci_image = 'cmur2/dyndnsd:ci'
|
||||
|
||||
desc 'Lint Dockerfile'
|
||||
task :lint do
|
||||
sh "if [ ! -e ./hadolint ]; then wget -q -O ./hadolint https://github.com/hadolint/hadolint/releases/download/#{hadolint_version}/hadolint-Linux-x86_64; fi"
|
||||
sh 'chmod a+x ./hadolint'
|
||||
sh './hadolint --ignore DL3018 docker/Dockerfile'
|
||||
sh './hadolint --ignore DL3018 --ignore DL3028 docker/ci/Dockerfile'
|
||||
end
|
||||
|
||||
desc 'Build CI Docker image'
|
||||
task :build do
|
||||
sh 'docker build -t cmur2/dyndnsd:ci -f docker/ci/Dockerfile .'
|
||||
end
|
||||
|
||||
desc 'Scan CI Docker image for vulnerabilities'
|
||||
task :scan do
|
||||
ver = trivy_version.gsub('v', '')
|
||||
sh "if [ ! -e ./trivy ]; then wget -q -O - https://github.com/aquasecurity/trivy/releases/download/v#{ver}/trivy_#{ver}_Linux-64bit.tar.gz | tar -xzf - trivy; fi"
|
||||
sh "./trivy image #{ci_image}"
|
||||
end
|
||||
|
||||
desc 'End-to-end test the CI Docker image'
|
||||
task :e2e do
|
||||
sh <<~SCRIPT
|
||||
echo -n '{}' > e2e/db.json
|
||||
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'
|
||||
puts '----------------------------------------'
|
||||
# `dig` needs `sudo apt-get install -y -q dnsutils`
|
||||
sh <<~SCRIPT
|
||||
curl -s -o /dev/null -w '%{http_code}' 'http://localhost:8080/' | grep -q '401'
|
||||
curl -s 'http://foo:secret@localhost:8080/nic/update?hostname=foo.dyn.example.org&myip=1.2.3.4' | grep -q 'good'
|
||||
curl -s 'http://foo:secret@localhost:8080/nic/update?hostname=foo.dyn.example.org&myip=1.2.3.4' | grep -q 'nochg'
|
||||
dig +short AXFR 'dyn.example.org' @127.0.0.1 -p 5353 | grep -q '1.2.3.4'
|
||||
SCRIPT
|
||||
puts '----------------------------------------'
|
||||
sh <<~SCRIPT
|
||||
docker logs dyndnsd-ci
|
||||
docker container rm -f -v dyndnsd-ci
|
||||
rm e2e/db.json
|
||||
SCRIPT
|
||||
end
|
||||
end
|
||||
|
||||
task default: [:rubocop, :spec, 'bundle:audit', :solargraph]
|
||||
|
||||
desc 'Run all tasks desired for CI'
|
||||
task ci: ['solargraph:init', :default, :hadolint]
|
||||
task ci: [:default, 'docker:lint', :build, 'docker:build', 'docker:e2e']
|
||||
|
|
|
@ -1,15 +1,22 @@
|
|||
FROM alpine:3.13
|
||||
FROM alpine:3.19.1
|
||||
|
||||
EXPOSE 5353 8080
|
||||
|
||||
ARG DYNDNSD_VERSION=3.0.0
|
||||
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 --virtual .build-deps 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} && \
|
||||
rm -rf /usr/lib/ruby/gems/*/cache/ && \
|
||||
# set timezone to Berlin
|
||||
cp /usr/share/zoneinfo/Europe/Berlin /etc/localtime && \
|
||||
apk del .build-deps
|
||||
|
||||
# Follow the principle of least privilege: run as unprivileged user.
|
||||
# Running as non-root enables running this image in platforms like OpenShift
|
||||
# that do not allow images running as root.
|
||||
# User ID 65534 is usually user 'nobody'.
|
||||
USER 65534
|
||||
|
||||
ENTRYPOINT ["dyndnsd", "/etc/dyndnsd/config.yml"]
|
||||
|
|
|
@ -0,0 +1,22 @@
|
|||
FROM alpine:3.19.1
|
||||
|
||||
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 --virtual .build-deps linux-headers ruby-dev build-base tzdata && \
|
||||
gem install --no-document /tmp/dyndnsd.gem && \
|
||||
rm -rf /usr/lib/ruby/gems/*/cache/ && \
|
||||
# set timezone to Berlin
|
||||
cp /usr/share/zoneinfo/Europe/Berlin /etc/localtime && \
|
||||
apk del .build-deps
|
||||
|
||||
# Follow the principle of least privilege: run as unprivileged user.
|
||||
# Running as non-root enables running this image in platforms like OpenShift
|
||||
# that do not allow images running as root.
|
||||
# User ID 65534 is usually user 'nobody'.
|
||||
USER 65534
|
||||
|
||||
ENTRYPOINT ["dyndnsd", "/etc/dyndnsd/config.yml"]
|
|
@ -25,23 +25,25 @@ 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 = '>= 3.0'
|
||||
|
||||
s.add_runtime_dependency 'async-dns', '~> 1.2.0'
|
||||
s.add_runtime_dependency 'jaeger-client', '~> 1.1.0'
|
||||
s.add_runtime_dependency 'async', '~> 1.31.0'
|
||||
s.add_runtime_dependency 'async-dns', '~> 1.3.0'
|
||||
s.add_runtime_dependency 'metriks'
|
||||
s.add_runtime_dependency 'opentracing', '~> 0.5.0'
|
||||
s.add_runtime_dependency 'rack', '~> 2.0'
|
||||
s.add_runtime_dependency 'rack-tracer', '~> 0.9.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', '~> 2'
|
||||
s.add_runtime_dependency 'webrick', '>= 1.6.1'
|
||||
|
||||
s.add_development_dependency 'bundler'
|
||||
s.add_development_dependency 'bundler-audit', '~> 0.7.0'
|
||||
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.7.0'
|
||||
s.add_development_dependency 'rubocop-rake', '~> 0.5.1'
|
||||
s.add_development_dependency 'rubocop-rspec', '~> 2.1.0'
|
||||
s.add_development_dependency 'solargraph', '~> 0.40.0'
|
||||
s.add_development_dependency 'rubocop', '~> 1.63.5'
|
||||
s.add_development_dependency 'rubocop-rake', '~> 0.6.0'
|
||||
s.add_development_dependency 'rubocop-rspec', '~> 2.29.2'
|
||||
s.add_development_dependency 'solargraph', '~> 0.50.0'
|
||||
end
|
||||
|
|
|
@ -0,0 +1,31 @@
|
|||
---
|
||||
host: "0.0.0.0"
|
||||
port: 8080
|
||||
|
||||
db: /etc/dyndnsd/db.json
|
||||
debug: false
|
||||
domain: dyn.example.org
|
||||
#responder: RestStyle
|
||||
|
||||
updater:
|
||||
name: zone_transfer_server
|
||||
params:
|
||||
server_listens:
|
||||
- 0.0.0.0@5353
|
||||
#send_notifies:
|
||||
#- 10.0.2.15@53
|
||||
zone_ttl: 300 # 5m
|
||||
zone_nameservers:
|
||||
- dns1.example.org.
|
||||
- dns2.example.org.
|
||||
zone_email_address: admin.example.org.
|
||||
zone_additional_ips:
|
||||
- "127.0.0.1"
|
||||
- "::1"
|
||||
|
||||
users:
|
||||
foo:
|
||||
password: "secret"
|
||||
hosts:
|
||||
- foo.dyn.example.org
|
||||
- bar.dyn.example.org
|
|
@ -7,10 +7,11 @@ require 'ipaddr'
|
|||
require 'json'
|
||||
require 'yaml'
|
||||
require 'rack'
|
||||
require 'rackup'
|
||||
require 'metriks'
|
||||
require 'opentelemetry/instrumentation/rack'
|
||||
require 'opentelemetry/sdk'
|
||||
require 'metriks/reporter/graphite'
|
||||
require 'opentracing'
|
||||
require 'rack/tracer'
|
||||
|
||||
require 'dyndnsd/generator/bind'
|
||||
require 'dyndnsd/updater/command_with_bind_zone'
|
||||
|
@ -69,7 +70,7 @@ module Dyndnsd
|
|||
# @return [Boolean]
|
||||
def authorized?(username, password)
|
||||
Helper.span('check_authorized') do |span|
|
||||
span.set_tag('dyndnsd.user', username)
|
||||
span.set_attribute('enduser.id', username)
|
||||
|
||||
allow = Helper.user_allowed?(username, password, @users)
|
||||
if !allow
|
||||
|
@ -106,13 +107,13 @@ module Dyndnsd
|
|||
puts "DynDNSd version #{Dyndnsd::VERSION}"
|
||||
puts "Using config file #{config_file}"
|
||||
|
||||
config = YAML.safe_load(File.open(config_file, 'r', &:read))
|
||||
config = YAML.safe_load_file(config_file)
|
||||
|
||||
setup_logger(config)
|
||||
|
||||
Dyndnsd.logger.info 'Starting...'
|
||||
|
||||
# drop priviliges as soon as possible
|
||||
# drop privileges as soon as possible
|
||||
# NOTE: first change group than user
|
||||
if config['group']
|
||||
group = Etc.getgrnam(config['group'])
|
||||
|
@ -170,7 +171,7 @@ module Dyndnsd
|
|||
def process_changes(hostnames, myips)
|
||||
changes = []
|
||||
Helper.span('process_changes') do |span|
|
||||
span.set_tag('dyndnsd.hostnames', hostnames.join(','))
|
||||
span.set_attribute('dyndnsd.hostnames', hostnames.join(','))
|
||||
|
||||
hostnames.each do |hostname|
|
||||
# myips order is always deterministic
|
||||
|
@ -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'
|
||||
|
@ -252,15 +254,17 @@ module Dyndnsd
|
|||
Dyndnsd.logger.progname = 'dyndnsd'
|
||||
Dyndnsd.logger.formatter = LogFormatter.new
|
||||
Dyndnsd.logger.level = config['debug'] ? Logger::DEBUG : Logger::INFO
|
||||
|
||||
OpenTelemetry.logger = Dyndnsd.logger
|
||||
end
|
||||
|
||||
# @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
|
||||
|
||||
|
@ -296,16 +300,31 @@ module Dyndnsd
|
|||
# @param config [Hash{String => Object}]
|
||||
# @return [void]
|
||||
private_class_method def self.setup_tracing(config)
|
||||
# configure OpenTracing
|
||||
if config.dig('tracing', 'jaeger')
|
||||
require 'jaeger/client'
|
||||
# by default do not try to emit any traces until the user opts in
|
||||
ENV['OTEL_TRACES_EXPORTER'] ||= 'none'
|
||||
|
||||
host = config['tracing']['jaeger']['host'] || '127.0.0.1'
|
||||
port = config['tracing']['jaeger']['port'] || 6831
|
||||
service_name = config['tracing']['jaeger']['service_name'] || 'dyndnsd'
|
||||
OpenTracing.global_tracer = Jaeger::Client.build(
|
||||
host: host, port: port, service_name: service_name, flush_interval: 1
|
||||
)
|
||||
# configure OpenTelemetry
|
||||
OpenTelemetry::SDK.configure do |c|
|
||||
if config.dig('tracing', 'jaeger')
|
||||
require 'opentelemetry/exporter/jaeger'
|
||||
|
||||
c.add_span_processor(
|
||||
OpenTelemetry::SDK::Trace::Export::BatchSpanProcessor.new(
|
||||
OpenTelemetry::Exporter::Jaeger::AgentExporter.new
|
||||
)
|
||||
)
|
||||
end
|
||||
|
||||
if config.dig('tracing', 'service_name')
|
||||
c.service_name = config['tracing']['service_name']
|
||||
end
|
||||
|
||||
c.service_version = Dyndnsd::VERSION
|
||||
c.use('OpenTelemetry::Instrumentation::Rack')
|
||||
end
|
||||
|
||||
if !config.dig('tracing', 'trust_incoming_span')
|
||||
OpenTelemetry.propagation = OpenTelemetry::Context::Propagation::NoopTextMapPropagator.new
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -331,10 +350,9 @@ module Dyndnsd
|
|||
app = Responder::DynDNSStyle.new(app)
|
||||
end
|
||||
|
||||
trust_incoming_span = config.dig('tracing', 'trust_incoming_span') || false
|
||||
app = Rack::Tracer.new(app, trust_incoming_span: trust_incoming_span)
|
||||
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
|
||||
|
|
|
@ -45,24 +45,17 @@ module Dyndnsd
|
|||
# @param block [Proc]
|
||||
# @return [void]
|
||||
def self.span(operation, &block)
|
||||
scope = OpenTracing.start_active_span(operation)
|
||||
span = scope.span
|
||||
span.set_tag('component', 'dyndnsd')
|
||||
span.set_tag('span.kind', 'server')
|
||||
begin
|
||||
tracer = OpenTelemetry.tracer_provider.tracer(Dyndnsd.name, Dyndnsd::VERSION)
|
||||
tracer.in_span(
|
||||
operation,
|
||||
attributes: {'component' => 'dyndnsd'},
|
||||
kind: :server
|
||||
) do |span|
|
||||
Dyndnsd.logger.debug "Creating span ID #{span.context.hex_span_id} for trace ID #{span.context.hex_trace_id}"
|
||||
block.call(span)
|
||||
rescue StandardError => e
|
||||
span.set_tag('error', true)
|
||||
span.log_kv(
|
||||
event: 'error',
|
||||
'error.kind': e.class.to_s,
|
||||
'error.object': e,
|
||||
message: e.message,
|
||||
stack: e.backtrace&.join("\n") || ''
|
||||
)
|
||||
span.record_exception(e)
|
||||
raise e
|
||||
ensure
|
||||
scope.close
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -18,10 +18,10 @@ module Dyndnsd
|
|||
return if !db.changed?
|
||||
|
||||
Helper.span('updater_update') do |span|
|
||||
span.set_tag('dyndnsd.updater.name', self.class.name&.split('::')&.last || 'None')
|
||||
span.set_attribute('dyndnsd.updater.name', self.class.name&.split('::')&.last || 'None')
|
||||
|
||||
# write zone file in bind syntax
|
||||
File.open(@zone_file, 'w') { |f| f.write(@generator.generate(db)) }
|
||||
File.write(@zone_file, @generator.generate(db))
|
||||
# call user-defined command
|
||||
pid = fork do
|
||||
exec @command
|
||||
|
|
|
@ -35,7 +35,7 @@ module Dyndnsd
|
|||
# @return [void]
|
||||
def update(db)
|
||||
Helper.span('updater_update') do |span|
|
||||
span.set_tag('dyndnsd.updater.name', self.class.name&.split('::')&.last || 'None')
|
||||
span.set_attribute('dyndnsd.updater.name', self.class.name&.split('::')&.last || 'None')
|
||||
|
||||
soa_rr = Resolv::DNS::Resource::IN::SOA.new(
|
||||
@zone_nameservers[0], @zone_email_address,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
module Dyndnsd
|
||||
VERSION = '3.3.0'
|
||||
VERSION = '3.9.2'
|
||||
end
|
||||
|
|
|
@ -15,6 +15,9 @@ describe Dyndnsd::Daemon do
|
|||
'test' => {
|
||||
'password' => 'secret',
|
||||
'hosts' => ['foo.example.org', 'bar.example.org']
|
||||
},
|
||||
'test2' => {
|
||||
'password' => 'ihavenohosts'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -24,9 +27,7 @@ describe Dyndnsd::Daemon do
|
|||
|
||||
app = Rack::Auth::Basic.new(daemon, 'DynDNS', &daemon.method(:authorized?))
|
||||
|
||||
app = Dyndnsd::Responder::DynDNSStyle.new(app)
|
||||
|
||||
Rack::Tracer.new(app, trust_incoming_span: false)
|
||||
Dyndnsd::Responder::DynDNSStyle.new(app)
|
||||
end
|
||||
|
||||
it 'requires authentication' do
|
||||
|
@ -101,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'
|
||||
|
||||
|
|
|
@ -0,0 +1,13 @@
|
|||
#!/bin/bash -eux
|
||||
|
||||
sed -i "s/$1/$2/g" lib/dyndnsd/version.rb
|
||||
|
||||
release_date=$(LC_ALL=en_US.utf8 date +"%B %-d, %Y")
|
||||
|
||||
if grep "## $2 (" CHANGELOG.md; then
|
||||
true
|
||||
elif grep "## $2" CHANGELOG.md; then
|
||||
sed -i "s/## $2/## $2 ($release_date)/g" CHANGELOG.md
|
||||
else
|
||||
echo "## $2 ($release_date)" >> CHANGELOG.md
|
||||
fi
|
Loading…
Reference in New Issue