pegasus/unrealircd
1
0
Fork 0
mirror of https://github.com/unrealircd/unrealircd.git synced 2026-07-05 00:13:14 +02:00
Code Activity

Fix raw entry logic, fix descent logic

Browse Source
This commit is contained in:
Travis McArthur
2015-06-01 02:53:41 -04:00
parent 2cacfa1d27
commit 090faaccf9
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/operclass.c
+20 -8
View File
@@ -196,11 +196,17 @@ unsigned char OperClass_evaluateACLEntry(OperClassACLEntry* entry, OperClassACLP
OperClass_CallbackNode *callbackNode = NULL;
unsigned char eval = 0;
/* If no variables, always match */
if (!entry->variables)
{
return 1;
}
/* Go as deep as possible */
while (path->next && node)
{
node = OperClass_findPathNodeForIdentifier(path->identifier,node);
/* If we can't find a node we need, no match */
/* If we can't find a node we need, and we have vars, no match */
if (!node)
{
return 0;
@@ -215,11 +221,6 @@ unsigned char OperClass_evaluateACLEntry(OperClassACLEntry* entry, OperClassACLP
return 0;
}
/* If we just have allow or deny then we match it */
if (!node->callbacks)
{
return 1;
}
/* We have a valid node, execute all callback nodes */
for (callbackNode = node->callbacks; callbackNode; callbackNode = callbackNode->next)
@@ -239,16 +240,24 @@ OperPermission OperClass_evaluateACLPathEx(OperClassACL* acl, OperClassACLPath*
OperClassACLEntry* entry;
unsigned char allow = 0;
unsigned char deny = 0;
while (path && path->next && acl->acls)
unsigned char aclNotFound = 0;
while (path && acl->acls)
{
tmp = OperClass_FindACL(acl->acls,path->identifier);
if (!tmp)
{
aclNotFound = 1;
break;
}
path = path->next;
acl = tmp;
}
/** If node does not exist, but most specific one has other ACLs, deny **/
if (acl->acls && aclNotFound)
{
return OPER_DENY;
}
/** If node exists for this but has no ACL entries, allow **/
if (!acl->entries)
{
@@ -268,7 +277,10 @@ OperPermission OperClass_evaluateACLPathEx(OperClassACL* acl, OperClassACLPath*
{
allow = result;
}
deny = result;
else
{
deny = result;
}
}
/** We only permit if an allow matched AND no deny matched **/