From f6d24120f35ab574ea27c89e7bdb980bf280e1e8 Mon Sep 17 00:00:00 2001 From: Simon Stier <52674635+simontaurus@users.noreply.github.com> Date: Wed, 13 Dec 2023 08:03:42 +0100 Subject: [PATCH 01/22] Create httpd.conf --- .test/conf/httpd.conf | 551 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 551 insertions(+) create mode 100644 .test/conf/httpd.conf diff --git a/.test/conf/httpd.conf b/.test/conf/httpd.conf new file mode 100644 index 000000000..e34c898d0 --- /dev/null +++ b/.test/conf/httpd.conf @@ -0,0 +1,551 @@ +# +# This is the main Apache HTTP server configuration file. It contains the +# configuration directives that give the server its instructions. +# See for detailed information. +# In particular, see +# +# for a discussion of each configuration directive. +# +# Do NOT simply read the instructions in here without understanding +# what they do. They're here only as hints or reminders. If you are unsure +# consult the online docs. You have been warned. +# +# Configuration and logfile names: If the filenames you specify for many +# of the server's control files begin with "/" (or "drive:/" for Win32), the +# server will use that explicit path. If the filenames do *not* begin +# with "/", the value of ServerRoot is prepended -- so "logs/access_log" +# with ServerRoot set to "/usr/local/apache2" will be interpreted by the +# server as "/usr/local/apache2/logs/access_log", whereas "/logs/access_log" +# will be interpreted as '/logs/access_log'. + +# +# ServerRoot: The top of the directory tree under which the server's +# configuration, error, and log files are kept. +# +# Do not add a slash at the end of the directory path. If you point +# ServerRoot at a non-local disk, be sure to specify a local disk on the +# Mutex directive, if file-based mutexes are used. If you wish to share the +# same ServerRoot for multiple httpd daemons, you will need to change at +# least PidFile. +# +ServerRoot "/usr/local/apache2" + +# +# Mutex: Allows you to set the mutex mechanism and mutex file directory +# for individual mutexes, or change the global defaults +# +# Uncomment and change the directory if mutexes are file-based and the default +# mutex file directory is not on a local disk or is not appropriate for some +# other reason. +# +# Mutex default:logs + +# +# Listen: Allows you to bind Apache to specific IP addresses and/or +# ports, instead of the default. See also the +# directive. +# +# Change this to Listen on specific IP addresses as shown below to +# prevent Apache from glomming onto all bound IP addresses. +# +#Listen 12.34.56.78:80 +Listen 80 + +# +# Dynamic Shared Object (DSO) Support +# +# To be able to use the functionality of a module which was built as a DSO you +# have to place corresponding `LoadModule' lines at this location so the +# directives contained in it are actually available _before_ they are used. +# Statically compiled modules (those listed by `httpd -l') do not need +# to be loaded here. +# +# Example: +# LoadModule foo_module modules/mod_foo.so +# +LoadModule mpm_event_module modules/mod_mpm_event.so +#LoadModule mpm_prefork_module modules/mod_mpm_prefork.so +#LoadModule mpm_worker_module modules/mod_mpm_worker.so +LoadModule authn_file_module modules/mod_authn_file.so +#LoadModule authn_dbm_module modules/mod_authn_dbm.so +#LoadModule authn_anon_module modules/mod_authn_anon.so +#LoadModule authn_dbd_module modules/mod_authn_dbd.so +#LoadModule authn_socache_module modules/mod_authn_socache.so +LoadModule authn_core_module modules/mod_authn_core.so +LoadModule authz_host_module modules/mod_authz_host.so +LoadModule authz_groupfile_module modules/mod_authz_groupfile.so +LoadModule authz_user_module modules/mod_authz_user.so +#LoadModule authz_dbm_module modules/mod_authz_dbm.so +#LoadModule authz_owner_module modules/mod_authz_owner.so +#LoadModule authz_dbd_module modules/mod_authz_dbd.so +LoadModule authz_core_module modules/mod_authz_core.so +#LoadModule authnz_ldap_module modules/mod_authnz_ldap.so +#LoadModule authnz_fcgi_module modules/mod_authnz_fcgi.so +LoadModule access_compat_module modules/mod_access_compat.so +LoadModule auth_basic_module modules/mod_auth_basic.so +#LoadModule auth_form_module modules/mod_auth_form.so +#LoadModule auth_digest_module modules/mod_auth_digest.so +#LoadModule allowmethods_module modules/mod_allowmethods.so +#LoadModule isapi_module modules/mod_isapi.so +#LoadModule file_cache_module modules/mod_file_cache.so +#LoadModule cache_module modules/mod_cache.so +#LoadModule cache_disk_module modules/mod_cache_disk.so +#LoadModule cache_socache_module modules/mod_cache_socache.so +#LoadModule socache_shmcb_module modules/mod_socache_shmcb.so +#LoadModule socache_dbm_module modules/mod_socache_dbm.so +#LoadModule socache_memcache_module modules/mod_socache_memcache.so +#LoadModule socache_redis_module modules/mod_socache_redis.so +#LoadModule watchdog_module modules/mod_watchdog.so +#LoadModule macro_module modules/mod_macro.so +#LoadModule dbd_module modules/mod_dbd.so +#LoadModule bucketeer_module modules/mod_bucketeer.so +#LoadModule dumpio_module modules/mod_dumpio.so +#LoadModule echo_module modules/mod_echo.so +#LoadModule example_hooks_module modules/mod_example_hooks.so +#LoadModule case_filter_module modules/mod_case_filter.so +#LoadModule case_filter_in_module modules/mod_case_filter_in.so +#LoadModule example_ipc_module modules/mod_example_ipc.so +#LoadModule buffer_module modules/mod_buffer.so +#LoadModule data_module modules/mod_data.so +#LoadModule ratelimit_module modules/mod_ratelimit.so +LoadModule reqtimeout_module modules/mod_reqtimeout.so +#LoadModule ext_filter_module modules/mod_ext_filter.so +#LoadModule request_module modules/mod_request.so +#LoadModule include_module modules/mod_include.so +LoadModule filter_module modules/mod_filter.so +#LoadModule reflector_module modules/mod_reflector.so +#LoadModule substitute_module modules/mod_substitute.so +#LoadModule sed_module modules/mod_sed.so +#LoadModule charset_lite_module modules/mod_charset_lite.so +#LoadModule deflate_module modules/mod_deflate.so +#LoadModule xml2enc_module modules/mod_xml2enc.so +#LoadModule proxy_html_module modules/mod_proxy_html.so +#LoadModule brotli_module modules/mod_brotli.so +LoadModule mime_module modules/mod_mime.so +#LoadModule ldap_module modules/mod_ldap.so +LoadModule log_config_module modules/mod_log_config.so +#LoadModule log_debug_module modules/mod_log_debug.so +#LoadModule log_forensic_module modules/mod_log_forensic.so +#LoadModule logio_module modules/mod_logio.so +#LoadModule lua_module modules/mod_lua.so +LoadModule env_module modules/mod_env.so +#LoadModule mime_magic_module modules/mod_mime_magic.so +#LoadModule cern_meta_module modules/mod_cern_meta.so +#LoadModule expires_module modules/mod_expires.so +LoadModule headers_module modules/mod_headers.so +#LoadModule ident_module modules/mod_ident.so +#LoadModule usertrack_module modules/mod_usertrack.so +#LoadModule unique_id_module modules/mod_unique_id.so +LoadModule setenvif_module modules/mod_setenvif.so +LoadModule version_module modules/mod_version.so +#LoadModule remoteip_module modules/mod_remoteip.so +#LoadModule proxy_module modules/mod_proxy.so +#LoadModule proxy_connect_module modules/mod_proxy_connect.so +#LoadModule proxy_ftp_module modules/mod_proxy_ftp.so +#LoadModule proxy_http_module modules/mod_proxy_http.so +#LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so +#LoadModule proxy_scgi_module modules/mod_proxy_scgi.so +#LoadModule proxy_uwsgi_module modules/mod_proxy_uwsgi.so +#LoadModule proxy_fdpass_module modules/mod_proxy_fdpass.so +#LoadModule proxy_wstunnel_module modules/mod_proxy_wstunnel.so +#LoadModule proxy_ajp_module modules/mod_proxy_ajp.so +#LoadModule proxy_balancer_module modules/mod_proxy_balancer.so +#LoadModule proxy_express_module modules/mod_proxy_express.so +#LoadModule proxy_hcheck_module modules/mod_proxy_hcheck.so +#LoadModule session_module modules/mod_session.so +#LoadModule session_cookie_module modules/mod_session_cookie.so +#LoadModule session_crypto_module modules/mod_session_crypto.so +#LoadModule session_dbd_module modules/mod_session_dbd.so +#LoadModule slotmem_shm_module modules/mod_slotmem_shm.so +#LoadModule slotmem_plain_module modules/mod_slotmem_plain.so +#LoadModule ssl_module modules/mod_ssl.so +#LoadModule optional_hook_export_module modules/mod_optional_hook_export.so +#LoadModule optional_hook_import_module modules/mod_optional_hook_import.so +#LoadModule optional_fn_import_module modules/mod_optional_fn_import.so +#LoadModule optional_fn_export_module modules/mod_optional_fn_export.so +#LoadModule dialup_module modules/mod_dialup.so +#LoadModule http2_module modules/mod_http2.so +#LoadModule proxy_http2_module modules/mod_proxy_http2.so +#LoadModule md_module modules/mod_md.so +#LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so +#LoadModule lbmethod_bytraffic_module modules/mod_lbmethod_bytraffic.so +#LoadModule lbmethod_bybusyness_module modules/mod_lbmethod_bybusyness.so +#LoadModule lbmethod_heartbeat_module modules/mod_lbmethod_heartbeat.so +LoadModule unixd_module modules/mod_unixd.so +#LoadModule heartbeat_module modules/mod_heartbeat.so +#LoadModule heartmonitor_module modules/mod_heartmonitor.so +#LoadModule dav_module modules/mod_dav.so +LoadModule status_module modules/mod_status.so +LoadModule autoindex_module modules/mod_autoindex.so +#LoadModule asis_module modules/mod_asis.so +#LoadModule info_module modules/mod_info.so +#LoadModule suexec_module modules/mod_suexec.so + + #LoadModule cgid_module modules/mod_cgid.so + + + #LoadModule cgi_module modules/mod_cgi.so + +#LoadModule dav_fs_module modules/mod_dav_fs.so +#LoadModule dav_lock_module modules/mod_dav_lock.so +#LoadModule vhost_alias_module modules/mod_vhost_alias.so +#LoadModule negotiation_module modules/mod_negotiation.so +LoadModule dir_module modules/mod_dir.so +#LoadModule imagemap_module modules/mod_imagemap.so +#LoadModule actions_module modules/mod_actions.so +#LoadModule speling_module modules/mod_speling.so +#LoadModule userdir_module modules/mod_userdir.so +LoadModule alias_module modules/mod_alias.so +LoadModule rewrite_module modules/mod_rewrite.so + + +# +# If you wish httpd to run as a different user or group, you must run +# httpd as root initially and it will switch. +# +# User/Group: The name (or #number) of the user/group to run httpd as. +# It is usually good practice to create a dedicated user and group for +# running httpd, as with most system services. +# +User www-data +Group www-data + + + +# 'Main' server configuration +# +# The directives in this section set up the values used by the 'main' +# server, which responds to any requests that aren't handled by a +# definition. These values also provide defaults for +# any containers you may define later in the file. +# +# All of these directives may appear inside containers, +# in which case these default settings will be overridden for the +# virtual host being defined. +# + +# +# ServerAdmin: Your address, where problems with the server should be +# e-mailed. This address appears on some server-generated pages, such +# as error documents. e.g. admin@your-domain.com +# +ServerAdmin you@example.com + +# +# ServerName gives the name and port that the server uses to identify itself. +# This can often be determined automatically, but we recommend you specify +# it explicitly to prevent problems during startup. +# +# If your host doesn't have a registered DNS name, enter its IP address here. +# +#ServerName www.example.com:80 + +# +# Deny access to the entirety of your server's filesystem. You must +# explicitly permit access to web content directories in other +# blocks below. +# + + AllowOverride none + Require all denied + + +# +# Note that from this point forward you must specifically allow +# particular features to be enabled - so if something's not working as +# you might expect, make sure that you have specifically enabled it +# below. +# + +# +# DocumentRoot: The directory out of which you will serve your +# documents. By default, all requests are taken from this directory, but +# symbolic links and aliases may be used to point to other locations. +# +DocumentRoot "/usr/local/apache2/htdocs" + + # + # Possible values for the Options directive are "None", "All", + # or any combination of: + # Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews + # + # Note that "MultiViews" must be named *explicitly* --- "Options All" + # doesn't give it to you. + # + # The Options directive is both complicated and important. Please see + # http://httpd.apache.org/docs/2.4/mod/core.html#options + # for more information. + # + Options Indexes FollowSymLinks + + # + # AllowOverride controls what directives may be placed in .htaccess files. + # It can be "All", "None", or any combination of the keywords: + # AllowOverride FileInfo AuthConfig Limit + # + AllowOverride All + + # + # Controls who can get stuff from this server. + # + Require all granted + + +# +# DirectoryIndex: sets the file that Apache will serve if a directory +# is requested. +# + + DirectoryIndex index.html + + +# +# The following lines prevent .htaccess and .htpasswd files from being +# viewed by Web clients. +# + + Require all denied + + +# +# ErrorLog: The location of the error log file. +# If you do not specify an ErrorLog directive within a +# container, error messages relating to that virtual host will be +# logged here. If you *do* define an error logfile for a +# container, that host's errors will be logged there and not here. +# +ErrorLog /proc/self/fd/2 + +# +# LogLevel: Control the number of messages logged to the error_log. +# Possible values include: debug, info, notice, warn, error, crit, +# alert, emerg. +# +LogLevel warn + + + # + # The following directives define some format nicknames for use with + # a CustomLog directive (see below). + # + LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined + LogFormat "%h %l %u %t \"%r\" %>s %b" common + + + # You need to enable mod_logio.c to use %I and %O + LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio + + + # + # The location and format of the access logfile (Common Logfile Format). + # If you do not define any access logfiles within a + # container, they will be logged here. Contrariwise, if you *do* + # define per- access logfiles, transactions will be + # logged therein and *not* in this file. + # + CustomLog /proc/self/fd/1 common + + # + # If you prefer a logfile with access, agent, and referer information + # (Combined Logfile Format) you can use the following directive. + # + #CustomLog "logs/access_log" combined + + + + # + # Redirect: Allows you to tell clients about documents that used to + # exist in your server's namespace, but do not anymore. The client + # will make a new request for the document at its new location. + # Example: + # Redirect permanent /foo http://www.example.com/bar + + # + # Alias: Maps web paths into filesystem paths and is used to + # access content that does not live under the DocumentRoot. + # Example: + # Alias /webpath /full/filesystem/path + # + # If you include a trailing / on /webpath then the server will + # require it to be present in the URL. You will also likely + # need to provide a section to allow access to + # the filesystem path. + + # + # ScriptAlias: This controls which directories contain server scripts. + # ScriptAliases are essentially the same as Aliases, except that + # documents in the target directory are treated as applications and + # run by the server when requested rather than as documents sent to the + # client. The same rules about trailing "/" apply to ScriptAlias + # directives as to Alias. + # + ScriptAlias /cgi-bin/ "/usr/local/apache2/cgi-bin/" + + + + + # + # ScriptSock: On threaded servers, designate the path to the UNIX + # socket used to communicate with the CGI daemon of mod_cgid. + # + #Scriptsock cgisock + + +# +# "/usr/local/apache2/cgi-bin" should be changed to whatever your ScriptAliased +# CGI directory exists, if you have that configured. +# + + AllowOverride None + Options None + Require all granted + + + + # + # Avoid passing HTTP_PROXY environment to CGI's on this or any proxied + # backend servers which have lingering "httpoxy" defects. + # 'Proxy' request header is undefined by the IETF, not listed by IANA + # + RequestHeader unset Proxy early + + + + # + # TypesConfig points to the file containing the list of mappings from + # filename extension to MIME-type. + # + TypesConfig conf/mime.types + + # + # AddType allows you to add to or override the MIME configuration + # file specified in TypesConfig for specific file types. + # + #AddType application/x-gzip .tgz + # + # AddEncoding allows you to have certain browsers uncompress + # information on the fly. Note: Not all browsers support this. + # + #AddEncoding x-compress .Z + #AddEncoding x-gzip .gz .tgz + # + # If the AddEncoding directives above are commented-out, then you + # probably should define those extensions to indicate media types: + # + AddType application/x-compress .Z + AddType application/x-gzip .gz .tgz + + # + # AddHandler allows you to map certain file extensions to "handlers": + # actions unrelated to filetype. These can be either built into the server + # or added with the Action directive (see below) + # + # To use CGI scripts outside of ScriptAliased directories: + # (You will also need to add "ExecCGI" to the "Options" directive.) + # + #AddHandler cgi-script .cgi + + # For type maps (negotiated resources): + #AddHandler type-map var + + # + # Filters allow you to process content before it is sent to the client. + # + # To parse .shtml files for server-side includes (SSI): + # (You will also need to add "Includes" to the "Options" directive.) + # + #AddType text/html .shtml + #AddOutputFilter INCLUDES .shtml + + +# +# The mod_mime_magic module allows the server to use various hints from the +# contents of the file itself to determine its type. The MIMEMagicFile +# directive tells the module where the hint definitions are located. +# +#MIMEMagicFile conf/magic + +# +# Customizable error responses come in three flavors: +# 1) plain text 2) local redirects 3) external redirects +# +# Some examples: +#ErrorDocument 500 "The server made a boo boo." +#ErrorDocument 404 /missing.html +#ErrorDocument 404 "/cgi-bin/missing_handler.pl" +#ErrorDocument 402 http://www.example.com/subscription_info.html +# + +# +# MaxRanges: Maximum number of Ranges in a request before +# returning the entire resource, or one of the special +# values 'default', 'none' or 'unlimited'. +# Default setting is to accept 200 Ranges. +#MaxRanges unlimited + +# +# EnableMMAP and EnableSendfile: On systems that support it, +# memory-mapping or the sendfile syscall may be used to deliver +# files. This usually improves server performance, but must +# be turned off when serving from networked-mounted +# filesystems or if support for these functions is otherwise +# broken on your system. +# Defaults: EnableMMAP On, EnableSendfile Off +# +#EnableMMAP off +#EnableSendfile on + +# Supplemental configuration +# +# The configuration files in the conf/extra/ directory can be +# included to add extra features or to modify the default configuration of +# the server, or you may simply copy their contents here and change as +# necessary. + +# Server-pool management (MPM specific) +#Include conf/extra/httpd-mpm.conf + +# Multi-language error messages +#Include conf/extra/httpd-multilang-errordoc.conf + +# Fancy directory listings +#Include conf/extra/httpd-autoindex.conf + +# Language settings +#Include conf/extra/httpd-languages.conf + +# User home directories +#Include conf/extra/httpd-userdir.conf + +# Real-time info on requests and configuration +#Include conf/extra/httpd-info.conf + +# Virtual hosts +#Include conf/extra/httpd-vhosts.conf + +# Local access to the Apache HTTP Server Manual +#Include conf/extra/httpd-manual.conf + +# Distributed authoring and versioning (WebDAV) +#Include conf/extra/httpd-dav.conf + +# Various default settings +#Include conf/extra/httpd-default.conf + +# Configure mod_proxy_html to understand HTML4/XHTML1 + +Include conf/extra/proxy-html.conf + + +# Secure (SSL/TLS) connections +#Include conf/extra/httpd-ssl.conf +# +# Note: The following must must be present to support +# starting without SSL on platforms with no /dev/random equivalent +# but a statically compiled-in mod_ssl. +# + +SSLRandomSeed startup builtin +SSLRandomSeed connect builtin + + From 8654ad8a9804b01fc297b83a471e956c14e83b2d Mon Sep 17 00:00:00 2001 From: Simon Stier <52674635+simontaurus@users.noreply.github.com> Date: Wed, 13 Dec 2023 08:08:42 +0100 Subject: [PATCH 02/22] Create test.sh --- .test/test.sh | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .test/test.sh diff --git a/.test/test.sh b/.test/test.sh new file mode 100644 index 000000000..77ff23976 --- /dev/null +++ b/.test/test.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +return_code=0 +for f in $(find /usr/local/apache2/htdocs -name '.htaccess') +do + echo "Processing file $f" + res=$(grep "##TESTv1" "$f") + if [ "$res" == "" ]; then + echo "No tests found" + continue + fi + #eval "parts=($IN)" + declare -a "parts=($( echo "$res" | sed 's/[][`~!@#$%^&*();<>,?\|{}=+]/\\&/g' ))" + + curl="curl -sL -o /dev/null -w "%{url_effective}" --resolve www.w3id.org:80:127.0.0.1 www.w3id.org:80" + curl_cmd="${parts[1]}" + expected_result="${parts[2]}" + echo "TEST '$curl_cmd' => '$expected_result'" + + cmd="$curl$curl_cmd" + result=$(bash -c "$cmd") + if [ "$result" == "$expected_result" ]; then + echo "SUCCESS: Result is '$result'" + else + echo "ERROR : Result is '$result'" + return_code=1 + fi + +done +exit $return_code + From 5d6e8fd74e2e2194704be828add01af41ca24fa7 Mon Sep 17 00:00:00 2001 From: Simon Stier <52674635+simontaurus@users.noreply.github.com> Date: Wed, 13 Dec 2023 09:02:58 +0100 Subject: [PATCH 03/22] Create redirect_tests.yml --- .github/workflows/redirect_tests.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/redirect_tests.yml diff --git a/.github/workflows/redirect_tests.yml b/.github/workflows/redirect_tests.yml new file mode 100644 index 000000000..1b6b62e4b --- /dev/null +++ b/.github/workflows/redirect_tests.yml @@ -0,0 +1,28 @@ +name: redirect_tests +on: workflow_dispatch +jobs: + build: + runs-on: ubuntu-latest + container: + image: httpd:2.4 + env: + SEARCH_PATH: "./" + ports: + - 80 + volumes: + - ./:/usr/local/apache2/htdocs/ + - ./.test/conf/httpd.conf:/usr/local/apache2/conf/httpd.conf + steps: + - name: Checkout Project + uses: actions/checkout@v1 + + - name: Install curl + run: | + apt-get update + apt-get install curl + + - name: Run tests + run: | + chmod +x ./public/scripts/test.sh + /usr/local/apache2/htdocs/.test/test.sh + shell: bash From 7f71cb0077f1c422846083349d1e631a83526e5b Mon Sep 17 00:00:00 2001 From: Simon Stier <52674635+simontaurus@users.noreply.github.com> Date: Wed, 13 Dec 2023 09:03:41 +0100 Subject: [PATCH 04/22] Delete .github/workflows/redirect_tests.yml --- .github/workflows/redirect_tests.yml | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 .github/workflows/redirect_tests.yml diff --git a/.github/workflows/redirect_tests.yml b/.github/workflows/redirect_tests.yml deleted file mode 100644 index 1b6b62e4b..000000000 --- a/.github/workflows/redirect_tests.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: redirect_tests -on: workflow_dispatch -jobs: - build: - runs-on: ubuntu-latest - container: - image: httpd:2.4 - env: - SEARCH_PATH: "./" - ports: - - 80 - volumes: - - ./:/usr/local/apache2/htdocs/ - - ./.test/conf/httpd.conf:/usr/local/apache2/conf/httpd.conf - steps: - - name: Checkout Project - uses: actions/checkout@v1 - - - name: Install curl - run: | - apt-get update - apt-get install curl - - - name: Run tests - run: | - chmod +x ./public/scripts/test.sh - /usr/local/apache2/htdocs/.test/test.sh - shell: bash From 40de8dd66d799a3dc2f9197c0ffc1a28241bf368 Mon Sep 17 00:00:00 2001 From: Simon Stier <52674635+simontaurus@users.noreply.github.com> Date: Wed, 13 Dec 2023 09:06:10 +0100 Subject: [PATCH 05/22] Create redirect_tests.yml --- .github/workflows/redirect_tests.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/redirect_tests.yml diff --git a/.github/workflows/redirect_tests.yml b/.github/workflows/redirect_tests.yml new file mode 100644 index 000000000..1b6b62e4b --- /dev/null +++ b/.github/workflows/redirect_tests.yml @@ -0,0 +1,28 @@ +name: redirect_tests +on: workflow_dispatch +jobs: + build: + runs-on: ubuntu-latest + container: + image: httpd:2.4 + env: + SEARCH_PATH: "./" + ports: + - 80 + volumes: + - ./:/usr/local/apache2/htdocs/ + - ./.test/conf/httpd.conf:/usr/local/apache2/conf/httpd.conf + steps: + - name: Checkout Project + uses: actions/checkout@v1 + + - name: Install curl + run: | + apt-get update + apt-get install curl + + - name: Run tests + run: | + chmod +x ./public/scripts/test.sh + /usr/local/apache2/htdocs/.test/test.sh + shell: bash From 56f8b8db5a02363ec81947e04966ecd32618a6de Mon Sep 17 00:00:00 2001 From: Simon Stier <52674635+simontaurus@users.noreply.github.com> Date: Wed, 13 Dec 2023 09:21:44 +0100 Subject: [PATCH 06/22] Update redirect_tests.yml --- .github/workflows/redirect_tests.yml | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/.github/workflows/redirect_tests.yml b/.github/workflows/redirect_tests.yml index 1b6b62e4b..6c9aaf799 100644 --- a/.github/workflows/redirect_tests.yml +++ b/.github/workflows/redirect_tests.yml @@ -3,26 +3,15 @@ on: workflow_dispatch jobs: build: runs-on: ubuntu-latest - container: - image: httpd:2.4 - env: - SEARCH_PATH: "./" - ports: - - 80 - volumes: - - ./:/usr/local/apache2/htdocs/ - - ./.test/conf/httpd.conf:/usr/local/apache2/conf/httpd.conf steps: - name: Checkout Project uses: actions/checkout@v1 + - name: Run apache docker + run: docker run -dit --name apache -p 80:80 -v "$PWD":/usr/local/apache2/htdocs/ -v "$PWD"/.test/conf/httpd.conf:/usr/local/apache2/conf/httpd.conf httpd:2.4 + - name: Install curl - run: | - apt-get update - apt-get install curl + run: docker exec -i apache sh -c "apt-get update && apt-get install curl" - name: Run tests - run: | - chmod +x ./public/scripts/test.sh - /usr/local/apache2/htdocs/.test/test.sh - shell: bash + run: docker exec -i apache bash < .test/test.sh From b3bdadf8cff1f8d428e05c64b152d8a42c83d0f8 Mon Sep 17 00:00:00 2001 From: Simon Stier <52674635+simontaurus@users.noreply.github.com> Date: Wed, 13 Dec 2023 10:31:36 +0100 Subject: [PATCH 07/22] fix run multiple tests --- .test/test.sh | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/.test/test.sh b/.test/test.sh index 77ff23976..8d541a4c4 100644 --- a/.test/test.sh +++ b/.test/test.sh @@ -4,28 +4,24 @@ return_code=0 for f in $(find /usr/local/apache2/htdocs -name '.htaccess') do echo "Processing file $f" - res=$(grep "##TESTv1" "$f") - if [ "$res" == "" ]; then - echo "No tests found" - continue - fi - #eval "parts=($IN)" - declare -a "parts=($( echo "$res" | sed 's/[][`~!@#$%^&*();<>,?\|{}=+]/\\&/g' ))" + grep "##TESTv1" "$f" | while read -r line ; do + #eval "parts=($IN)" + declare -a "parts=($( echo "$line" | sed 's/[][`~!@#$%^&*();<>,?\|{}=+]/\\&/g' ))" - curl="curl -sL -o /dev/null -w "%{url_effective}" --resolve www.w3id.org:80:127.0.0.1 www.w3id.org:80" - curl_cmd="${parts[1]}" - expected_result="${parts[2]}" - echo "TEST '$curl_cmd' => '$expected_result'" - - cmd="$curl$curl_cmd" - result=$(bash -c "$cmd") - if [ "$result" == "$expected_result" ]; then - echo "SUCCESS: Result is '$result'" - else - echo "ERROR : Result is '$result'" - return_code=1 - fi + curl="curl -sL -o /dev/null -w "%{url_effective}" --resolve www.w3id.org:80:127.0.0.1 www.w3id.org:80" + curl_cmd="${parts[1]}" + expected_result="${parts[2]}" + echo "TEST '$curl_cmd' => '$expected_result'" + + cmd="$curl$curl_cmd" + result=$(bash -c "$cmd") + if [ "$result" == "$expected_result" ]; then + echo "SUCCESS: Result is '$result'" + else + echo "ERROR : Result is '$result'" + return_code=1 + fi + done done exit $return_code - From 027c4e0a03be75d491464a9b645170d689d07129 Mon Sep 17 00:00:00 2001 From: Simon Stier <52674635+simontaurus@users.noreply.github.com> Date: Thu, 14 Dec 2023 03:31:22 +0100 Subject: [PATCH 08/22] Create README.md --- .test/README.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .test/README.md diff --git a/.test/README.md b/.test/README.md new file mode 100644 index 000000000..b0733e0fd --- /dev/null +++ b/.test/README.md @@ -0,0 +1,21 @@ +# Redirect test + +Tests running directly on the source .htaccess files. It does only test the redirect, not the existance of the resource redirected to. +This is done by mounting the w3id.org repo in an apache docker and test the redirects with curl. + +Test specifications are currently extracted from .htaccess file comments, e. g. +``` +##TESTv1 '/emmo/domain-test --header "Accept: text/html"' "https://emmo-repo.github.io/domain-test/test.html" +``` + +## Run the test locally +```bash +docker run -dit --name apache -p 8080:80 -v "$PWD":/usr/local/apache2/htdocs/ -v "$PWD"/.test/conf/httpd.conf:/usr/local/apache2/conf/httpd.conf httpd:2.4 +docker exec -i apache sh -c "apt-get update && apt-get install curl" +docker exec -i apache bash < .test/test.sh +``` + +## Run a singe test +```bash +docker exec -i apache sh -c 'curl -sL -o /dev/null -w "%{url_effective}\n" --resolve www.w3id.org:80:127.0.0.1 www.w3id.org:80/subpath --header "Accept: application/rdf+xml"' +``` From 7aa52ef9f93abf3e5931261f524fc49d95deeb6e Mon Sep 17 00:00:00 2001 From: Simon Stier <52674635+simontaurus@users.noreply.github.com> Date: Fri, 15 Dec 2023 14:58:48 +0100 Subject: [PATCH 09/22] fix script --- .test/test.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.test/test.sh b/.test/test.sh index 8d541a4c4..7ef1fe33f 100644 --- a/.test/test.sh +++ b/.test/test.sh @@ -1,12 +1,14 @@ #!/bin/bash return_code=0 -for f in $(find /usr/local/apache2/htdocs -name '.htaccess') +for f in $(find /usr/local/apache2/htdocs$SEARCH_PATH -name '.htaccess') do echo "Processing file $f" - grep "##TESTv1" "$f" | while read -r line ; do - #eval "parts=($IN)" - declare -a "parts=($( echo "$line" | sed 's/[][`~!@#$%^&*();<>,?\|{}=+]/\\&/g' ))" + while IFS= read -r line + do + #eval "parts=($line)" # not safe to eval user input + # ecape most special chars, better but not completly safe + declare -a "parts=($( echo "$line" | sed 's/[][`~!@#$%^&*();<>,?\|{}=+]/\\&/g' ))" curl="curl -sL -o /dev/null -w "%{url_effective}" --resolve www.w3id.org:80:127.0.0.1 www.w3id.org:80" curl_cmd="${parts[1]}" @@ -21,7 +23,9 @@ do echo "ERROR : Result is '$result'" return_code=1 fi - done + done < <(grep "##TESTv1" "$f") done exit $return_code + + From 16a5a30d9a92ebfcf88f960b7c6ee47d91ee3ae5 Mon Sep 17 00:00:00 2001 From: Simon Stier <52674635+simontaurus@users.noreply.github.com> Date: Fri, 15 Dec 2023 15:28:48 +0100 Subject: [PATCH 10/22] add search_path param --- .github/workflows/redirect_tests.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/redirect_tests.yml b/.github/workflows/redirect_tests.yml index 6c9aaf799..717b6b354 100644 --- a/.github/workflows/redirect_tests.yml +++ b/.github/workflows/redirect_tests.yml @@ -1,5 +1,11 @@ name: redirect_tests -on: workflow_dispatch +on: + workflow_dispatch: + inputs: + search_path: + description: "Subpath to test, e.g. '/osw' (empty = all subpaths)" + default: '/*' + jobs: build: runs-on: ubuntu-latest @@ -8,7 +14,7 @@ jobs: uses: actions/checkout@v1 - name: Run apache docker - run: docker run -dit --name apache -p 80:80 -v "$PWD":/usr/local/apache2/htdocs/ -v "$PWD"/.test/conf/httpd.conf:/usr/local/apache2/conf/httpd.conf httpd:2.4 + run: docker run -dit --name apache -e SEARCH_PATH=${{ github.event.inputs.search_path }} -v "$PWD":/usr/local/apache2/htdocs/ -v "$PWD"/.test/conf/httpd.conf:/usr/local/apache2/conf/httpd.conf httpd:2.4 - name: Install curl run: docker exec -i apache sh -c "apt-get update && apt-get install curl" From f9f7257c6f2388c008c4a2c5b855fec959998039 Mon Sep 17 00:00:00 2001 From: Simon Stier <52674635+simontaurus@users.noreply.github.com> Date: Fri, 15 Dec 2023 17:35:16 +0100 Subject: [PATCH 11/22] fix escaping and add docs --- .test/test.sh | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/.test/test.sh b/.test/test.sh index 7ef1fe33f..3f9698605 100644 --- a/.test/test.sh +++ b/.test/test.sh @@ -1,22 +1,39 @@ #!/bin/bash +# Script to run redirct tests directly on the source .htaccess files + +# default: no error return_code=0 + +# search path can be restricted with env var $SEARCH_PATH for f in $(find /usr/local/apache2/htdocs$SEARCH_PATH -name '.htaccess') do echo "Processing file $f" + + tests_found=0 + while IFS= read -r line do - #eval "parts=($line)" # not safe to eval user input - # ecape most special chars, better but not completly safe - declare -a "parts=($( echo "$line" | sed 's/[][`~!@#$%^&*();<>,?\|{}=+]/\\&/g' ))" + tests_found=$((tests_found + 1)) + # Security note: In gerneral it is not secure at all to eval user input + # (here and later in the curl command). + # Make sure to run the test within a encapsulated environment + # and / or run only the test in your subpath. + declare -a "parts=($( echo "$line" | sed 's/##TESTv1//g' ))" + + # note: we request only the effective url and create an alias with --resolve + # the subpath specified in the test gets appended to the request url curl="curl -sL -o /dev/null -w "%{url_effective}" --resolve www.w3id.org:80:127.0.0.1 www.w3id.org:80" - curl_cmd="${parts[1]}" - expected_result="${parts[2]}" + curl_cmd="${parts[0]}" + expected_result="${parts[1]}" + echo "TEST '$curl_cmd' => '$expected_result'" cmd="$curl$curl_cmd" result=$(bash -c "$cmd") + + # compare the result url with the expected url if [ "$result" == "$expected_result" ]; then echo "SUCCESS: Result is '$result'" else @@ -25,6 +42,10 @@ do fi done < <(grep "##TESTv1" "$f") + if [ $tests_found == 0 ]; then + echo "No tests found" + fi + done exit $return_code From 7e1a113d761bf5bfae6d279cc19b025047e3ed98 Mon Sep 17 00:00:00 2001 From: Simon Stier <52674635+simontaurus@users.noreply.github.com> Date: Fri, 15 Dec 2023 17:35:39 +0100 Subject: [PATCH 12/22] Update README.md --- .test/README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.test/README.md b/.test/README.md index b0733e0fd..4155495a5 100644 --- a/.test/README.md +++ b/.test/README.md @@ -5,12 +5,14 @@ This is done by mounting the w3id.org repo in an apache docker and test the redi Test specifications are currently extracted from .htaccess file comments, e. g. ``` -##TESTv1 '/emmo/domain-test --header "Accept: text/html"' "https://emmo-repo.github.io/domain-test/test.html" +##TESTv1 '/mypath --header "Accept: text/html"' "https://my-target-domain.com/test.html" ``` ## Run the test locally +Note: replace `/*` with your own trusted subpath, e.g. `/mypath`, otherwise all subpaths are tested which may create security issues ```bash -docker run -dit --name apache -p 8080:80 -v "$PWD":/usr/local/apache2/htdocs/ -v "$PWD"/.test/conf/httpd.conf:/usr/local/apache2/conf/httpd.conf httpd:2.4 +docker stop apache && docker rm apache +docker run -dit --name apache -e SEARCH_PATH='/*' -v "$PWD":/usr/local/apache2/htdocs/ -v "$PWD"/.test/conf/httpd.conf:/usr/local/apache2/conf/httpd.conf httpd:2.4 docker exec -i apache sh -c "apt-get update && apt-get install curl" docker exec -i apache bash < .test/test.sh ``` @@ -19,3 +21,4 @@ docker exec -i apache bash < .test/test.sh ```bash docker exec -i apache sh -c 'curl -sL -o /dev/null -w "%{url_effective}\n" --resolve www.w3id.org:80:127.0.0.1 www.w3id.org:80/subpath --header "Accept: application/rdf+xml"' ``` + From bc96dea8561cdd3dd40c857c3370631bd5cc53d1 Mon Sep 17 00:00:00 2001 From: Simon Stier <52674635+simontaurus@users.noreply.github.com> Date: Fri, 15 Dec 2023 17:55:37 +0100 Subject: [PATCH 13/22] add Github Action docs --- .test/README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.test/README.md b/.test/README.md index 4155495a5..39326253f 100644 --- a/.test/README.md +++ b/.test/README.md @@ -8,6 +8,14 @@ Test specifications are currently extracted from .htaccess file comments, e. g. ##TESTv1 '/mypath --header "Accept: text/html"' "https://my-target-domain.com/test.html" ``` +## Run the test as Github Action +1. Navigate to `https://github.com//w3id.org/actions/workflows/redirect_tests.yml` (example see [here](https://github.com/OpenSemanticWorld/w3id.org/actions/workflows/redirect_tests.yml)) +1. Select 'Run workflow' +1. Keep the master branch or select your custom branch +1. Change the subpath to your subpath, e.g. `/mypath` +1. Click 'Run workflow' +1. After completion, click on the run entry to view details (example see [here](https://github.com/OpenSemanticWorld/w3id.org/actions/runs/7224639650/job/19686349546)) + ## Run the test locally Note: replace `/*` with your own trusted subpath, e.g. `/mypath`, otherwise all subpaths are tested which may create security issues ```bash From 0b241bf74ce4bddc7b495dbce04841f431218c86 Mon Sep 17 00:00:00 2001 From: Simon Stier <52674635+simontaurus@users.noreply.github.com> Date: Sat, 16 Dec 2023 03:33:09 +0100 Subject: [PATCH 14/22] docs: language Co-authored-by: Jesper Friis --- .test/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.test/README.md b/.test/README.md index 39326253f..1413096b3 100644 --- a/.test/README.md +++ b/.test/README.md @@ -3,7 +3,7 @@ Tests running directly on the source .htaccess files. It does only test the redirect, not the existance of the resource redirected to. This is done by mounting the w3id.org repo in an apache docker and test the redirects with curl. -Test specifications are currently extracted from .htaccess file comments, e. g. +Test specifications are currently extracted from .htaccess file comments, e.g. ``` ##TESTv1 '/mypath --header "Accept: text/html"' "https://my-target-domain.com/test.html" ``` From acc919c4eb195cb68886407fd586149df1c8e270 Mon Sep 17 00:00:00 2001 From: Simon Stier <52674635+simontaurus@users.noreply.github.com> Date: Sat, 16 Dec 2023 03:33:43 +0100 Subject: [PATCH 15/22] docs: language Co-authored-by: Ted Thibodeau Jr --- .test/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.test/README.md b/.test/README.md index 1413096b3..79987b707 100644 --- a/.test/README.md +++ b/.test/README.md @@ -11,8 +11,8 @@ Test specifications are currently extracted from .htaccess file comments, e.g. ## Run the test as Github Action 1. Navigate to `https://github.com//w3id.org/actions/workflows/redirect_tests.yml` (example see [here](https://github.com/OpenSemanticWorld/w3id.org/actions/workflows/redirect_tests.yml)) 1. Select 'Run workflow' -1. Keep the master branch or select your custom branch -1. Change the subpath to your subpath, e.g. `/mypath` +1. Accept the master branch, or select your custom branch +1. Change the subpath to your subpath, e.g., `/mypath` 1. Click 'Run workflow' 1. After completion, click on the run entry to view details (example see [here](https://github.com/OpenSemanticWorld/w3id.org/actions/runs/7224639650/job/19686349546)) From 5e8b2f1977dc87f4eff31d62578e80d7b6311bde Mon Sep 17 00:00:00 2001 From: Simon Stier <52674635+simontaurus@users.noreply.github.com> Date: Sat, 16 Dec 2023 03:49:15 +0100 Subject: [PATCH 16/22] add pull_request test --- .github/workflows/redirect_tests.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/redirect_tests.yml b/.github/workflows/redirect_tests.yml index 717b6b354..6548bd975 100644 --- a/.github/workflows/redirect_tests.yml +++ b/.github/workflows/redirect_tests.yml @@ -3,15 +3,19 @@ on: workflow_dispatch: inputs: search_path: - description: "Subpath to test, e.g. '/osw' (empty = all subpaths)" + description: "Subpath to test, e.g. '/osw' ('/*' = all subpaths)" default: '/*' + pull_request: jobs: - build: + dispatch_test: runs-on: ubuntu-latest + if: ${{ github.event_name == 'workflow_dispatch' }} steps: - name: Checkout Project - uses: actions/checkout@v1 + uses: actions/checkout@v4 + with: + fetch-depth: 0 - name: Run apache docker run: docker run -dit --name apache -e SEARCH_PATH=${{ github.event.inputs.search_path }} -v "$PWD":/usr/local/apache2/htdocs/ -v "$PWD"/.test/conf/httpd.conf:/usr/local/apache2/conf/httpd.conf httpd:2.4 @@ -21,3 +25,17 @@ jobs: - name: Run tests run: docker exec -i apache bash < .test/test.sh + + pull_request_test: + runs-on: ubuntu-latest + if: ${{ github.event_name == 'pull_request' }} + steps: + - name: Get changed files + id: changed-files + uses: tj-actions/changed-files@v40 + + - name: List all changed files + run: | + for file in ${{ steps.changed-files.outputs.all_changed_files }}; do + echo "$file was changed" + done From 3c2d8cc8c681a2e5d3b63a275015ba8aca450cff Mon Sep 17 00:00:00 2001 From: Simon Stier <52674635+simontaurus@users.noreply.github.com> Date: Sat, 16 Dec 2023 03:54:50 +0100 Subject: [PATCH 17/22] track changed dirs --- .github/workflows/redirect_tests.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/redirect_tests.yml b/.github/workflows/redirect_tests.yml index 6548bd975..b17ee2151 100644 --- a/.github/workflows/redirect_tests.yml +++ b/.github/workflows/redirect_tests.yml @@ -30,12 +30,16 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event_name == 'pull_request' }} steps: - - name: Get changed files - id: changed-files + - name: Get changed dirs + id: changed-dirs uses: tj-actions/changed-files@v40 + with: + dir_names: true + dir_names_max_depth: '1' + dir_names_exclude_current_dir: false - - name: List all changed files + - name: List all changed dirs run: | - for file in ${{ steps.changed-files.outputs.all_changed_files }}; do - echo "$file was changed" + for dir in ${{ steps.changed-dirs.outputs.all_changed_files }}; do + echo "$dir was changed" done From fcb41a5792af6ed8557f9d8293adbc9b5afa3861 Mon Sep 17 00:00:00 2001 From: Simon Stier <52674635+simontaurus@users.noreply.github.com> Date: Sat, 16 Dec 2023 04:28:52 +0100 Subject: [PATCH 18/22] allow multiple search paths, do nothing if SEARCH_PATH is empty --- .test/test.sh | 80 +++++++++++++++++++++++++++------------------------ 1 file changed, 42 insertions(+), 38 deletions(-) diff --git a/.test/test.sh b/.test/test.sh index 3f9698605..c6ad719be 100644 --- a/.test/test.sh +++ b/.test/test.sh @@ -5,48 +5,52 @@ # default: no error return_code=0 -# search path can be restricted with env var $SEARCH_PATH -for f in $(find /usr/local/apache2/htdocs$SEARCH_PATH -name '.htaccess') -do - echo "Processing file $f" +# SEARCH_PATH can provide a single ("/mypath") or multiple values ("/mypath1;/mypath2") +IFS=';' read -ra paths <<< "$SEARCH_PATH" +for path in "${paths[@]}"; do - tests_found=0 - - while IFS= read -r line + # search path can be restricted with env var $SEARCH_PATH + for f in $(find /usr/local/apache2/htdocs/$path -name '.htaccess') do - tests_found=$((tests_found + 1)) - - # Security note: In gerneral it is not secure at all to eval user input - # (here and later in the curl command). - # Make sure to run the test within a encapsulated environment - # and / or run only the test in your subpath. - declare -a "parts=($( echo "$line" | sed 's/##TESTv1//g' ))" - - # note: we request only the effective url and create an alias with --resolve - # the subpath specified in the test gets appended to the request url - curl="curl -sL -o /dev/null -w "%{url_effective}" --resolve www.w3id.org:80:127.0.0.1 www.w3id.org:80" - curl_cmd="${parts[0]}" - expected_result="${parts[1]}" - - echo "TEST '$curl_cmd' => '$expected_result'" - - cmd="$curl$curl_cmd" - result=$(bash -c "$cmd") - - # compare the result url with the expected url - if [ "$result" == "$expected_result" ]; then - echo "SUCCESS: Result is '$result'" - else - echo "ERROR : Result is '$result'" - return_code=1 + echo "Processing file $f" + + tests_found=0 + + while IFS= read -r line + do + tests_found=$((tests_found + 1)) + + # Security note: In gerneral it is not secure at all to eval user input + # (here and later in the curl command). + # Make sure to run the test within a encapsulated environment + # and / or run only the test in your subpath. + declare -a "parts=($( echo "$line" | sed 's/##TESTv1//g' ))" + + # note: we request only the effective url and create an alias with --resolve + # the subpath specified in the test gets appended to the request url + curl="curl -sL -o /dev/null -w "%{url_effective}" --resolve www.w3id.org:80:127.0.0.1 www.w3id.org:80" + curl_cmd="${parts[0]}" + expected_result="${parts[1]}" + + echo "TEST '$curl_cmd' => '$expected_result'" + + cmd="$curl$curl_cmd" + result=$(bash -c "$cmd") + + # compare the result url with the expected url + if [ "$result" == "$expected_result" ]; then + echo "SUCCESS: Result is '$result'" + else + echo "ERROR : Result is '$result'" + return_code=1 + fi + done < <(grep "##TESTv1" "$f") + + if [ $tests_found == 0 ]; then + echo "No tests found" fi - done < <(grep "##TESTv1" "$f") - if [ $tests_found == 0 ]; then - echo "No tests found" - fi +done done exit $return_code - - From cbe7529a97a9e5db3ced1e9e91098ef199f348de Mon Sep 17 00:00:00 2001 From: Simon Stier <52674635+simontaurus@users.noreply.github.com> Date: Sat, 16 Dec 2023 04:29:46 +0100 Subject: [PATCH 19/22] pass changed dirs to script --- .github/workflows/redirect_tests.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/redirect_tests.yml b/.github/workflows/redirect_tests.yml index b17ee2151..91fe53046 100644 --- a/.github/workflows/redirect_tests.yml +++ b/.github/workflows/redirect_tests.yml @@ -40,6 +40,19 @@ jobs: - name: List all changed dirs run: | + paths="" for dir in ${{ steps.changed-dirs.outputs.all_changed_files }}; do echo "$dir was changed" + paths="$paths/$dir;" done + echo "SEARCH_PATH=$paths" >> $GITHUB_ENV + echo "set SEARCH_PATH to $SEARCH_PATH" + + - name: Run apache docker + run: docker run -dit --name apache -e SEARCH_PATH="$SEARCH_PATH" -v "$PWD":/usr/local/apache2/htdocs/ -v "$PWD"/.test/conf/httpd.conf:/usr/local/apache2/conf/httpd.conf httpd:2.4 + + - name: Install curl + run: docker exec -i apache sh -c "apt-get update && apt-get install curl" + + - name: Run tests + run: docker exec -i apache bash < .test/test.sh From 6f7e7ebe9d3fd0a02d47a4271e62ca56bd214ec4 Mon Sep 17 00:00:00 2001 From: Simon Stier <52674635+simontaurus@users.noreply.github.com> Date: Sat, 16 Dec 2023 04:32:49 +0100 Subject: [PATCH 20/22] fix checkout --- .github/workflows/redirect_tests.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/redirect_tests.yml b/.github/workflows/redirect_tests.yml index 91fe53046..76c1443b6 100644 --- a/.github/workflows/redirect_tests.yml +++ b/.github/workflows/redirect_tests.yml @@ -30,6 +30,11 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event_name == 'pull_request' }} steps: + - name: Checkout Project + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Get changed dirs id: changed-dirs uses: tj-actions/changed-files@v40 From 5e277810a747296972a81e2da2938ba5d32932ba Mon Sep 17 00:00:00 2001 From: Simon Stier <52674635+simontaurus@users.noreply.github.com> Date: Sat, 16 Dec 2023 04:38:56 +0100 Subject: [PATCH 21/22] fix search path --- .test/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.test/test.sh b/.test/test.sh index c6ad719be..993e9acdd 100644 --- a/.test/test.sh +++ b/.test/test.sh @@ -10,7 +10,7 @@ IFS=';' read -ra paths <<< "$SEARCH_PATH" for path in "${paths[@]}"; do # search path can be restricted with env var $SEARCH_PATH - for f in $(find /usr/local/apache2/htdocs/$path -name '.htaccess') + for f in $(find /usr/local/apache2/htdocs$path -name '.htaccess') do echo "Processing file $f" From c96592fc0ad6efb4c28d3e97f45ca4e97621ba3a Mon Sep 17 00:00:00 2001 From: Simon Stier <52674635+simontaurus@users.noreply.github.com> Date: Sat, 16 Dec 2023 05:27:54 +0100 Subject: [PATCH 22/22] feat: add precheck if any test exists --- .github/workflows/redirect_tests.yml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/.github/workflows/redirect_tests.yml b/.github/workflows/redirect_tests.yml index 76c1443b6..ddb19e8be 100644 --- a/.github/workflows/redirect_tests.yml +++ b/.github/workflows/redirect_tests.yml @@ -3,7 +3,7 @@ on: workflow_dispatch: inputs: search_path: - description: "Subpath to test, e.g. '/osw' ('/*' = all subpaths)" + description: "Subpath(s) to test, e.g. '/osw;/emmo;/pmd' ('/*' = all subpaths)" default: '/*' pull_request: @@ -17,13 +17,21 @@ jobs: with: fetch-depth: 0 + - name: Check if at least one test exists + id: precheck + continue-on-error: true # if 'false' the whole workflow will fail if no test was defined + run: find $(IFS=';' read -ra paths <<< "${{ github.event.inputs.search_path }}"; for path in "${paths[@]}"; do echo ".$path "; done) -type f -name ".htaccess" -print0 | xargs -0 grep "##TEST" + - name: Run apache docker - run: docker run -dit --name apache -e SEARCH_PATH=${{ github.event.inputs.search_path }} -v "$PWD":/usr/local/apache2/htdocs/ -v "$PWD"/.test/conf/httpd.conf:/usr/local/apache2/conf/httpd.conf httpd:2.4 + if: steps.precheck.outcome == 'success' + run: docker run -dit --name apache -e SEARCH_PATH="${{ github.event.inputs.search_path }}" -v "$PWD":/usr/local/apache2/htdocs/ -v "$PWD"/.test/conf/httpd.conf:/usr/local/apache2/conf/httpd.conf httpd:2.4 - name: Install curl + if: steps.precheck.outcome == 'success' run: docker exec -i apache sh -c "apt-get update && apt-get install curl" - name: Run tests + if: steps.precheck.outcome == 'success' run: docker exec -i apache bash < .test/test.sh pull_request_test: @@ -52,12 +60,20 @@ jobs: done echo "SEARCH_PATH=$paths" >> $GITHUB_ENV echo "set SEARCH_PATH to $SEARCH_PATH" + + - name: Check if at least one test exists + id: precheck + continue-on-error: true # if 'false' the whole workflow will fail if no test was defined + run: find $(IFS=';' read -ra paths <<< "$SEARCH_PATH"; for path in "${paths[@]}"; do echo ".$path "; done) -type f -name ".htaccess" -print0 | xargs -0 grep "##TEST" - name: Run apache docker + if: steps.precheck.outcome == 'success' run: docker run -dit --name apache -e SEARCH_PATH="$SEARCH_PATH" -v "$PWD":/usr/local/apache2/htdocs/ -v "$PWD"/.test/conf/httpd.conf:/usr/local/apache2/conf/httpd.conf httpd:2.4 - name: Install curl + if: steps.precheck.outcome == 'success' run: docker exec -i apache sh -c "apt-get update && apt-get install curl" - name: Run tests + if: steps.precheck.outcome == 'success' run: docker exec -i apache bash < .test/test.sh