9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow auth{} to apply extra umodes (#202)

Browse source 
Allow auth{} to apply extra umodes

Co-authored-by: Doug Freed <dwfreed@mtu.edu>
Co-authored-by: Ed Kellett <e@kellett.im>
This commit is contained in:
Eric Mertens 2021-06-12 11:04:33 -07:00 committed by GitHub
parent 29a0def020
commit 4d8088c386
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 68 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/oper-guide/config.rst
View file

@ -255,6 +255,9 @@ flags
class
A name of a class to put users matching this auth{} block into.
umodes
Additional umodes to apply to the default_umodes upon connect.
auth {} flags
~~~~~~~~~~~~~

1
include/s_conf.h
View file

@ -72,6 +72,7 @@ struct ConfItem
char *className; /* Name of class */
struct Class *c_class; /* Class of connection */
rb_patricia_node_t *pnode; /* Our patricia node */
int umodes, umodes_mask; /* Override umodes specified by mask */
};
#define CONF_ILLEGAL 0x80000000

92
ircd/newconf.c
View file

@ -438,6 +438,53 @@ set_modes_from_table(int *modes, const char *whatis, struct mode_table *tab, con
}
}
static void
parse_umodes(const char *pm, int *values, int *mask)
{
int what = MODE_ADD, flag;
*values = 0;
if (NULL != mask)
*mask = 0;
for (; *pm; pm++)
{
switch (*pm)
{
case '+':
what = MODE_ADD;
break;
case '-':
what = MODE_DEL;
break;
/* don't allow +o */
case 'o':
case 'S':
case 'Z':
case ' ':
break;
default:
flag = user_modes[(unsigned char) *pm];
if (flag)
{
/* Proper value has probably not yet been set
* so don't check oper_only_umodes -- jilles */
if (what == MODE_ADD)
*values |= flag;
else
*values &= ~flag;
if (NULL != mask)
*mask |= flag;
}
break;
}
}
}
static void
conf_set_privset_extends(void *data)
{
@ -1157,6 +1204,14 @@ conf_set_auth_class(void *data)
yy_aconf->className = rb_strdup(data);
}
static void
conf_set_auth_umodes(void *data)
{
char *umodes = data;
parse_umodes(umodes, &yy_aconf->umodes, &yy_aconf->umodes_mask);
}
static int
conf_begin_connect(struct TopConf *tc)
{
@ -1546,41 +1601,9 @@ conf_set_general_compression_level(void *data)
static void
conf_set_general_default_umodes(void *data)
{
char *pm;
int what = MODE_ADD, flag;
char *umodes = data;
ConfigFileEntry.default_umodes = 0;
for (pm = (char *) data; *pm; pm++)
{
switch (*pm)
{
case '+':
what = MODE_ADD;
break;
case '-':
what = MODE_DEL;
break;
/* don't allow +o */
case 'o':
case 'S':
case 'Z':
case ' ':
break;
default:
if ((flag = user_modes[(unsigned char) *pm]))
{
/* Proper value has probably not yet been set
* so don't check oper_only_umodes -- jilles */
if (what == MODE_ADD)
ConfigFileEntry.default_umodes |= flag;
else
ConfigFileEntry.default_umodes &= ~flag;
}
break;
}
}
parse_umodes(umodes, &ConfigFileEntry.default_umodes, NULL);
}
static void
@ -2607,6 +2630,7 @@ static struct ConfEntry conf_auth_table[] =
{ "redirserv", CF_QSTRING, conf_set_auth_redir_serv, 0, NULL },
{ "redirport", CF_INT, conf_set_auth_redir_port, 0, NULL },
{ "flags", CF_STRING | CF_FLIST, conf_set_auth_flags, 0, NULL },
{ "umodes", CF_QSTRING, conf_set_auth_umodes, 0, NULL},
{ "\0", 0, NULL, 0, NULL }
};

8
ircd/s_user.c
View file

@ -351,7 +351,7 @@ register_local_user(struct Client *client_p, struct Client *source_p)
char tmpstr2[BUFSIZE];
char ipaddr[HOSTIPLEN];
char myusername[USERLEN+1];
int status;
int status, umodes;
s_assert(NULL != source_p);
s_assert(MyConnect(source_p));
@ -594,7 +594,11 @@ register_local_user(struct Client *client_p, struct Client *source_p)
SetDynSpoof(source_p);
}
source_p->umodes |= ConfigFileEntry.default_umodes & ~ConfigFileEntry.oper_only_umodes & ~orphaned_umodes;
umodes = ConfigFileEntry.default_umodes & ~aconf->umodes_mask;
umodes |= aconf->umodes;
umodes &= ~ConfigFileEntry.oper_only_umodes;
umodes &= ~orphaned_umodes;
source_p->umodes |= umodes;
call_hook(h_new_local_user, source_p);