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

Merge branch 'insp3' into master.

Browse Source
This commit is contained in:
Sadie Powell 2022-01-03 15:14:36 +00:00
commit b96af051c2
50 changed files with 133 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1608,25 +1608,28 @@
#<module name="opmoderated">
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# Password forwarding module: Forwards a password users can send on
# connect to the specified client below. The client is usually NickServ
# and this module is usually used to authenticate users with NickServ
# using their connect password.
# Password forwarding module: Allows forwarding passwords to services to
# automatically log users into their account. The password can either be
# specified as the server password or as a second parameter to the /NICK
# command.
#<module name="passforward">
<passforward
# nick: nick to forward connect passwords to.
nick="NickServ"
# forwardmsg: Message to send to users using a connect password.
# $nick will be the users' nick, $nickrequired will be the nick
# of where the password is going (the nick above).
# You can also use $user for the user ident string.
forwardmsg="NOTICE $nick :*** Forwarding PASS to $nickrequired"
# nick: The nick of the service to forward passwords to.
nick="NickServ"
# cmd: Command for the user to run when it receives a connect
# password.
cmd="SQUERY $nickrequired :IDENTIFY $pass">
# forwardmsg: Message to send to users when forwarding their
# password. You can use the following variables in this message:
#
# $nick The nickname of the authenticating user.
# $nickrequired The nickname of the service to forward to (see above).
# $pass The password to forward to services.
# $user The username (ident) of the authenticating user.
forwardmsg="NOTICE $nick :*** Forwarding password to $nickrequired"
# cmd: The message to send to forward passwords to services.
cmd="SQUERY $nickrequired :IDENTIFY $nick $pass">
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# Password hash module: Allows hashed passwords to be used.

4
docs/conf/providers/irccloud.conf.example
View File

@ -13,11 +13,11 @@
<connect name="IRCCloud (IPv4)"
parent="IRCCloud"
allow="5.254.36.56/29 192.184.8.103 192.184.9.108 192.184.9.112 192.184.10.118 192.184.10.9"
allow="5.254.36.56/29 5.254.36.104/29"
uniqueusername="yes">
# This is not typically needed as each user has their own IPv6 but if you have
# <cidr:ipv6clone> set to a value lower than 128 you will need to enable it.
#<connect name="IRCCloud (IPv6)"
# parent="IRCCloud"
# allow="2001:67c:2f08::/48 2a03:5180:f::/62 2a03:5180:f:4::/63 2a03:5180:f:6::/64">
# allow="2a03:5180:f::/62 2a03:5180:f:4::/63 2a03:5180:f:6::/64">

2
include/configreader.h
View File

@ -2,7 +2,7 @@
* InspIRCd -- Internet Relay Chat Daemon
*
* Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
* Copyright (C) 2018 Chris Novakovic <chrisnovakovic@users.noreply.github.com>
* Copyright (C) 2018 Chris Novakovic
* Copyright (C) 2013-2014, 2016 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2013 Daniel Vassdal <shutter@canternet.org>
* Copyright (C) 2012-2014, 2016-2021 Sadie Powell <sadie@witchery.services>

1
include/iohook.h
View File

@ -1,6 +1,7 @@
/*
* InspIRCd -- Internet Relay Chat Daemon
*
* Copyright (C) 2021 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2019 Robby <robby@chatbelgie.be>
* Copyright (C) 2013, 2016-2017 Attila Molnar <attilamolnar@hush.com>
*

7
include/modules/account.h
View File

@ -2,7 +2,7 @@
* InspIRCd -- Internet Relay Chat Daemon
*
* Copyright (C) 2015 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2013 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2013, 2020 Sadie Powell <sadie@witchery.services>
* 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>
@ -36,6 +36,11 @@ inline AccountExtItem* GetAccountExtItem()
return static_cast<AccountExtItem*>(ServerInstance->Extensions.GetItem("accountname"));
}
inline AccountExtItem* GetAccountIdExtItem()
{
return static_cast<AccountExtItem*>(ServerInstance->Extensions.GetItem("accountid"));
}
class AccountEventListener
: public Events::ModuleEventListener
{

5
include/modules/ircv3.h
View File

@ -1,7 +1,7 @@
/*
* InspIRCd -- Internet Relay Chat Daemon
*
* Copyright (C) 2018-2019, 2021 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2018-2021 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2015, 2018 Attila Molnar <attilamolnar@hush.com>
*
* This file is part of InspIRCd. InspIRCd is free software: you can
@ -106,4 +106,7 @@ class IRCv3::CapTag
, tagname(Tagname)
{
}
/** Retrieves the underlying capability. */
const Cap::Capability& GetCap() const { return cap; }
};

