gre-ilya/petidomo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved the call to checkACL() before anything else is tested regarding

Browse Source 
authorization. Combined with the new "approve" action in the ACL file,
this allows to pass all other authentication mechanisms with the ACL.
This commit is contained in:
Peter Simons 2001-01-16 10:45:21 +00:00
parent 5df03932d0
commit 5f6df01b4e
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
hermes.c
View File

@ -46,6 +46,7 @@ hermes_main(char * incoming_mail, const char * listname)
/* Initialize internals. */
MasterConfig = getMasterConfig();
ListConfig = getListConfig(listname);
/* Parse the incoming mail. */
@ -83,7 +84,6 @@ hermes_main(char * incoming_mail, const char * listname)
exit(1);
}
PostingHeaders = xmalloc(strlen(MailStruct->Header)+1024);
MasterConfig = getMasterConfig();
sprintf(envelope, "%s-owner@%s", listname, ListConfig->fqdn);
sprintf(owner, "%s-owner@%s", listname, ListConfig->fqdn);
@ -92,6 +92,23 @@ hermes_main(char * incoming_mail, const char * listname)
if (FindBodyPassword(MailStruct) != 0)
exit(1);
if (checkACL(MailStruct, listname, &operation, &parameter) != 0)
{
syslog(LOG_ERR, "checkACL() failed with an error.");
exit(1);
}
rc = handleACL(MailStruct, listname, operation, parameter);
switch(rc)
{
case -1:
syslog(LOG_ERR, "handleACL() failed with an error.");
exit(1);
case 0:
break;
case 1:
return 0;
}
if (isValidPostingPassword(MailStruct->Approve, listname) == FALSE)
{
/* No valid password found. Reject the article, if the list is
@ -182,23 +199,6 @@ hermes_main(char * incoming_mail, const char * listname)
}
return 0;
}
if (checkACL(MailStruct, listname, &operation, &parameter) != 0)
{
syslog(LOG_ERR, "checkACL() failed with an error.");
exit(1);
}
rc = handleACL(MailStruct, listname, operation, parameter);
switch(rc)
{
case -1:
syslog(LOG_ERR, "handleACL() failed with an error.");
exit(1);
case 0:
break;
case 1:
return 0;
}
}
/* Copy the desired headers from the original mail to our own