diff options
| -rw-r--r-- | conf/inspircd.conf.example | 23 | ||||
| -rw-r--r-- | src/modules/m_sasl.cpp | 15 |
2 files changed, 25 insertions, 13 deletions
diff --git a/conf/inspircd.conf.example b/conf/inspircd.conf.example index b9eec0e43..0b8c466ad 100644 --- a/conf/inspircd.conf.example +++ b/conf/inspircd.conf.example @@ -275,8 +275,9 @@ # module be loaded as well. modes="+x" - # requireident/requiressl: require that users of this block use SSL or - # have a valid ident response. Requires m_ident or m_sslinfo + # requireident, requiressl, requiresasl: require that users of this + # block have a valid ident response, use SSL, or have authenticated with SASL. + # Requires m_ident, m_sslinfo, or m_sasl respectively requiressl="on" # port: What port this user is allowed to connect on. (optional) @@ -395,13 +396,16 @@ #-#-#-#-#-#-#-#-#-#- MISCELLANEOUS CONFIGURATION -#-#-#-#-#-#-#-#-#-# # # -<files - # motd: Path to your motd file. Path is relative to the run directory. - motd="conf/inspircd.motd.example" +# Files block - contains files whose contents are used by the ircd +# +# motd - displayed on connect and when a user executes /MOTD +# rules - displayed when the user executes /RULES +# Modules can also define their own files +<files motd="conf/inspircd.motd.example" rules="conf/inspircd.rules.example"> - # rules: Path to your rules file. Path is relative to the run directory. - # This is optional and is displayed when a user does /rules on the network. - rules="conf/inspircd.rules.example"> +# Example of an executable file include. Note this will be read on rehash, +# not when the command is run. +#<execfiles rules="wget -O - http://www.example.com/rules.txt"> #-#-#-#-#-#-#-#-#-#-#-# MAXIMUM CHANNELS -#-#-#-#-#-#-#-#-#-#-#-#-#-#-# # # @@ -553,9 +557,6 @@ # serverpingfreq: How often pings are sent between servers (in seconds). serverpingfreq="60" - # allowhalfop: Allows the use of +h channelmode (halfops). - allowhalfop="yes" - # defaultmodes: What modes are set on a empty channel when a user # joins it and it is unregistered. This is similar to Asuka's # autochanmodes. diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp index 28a583c80..4dcb350bc 100644 --- a/src/modules/m_sasl.cpp +++ b/src/modules/m_sasl.cpp @@ -226,8 +226,8 @@ class ModuleSASL : public Module ModuleSASL() : authExt("sasl_auth", this), cap(this, "sasl"), auth(this, authExt, cap), sasl(this, authExt) { - Implementation eventlist[] = { I_OnEvent, I_OnUserRegister }; - ServerInstance->Modules->Attach(eventlist, this, 2); + Implementation eventlist[] = { I_OnEvent, I_OnUserRegister, I_OnSetConnectClass }; + ServerInstance->Modules->Attach(eventlist, this, 3); ServiceProvider* providelist[] = { &auth, &sasl, &authExt }; ServerInstance->Modules->AddServices(providelist, 3); @@ -248,6 +248,17 @@ class ModuleSASL : public Module return MOD_RES_PASSTHRU; } + ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) + { + if (myclass->config->getBool("requiresasl")) + { + AccountExtItem* ext = GetAccountExtItem(); + if (ext && !ext.get(user)) + return MOD_RES_DENY; + } + return MOD_RES_PASSTHRU; + } + ~ModuleSASL() { } |