2
include/server.h
View File

@ -1,7 +1,7 @@
/*
* InspIRCd -- Internet Relay Chat Daemon
*
* Copyright (C) 2019-2020 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2019-2021 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2018 Matt Schatz <genius3000@g3k.solutions>
* Copyright (C) 2014 Attila Molnar <attilamolnar@hush.com>
*

2
include/token_list.h
View File

@ -1,7 +1,7 @@
/*
* InspIRCd -- Internet Relay Chat Daemon
*
* Copyright (C) 2017 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2017, 2021 Sadie Powell <sadie@witchery.services>
*
* 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

2
include/typedefs.h
View File

@ -1,7 +1,7 @@
/*
* InspIRCd -- Internet Relay Chat Daemon
*
* Copyright (C) 2013, 2016, 2018, 2020 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2013, 2016, 2018, 2020-2021 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2012-2014, 2016, 2018 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2012 Robby <robby@chatbelgie.be>
* Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>

2
src/coremods/core_channel/cmd_kick.cpp
View File

@ -1,7 +1,7 @@
/*
* InspIRCd -- Internet Relay Chat Daemon
*
* Copyright (C) 2017-2018 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2017-2018, 2021 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2017 B00mX0r <b00mx0r@aureus.pw>
* Copyright (C) 2013-2014, 2016 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>

1
src/coremods/core_hostname_lookup.cpp
View File

@ -1,7 +1,6 @@
/*
* InspIRCd -- Internet Relay Chat Daemon
*
* Copyright (C) 2020 Matt Schatz <genius3000@g3k.solutions>
* Copyright (C) 2013, 2017-2021 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2013, 2016 Adam <Adam@anope.org>
* Copyright (C) 2013, 2015 Attila Molnar <attilamolnar@hush.com>

2
src/coremods/core_info/core_info.cpp
View File

@ -1,7 +1,7 @@
/*
* InspIRCd -- Internet Relay Chat Daemon
*
* Copyright (C) 2018, 2020 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2018, 2020-2021 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2018 linuxdaemon <linuxdaemon.irc@gmail.com>
* Copyright (C) 2014, 2016, 2018 Attila Molnar <attilamolnar@hush.com>
*

4
src/coremods/core_user/cmd_nick.cpp
View File

@ -3,7 +3,7 @@
*
* Copyright (C) 2017 B00mX0r <b00mx0r@aureus.pw>
* Copyright (C) 2014, 2016 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2013, 2016, 2018 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2013, 2016, 2018, 2021 Sadie Powell <sadie@witchery.services>
* 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>
@ -29,7 +29,7 @@
#include "core_user.h"
CommandNick::CommandNick(Module* parent)
: SplitCommand(parent, "NICK", 1, 1)
: SplitCommand(parent, "NICK", 1)
{
works_before_reg = true;
syntax = { "<newnick>" };

2
src/coremods/core_xline/cmd_eline.cpp
View File

@ -2,8 +2,8 @@
* InspIRCd -- Internet Relay Chat Daemon
*
* Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
* Copyright (C) 2018, 2021 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2018 linuxdaemon <linuxdaemon.irc@gmail.com>
* Copyright (C) 2018 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
* Copyright (C) 2012, 2014 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>

2
src/coremods/core_xline/cmd_gline.cpp
View File

@ -2,8 +2,8 @@
* InspIRCd -- Internet Relay Chat Daemon
*
* Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
* Copyright (C) 2018, 2021 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2018 linuxdaemon <linuxdaemon.irc@gmail.com>
* Copyright (C) 2018 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
* Copyright (C) 2012, 2014 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>

2
src/coremods/core_xline/cmd_kline.cpp
View File

@ -2,8 +2,8 @@
* InspIRCd -- Internet Relay Chat Daemon
*
* Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
* Copyright (C) 2018, 2021 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2018 linuxdaemon <linuxdaemon.irc@gmail.com>
* Copyright (C) 2018 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
* Copyright (C) 2012, 2014 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>

2
src/inspircd.cpp
View File

@ -3,7 +3,7 @@
*
* Copyright (C) 2021 Valentin Lorentz <progval+git@progval.net>
* Copyright (C) 2020 Matt Schatz <genius3000@g3k.solutions>
* Copyright (C) 2018 Chris Novakovic <chrisnovakovic@users.noreply.github.com>
* Copyright (C) 2018 Chris Novakovic
* Copyright (C) 2013, 2017-2021 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2013 Adam <Adam@anope.org>
* Copyright (C) 2012-2014, 2016, 2018 Attila Molnar <attilamolnar@hush.com>

2
src/modules/extra/m_ldap.cpp
View File

@ -3,7 +3,7 @@
*
* Copyright (C) 2020 Joel Sing <joel@sing.id.au>
* Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
* Copyright (C) 2016-2020 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2016-2021 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2014, 2016 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2013-2016 Adam <Adam@anope.org>
*

4
src/modules/m_banredirect.cpp
View File

@ -3,8 +3,8 @@
*
* Copyright (C) 2018 linuxdaemon <linuxdaemon.irc@gmail.com>
* Copyright (C) 2014 Adam <Adam@anope.org>
* Copyright (C) 2013-2016 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2013, 2017-2018 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2013-2014, 2016 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2013, 2017-2018, 2021 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2013 Daniel Vassdal <shutter@canternet.org>
* Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
* Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>

2
src/modules/m_classban.cpp
View File

@ -2,7 +2,7 @@
* InspIRCd -- Internet Relay Chat Daemon
*
* Copyright (C) 2020-2021 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2016 Johanna A <johanna-a@users.noreply.github.com>
* Copyright (C) 2016 Johanna A
*
* 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

2
src/modules/m_clearchan.cpp
View File

@ -2,7 +2,7 @@
* InspIRCd -- Internet Relay Chat Daemon
*
* Copyright (C) 2019 Robby <robby@chatbelgie.be>
* Copyright (C) 2017-2018 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2017-2018, 2021 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2014, 2016 Attila Molnar <attilamolnar@hush.com>
*
* This file is part of InspIRCd. InspIRCd is free software: you can

2
src/modules/m_customprefix.cpp
View File

@ -2,7 +2,7 @@
* InspIRCd -- Internet Relay Chat Daemon
*
* Copyright (C) 2013-2014 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2013, 2017-2018 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2013, 2017-2018, 2021 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
* Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org>
*

2
src/modules/m_dccallow.cpp
View File

@ -13,7 +13,7 @@
* Copyright (C) 2008 John Brooks <special@inspircd.org>
* Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
* Copyright (C) 2007-2008 Dennis Friis <peavey@inspircd.org>
* Copyright (C) 2006 jamie <jamie@e03df62e-2008-0410-955e-edbf42e46eb7>
* Copyright (C) 2006 jamie
*
* 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

2
src/modules/m_haproxy.cpp
View File

@ -3,7 +3,7 @@
*
* Copyright (C) 2019-2020 Matt Schatz <genius3000@g3k.solutions>
* Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
* Copyright (C) 2018-2019 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2018-2019, 2021 Sadie Powell <sadie@witchery.services>
*
* 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

4
src/modules/m_httpd_stats.cpp
View File

@ -4,9 +4,9 @@
* Copyright (C) 2021 Herman <GermanAizek@yandex.ru>
* Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
* Copyright (C) 2018 Matt Schatz <genius3000@g3k.solutions>
* Copyright (C) 2016 Johanna A <johanna-a@users.noreply.github.com>
* Copyright (C) 2016 Johanna A
* Copyright (C) 2013-2016 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2013, 2017, 2019-2020 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2013, 2017, 2019-2021 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2012 Robby <robby@chatbelgie.be>
* Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
* Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>

35
src/modules/m_ircv3_accounttag.cpp
View File

@ -1,7 +1,7 @@
/*
* InspIRCd -- Internet Relay Chat Daemon
*
* Copyright (C) 2018 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2018, 2020 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2018 Attila Molnar <attilamolnar@hush.com>
*
* This file is part of InspIRCd. InspIRCd is free software: you can
@ -19,6 +19,7 @@
#include "inspircd.h"
#include "modules/ctctags.h"
#include "modules/ircv3.h"
#include "modules/account.h"
@ -45,16 +46,48 @@ class AccountTag final
}
};
class AccountIdTag final
: public ClientProtocol::MessageTagProvider
{
private:
AccountTag& acctag;
CTCTags::CapReference ctctagcap;
public:
AccountIdTag(Module* mod, AccountTag& tag)
: ClientProtocol::MessageTagProvider(mod)
, acctag(tag)
, ctctagcap(mod)
{
}
void OnPopulateTags(ClientProtocol::Message& msg) override
{
const User* user = msg.GetSourceUser();
const AccountExtItem* accextitem = user ? GetAccountIdExtItem() : nullptr;
const std::string* accountid = accextitem ? accextitem->Get(user) : nullptr;
if (accountid)
msg.AddTag("inspircd.org/account-id", this, *accountid);
}
bool ShouldSendTag(LocalUser* user, const ClientProtocol::MessageTagData& tagdata) override
{
return acctag.GetCap().IsEnabled(user) && ctctagcap.IsEnabled(user);
}
};
class ModuleIRCv3AccountTag final
: public Module
{
private:
AccountTag tag;
AccountIdTag idtag;
public:
ModuleIRCv3AccountTag()
: Module(VF_VENDOR, "Provides the IRCv3 account-tag client capability.")
, tag(this)
, idtag(this, tag)
{
}
};

2
src/modules/m_kicknorejoin.cpp
View File

@ -1,7 +1,7 @@
/*
* InspIRCd -- Internet Relay Chat Daemon
*
* Copyright (C) 2018 A_D <A-UNDERSCORE-D@users.noreply.github.com>
* Copyright (C) 2018 A_D
* Copyright (C) 2014 Daniel Vassdal <shutter@canternet.org>
* Copyright (C) 2013, 2017-2020 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2012-2015 Attila Molnar <attilamolnar@hush.com>

2
src/modules/m_ldapoper.cpp
View File

@ -1,7 +1,7 @@
/*
* InspIRCd -- Internet Relay Chat Daemon
*
* Copyright (C) 2020 Christos Triantafyllidis <ctria@users.noreply.github.com>
* Copyright (C) 2020 Christos Triantafyllidis
* Copyright (C) 2018-2020 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2014, 2018 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2013-2014 Adam <Adam@anope.org>

2
src/modules/m_messageflood.cpp
View File

@ -1,7 +1,7 @@
/*
* InspIRCd -- Internet Relay Chat Daemon
*
* Copyright (C) 2013, 2017-2019 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2013, 2017-2019, 2021 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2012-2014, 2016 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
* Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>

2
src/modules/m_nokicks.cpp
View File

@ -2,7 +2,7 @@
* InspIRCd -- Internet Relay Chat Daemon
*
* Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
* Copyright (C) 2013, 2017 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2013, 2017, 2021 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
* Copyright (C) 2012 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>

2
src/modules/m_opmoderated.cpp
View File

@ -68,7 +68,7 @@ class ModuleOpModerated final
public:
ModuleOpModerated()
: Module(VF_VENDOR | VF_OPTCOMMON, "Implements opmoderated channel mode +U (non-voiced messages sent to ops) and extban 'u'.")
: Module(VF_VENDOR | VF_OPTCOMMON, "Adds the ability for IRC gateways to forward the real IP address of users connecting through them.")
, CTCTags::EventListener(this)
, exemptionprov(this)
, extban(this, "opmoderated", 'u')

4
src/modules/m_override.cpp
View File

@ -2,11 +2,11 @@
* InspIRCd -- Internet Relay Chat Daemon
*
* Copyright (C) 2021 Herman <GermanAizek@yandex.ru>
* Copyright (C) 2020 satmd <satmd@users.noreply.github.com>
* Copyright (C) 2020 satmd <satmd@satmd.de>
* Copyright (C) 2017 B00mX0r <b00mx0r@aureus.pw>
* Copyright (C) 2017 Adam <Adam@anope.org>
* Copyright (C) 2016 Sheogorath <sheogorath@shivering-isles.com>
* Copyright (C) 2013, 2017, 2020 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2013, 2017, 2020-2021 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2013 Daniel Vassdal <shutter@canternet.org>
* Copyright (C) 2012-2015 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2012 Shawn Smith <ShawnSmith0828@gmail.com>

27
src/modules/m_passforward.cpp
View File

@ -3,7 +3,7 @@
*
* Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
* Copyright (C) 2014 Googolplexed <googol@googolplexed.net>
* Copyright (C) 2013, 2018, 2020 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2013, 2018, 2020-2021 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2012-2014 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2012 Robby <robby@chatbelgie.be>
* Copyright (C) 2012 Boleslaw Tokarski <boleslaw.tokarski@tieto.com>
@ -33,7 +33,7 @@ class ModulePassForward final
public:
ModulePassForward()
: Module(VF_VENDOR, "Allows the /PASS password to be forwarded to a services pseudoclient such as NickServ.")
: Module(VF_VENDOR, "Allows an account password to be forwarded to a services pseudoclient such as NickServ.")
{
}
@ -41,11 +41,11 @@ class ModulePassForward final
{
auto tag = ServerInstance->Config->ConfValue("passforward");
nickrequired = tag->getString("nick", "NickServ");
forwardmsg = tag->getString("forwardmsg", "NOTICE $nick :*** Forwarding PASS to $nickrequired");
forwardcmd = tag->getString("cmd", "SQUERY $nickrequired :IDENTIFY $pass", 1);
forwardmsg = tag->getString("forwardmsg", "NOTICE $nick :*** Forwarding password to $nickrequired");
forwardcmd = tag->getString("cmd", "SQUERY $nickrequired :IDENTIFY $nick $pass", 1);
}
void FormatStr(std::string& result, const std::string& format, const LocalUser* user)
void FormatStr(const LocalUser* user, const std::string& format, const std::string& pass, std::string& result)
{
for (unsigned int i = 0; i < format.length(); i++)
{
@ -69,7 +69,7 @@ class ModulePassForward final
}
else if (!format.compare(i, 5, "$pass", 5))
{
result.append(user->password);
result.append(pass);
i += 4;
}
else
@ -97,6 +97,17 @@ class ModulePassForward final
return;
}
ForwardPass(user, user->password);
}
void OnPostCommand(Command* command, const CommandBase::Params& parameters, LocalUser* user, CmdResult result, bool loop) override
{
if (command->name == "NICK" && parameters.size() > 1)
ForwardPass(user, parameters[1]);
}
void ForwardPass(LocalUser* user, const std::string& pass)
{
if (!nickrequired.empty())
{
/* Check if nick exists and is on a services server. */
@ -108,12 +119,12 @@ class ModulePassForward final
std::string tmp;
if (!forwardmsg.empty())
{
FormatStr(tmp, forwardmsg, user);
FormatStr(user, forwardmsg, pass, tmp);
ServerInstance->Parser.ProcessBuffer(user, tmp);
tmp.clear();
}
FormatStr(tmp, forwardcmd, user);
FormatStr(user, forwardcmd, pass, tmp);
ServerInstance->Parser.ProcessBuffer(user, tmp);
}
};

