Merge branch 'master' of timkimber.github.com:srvrco/getssl

.github/workflows/run-all-tests.yml

@@ -23,22 +23,22 @@ jobs:
         run: docker-compose up -d --build
       - name: Run test suite on centos6
         run: test/run-test.sh centos6
-  test-debian:
+  test-centos7-duckdns:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
       - name: Build the docker-compose stack
         run: docker-compose up -d --build
-      - name: Run test suite on Debian
-        run: test/run-test.sh debian
-  test-duckdns:
+      - name: Run test suite on CentOS7 against Staging using DuckDNS
+        run: test/run-test.sh centos7-duckdns
+  test-debian:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
       - name: Build the docker-compose stack
         run: docker-compose up -d --build
-      - name: Run test suite on Ubuntu using DuckDNS
-        run: test/run-test.sh duckdns
+      - name: Run test suite on Debian
+        run: test/run-test.sh debian
   test-ubuntu:
     runs-on: ubuntu-latest
     steps:
@@ -63,3 +63,11 @@ jobs:
         run: docker-compose up -d --build
       - name: Run test suite on Ubuntu18
         run: test/run-test.sh ubuntu18
+  test-ubuntu-duckdns:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Build the docker-compose stack
+        run: docker-compose up -d --build
+      - name: Run test suite on Ubuntu against Staging using DuckDNS
+        run: test/run-test.sh ubuntu-duckdns

.github/workflows/shellcheck.yml

@@ -0,0 +1,17 @@
+name: shellcheck
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Lint check
+        uses: azohra/shell-linter@v0.2.0
+        with:
+          path: "getssl"

README.md

