ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-09 10:39:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Demote the regex_tre module to inspircd-contrib.

Browse Source
This commit is contained in:
Sadie Powell 2021-06-01 02:49:33 +01:00
parent 1f421861e6
commit bd9b6c4005
6 changed files with 3 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/ci-linux.yml vendored
View File

@ -31,7 +31,6 @@ jobs:
libre2-dev \
libsqlite3-dev \
libssl-dev \
libtre-dev \
make \
pkg-config
- name: Work around a bug in GitHub Actions
@ -40,7 +39,7 @@ jobs:
sudo apt-get remove gcc-11 libgcc-11-dev
- name: Run configure
run: |
./configure --enable-extras "argon2 geo_maxmind ldap mysql pgsql regex_pcre regex_posix regex_re2 regex_tre sqlite3 ssl_gnutls ssl_mbedtls ssl_openssl sslrehashsignal"
./configure --enable-extras "argon2 geo_maxmind ldap mysql pgsql regex_pcre regex_posix regex_re2 sqlite3 ssl_gnutls ssl_mbedtls ssl_openssl sslrehashsignal"
./configure --development --disable-auto-extras --socketengine ${{ matrix.socketengine }}
- name: Build core
run: |

4
.github/workflows/ci-macos.yml vendored
View File

@ -16,7 +16,7 @@ jobs:
- name: Install dependencies
run: |
brew update || true
for PACKAGE in pkg-config argon2 gnutls libmaxminddb libpq mbedtls mysql-client openssl@1.1 pcre re2 sqlite tre;
for PACKAGE in pkg-config argon2 gnutls libmaxminddb libpq mbedtls mysql-client openssl@1.1 pcre re2 sqlite;
do
brew install $PACKAGE || brew upgrade $PACKAGE
done
@ -24,7 +24,7 @@ jobs:
brew link --force --overwrite mysql-client
- name: Run configure
run: |
./configure --enable-extras "argon2 geo_maxmind ldap mysql pgsql regex_pcre regex_posix regex_re2 regex_tre sqlite3 ssl_gnutls ssl_mbedtls ssl_openssl sslrehashsignal"
./configure --enable-extras "argon2 geo_maxmind ldap mysql pgsql regex_pcre regex_posix regex_re2 sqlite3 ssl_gnutls ssl_mbedtls ssl_openssl sslrehashsignal"
./configure --development --disable-auto-extras --socketengine ${{ matrix.socketengine }}
- name: Build core
run: |

1
.gitignore vendored
View File

@ -24,7 +24,6 @@
/src/modules/m_regex_pcre.cpp
/src/modules/m_regex_posix.cpp
/src/modules/m_regex_re2.cpp
/src/modules/m_regex_tre.cpp
/src/modules/m_sqlite3.cpp
/src/modules/m_ssl_gnutls.cpp
/src/modules/m_ssl_mbedtls.cpp

1
configure vendored
View File

@ -368,7 +368,6 @@ if (prompt_bool $interactive, $question, 0) {
'm_regex_pcre.cpp' => 'pcre-config --version',
'm_regex_posix.cpp' => undef,
'm_regex_re2.cpp' => 'pkg-config --exists re2',
'm_regex_tre.cpp' => 'pkg-config --exists tre',
'm_sqlite3.cpp' => 'pkg-config --exists sqlite3',
'm_ssl_gnutls.cpp' => 'pkg-config --exists gnutls',
'm_ssl_mbedtls.cpp' => "echo '#include <mbedtls/version.h>' | $config{CXX} -E -",

9
docs/conf/modules.conf.example
View File

@ -885,7 +885,6 @@
# #
# glob - Glob patterns, provided via regex_glob. #
# pcre - PCRE regexps, provided via regex_pcre, needs libpcre. #
# tre - TRE regexps, provided via regex_tre, requires libtre. #
# posix - POSIX regexps, provided via regex_posix, not available #
# on Windows, no dependencies on other operating systems. #
# stdlib - stdlib regexps, provided via regex_stdlib, see comment #
@ -1793,14 +1792,6 @@
# bre, ere, awk, grep, egrep, ecmascript (default if not specified).
#<stdregex type="ecmascript">
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# Regular expression provider for TRE regular expressions.
# This is the same regular expression engine used by UnrealIRCd, so
# if you are most familiar with the syntax of /SPAMFILTER from there,
# this is the provider you want. You need libtre installed in order
# to compile and load this module.
#<module name="regex_tre">
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# Remove module: Adds the /REMOVE command which is a peaceful
# alternative to /KICK. It also provides the /FPART command which works

91
src/modules/extra/m_regex_tre.cpp
View File

@ -1,91 +0,0 @@
/*
* InspIRCd -- Internet Relay Chat Daemon
*
* Copyright (C) 2013, 2016-2017, 2019, 2021 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2013 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2012 Robby <robby@chatbelgie.be>
* Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
* Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
* Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
*
* This file is part of InspIRCd. InspIRCd is free software: you can
* redistribute it and/or modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation, version 2.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/// $CompilerFlags: find_compiler_flags("tre")
/// $LinkerFlags: find_linker_flags("tre")
/// $PackageInfo: require_system("arch") pkgconf tre
/// $PackageInfo: require_system("darwin") pkg-config tre
/// $PackageInfo: require_system("debian") libtre-dev pkg-config
/// $PackageInfo: require_system("ubuntu") libtre-dev pkg-config
#include "inspircd.h"
#include "modules/regex.h"
#include <sys/types.h>
#include <tre/regex.h>
class TREPattern final
: public Regex::Pattern
{
private:
regex_t regex;
public:
TREPattern(const std::string& pattern, uint8_t options)
: Regex::Pattern(pattern, options)
{
int flags = REG_EXTENDED | REG_NOSUB;
if (options & Regex::OPT_CASE_INSENSITIVE)
flags &= REG_ICASE;
int error = regcomp(&regex, pattern.c_str(), flags);
if (!error)
return;
// Retrieve the size of the error message and allocate a buffer.
size_t errorsize = regerror(error, &regex, NULL, 0);
std::vector<char> errormsg(errorsize);
// Retrieve the error message and free the buffer.
regerror(error, &regex, &errormsg[0], errormsg.size());
regfree(&regex);
throw Regex::Exception(pattern, std::string(&errormsg[0], errormsg.size()));
}
~TREPattern() override
{
regfree(&regex);
}
bool IsMatch(const std::string& text) override
{
return !regexec(&regex, text.c_str(), 0, NULL, 0);
}
};
class ModuleRegexTRE : public Module
{
private:
Regex::SimpleEngine<TREPattern> regex;
public:
ModuleRegexTRE()
: Module(VF_VENDOR, "Provides the tre regular expression engine which uses the TRE library.")
, regex(this, "tre")
{
}
};
MODULE_INIT(ModuleRegexTRE)