Skip to content

Commit

Permalink
libnaxsi + unit tests + CI + nginx module
Browse files Browse the repository at this point in the history
  • Loading branch information
wargio committed Mar 6, 2022
1 parent d0a1b9c commit 6460ec4
Show file tree
Hide file tree
Showing 54 changed files with 2,322 additions and 14,701 deletions.
26 changes: 26 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
Language: Cpp
MaxEmptyLinesToKeep: 1
SpaceBeforeParens: ControlStatements
SpaceInEmptyParentheses: false
SpacesInContainerLiterals: true
BasedOnStyle: LLVM
ContinuationIndentWidth: 8
IndentCaseLabels: false
IndentFunctionDeclarationAfterType: false
IndentWidth: 8
UseTab: ForContinuationAndIndentation
ColumnLimit: 0
BreakBeforeBraces: Attach
BreakBeforeTernaryOperators: true
AllowShortIfStatementsOnASingleLine: false
AllowShortCaseLabelsOnASingleLine: true
AllowShortFunctionsOnASingleLine: Inline
AllowShortLoopsOnASingleLine: false
AlignAfterOpenBracket: DontAlign
AlignEscapedNewlines: DontAlign
AlignConsecutiveMacros: true
AlignTrailingComments: false
AlignOperands: false
Cpp11BracedListStyle: false
ForEachMacros: ['naxsi_list_foreach']
SortIncludes: false
38 changes: 38 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: "CI Unit Tests"

on:
push:
branches:
- main
pull_request:

jobs:
Normal:
runs-on: ubuntu-20.04
steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Install meson and ninja
run: pip3 install --user meson ninja
- name: Run Unit Tests
run: |
export PATH=${HOME}/Library/Python/3.8/bin:${HOME}/Library/Python/3.9/bin:${HOME}/.local/bin:${PATH}
cd libnaxsi
meson -Dbuildtype=release build
ninja -C build test
Asan:
runs-on: ubuntu-20.04
steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Install meson and ninja
run: pip3 install --user meson ninja
- name: Run Unit Tests with ASAN
env:
ASAN_OPTIONS: detect_leaks=0,detect_odr_violation=0,allocator_may_return_null=1
run: |
export PATH=${HOME}/Library/Python/3.8/bin:${HOME}/Library/Python/3.9/bin:${HOME}/.local/bin:${PATH}
cd libnaxsi
meson -Dbuildtype=debugoptimized -Db_sanitize=address,undefined build
ninja -C build test
32 changes: 32 additions & 0 deletions .github/workflows/linter.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: "Licenses reuse & code lint"

on:
push:
branches:
- main
pull_request:

jobs:
licenses:
runs-on: ubuntu-20.04
steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: REUSE Compliance Check
uses: fsfe/[email protected]

code:
runs-on: ubuntu-20.04
steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Install wget, software-properties-common, lsb-release (dependencies of LLVM install script)
run: sudo apt --assume-yes install wget software-properties-common lsb-release
- name: Install automatic LLVM 13
run: wget https://apt.llvm.org/llvm.sh -O /tmp/llvm-install.sh; chmod +x /tmp/llvm-install.sh; sudo /tmp/llvm-install.sh 13
- name: Install clang-format-13
run: sudo apt --assume-yes install clang-format-13
- name: Install gitpython
run: sudo pip install gitpython
- name: Run Unit Tests
run: python clang-format.py --verbose --check
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
libnaxsi/build*/
libnaxsi/subprojects/libinjection
libnaxsi/subprojects/pcre2
24 changes: 24 additions & 0 deletions .reuse/dep5
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Re:WAF
Upstream-Contact: deroad <[email protected]>
Source: https://github.com/wargio/rewaf

Files: *.md *.sh *.py *.yaml .gitignore .clang-format
Copyright: 2022 deroad <[email protected]>
License: LGPL-3.0-only

Files: **/meson.build **/*.wrap **/meson_options.txt
Copyright: 2022 deroad <[email protected]>
License: LGPL-3.0-only

Files: naxsi_nginx_module/config
Copyright: 2022 deroad <[email protected]>
License: LGPL-3.0-only