@@ -1,3 +1,4 @@
+![Run all tests](https://github.com/srvrco/getssl/workflows/Run%20all%20tests/badge.svg) ![shellcheck](https://github.com/srvrco/getssl/workflows/shellcheck/badge.svg)
 # getssl
 
 Obtain SSL certificates from the letsencrypt.org ACME server. Suitable

test/7-duckdns-dns01.bats

@@ -5,13 +5,6 @@ load '/bats-assert/load.bash'
 load '/getssl/test/test_helper.bash'
 
 
-# These are run for every test, not once per file
-setup() {
-    if [ -n "$STAGING" ]; then
-        export GETSSL_HOST=getssl.duckdns.org
-    fi
-}
-
 
 @test "Create new certificate using staging server and DuckDNS" {
     if [ -z "$STAGING" ]; then
@@ -38,5 +31,4 @@ setup() {
     refute_output --regexp '[Ee][Rr][Rr][Oo][Rr]'
     refute_output --regexp '[Ww][Aa][Rr][Nn][Ii][Nn][Gg]'
     cleanup_environment
-    curl --silent -X POST -d '{"host":"getssl.duckdns.org"}' http://10.30.50.3:8055/clear-a
 }

test/8-duckdns-ecdsa.bats

@@ -5,12 +5,6 @@ load '/bats-assert/load.bash'
 load '/getssl/test/test_helper.bash'
 
 
-# These are run for every test, not once per file
-setup() {
-    if [ -n "$STAGING" ]; then
-        export GETSSL_HOST=getssl.duckdns.org
-    fi
-}
 
 
 @test "Create new certificate using staging server and prime256v1" {
@@ -18,7 +12,6 @@ setup() {
         skip "Running internal tests, skipping external test"
     fi
     CONFIG_FILE="getssl-duckdns01.cfg"
-    GETSSL_HOST=getssl.duckdns.org
 
     setup_environment
     init_getssl
@@ -49,7 +42,6 @@ setup() {
         skip "Running internal tests, skipping external test"
     fi
     CONFIG_FILE="getssl-duckdns01.cfg"
-    GETSSL_HOST=getssl.duckdns.org
 
     setup_environment
     init_getssl

test/Dockerfile-centos7-duckdns

@@ -0,0 +1,28 @@
+FROM centos:centos7
+
+# Note this image uses gawk
+
+# Update and install required software
+RUN yum -y update
+RUN yum -y install epel-release
+RUN yum -y install git curl bind-utils wget which nginx
+
+ENV staging "true"
+ENV DUCKDNS_TOKEN 1d616aa9-b8e4-4bb4-b312-3289de82badb
+
+WORKDIR /root
+RUN mkdir /etc/nginx/pki
+RUN mkdir /etc/nginx/pki/private
+COPY ./test/test-config/nginx-ubuntu-no-ssl /etc/nginx/conf.d/default.conf
+COPY ./test/test-config/nginx-centos7.conf /etc/nginx/nginx.conf
+
+# BATS (Bash Automated Testings)
+RUN git clone https://github.com/bats-core/bats-core.git /bats-core
+RUN git clone https://github.com/jasonkarns/bats-support /bats-support
+RUN git clone https://github.com/jasonkarns/bats-assert-1 /bats-assert
+RUN /bats-core/install.sh /usr/local
+
+EXPOSE 80 443
+
+# Run eternal loop - for testing
+CMD tail -f /dev/null

test/Dockerfile-ubuntu-duckdns

@@ -0,0 +1,25 @@
+FROM ubuntu:latest
+
+# Note this image uses mawk1.3
+
+ENV staging "true"
+ENV DUCKDNS_TOKEN 1d616aa9-b8e4-4bb4-b312-3289de82badb
+# Update and install required software
+RUN apt-get update --fix-missing
+RUN apt-get install -y git curl dnsutils wget nginx-light
+RUN apt-get install -y vim dos2unix # for debugging
+# TODO test with drill, dig, host
+
+WORKDIR /root
+
+# Prevent "Can't load /root/.rnd into RNG" error from openssl
+RUN touch /root/.rnd
+
+# BATS (Bash Automated Testings)
+RUN git clone https://github.com/bats-core/bats-core.git /bats-core
+RUN git clone https://github.com/jasonkarns/bats-support /bats-support
+RUN git clone https://github.com/jasonkarns/bats-assert-1 /bats-assert
+RUN /bats-core/install.sh /usr/local
+
+# Run eternal loop - for testing
+CMD tail -f /dev/null

test/restart-nginx

@@ -1,8 +1,11 @@
 #!/usr/bin/env bash
 
-if [ "$GETSSL_HOST" = "alpine.getssl.test" ]; then
+if [ "$GETSSL_OS" = "alpine" ]; then
     killall -HUP nginx >&3-
     sleep 5
+elif [ "$GETSSL_OS" == "centos7" ]; then
+    pgrep nginx | head -1 | xargs kill -HUP
+    sleep 5
 else
     service nginx restart >/dev/null >&3-
 fi

test/run-test.cmd

@@ -7,7 +7,8 @@ IF %2.==. GOTO NoCmd
 set COMMAND=%2 %3
 
 :CheckAlias
-IF %OS%==duckdns GOTO duckdns
+REM check if OS *contains* duckdns
+IF NOT x%OS:duckdns=%==x%OS% GOTO duckdns
 set ALIAS=%OS%.getssl.test
 set STAGING=
 GOTO Run
@@ -22,7 +23,7 @@ set COMMAND=bats /getssl/test
 GOTO CheckAlias
 
 :duckdns
-set ALIAS=getssl.duckdns.org
+set ALIAS=%OS:-duckdns=%-getssl.duckdns.org
 set STAGING=--env STAGING=true
 
 :Run
@@ -32,6 +33,7 @@ docker build --rm -f "test\Dockerfile-%OS%" -t getssl-%OS% .
 @echo on
 docker run -it ^
   --env GETSSL_HOST=%ALIAS% %STAGING% ^
+  --env GETSSL_OS=%OS:-duckdns=% ^
   -v %cd%:/getssl ^
   --rm ^
   --network %CurrDirName%_acmenet ^

test/run-test.sh

@@ -14,8 +14,8 @@ else
     COMMAND="bats /getssl/test"
 fi
 
-if [ "$OS" == "duckdns" ]; then
-    ALIAS="getssl.duckdns.org"
+if [[ "$OS" == *"duckdns"* ]]; then
+    ALIAS="${OS%-duckdns}-getssl.duckdns.org"
     STAGING="--env STAGING=true"
 else
     ALIAS="$OS.getssl.test"
@@ -25,7 +25,8 @@ fi
 docker build --rm -f "test/Dockerfile-$OS" -t "getssl-$OS" .
 # shellcheck disable=SC2086
 docker run \
-  --env GETSSL_HOST="$OS.getssl.test" $STAGING \
+  --env GETSSL_HOST=$ALIAS $STAGING \
+  --env GETSSL_OS=${OS%-duckdns} \
   -v "$(pwd)":/getssl \
   --rm \
   --network ${PWD##*/}_acmenet \

test/test-config/nginx-centos7.conf

@@ -0,0 +1,37 @@
+# For more information on configuration, see:
+#   * Official English Documentation: http://nginx.org/en/docs/
+#   * Official Russian Documentation: http://nginx.org/ru/docs/
+
+user nginx;
+worker_processes auto;
+error_log /var/log/nginx/error.log;
+pid /run/nginx.pid;
+
+# Load dynamic modules. See /usr/share/doc/nginx/README.dynamic.
+include /usr/share/nginx/modules/*.conf;
+
+events {
+    worker_connections 1024;
+}
+
+http {
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    sendfile            on;
+    tcp_nopush          on;
+    tcp_nodelay         on;
+    keepalive_timeout   65;
+    types_hash_max_size 2048;
+
+    include             /etc/nginx/mime.types;
+    default_type        application/octet-stream;
+
+    # Load modular configuration files from the /etc/nginx/conf.d directory.
+    # See http://nginx.org/en/docs/ngx_core_module.html#include
+    # for more information.
+    include /etc/nginx/conf.d/*.conf;
+}

test/test_helper.bash

@@ -35,10 +35,15 @@ create_certificate() {
 }
 
 # start nginx in background on alpine via supervisord
+# shellcheck disable=SC2153 # Ignore GETSSL_OS looks like typo of GETSSL_IP
 if [[ -f /usr/bin/supervisord && -f /etc/supervisord.conf ]]; then
     if [[ ! $(pgrep supervisord) ]]; then
         /usr/bin/supervisord -c /etc/supervisord.conf >&3-
     fi
+elif [ "$GETSSL_OS" == "centos7" ]; then
+    if [ -z "$(pgrep nginx)" ]; then
+        nginx >&3-
+    fi
 fi
 
 # Find NGINX configuration directory for HTTP-01 testing (need to add SSL to config)
@@ -52,7 +57,16 @@ else
 fi
 
 # Find IP address
-GETSSL_IP=$(ip address | awk '/10.30.50/ { print $2 }' | awk -F/ '{ print $1 }')
+if [[ -n "$(command -v ip)" ]]; then
+    IP=$(ip address)
+elif [[ -n "$(command -v hostname)" ]]; then
+    IP=$(hostname -I)
+else
+    echo "Cannot find IP address"
+    exit 1
+fi
+
+GETSSL_IP=$(echo "$IP" | awk '/10.30.50/ { print $2 }' | awk -F/ '{ print $1 }')
 export GETSSL_IP
 
 if [ ! -f ${INSTALL_DIR}/pebble.minica.pem ]; then

test/trigger-github-action.cmd

@@ -0,0 +1,4 @@
+curl -X POST https://api.github.com/repos/timkimber/getssl/dispatches ^
+-H "Accept: application/vnd.github.everest-preview+json" ^
+-H "Authorization: token 66f265bae085c817a3b72bff1cabe4aa3e7ea31b" ^
+--data "{\"event_type\": \"CUSTOM_ACTION_NAME_HERE\"}"