3
src/modules/m_repeat.cpp
View File

@ -2,10 +2,11 @@
* InspIRCd -- Internet Relay Chat Daemon
*
* Copyright (C) 2021 iwalkalone <iwalkalone69@gmail.com>
* Copyright (C) 2021 David Schultz <me@zpld.me>
* Copyright (C) 2019 Robby <robby@chatbelgie.be>
* Copyright (C) 2018-2019 linuxdaemon <linuxdaemon.irc@gmail.com>
* Copyright (C) 2018 Matt Schatz <genius3000@g3k.solutions>
* Copyright (C) 2017-2019 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2017-2019, 2021 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2015 James Lu <GLolol@overdrivenetworks.com>
* Copyright (C) 2013-2015 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2013 Daniel Vassdal <shutter@canternet.org>

2
src/modules/m_sajoin.cpp
View File

@ -7,7 +7,7 @@
* Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
* Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
* Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
* Copyright (C) 2006 jamie <jamie@e03df62e-2008-0410-955e-edbf42e46eb7>
* Copyright (C) 2006 jamie
* Copyright (C) 2005, 2007 Robin Burchell <robin+git@viroteck.net>
* Copyright (C) 2004, 2007, 2010 Craig Edwards <brain@inspircd.org>
*

2
src/modules/m_serverban.cpp
View File

