From a5d110282a864fd2e91b51ce360a977cd0643657 Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Sun, 20 Aug 2017 17:47:38 +0100 Subject: Update wiki links to use HTTPS and point to the correct pages. When we release 3.0 these links will break as they will point to the pages for 3.0 rather than 2.0. --- docs/conf/modules.conf.example | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'docs/conf/modules.conf.example') diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example index b0c24194a..34e25b1e2 100644 --- a/docs/conf/modules.conf.example +++ b/docs/conf/modules.conf.example @@ -10,7 +10,7 @@ # # # By default, ALL modules are commented out. You must uncomment them # # or add lines to your config to load modules. Please refer to # -# http://wiki.inspircd.org/Modules for a list of modules and # +# https://wiki.inspircd.org/2.0/Modules for a list of modules and # # each modules link for any additional conf tags they require. # # # # ____ _ _____ _ _ ____ _ _ _ # @@ -313,7 +313,7 @@ # # # Optional - If you specify to use the m_censor module, then you must # # specify some censor tags. See also: # -# http://wiki.inspircd.org/Modules/censor # +# https://wiki.inspircd.org/Modules/2.0/censor # # # @@ -327,7 +327,7 @@ # Optional - If you specify to use m_cgiirc, then you must specify one # or more cgihost tags which indicate authorised CGI:IRC servers which # will be connecting to your network, and an optional cgiirc tag. -# For more information see: http://wiki.inspircd.org/Modules/cgiirc +# For more information see: https://wiki.inspircd.org/Modules/2.0/cgiirc # # Set to yes if you want to notice opers when CGI:IRC clients connect. # @@ -745,7 +745,7 @@ # # # # # For configuration options please see the wiki page for m_dnsbl at # -# http://wiki.inspircd.org/Modules/dnsbl # +# https://wiki.inspircd.org/Modules/2.0/dnsbl # #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# # Exempt channel operators module: Provides support for allowing # @@ -868,7 +868,7 @@ # #-#-#-#-#-#-#-#-#-#-#- HOSTCHANGE CONFIGURATION -#-#-#-#-#-#-#-#-#-# # # -# See http://wiki.inspircd.org/Modules/hostchange for help. # +# See https://wiki.inspircd.org/Modules/2.0/hostchange for help. # # # # # @@ -1129,7 +1129,7 @@ #-#-#-#-#-#-#-#-#-#-#-#- SQL CONFIGURATION -#-#-#-#-#-#-#-#-#-#-#-#-# # # # m_mssql.so is more complex than described here, see wiki for more # -# info http://wiki.inspircd.org/Modules/mssql # +# info https://wiki.inspircd.org/Modules/2.0/mssql # # # @@ -1144,7 +1144,7 @@ #-#-#-#-#-#-#-#-#-#-#-#- SQL CONFIGURATION -#-#-#-#-#-#-#-#-#-#-#-#-# # # # m_mysql.so is more complex than described here, see the wiki for # -# more: http://wiki.inspircd.org/Modules/mysql # +# more: https://wiki.inspircd.org/Modules/2.0/mysql # # # @@ -1309,7 +1309,7 @@ #-#-#-#-#-#-#-#-#-#-# OVERRIDE CONFIGURATION -#-#-#-#-#-#-#-#-#-#-# # # # m_override.so is too complex it describe here, see the wiki: # -# http://wiki.inspircd.org/Modules/override # +# https://wiki.inspircd.org/Modules/2.0/override # #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# # Oper levels module: Gives each oper a level and prevents actions @@ -1402,7 +1402,7 @@ #-#-#-#-#-#-#-#-#-#-#-#- SQL CONFIGURATION -#-#-#-#-#-#-#-#-#-#-#-#-# # # # m_pgsql.so is more complex than described here, see the wiki for # -# more: http://wiki.inspircd.org/Modules/pgsql # +# more: https://wiki.inspircd.org/Modules/2.0/pgsql # # # @@ -1715,7 +1715,7 @@ #-#-#-#-#-#-#-#-#-#-#- GNUTLS CONFIGURATION -#-#-#-#-#-#-#-#-#-#-#-# # # # m_ssl_gnutls.so is too complex to describe here, see the wiki: # -# http://wiki.inspircd.org/Modules/ssl_gnutls # +# https://wiki.inspircd.org/Modules/2.0/ssl_gnutls # #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# # SSL info module: Allows users to retrieve information about other @@ -1742,7 +1742,7 @@ #-#-#-#-#-#-#-#-#-#-#- OPENSSL CONFIGURATION -#-#-#-#-#-#-#-#-#-#-#-# # # # m_ssl_openssl.so is too complex to describe here, see the wiki: # -# http://wiki.inspircd.org/Modules/ssl_openssl # +# https://wiki.inspircd.org/Modules/2.0/ssl_openssl # #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# # Strip color module: Adds channel mode +S that strips mIRC color @@ -1769,7 +1769,7 @@ #-#-#-#-#-#-#-#-#-#-#-#- SQL CONFIGURATION -#-#-#-#-#-#-#-#-#-#-#-#-# # # # m_sqlite.so is more complex than described here, see the wiki for # -# more: http://wiki.inspircd.org/Modules/sqlite3 # +# more: https://wiki.inspircd.org/Modules/2.0/sqlite3 # # # @@ -1785,7 +1785,7 @@ #-#-#-#-#-#-#-#-#-#-#- SQLAUTH CONFIGURATION -#-#-#-#-#-#-#-#-#-#-#-# # # # m_sqlauth.so is too complex to describe here, see the wiki: # -# http://wiki.inspircd.org/Modules/sqlauth # +# https://wiki.inspircd.org/Modules/2.0/sqlauth # #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# # SQL oper module: Allows you to store oper credentials in an SQL table @@ -1800,7 +1800,7 @@ # dbid - Database ID to use (see SQL modules). # # hash - Hashing provider to use for password hashing. # # # -# See also: http://wiki.inspircd.org/Modules/sqloper # +# See also: https://wiki.inspircd.org/Modules/2.0/sqloper # # # # -- cgit v1.2.3 From 9d4b4344b49de3c474302e8316576b759249c409 Mon Sep 17 00:00:00 2001 From: genius3000 Date: Thu, 27 Jul 2017 03:05:44 -0600 Subject: Inform the client when a SASL message cannot be sent When SASL is properly configured with a 'target' server, we are able to inform the client when the message fails to send. Currently if a target is configured and it is offline, no response is sent. This can cause some clients to time out while waiting for a response. If a target isn't configured, behaviour will not change with this commit. The default of '*' will still send to all servers. Updated example config with 'target' variable. --- docs/conf/modules.conf.example | 7 +++++++ src/modules/m_sasl.cpp | 4 ++++ 2 files changed, 11 insertions(+) (limited to 'docs/conf/modules.conf.example') diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example index b39ee5d2b..8e193904d 100644 --- a/docs/conf/modules.conf.example +++ b/docs/conf/modules.conf.example @@ -1591,6 +1591,13 @@ # Layer via AUTHENTICATE. Note: You also need to have m_cap.so loaded # for SASL to work. # +# Define the following to your services server name to improve security +# by ensuring the SASL messages are only sent to the services server +# and not to all connected servers. This prevents a rogue server from +# capturing SASL messages. Having this defined can also improve client +# connections when your services are down, as the client will be told +# that SASL failed rather than just timing out on registration. +# #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# # Secure list module: Prevent /LIST in the first minute of connection, diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp index 5afab9502..8ac43fba7 100644 --- a/src/modules/m_sasl.cpp +++ b/src/modules/m_sasl.cpp @@ -35,6 +35,10 @@ static void SendSASL(const parameterlist& params) { if (!ServerInstance->PI->SendEncapsulatedData(params)) { + User* u = ServerInstance->FindUUID(params[2]); + if (u) + u->WriteNumeric(904, "%s :SASL authentication failed", u->nick.c_str()); + SASLFallback(NULL, params); } } -- cgit v1.2.3 From a137eb1c2649e702efee7cb1a50b4da467f9d4bd Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Sun, 12 Nov 2017 11:58:49 +0000 Subject: Various minor documentation fixes. - Remind admins that not setting a DIE/RESTART password does not disable use of those commands. - Remove references to 1.2 and modules being able to create custom logging methods. This was never implemented in the 2.0 branch. - Remove references to an SASL improvement that was reverted. - Update various InspIRCd website links to use HTTPS over HTTP. - Update a link to the IRCv3 website to point to the new website. --- docs/conf/inspircd.conf.example | 15 +++++++++------ docs/conf/modules.conf.example | 8 +++----- docs/conf/motd.txt.example | 6 +++--- docs/conf/opermotd.txt.example | 6 +++--- 4 files changed, 18 insertions(+), 17 deletions(-) (limited to 'docs/conf/modules.conf.example') diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example index 7ca028ac0..8ec6616bd 100644 --- a/docs/conf/inspircd.conf.example +++ b/docs/conf/inspircd.conf.example @@ -187,10 +187,18 @@ # diepass: Password for opers to use if they need to shutdown (die) # a server. + # + # IMPORTANT: leaving this field empty does not disable the use of + # the DIE command. In order to prevent the use of this command you + # should remove it from the command privileges of your opers. diepass="" # restartpass: Password for opers to use if they need to restart # a server. + # + # IMPORTANT: leaving this field empty does not disable the use of + # the RESTART command. In order to prevent the use of this command + # you should remove it from the command privileges of your opers. restartpass=""> @@ -796,11 +804,6 @@ # Logging is covered with the tag, which you may use to change # the behaviour of the logging of the IRCd. # -# In InspIRCd as of 1.2, logging is pluggable and very extensible. -# Different files can log the same thing, different 'types' of log can -# go to different places, and modules can even extend the log tag -# to do what they want. -# # An example log tag would be: # # which would log all information on /oper (failed and successful) to @@ -978,6 +981,6 @@ ######################################################################### # # # - InspIRCd Development Team - # -# http://www.inspircd.org # +# https://www.inspircd.org # # # ######################################################################### diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example index d2dad8af5..b672367f9 100644 --- a/docs/conf/modules.conf.example +++ b/docs/conf/modules.conf.example @@ -941,7 +941,7 @@ # #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# -# IRCv3 module: Provides the following IRCv3.1 extensions: +# IRCv3 module: Provides the following IRCv3 extensions: # extended-join, away-notify and account-notify. These are optional # enhancements to the client-to-server protocol. An extension is only # active for a client when the client specifically requests it, so this @@ -949,7 +949,7 @@ # # Further information on these extensions can be found at the IRCv3 # working group website: -# http://ircv3.org/extensions/ +# http://ircv3.net/irc/ # # # The following block can be used to control which extensions are @@ -1594,9 +1594,7 @@ # Define the following to your services server name to improve security # by ensuring the SASL messages are only sent to the services server # and not to all connected servers. This prevents a rogue server from -# capturing SASL messages. Having this defined can also improve client -# connections when your services are down, as the client will be told -# that SASL failed rather than just timing out on registration. +# capturing SASL messages. # #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# diff --git a/docs/conf/motd.txt.example b/docs/conf/motd.txt.example index 04f7b11b2..891aaa51c 100644 --- a/docs/conf/motd.txt.example +++ b/docs/conf/motd.txt.example @@ -26,10 +26,10 @@ ---- To change, see motd.txt.example ----- / \ - / * Web: http://www.inspircd.org \ + / * Web: https://www.inspircd.org \ | * IRC: irc.inspircd.org #inspircd | - | * Docs: http://wiki.inspircd.org | - | * Bugs: http://inspircd.org/bugs | + | * Docs: https://wiki.inspircd.org | + | * Bugs: https://inspircd.org/bugs | | | | We hope you like this software. Please do | | make sure you put some effort into | diff --git a/docs/conf/opermotd.txt.example b/docs/conf/opermotd.txt.example index 0ac4cfea1..4bf7c85e4 100644 --- a/docs/conf/opermotd.txt.example +++ b/docs/conf/opermotd.txt.example @@ -26,10 +26,10 @@ -- To change, see opermotd.txt.example --- / \ - / * Web: http://www.inspircd.org \ + / * Web: https://www.inspircd.org \ | * IRC: irc.inspircd.org #inspircd | - | * Docs: http://wiki.inspircd.org | - | * Bugs: http://inspircd.org/bugs | + | * Docs: https://wiki.inspircd.org | + | * Bugs: https://inspircd.org/bugs | | | | We hope you like this software. Please do | | make sure you put some effort into | -- cgit v1.2.3