Files: naxsi_config/** naxsi_src/** nxapi/** t/** .gitattributes
Copyright: 2016, Thibault 'bui' Koechlin
License: GPL-3.0-only

Files: logo.png
Copyright: 2016-2020, NBS System
License: GPL-3.0-only
42 changes: 0 additions & 42 deletions .travis.yml

This file was deleted.

File renamed without changes.
71 changes: 71 additions & 0 deletions LICENSES/LGPL-3.0-only.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007

Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>

Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.

This version of the GNU Lesser General Public License incorporates the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below.

0. Additional Definitions.

As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU General Public License.

"The Library" refers to a covered work governed by this License, other than an Application or a Combined Work as defined below.

An "Application" is any work that makes use of an interface provided by the Library, but which is not otherwise based on the Library. Defining a subclass of a class defined by the Library is deemed a mode of using an interface provided by the Library.

A "Combined Work" is a work produced by combining or linking an Application with the Library. The particular version of the Library with which the Combined Work was made is also called the "Linked Version".

The "Minimal Corresponding Source" for a Combined Work means the Corresponding Source for the Combined Work, excluding any source code for portions of the Combined Work that, considered in isolation, are based on the Application, and not on the Linked Version.

The "Corresponding Application Code" for a Combined Work means the object code and/or source code for the Application, including any data and utility programs needed for reproducing the Combined Work from the Application, but excluding the System Libraries of the Combined Work.

1. Exception to Section 3 of the GNU GPL.
You may convey a covered work under sections 3 and 4 of this License without being bound by section 3 of the GNU GPL.

2. Conveying Modified Versions.
If you modify a copy of the Library, and, in your modifications, a facility refers to a function or data to be supplied by an Application that uses the facility (other than as an argument passed when the facility is invoked), then you may convey a copy of the modified version:

a) under this License, provided that you make a good faith effort to ensure that, in the event an Application does not supply the function or data, the facility still operates, and performs whatever part of its purpose remains meaningful, or

b) under the GNU GPL, with none of the additional permissions of this License applicable to that copy.

3. Object Code Incorporating Material from Library Header Files.
The object code form of an Application may incorporate material from a header file that is part of the Library. You may convey such object code under terms of your choice, provided that, if the incorporated material is not limited to numerical parameters, data structure layouts and accessors, or small macros, inline functions and templates (ten or fewer lines in length), you do both of the following:

a) Give prominent notice with each copy of the object code that the Library is used in it and that the Library and its use are covered by this License.

b) Accompany the object code with a copy of the GNU GPL and this license document.

4. Combined Works.
You may convey a Combined Work under terms of your choice that, taken together, effectively do not restrict modification of the portions of the Library contained in the Combined Work and reverse engineering for debugging such modifications, if you also do each of the following:

a) Give prominent notice with each copy of the Combined Work that the Library is used in it and that the Library and its use are covered by this License.

b) Accompany the Combined Work with a copy of the GNU GPL and this license document.

c) For a Combined Work that displays copyright notices during execution, include the copyright notice for the Library among these notices, as well as a reference directing the user to the copies of the GNU GPL and this license document.

d) Do one of the following:

0) Convey the Minimal Corresponding Source under the terms of this License, and the Corresponding Application Code in a form suitable for, and under terms that permit, the user to recombine or relink the Application with a modified version of the Linked Version to produce a modified Combined Work, in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.

1) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (a) uses at run time a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked Version.

e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the GNU GPL, and only to the extent that such information is necessary to install and execute a modified version of the Combined Work produced by recombining or relinking the Application with a modified version of the Linked Version. (If you use option 4d0, the Installation Information must accompany the Minimal Corresponding Source and Corresponding Application Code. If you use option 4d1, you must provide the Installation Information in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.)

5. Combined Libraries.
You may place library facilities that are a work based on the Library side by side in a single library together with other library facilities that are not Applications and are not covered by this License, and convey such a combined library under terms of your choice, if you do both of the following:

a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities, conveyed under the terms of this License.

b) Give prominent notice with the combined library that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work.

6. Revised Versions of the GNU Lesser General Public License.
The Free Software Foundation may publish revised and/or new versions of the GNU Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.

Each version is given a distinguishing version number. If the Library as you received it specifies that a certain numbered version of the GNU Lesser General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that published version or of any later version published by the Free Software Foundation. If the Library as you received it does not specify a version number of the GNU Lesser General Public License, you may choose any version of the GNU Lesser General Public License ever published by the Free Software Foundation.

If the Library as you received it specifies that a proxy can decide whether future versions of the GNU Lesser General Public License shall
apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library.
32 changes: 32 additions & 0 deletions build-nginx.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#!/bin/sh
set -e

if [ ! -d "$1" ]; then
echo "$0 <nginx src> [optional: debug|asan]"
exit 1
fi

NGINX_SRC=$(realpath "$1")
OPTION="$2"

MESON_OPTIONS="--buildtype=release"
if [ "$OPTION" == "debug" ]; then
MESON_OPTIONS="--buildtype=debugoptimized"
elif [ "$OPTION" == "asan" ]; then
MESON_OPTIONS="--buildtype=debugoptimized -Db_sanitize=address,undefined"
fi

ROOT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )

# build librewaf
cd "$ROOT_DIR/libnaxsi"
if [ -d "build" ]; then
rm -rf build
fi
meson -Ddefault_library=static $MESON_OPTIONS build
ninja -C build

# build nginx module
cd "$NGINX_SRC"
./configure --add-dynamic-module="$ROOT_DIR/naxsi_nginx_module/"
make modules
121 changes: 121 additions & 0 deletions clang-format.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
#!/usr/bin/env python3
#
# SPDX-FileCopyrightText: 2021 Anton Kochkov <[email protected]>
# SPDX-License-Identifier: LGPL-3.0-only

import argparse
import glob
import itertools
import subprocess
import sys

from git import Repo

dirlist = [
"libnaxsi",
"naxsi_nginx_module",
]

skiplist = [
"subprojects/",
"/build"
]

patterns = ["*.c", "*.h"]


def should_scan(filename):
return any(directory in filename for directory in dirlist) and any(
pattern[1:] in filename for pattern in patterns
)


def skip(filename):
return any(skipfile in filename for skipfile in skiplist)


def get_matching_files():
for directory, pattern in itertools.product(dirlist, patterns):
for filename in glob.iglob(directory + "/**/" + pattern, recursive=True):
if not skip(filename):
yield filename