@ -2,8 +2,8 @@
* InspIRCd -- Internet Relay Chat Daemon
*
* Copyright (C) 2013, 2021 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2012, 2014 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2012 Robby <robby@chatbelgie.be>
* Copyright (C) 2012 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2010 Craig Edwards <brain@inspircd.org>
* Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
* Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>

2
src/modules/m_services_account.cpp
View File

@ -184,6 +184,7 @@ class ModuleServicesAccount final
SimpleUserMode regdeafmode;
RegisteredChannel chanregmode;
RegisteredUser userregmode;
AccountExtItem accountid;
AccountExtItemImpl accountname;
AccountExtBan accountextban;
UnauthedExtBan unauthedextban;
@ -200,6 +201,7 @@ class ModuleServicesAccount final
, regdeafmode(this, "regdeaf", 'R')
, chanregmode(this)
, userregmode(this)
, accountid(this, "accountid", ExtensionType::USER)
, accountname(this)
, accountextban(this, accountname)
, unauthedextban(this, accountname)

3
src/modules/m_shun.cpp
View File

@ -3,12 +3,13 @@
*
* Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
* Copyright (C) 2018 linuxdaemon <linuxdaemon.irc@gmail.com>
* Copyright (C) 2017-2018 B00mX0r <b00mx0r@aureus.pw>
* Copyright (C) 2017 B00mX0r <b00mx0r@aureus.pw>
* Copyright (C) 2013, 2017-2018, 2020-2021 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2012-2013, 2015-2016 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
* Copyright (C) 2012 Jens Voss <DukePyrolator@anope.org>
* Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
* Copyright (C) 2009 John Brooks <special@inspircd.org>
* Copyright (C) 2009 Dennis Friis <peavey@inspircd.org>
* Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
* Copyright (C) 2008-2010 Craig Edwards <brain@inspircd.org>

