From owner-dev-commits-ports-all@freebsd.org Tue Apr 27 13:49:48 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DD54B5F2384; Tue, 27 Apr 2021 13:49:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FV36N5wJcz4T3f; Tue, 27 Apr 2021 13:49:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BE1831BBBD; Tue, 27 Apr 2021 13:49:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13RDnmSn081763; Tue, 27 Apr 2021 13:49:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13RDnmEe081762; Tue, 27 Apr 2021 13:49:48 GMT (envelope-from git) Date: Tue, 27 Apr 2021 13:49:48 GMT Message-Id: <202104271349.13RDnmEe081762@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?B?RmVybmFuZG8gQXBlc3RlZ3XDrWE=?= Subject: git: f9372d01e096 - main - www/hiawatha : Fix run errors on 13 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f9372d01e096cb391b3ebc5cd69d7bebd640b5e9 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Apr 2021 13:49:48 -0000 The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=f9372d01e096cb391b3ebc5cd69d7bebd640b5e9 commit f9372d01e096cb391b3ebc5cd69d7bebd640b5e9 Author: Fernando Apesteguía AuthorDate: 2021-04-27 07:17:30 +0000 Commit: Fernando Apesteguía CommitDate: 2021-04-27 13:45:53 +0000 www/hiawatha : Fix run errors on 13 Change regular expressions to POSIX-style. References: https://lists.freebsd.org/pipermail/freebsd-hackers/2021-April/057275.html PR: 255182 Reported by: ascilia@free.fr --- www/hiawatha/files/patch-src_session.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/www/hiawatha/files/patch-src_session.c b/www/hiawatha/files/patch-src_session.c new file mode 100644 index 000000000000..f095434683f9 --- /dev/null +++ b/www/hiawatha/files/patch-src_session.c @@ -0,0 +1,27 @@ +--- src/session.c.orig 2021-04-27 07:15:50 UTC ++++ src/session.c +@@ -33,15 +33,15 @@ + static const struct { + const char *text; + } sqli_detection[] = { +- {"'\\s*(;\\s*)?--(\\s|')"}, +- {"\\s+(and|or|xor|&&|\\|\\|)\\s*\\(?\\s*('|[0-9]|`?[a-z\\._-]+`?\\s*(=|like)|[a-z]+\\s*\\()"}, +- {"\\s+(not\\s+)?in\\s*\\(\\s*['0-9]"}, +- {"union(\\s+all)?(\\s*\\(\\s*|\\s+)select(`|\\s)"}, +- {"select(\\s*`|\\s+)(\\*|[a-z0-9_\\, ]*)(`\\s*|\\s+)from(\\s*`|\\s+)[a-z0-9_\\.]*"}, +- {"insert\\s+into(\\s*`|\\s+).*(`\\s*|\\s+)(values\\s*)?\\(.*\\)"}, +- {"update(\\s*`|\\s+)[a-z0-9_\\.]*(`\\s*|\\s+)set(\\s*`|\\s+).*="}, +- {"delete\\s+from(\\s*`|\\s+)[a-z0-9_\\.]*`?"}, +- {"extractvalue\\s*\\(\\s*[0-9'\"@]"}, ++ {"'[[:space:]]*(;[[:space:]]*)?--([[:space:]]|')"}, ++ {"[[:space:]]+(and|or|xor|&&|\\|\\|)[[:space:]]*\\(?[[:space:]]*('|[0-9]|`?[a-z\\._-]+`?[[:space:]]*(=|like)|[a-z]+[[:space:]]*\\()"}, ++ {"[[:space:]]+(not[[:space:]]+)?in[[:space:]]*\\([[:space:]]*['0-9]"}, ++ {"union([[:space:]]+all)?([[:space:]]*\\([[:space:]]*|[[:space:]]+)select(`|[[:space:]])"}, ++ {"select([[:space:]]*`|[[:space:]]+)(\\*|[a-z0-9_\\, ]*)(`[[:space:]]*|[[:space:]]+)from([[:space:]]*`|[[:space:]]+)[a-z0-9_\\.]*"}, ++ {"insert[[:space:]]+into([[:space:]]*`|[[:space:]]+).*(`[[:space:]]*|[[:space:]]+)(values[[:space:]]*)?\\(.*\\)"}, ++ {"update([[:space:]]*`|[[:space:]]+)[a-z0-9_\\.]*(`[[:space:]]*|[[:space:]]+)set([[:space:]]*`|[[:space:]]+).*="}, ++ {"delete[[:space:]]+from([[:space:]]*`|[[:space:]]+)[a-z0-9_\\.]*`?"}, ++ {"extractvalue[[:space:]]*\\([[:space:]]*[0-9'\"@]"}, + {NULL} + }; +