V1.0.0

.devcontainer/devcontainer.json

@@ -0,0 +1,27 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.187.0/containers/docker-existing-dockerfile
+{
+	"name": "lua_resty_netacea Dev container",
+	"build": {
+		"dockerfile": "../Dockerfile",
+		"target": "test"
+	},
+	// Add the IDs of extensions you want installed when the container is created.
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"bierner.markdown-emoji", // Markdown Emoji
+				"bierner.markdown-mermaid", // Markdown Mermaid
+				"DavidAnson.vscode-markdownlint", // Markdown Lint
+				"ms-azuretools.vscode-docker", // Docker
+				"oderwat.indent-rainbow", // indent-rainbow
+			],
+			"settings": {
+			}
+		}
+	},
+	"remoteUser": "ubuntu",
+	"features": {
+	"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {}
+	}
+}

.github/workflows/build.yml

@@ -1,8 +1,7 @@
 name: lua-resty-netacea-build
 on: 
+  workflow_dispatch:
   pull_request:
-    branches:
-      - master
   push:
     branches:
       - master

.gitignore

@@ -39,5 +39,13 @@ luac.out
 *.x86_64
 *.hex
 
+# Backup files
+*.bak
 
 tags
+
+# luacov reports
+luacov.report
+luacov.report.*
+luacov.stats.out
+luacov.stats.out.*

.luacov

@@ -0,0 +1,6 @@
+return {
+    ["reporter"] = "html",
+    ["reportfile"] = "luacov.report.html",
+    ["include"] = {"./src/" },
+    runreport = true
+}

Dockerfile

@@ -1,27 +1,17 @@
-FROM openresty/openresty:xenial AS base
-
-LABEL author="Curtis Johnson <curtis.johnson@netacea.com>"
-LABEL maintainer="Curtis Johnson <curtis.johnson@netacea.com>"
+FROM openresty/openresty:noble AS base
 
 USER root
 
 WORKDIR /usr/src
-# ENV HOME=/usr/src
 
 RUN apt-get update
 RUN apt-get install -y libssl-dev
 
-# RUN cd $HOME
-
-RUN curl -L -o /tmp/luarocks-3.12.2-1.src.rock https://luarocks.org/luarocks-3.12.2-1.src.rock &&\
-    luarocks install /tmp/luarocks-3.12.2-1.src.rock &&\
-    rm /tmp/luarocks-3.12.2-1.src.rock
-
 
 FROM base AS build
-COPY ./lua_resty_netacea-0.2-2.rockspec ./
+COPY ./lua_resty_netacea-1.0-0.rockspec ./
 COPY ./src ./src
-RUN /usr/local/openresty/luajit/bin/luarocks make ./lua_resty_netacea-0.2-2.rockspec
+RUN /usr/local/openresty/luajit/bin/luarocks make ./lua_resty_netacea-1.0-0.rockspec
 
 FROM build AS test
 
@@ -31,6 +21,7 @@ RUN /usr/local/openresty/luajit/bin/luarocks install cluacov
 RUN /usr/local/openresty/luajit/bin/luarocks install require
 RUN /usr/local/openresty/luajit/bin/luarocks install luacheck
 
+COPY ./.luacov ./.luacov
 COPY ./test ./test
 COPY ./run_lua_tests.sh ./run_lua_tests.sh
 RUN chmod +x ./run_lua_tests.sh
@@ -39,4 +30,4 @@ CMD ["bash", "-c", "./run_lua_tests.sh"]
 
 FROM test AS lint
 
-CMD ["bash", "-c", "luacheck --no-self -- ./src"]
+CMD ["bash", "-c", "luacheck --no-self -- ./src"]

README.md

@@ -1,17 +1,53 @@
 # lua_resty_netacea
-An Openresty module for easy integration of Netacea services
 
-# Building the base image
-All the images used by docker rely on a specific base image being available on your local docker registry. You can ensure you have this by running the following command
-```sh
-docker build -t lua_resty_netacea:latest .
-```
+An Openresty module for easy integration of Netacea services. This repo is for developing the package. The package can be accessed by the Luarocks package management platform. See the Netacea documentation for making use of the module.
 