2
src/modules/m_spanningtree/main.h
View File

@ -3,7 +3,7 @@
*
* Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
* Copyright (C) 2013-2016, 2018 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2013, 2017-2020 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2013, 2017-2021 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2013 Adam <Adam@anope.org>
* Copyright (C) 2012 Robby <robby@chatbelgie.be>
* Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>

2
src/modules/m_spanningtree/resolvers.cpp
View File

@ -1,7 +1,7 @@
/*
* InspIRCd -- Internet Relay Chat Daemon
*
* Copyright (C) 2013, 2019-2020 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2019-2021 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2013, 2016 Adam <Adam@anope.org>
* Copyright (C) 2012-2014, 2016 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2012 Robby <robby@chatbelgie.be>

2
src/modules/m_spanningtree/resolvers.h
View File

@ -1,7 +1,7 @@
/*
* InspIRCd -- Internet Relay Chat Daemon
*
* Copyright (C) 2013 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2013, 2021 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2013 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2013 Adam <Adam@anope.org>
* Copyright (C) 2012 Robby <robby@chatbelgie.be>

2
src/modules/m_sqlauth.cpp
View File

@ -2,7 +2,7 @@
* InspIRCd -- Internet Relay Chat Daemon
*
* Copyright (C) 2015 Daniel Vassdal <shutter@canternet.org>
* Copyright (C) 2013, 2017-2019 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2013, 2017-2019, 2021 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2012-2015 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
* Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>

4
src/modules/m_sslinfo.cpp
View File

@ -1,7 +1,7 @@
/*
* InspIRCd -- Internet Relay Chat Daemon
*
* Copyright (C) 2021 Molly Miller <sysvinit@users.noreply.github.com>
* Copyright (C) 2021 Molly Miller
* Copyright (C) 2020 Matt Schatz <genius3000@g3k.solutions>
* Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
* Copyright (C) 2013, 2017-2021 Sadie Powell <sadie@witchery.services>
@ -281,7 +281,7 @@ class ModuleSSLInfo final
public:
ModuleSSLInfo()
: Module(VF_VENDOR, "Adds user facing TLS information, various TLS configuration options, and the /SSLINFO command to look up TLS certificate information for other users.")
: Module(VF_VENDOR, "Adds user facing TLS (SSL) information, various TLS (SSL) configuration options, and the /SSLINFO command to look up TLS (SSL) certificate information for other users.")
, WebIRC::EventListener(this)
, Whois::EventListener(this)
, Who::EventListener(this)

2
src/modules/m_sslmodes.cpp
View File

@ -165,7 +165,7 @@ class ModuleSSLModes final
public:
ModuleSSLModes()
: Module(VF_VENDOR, "Adds channel mode z (sslonly) which prevents users who are not connecting using TLS from joining the channel and user mode z (sslqueries) to prevent messages from non-TLS users.")
: Module(VF_VENDOR, "Adds channel mode z (sslonly) which prevents users who are not connecting using TLS (SSL) from joining the channel and user mode z (sslqueries) to prevent messages from non-TLS (SSL) users.")
, CTCTags::EventListener(this)
, api(this)
, sslm(this, api)

4
src/modules/m_starttls.cpp
View File

@ -3,9 +3,9 @@
*
* Copyright (C) 2020 Matt Schatz <genius3000@g3k.solutions>
* Copyright (C) 2019 Robby <robby@chatbelgie.be>
* Copyright (C) 2018 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2018, 2021 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2014 Adam <Adam@anope.org>
* Copyright (C) 2013, 2015-2016 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2013, 2016 Attila Molnar <attilamolnar@hush.com>
*
* 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

2
src/serializable.cpp
View File

@ -1,7 +1,7 @@
/*
* InspIRCd -- Internet Relay Chat Daemon
*
* Copyright (C) 2019 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2019, 2021 Sadie Powell <sadie@witchery.services>
*
* 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

2
src/server.cpp
View File

@ -3,7 +3,7 @@
*
* Copyright (C) 2019 nia <nia@netbsd.org>
* Copyright (C) 2013-2014, 2016 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2013, 2016-2017, 2020 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2013, 2016-2017, 2020-2021 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2013 Adam <Adam@anope.org>
* Copyright (C) 2012 Robby <robby@chatbelgie.be>
* Copyright (C) 2012 ChrisTX <xpipe@hotmail.de>

2
src/socketengine.cpp
View File

@ -8,7 +8,7 @@
* Copyright (C) 2012 ChrisTX <xpipe@hotmail.de>
* Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
* Copyright (C) 2008, 2017 Robin Burchell <robin+git@viroteck.net>
* Copyright (C) 2007 burlex <burlex@e03df62e-2008-0410-955e-edbf42e46eb7>
* Copyright (C) 2007 burlex
* Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
* Copyright (C) 2006-2008, 2010 Craig Edwards <brain@inspircd.org>
*

1
src/users.cpp
View File

@ -1,7 +1,6 @@
/*
* InspIRCd -- Internet Relay Chat Daemon
*
* Copyright (C) 2021 Herman <GermanAizek@yandex.ru>
* Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
* Copyright (C) 2018 systocrat <systocrat@outlook.com>
* Copyright (C) 2018 Dylan Frank <b00mx0r@aureus.pw>

2
win/inspircd_win32wrapper.h
View File

@ -11,7 +11,7 @@
* Copyright (C) 2007-2009 Robin Burchell <robin+git@viroteck.net>
* Copyright (C) 2007-2008 Craig Edwards <brain@inspircd.org>
* Copyright (C) 2007, 2009 Dennis Friis <peavey@inspircd.org>
* Copyright (C) 2007 burlex <burlex@e03df62e-2008-0410-955e-edbf42e46eb7>
* Copyright (C) 2007 burlex
*
* 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