BOSH release: 2.5.1: block phishers with CIDRs

bin/make_all

@@ -4,7 +4,7 @@
 #
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 cd $DIR/../src/sslip.io-dns-server
-ldflags="-X xip/xip.VersionSemantic=2.5.0 \
+ldflags="-X xip/xip.VersionSemantic=2.5.1 \
          -X xip/xip.VersionDate=$(date +%Y/%m/%d-%H:%M:%S%z) \
          -X xip/xip.VersionGitHash=$(git rev-parse --short HEAD)"
 export GOOS GOARCH

bosh-release/.final_builds/packages/sslip.io-dns-server/index.yml

@@ -27,6 +27,10 @@ builds:
     version: 3ee0344f06ba9e7777bee4d8b202979ee2db924ecf200ab0d06b9d974fda17dc
     blobstore_id: 3da727ee-50b3-4cf5-6c9a-18cd0b38a892
     sha1: sha256:ce60c704327d147e66bbcd4e50f359e28ba049b2dd62446625667d9656ceab14
+  4285fa6d391d53bca40dc5ea8262aa2ff8fc00139e895b6a814b46b39883ca06:
+    version: 4285fa6d391d53bca40dc5ea8262aa2ff8fc00139e895b6a814b46b39883ca06
+    blobstore_id: 9660b0ce-f61b-47c3-7d32-6e27a6fe3a30
+    sha1: sha256:c18d300df5739e271df09fcd27b8338f5e45b7b631d49402b856c97e27fd2d3a
   5334c767f208fff836440762299adce4d2b1fdb4774ee627ad8c262011cbd592:
     version: 5334c767f208fff836440762299adce4d2b1fdb4774ee627ad8c262011cbd592
     blobstore_id: 46519888-7e72-4a60-6003-45b741bcf5ea

bosh-release/packages/sslip.io-dns-server/packaging

@@ -5,9 +5,9 @@ source /var/vcap/packages/golang-1-linux/bosh/compile.env
 mkdir src ${BOSH_INSTALL_TARGET}/bin
 mv sslip.io-dns-server/{go.*,main.go,xip} src/
 cd src/
-ldflags="-X xip/xip.VersionSemantic=2.5.0 \
+ldflags="-X xip/xip.VersionSemantic=2.5.1 \
          -X xip/xip.VersionDate=$(date +%Y/%m/%d-%H:%M:%S%z) \
-         -X xip/xip.VersionGitHash=7831e3c"
+         -X xip/xip.VersionGitHash=c3c1d2a"
 go build \
     -ldflags="$ldflags" \
     -o ${BOSH_INSTALL_TARGET}/bin/sslip.io-dns-server

bosh-release/releases/sslip.io/index.yml

@@ -3,6 +3,8 @@ builds:
     version: 1.2.0
   2b0eb400-814f-4ce4-6046-c1cfda040d70:
     version: 2.5.0
+  3f5f59fa-3507-4354-43ff-2c7901e8744c:
+    version: 2.5.1
   43640b61-afe3-4bc0-79ed-4e279f286041:
     version: 2.4.1
   516ea48d-0717-494d-4082-9d8f0ab937df:

bosh-release/releases/sslip.io/sslip.io-2.5.1.yml

@@ -0,0 +1,23 @@
+name: sslip.io
+version: 2.5.1
+commit_hash: c446222
+uncommitted_changes: false
+jobs:
+- name: sslip.io-dns-server
+  version: 308acb7c186a042bc2ca4c28b83c9fe7589a64c48ab6a11869c442bcaea8fdf9
+  fingerprint: 308acb7c186a042bc2ca4c28b83c9fe7589a64c48ab6a11869c442bcaea8fdf9
+  sha1: sha256:6ca6f2c11816a82ecb3cf9300ea59369977cbaa7c39eddca35628a7c6b9b5b45
+  packages:
+  - sslip.io-dns-server
+packages:
+- name: golang-1-linux
+  version: 1ab563903c1f130ca908d3abdbf66650a395d3b77134474bff837aeed3649c06
+  fingerprint: 1ab563903c1f130ca908d3abdbf66650a395d3b77134474bff837aeed3649c06
+  sha1: sha256:1f4f73a903b8f59b46d9a8ff813961615126b843eafa991c7dc950ae9a2a0bf1
+  dependencies: []
+- name: sslip.io-dns-server
+  version: 4285fa6d391d53bca40dc5ea8262aa2ff8fc00139e895b6a814b46b39883ca06
+  fingerprint: 4285fa6d391d53bca40dc5ea8262aa2ff8fc00139e895b6a814b46b39883ca06
+  sha1: sha256:c18d300df5739e271df09fcd27b8338f5e45b7b631d49402b856c97e27fd2d3a
+  dependencies:
+  - golang-1-linux

docs/DEVELOPER.md

@@ -4,8 +4,8 @@ These instructions are meant primarily for me when deploying a new BOSH release;
 they might not make sense unless you're on my workstation.
 
 ```bash
-export OLD_VERSION=2.4.2
-export VERSION=2.5.0
+export OLD_VERSION=2.5.0
+export VERSION=2.5.1
 cd ~/workspace/sslip.io
 git pull -r --autostash
 # update the version number for the TXT record for version.status.sslip.io
@@ -68,8 +68,8 @@ dig @$IP delete.my-key.k-v.io txt +short
 echo "\"MyValue\""
 echo " ===" # separator because the results are too similar
 dig @$IP my-key.k-v.io txt +short # returns nothing
-dig @$IP metrics.status.sslip.io txt +short | grep '"queries: '
-echo '"queries: 16"'
+dig @$IP metrics.status.sslip.io txt +short | grep '"Queries: '
+echo '"Queries: 16"'
 # pop up a directory
 pushd ..
 # let's add our changes

k8s/Dockerfile-sslip.io-dns-server

@@ -26,7 +26,7 @@ LABEL maintainer="brian.cunnie@gmail.com"
 RUN apk update && apk add bind-tools
 
 ARG TARGETARCH # amd64, arm64 (so I can run on AWS graviton2)
-RUN wget https://github.com/cunnie/sslip.io/releases/download/2.5.0/sslip.io-dns-server-linux-$TARGETARCH \
+RUN wget https://github.com/cunnie/sslip.io/releases/download/2.5.1/sslip.io-dns-server-linux-$TARGETARCH \
     -O /usr/sbin/sslip.io-dns-server; \
   chmod 755 /usr/sbin/sslip.io-dns-server
 

k8s/document_root/index.html

@@ -156,7 +156,7 @@ src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> <![endif]-->
       install & run our server within a docker container:</p>
       <pre>
 docker run -it --rm fedora
-curl -L https://github.com/cunnie/sslip.io/releases/download/2.5.0/sslip.io-dns-server-linux-amd64 -o dns-server
+curl -L https://github.com/cunnie/sslip.io/releases/download/2.5.1/sslip.io-dns-server-linux-amd64 -o dns-server
 chmod +x dns-server
 ./dns-server 2&gt; dns-server.log &
 dnf install -y bind-utils

spec/check-dns_spec.rb

@@ -18,7 +18,7 @@ def get_whois_nameservers(domain)
 end
 
 domain = ENV['DOMAIN'] || 'example.com'
-sslip_version = '2.5.0'
+sslip_version = '2.5.1'
 whois_nameservers = get_whois_nameservers(domain)
 
 describe domain do