lists.barton.de
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2023
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
List overview
Download
ngIRCd Users
October 2019
----- 2023 -----
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
ngircd@lists.barton.de
1 participants
1 discussions
Start a n
N
ew thread
ngircd patch for censor module
by jrmu
Greetings po||ux, Here is the patch. Sorry it is a bit messy. I was not able to figure out how to edit the autoconf files so I just edited the makefile directly to add the libpcre library: Only in ngircd/src/ngircd: censor.c /* Copyright (C) 2019 by jrmu <jrmu(a)lecturify.com> Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted. This software is offered as-is, without any warranty. */ #include <stdio.h> #include <string.h> #include <stdlib.h> #include <pcre.h> #define OVECCOUNT 30 /* should be a multiple of 3 */ /** * Indicates whether a message matches a list of regular expressions. * * @param msg The message to test * @param msg_len The length of msg * @param re An array of compiled regular expressions * @param re_len The length of re * @param out The matched string to return or NULL * @return Boolean for whether the message should be censored. */ bool censor(char *msg, size_t msg_len, pcre **re, size_t re_len, char *match) { int rc; int ovector[OVECCOUNT]; /* actual length needed because pcre_exec scans past \0 */ int len = strnlen(msg, msg_len); for (unsigned int i = 0; i < re_len && re[i]; i++) { rc = pcre_exec(re[i], NULL, msg, len, 0, 0, ovector, OVECCOUNT); if (rc >= 0) { strlcpy(match, msg+ovector[0], ovector[1]-ovector[0]+1); return true; } } return false; } diff -ru ngircd-barton/src/ngircd/client.c ngircd/src/ngircd/client.c --- ngircd-barton/src/ngircd/client.c Wed Sep 4 00:28:34 2019 +++ ngircd/src/ngircd/client.c Mon Sep 16 07:57:43 2019 @@ -337,7 +337,9 @@ assert(Client != NULL); assert(Hostname != NULL); - if (Conf_CloakHost[0]) { + /* Only cloak the hostmask if it has not yet been cloaked (the period + * indicates it's still an IP address). */ + if (Conf_CloakHost[0] && strchr(Client->host, '.')) { char cloak[GETID_LEN]; strlcpy(cloak, Hostname, GETID_LEN); diff -ru ngircd-barton/src/ngircd/client.h ngircd/src/ngircd/client.h --- ngircd-barton/src/ngircd/client.h Wed Sep 4 00:28:34 2019 +++ ngircd/src/ngircd/client.h Mon Sep 16 07:57:43 2019 @@ -27,7 +27,7 @@ #define CLIENT_UNKNOWNSERVER 0x0080 /* unregistered server connection */ #define CLIENT_GOTPASS_2813 0x0100 /* client did send PASS, RFC 2813 style */ #ifndef STRICT_RFC -# define CLIENT_WAITAUTHPING 0x0200 /* waiting for AUTH PONG from client */ +#define CLIENT_WAITAUTHPING 0x0200 /* waiting for AUTH PONG from client */ #endif #define CLIENT_WAITCAPEND 0x0400 /* waiting for "CAP END" command */ #define CLIENT_ANY 0xFFFF diff -ru ngircd-barton/src/ngircd/conf.c ngircd/src/ngircd/conf.c --- ngircd-barton/src/ngircd/conf.c Wed Sep 4 00:28:34 2019 +++ ngircd/src/ngircd/conf.c Mon Sep 16 12:22:32 2019 @@ -68,6 +68,8 @@ char *Var, char *Arg )); static void Handle_CHANNEL PARAMS((const char *File, int Line, char *Var, char *Arg )); +static void Handle_CENSOR PARAMS((const char *File, int Line, + char *Var, char *Arg )); static void Config_Error PARAMS((const int Level, const char *Format, ...)); @@ -332,6 +334,8 @@ bool config_valid; size_t predef_channel_count; struct Conf_Channel *predef_chan; + size_t predef_censor_count; + struct Conf_Censor *predef_censor; Use_Log = false; @@ -388,7 +392,7 @@ printf(" MaxConnectionsIP = %d\n", Conf_MaxConnectionsIP); printf(" MaxJoins = %d\n", Conf_MaxJoins > 0 ? Conf_MaxJoins : -1); printf(" MaxNickLength = %u\n", Conf_MaxNickLength - 1); - printf(" MaxPenaltyTime = %ld\n", Conf_MaxPenaltyTime); + printf(" MaxPenaltyTime = %lld\n", Conf_MaxPenaltyTime); printf(" MaxListSize = %d\n", Conf_MaxListSize); printf(" PingTimeout = %d\n", Conf_PingTimeout); printf(" PongTimeout = %d\n", Conf_PongTimeout); @@ -490,6 +494,17 @@ printf(" KeyFile = %s\n\n", predef_chan->keyfile); } + predef_censor_count = array_length(&Conf_Censors, sizeof(*predef_censor)); + predef_censor = array_start(&Conf_Censors); + + for (i = 0; i < predef_censor_count; i++, predef_censor++) { + if (!predef_censor->file) + continue; + puts( "[CENSOR]" ); + printf(" File = %s\n\n", predef_censor->file); + } + /* "Censor" section */ + return (config_valid ? 0 : 1); } @@ -757,7 +772,7 @@ strlcat(Conf_HelpFile, HELP_FILE, sizeof(Conf_HelpFile)); strcpy(Conf_ServerPwd, ""); strlcpy(Conf_PidFile, PID_FILE, sizeof(Conf_PidFile)); - Conf_UID = Conf_GID = 0; + Conf_UID = Conf_GID = 703; /* Limits */ Conf_ConnectRetry = 60; @@ -818,7 +833,6 @@ Conf_SyslogFacility = 0; #endif #endif - /* Initialize server configuration structures */ if (InitServers) { for (i = 0; i < MAX_SERVERS; @@ -901,6 +915,12 @@ int i, n; FILE *fd; DIR *dh; + size_t predef_censor_count; + struct Conf_Censor *predef_censor; + const char *error; + int line = 0; + char filters[LINE_LEN][LINE_LEN]; + int erroffset; Log(LOG_INFO, "Using configuration file \"%s\" ...", NGIRCd_ConfFile); @@ -1049,6 +1069,41 @@ Conf_SSLOptions.CipherList = strdup_warn(DEFAULT_CIPHERS); #endif + /* Load censor files */ + predef_censor_count = array_length(&Conf_Censors, sizeof(*predef_censor)); + predef_censor = array_start(&Conf_Censors); + + for (unsigned int i = 0; i < predef_censor_count; i++, predef_censor++) { +// LogDebug("\n\nCensor file: %s\n", predef_censor->file); + if (predef_censor->file) { + fd = fopen(predef_censor->file, "r"); + if (fd) { + while (fgets(filters[line], LINE_LEN, fd)) { + ngt_TrimLastChr(filters[line], '\n'); + line++; + } + fclose(fd); + pcre **re = calloc(sizeof(pcre *), line); + if (!re) { + Config_Error(LOG_ERR, "Can't allocate memory for censor rules"); + break; + } + for (int i = 0; i < line; i++) { + re[i] = pcre_compile(filters[i], PCRE_CASELESS, &error, &erroffset, NULL); + if (!re[i]) { + Config_Error(LOG_ERR, "Can't compile censor rules"); + break; + } + LogDebug("Line: %d, Filter: %s, Re: %p", i, filters[i], re[i]); + } + predef_censor->re = re; + predef_censor->len = line; + } else { + Config_Error(LOG_ERR, "Can't read %s", predef_censor->file); + } + } + } + /* Censor filters */ return true; } @@ -1150,6 +1205,18 @@ continue; } + if (strcasecmp(section, "[CENSOR]") == 0) { + count = array_length(&Conf_Censors, + sizeof(struct Conf_Censor)); + if (!array_alloc(&Conf_Censors, + sizeof(struct Conf_Censor), count)) { + Config_Error(LOG_ERR, + "Could not allocate memory for new censor (line %d)", + line); + } + continue; + } + Config_Error(LOG_ERR, "%s, line %d: Unknown section \"%s\"!", File, line, section); @@ -1187,6 +1254,8 @@ Handle_SERVER(File, line, var, arg); else if (strcasecmp(section, "[CHANNEL]") == 0) Handle_CHANNEL(File, line, var, arg); + else if (strcasecmp(section, "[CENSOR]") == 0) + Handle_CENSOR(File, line, var, arg); else Config_Error(LOG_ERR, "%s, line %d: Variable \"%s\" outside section!", @@ -1646,7 +1715,7 @@ return; } if (strcasecmp(Var, "MaxPenaltyTime") == 0) { - Conf_MaxPenaltyTime = atol(Arg); + Conf_MaxPenaltyTime = atoll(Arg); if (Conf_MaxPenaltyTime < -1) Conf_MaxPenaltyTime = -1; /* "unlimited" */ return; @@ -2193,6 +2262,40 @@ } /** + * Handle variable in [CENSOR] configuration section. + * + * @param Line Line number in configuration file. + * @param Var Variable name. + * @param Arg Variable argument. + */ +static void +Handle_CENSOR(const char *File, int Line, char *Var, char *Arg) +{ + size_t len; + struct Conf_Censor *censor; + + assert( File != NULL ); + assert( Line > 0 ); + assert( Var != NULL ); + assert( Arg != NULL ); + + censor = array_get(&Conf_Censors, sizeof(*censor), + array_length(&Conf_Censors, sizeof(*censor)) - 1); + if (!censor) + return; + + if (strcasecmp(Var, "File") == 0) { + /* Censor file */ + len = strlcpy(censor->file, Arg, sizeof(censor->file)); + if (len >= sizeof(censor->file)) + Config_Error_TooLong(File, Line, Var); + return; + } + + Config_Error_Section(File, Line, Var, "Censor"); +} + +/** * Validate server configuration. * * Please note that this function uses exit(1) on fatal errors and therefore @@ -2280,8 +2383,8 @@ if (Conf_MaxPenaltyTime != -1) Config_Error(LOG_WARNING, - "Maximum penalty increase ('MaxPenaltyTime') is set to %ld, this is not recommended!", - Conf_MaxPenaltyTime); + "Maximum penalty increase ('MaxPenaltyTime') is set to %lld, this is not recommended!", + (long long)Conf_MaxPenaltyTime); #ifdef DEBUG servers = servers_once = 0; diff -ru ngircd-barton/src/ngircd/conf.h ngircd/src/ngircd/conf.h --- ngircd-barton/src/ngircd/conf.h Wed Sep 4 00:28:34 2019 +++ ngircd/src/ngircd/conf.h Mon Sep 16 07:57:43 2019 @@ -27,6 +27,8 @@ #include "proc.h" #include "conf-ssl.h" +#include <pcre.h> + /** * Configured IRC operator. * Please note that the name of the IRC operaor and his nick have nothing to @@ -101,7 +103,7 @@ /** Server info text */ GLOBAL char Conf_ServerInfo[CLIENT_INFO_LEN]; -/** Global server passwort */ +/** Global server password */ GLOBAL char Conf_ServerPwd[CLIENT_PASS_LEN]; /** Administrative information */ @@ -283,8 +285,16 @@ GLOBAL void Conf_DebugDump PARAMS((void)); #endif +/** Censorship rules, one per file */ +struct Conf_Censor { + char file[FNAME_LEN]; /** File path */ + pcre **re; /** Patterns to match against */ + size_t len; /** length of regex patterns array */ +}; -#endif +/** Array of censorship rules */ +GLOBAL array Conf_Censors; +#endif /* -eof- */ diff -ru ngircd-barton/src/ngircd/irc.c ngircd/src/ngircd/irc.c --- ngircd-barton/src/ngircd/irc.c Wed Sep 4 00:28:34 2019 +++ ngircd/src/ngircd/irc.c Mon Sep 16 11:27:55 2019 @@ -38,6 +38,7 @@ #include "op.h" #include "irc.h" +#include "censor.c" static char *Option_String PARAMS((CONN_ID Idx)); static bool Send_Message PARAMS((CLIENT *Client, REQUEST *Req, int ForceType, @@ -511,6 +512,7 @@ #endif } /* Option_String */ + /** * Send a message to target(s). * @@ -534,6 +536,12 @@ char *message = NULL; char *targets[MAX_HNDL_TARGETS]; int i, target_nr = 0; + size_t predef_censor_count; + struct Conf_Censor *predef_censor; + char match[COMMAND_LEN]; + char msg[COMMAND_LEN]; + pcre **re; + int re_len; assert(Client != NULL); assert(Req != NULL); @@ -572,6 +580,26 @@ #endif message = Req->argv[1]; + /* Check censorship rules */ + + predef_censor_count = array_length(&Conf_Censors, sizeof(*predef_censor)); + predef_censor = array_start(&Conf_Censors); + + if (strlcpy(msg, message, COMMAND_LEN) >= COMMAND_LEN) { + LogDebug("Error copying message!"); + } else { + for (unsigned int i = 0; i < predef_censor_count; i++, predef_censor++) { + re = predef_censor->re; + re_len = predef_censor->len; + if (re && censor(msg, COMMAND_LEN, re, re_len, match)) { + LogDebug("Message: %s, match: %s", msg, match); + snprintf(msg, COMMAND_LEN, "Your message to %s was dropped because it contains profanity or spam: %s. If this is an error, please report it in #help.", currentTarget, match); + currentTarget = Client_ID(Client); + message = msg; + break; + } + } + } /* handle msgtarget = msgto *("," msgto) */ currentTarget = strtok_r(currentTarget, ",", &strtok_last); ngt_UpperStr(Req->command); diff -ru ngircd-barton/src/ngircd/ngircd.c ngircd/src/ngircd/ngircd.c --- ngircd-barton/src/ngircd/ngircd.c Wed Sep 4 00:28:34 2019 +++ ngircd/src/ngircd/ngircd.c Mon Sep 16 07:57:43 2019 @@ -560,7 +560,7 @@ #if !defined(SINGLE_USER_OS) /** - * Get user and group ID of unprivileged "nobody" user. + * Get user and group ID of unprivileged "_ngircd" user. * * @param uid User ID * @param gid Group ID @@ -584,7 +584,7 @@ } #endif - pwd = getpwnam("nobody"); + pwd = getpwnam("_ngircd"); if (!pwd) return false; @@ -700,11 +700,11 @@ if (Conf_UID == 0) { pwd = getpwuid(0); Log(LOG_INFO, - "ServerUID must not be %s(0), using \"nobody\" instead.", + "ServerUID must not be %s(0), using \"_ngircd\" instead.", pwd ? pwd->pw_name : "?"); if (!NGIRCd_getNobodyID(&Conf_UID, &Conf_GID)) { Log(LOG_WARNING, - "Could not get user/group ID of user \"nobody\": %s", + "Could not get user/group ID of user \"_ngircd\": %s", errno ? strerror(errno) : "not found" ); goto out; } Only in /etc/ngircd: profanity \b(smart|fat|dumb|big)?(ass|arse)(hol|whol)?e?s?\b bastard \bbdsm\b bitch blow\s?job bollock \bboners?\b \bboo+b(ies|s)?\b \bbugger(ed|ing)?s?\b butt(w?hole|plug) \bcirclejerk \bclit(s)?\b \bcock(s|suck.*)?\b \bcrap(py|ped|ping|per|tastic)?\b \b[ck]um(mer|ming|shot)?s?\b [ck]un+il+ingus \b[c|k]unt(s|lick.*)?\b \b(god-?)?damn \bdick (tele)?dildo \bdykes?\b eja[ck]ulat.* \b(dumb|nazi)?fag+(ot)?(it+)?s?\b \bfap(ping|pening|ed)?s?\b fellat(e|io) \bfook(er)?s?\b \b(m[ou]ther|m[ou]tha|father|sister|goat|cyber|finger|fist)?fuc?k+ fuc?k+(a|er|in|ing|ed|wad|head|off|whit)?s?\b \bfcuk(er|ing)?\b fudge\s*packers? \bfux(or)?s?\b gang\s*bang gay\s*(slave|lords?|sex) g[eo]t(ting|ten)? laid (phone|hot|core|\banal|\boral)\s*sex \bhorn(y|iest) (jack|jerk)\-*\s*off \bjizz jizz\b \bkock(suck.*)?s?\b \blady\s*boys? lmf?ao\b mast[eu]rbat \bmofos?\b \bnigg(er|a)(s|z)?\b nutsacks? \bphu(ck|q)(ed|ing|ked)?s?\b \bpiss(ed|ing|in|es|er|ers|off)?\b \bpuss(e|y|ys|ies)\b \bretard(ed)?s?\b \brim(ming|job)?s?\b \bscrewing\b \bshag(ging)?\b \bshe\-*males? \bshit|shit\b \bskank(y|s)?\b \bslut(ty|ting|s)?\b \btit+(s|y|ies|wank|ywank)\b \btwat(head|ty)?\b \bturds?\b \bwank(y|er)?s?\b \b(cam)?whor(e|ing)?(house)?s?\b \bwtf\b shibboleth /etc/ngircd/ngircd.conf: [Censor] File = /etc/ngircd/profanity jrmu
3 years, 7 months
1
0
0
0
← Newer
1
Older →
Jump to page:
1
Results per page:
10
25
50
100
200