-# Running Tests
-`docker-compose build` then `docker-compose run test`
+## Published package
 
-## nginx.conf - mitigate
-```
+The Netacea package is available on the Luarocks package manager. Publishing is handled by the Netacea team.
+
+## Docker images
+
+The Dockerfile contains a multi-stage build, including:
+
+| Stage name | Based on | Description |
+| -- | -- | -- |
+| base  |  openresty/openresty:noble | Base image of Openresty with updated packages around openSSL |
+| build | base | Working Openresty instance with Netacea plugin installed using luarocks and rockspec file |
+| test | build | Lua packages installed for testing and linting. Command overridden to run unit tests |
+| lint | test | Command overridden to run luacheck linter and output results |
+
+The docker compose file is used to mount local files to the right place in the image to support development.
+
+### Run development version
+
+1. Update `./src/conf/nginx.conf` to include Netacea configuration and server configuration. Default is the NGINX instance will just return a static "Hello world" page. See "Configuration" below
+2. `docker compose up resty`
+3. Access [](http://localhost:8080)
+
+### Run tests
+
+#### Unit tests
+
+##### In dev container
+
+Without coverage report: `./run_lua_tests.sh`
+With coverage report (sent to stdout) `export LUACOV_REPORT=1 && ./run_lua_tests.sh`
+
+##### Docker compose
+
+Without coverage report: `docker compose run --build test`
+With coverage report (sent to stdout) `docker compose run -e LUACOV_REPORT=1 --build test [> output.html]`
+
+#### Linter
+
+`docker compose run --build lint`
+
+## Configuration
+
+### nginx.conf - mitigate
+
+```conf
 worker_processes 1;
 
 events {
@@ -57,8 +93,9 @@ http {
 }
 ```
 
-## nginx.conf - inject
-```
+### nginx.conf - inject
+
+```conf
 worker_processes 1;
 
 events {

docker-compose.yml

@@ -2,17 +2,24 @@ version: '3.5'
 
 services:
   resty:
-    image: lua_resty_netacea:latest
     build:
       dockerfile: Dockerfile
       context: .
+      target: build
     container_name: resty
     ports:
      - "8080:80"
      - "443:443"
     volumes:
      - "./src/conf/nginx.conf:/usr/local/openresty/nginx/conf/nginx.conf"
      - "./src/lua_resty_netacea.lua:/usr/local/openresty/site/lualib/lua_resty_netacea.lua"
+     - "./src/lua_resty_netacea_cookies_v3.lua:/usr/local/openresty/site/lualib/lua_resty_netacea_cookies_v3.lua"
+     - "./src/kinesis_resty.lua:/usr/local/openresty/site/lualib/kinesis_resty.lua"
+     - "./src/lua_resty_netacea_ingest.lua:/usr/local/openresty/site/lualib/lua_resty_netacea_ingest.lua"
+     - "./src/netacea_utils.lua:/usr/local/openresty/site/lualib/netacea_utils.lua"
+     - "./src/lua_resty_netacea_constants.lua:/usr/local/openresty/site/lualib/lua_resty_netacea_constants.lua"
+     - "./src/lua_resty_netacea_protector_client.lua:/usr/local/openresty/site/lualib/lua_resty_netacea_protector_client.lua"     
+
 
   test:
     build:
@@ -22,6 +29,8 @@ services:
     volumes:
       - "./src:/usr/src/src"
       - "./test:/usr/src/test"
+      - "./run_lua_tests.sh:/usr/src/run_lua_tests.sh"
+      - ".luacov:/usr/src/.luacov"
 
   lint:
     build:

lua_resty_netacea-0.2-2.rockspec → lua_resty_netacea-1.0-0.rockspec

@@ -1,21 +1,22 @@
 package = "lua_resty_netacea"
-version = "0.2-2"
+version = "1.0-0"
 source = {
   url = "git://github.com/Netacea/lua_resty_netacea",
   branch = "master"
 }
 description = {
   summary = "An Openresty module for easy integration of Netacea services",
   homepage = "https://github.com/Netacea/lua_resty_netacea",
-  maintainer = "Dan Lyon",
+  maintainer = "Netacea Ltd.",
   license = "MIT"
 }
 dependencies = {
   "lua >= 5.1, < 5.4",
   "luaossl",
   "lua-resty-http",
   "lbase64",
-  "lua-cjson"
+  "lua-cjson",
+  "lua-resty-jwt"
 }
 external_dependencies = {}
 build = {

run_lua_tests.sh

@@ -1,81 +1,7 @@
-#!/bin/bash
-# sh /docker/pull-changes.sh
 
-OPENRESTY="/usr/local/openresty"
-RESTY="${OPENRESTY}/bin/resty"
-WD="${OPENRESTY}/nginx"
-BASE_DIR="/usr/src"
-TEST_DIR="${BASE_DIR}/test"
-
-STATS_FILE="luacov.stats.out"
-STATS_SRC="${TEST_DIR}/${STATS_FILE}"
-REPORT_FILE="luacov.report.out"
-REPORT_SRC="${TEST_DIR}/${REPORT_FILE}"
-
-EXIT_CODE=0
-
-################################################################################
-
-OPT_PROCESS_STATS=0
-OPT_EARLY_EXIT=1
-
-while getopts "s" opt; do
-    case $opt in
-        s) OPT_PROCESS_STATS=1;;
-        \?) echo "invalid argument";;
-    esac
-done
-
-################################################################################
-
-function exit_script {
-    echo ""
-    echo "END TESTS"
-    echo ""
-    echo "coverage stats file: ${STATS_SRC}"
-    end_tests
-    echo "$1"
-    exit "$1"
-}
-
-function end_tests {
-  echo "done"
-    # if [ $OPT_PROCESS_STATS -eq 1 ]; then
-    #     cd $TEST_DIR
-    #     (luacov)
-    #     echo "coverage report file: ${REPORT_SRC}"
-    # fi
-}
-
- ################################################################################
-
-echo ""
-echo "BEGIN TESTS"
-echo ""
-
-cd $TEST_DIR || exit 1
-PREV=$(pwd)
-
-files=$(find . -name '*.test.lua')
-
-while read -r line; do
-    echo " -- TEST FILE: ${line}"
-    DIR=$(dirname "${line}")
-    FILE=$(basename "${line}")
-
-    onlytag=""
-    grep '#only' "${line}" && onlytag="--tags='only'"
-
-    bash -c "$RESTY $line --exclude-tags='skip' ${onlytag}"
-    RES=$?
-
-    if [ $RES -ne 0 ]; then
-        EXIT_CODE=$RES
-        if [ $OPT_EARLY_EXIT -eq 1 ]; then break; fi
-    fi
-
-        cd "$PREV" || exit 1
-    echo ""
-done <<< "$files"
-
-exit_script $EXIT_CODE
+if [ "$LUACOV_REPORT" = "1" ]; then
+    busted --coverage-config-file ./.luacov --coverage ./test >&2
+    cat ./luacov.report.html
+else
+    busted ./test
+fi

src/conf/nginx.conf

@@ -16,26 +16,37 @@ http {
   lua_ssl_trusted_certificate /etc/ssl/certs/ca-certificates.crt;
   init_worker_by_lua_block {
     netacea = (require 'lua_resty_netacea'):new({
-      ingestEndpoint     = '',
       mitigationEndpoint = '',
       apiKey             = '',
       secretKey          = '',
       realIpHeader       = '',
       ingestEnabled      = false,
       mitigationEnabled  = false,
-      mitigationType     = ''
+      mitigationType     = '',
+      cookieName         = '',
+      kinesisProperties = {
+        region          = '',
+        stream_name     = '',
+        aws_access_key = '',
+        aws_secret_key = '',
+      }
     })
   }
   log_by_lua_block {
     netacea:ingest()
   }
   access_by_lua_block {
-    netacea:mitigate()
+    if ngx.var.uri == "/AtaVerifyCaptcha" then
+      netacea:handleCaptcha()
+    else
+      netacea:mitigate()
+    end
   }
 
   server {
     listen 80;
     server_name localhost;
+    server_tokens off;
     location / {
       default_type text/html;
       content_by_lua 'ngx.say("<p>hello, world</p>")';