def get_edited_files(args):
repo = Repo()

for diff in repo.index.diff(args.diff):
filename = diff.a_path
if should_scan(filename) and not skip(filename):
yield filename


def build_command(check, verbose, filenames):
cmd = []
if check:
cmd += ["clang-format", "--style=file", "--Werror", "--dry-run"]
else:
cmd += ["clang-format", "--style=file", "-i"]
if verbose:
cmd += ['--verbose']
return cmd + filenames


def format_files(args, files):
if len(files) == 0:
print("No C files to format.")
sys.exit(0)
cmd = build_command(args.check, args.verbose, files)
r = subprocess.run(cmd, check=False)
sys.exit(r.returncode)


def get_file(args):
filename = args.file
if should_scan(filename) and not skip(filename):
return [filename]

return []


def get_files(args):
if args.diff:
return get_edited_files(args)

if args.file:
return get_file(args)

return get_matching_files()


def process(args):
files = get_files(args)
format_files(args, list(files))


def parse():
parser = argparse.ArgumentParser(description="Clang format the rizin project")
parser.add_argument(
"-c", "--check", action="store_true", help="enable the check mode"
)
parser.add_argument(
"-v", "--verbose", action="store_true", help="use verbose output"
)
parser.add_argument("-f", "--file", help="formats (or checks) only the given file")
parser.add_argument(
"-d",
"--diff",
type=str,
default=None,
help="format all modified file related to branch",
)
return parser.parse_args()


def main():
args = parse()
process(args)


if __name__ == "__main__":
main()
Loading

0 comments on commit 6460ec4

Please sign in to comment.