Skip to content

Fix: Satisfy all with multiple Require directives (issue #1304) #1577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
abubakarsabir924-cell wants to merge 1 commit into
base: master
Choose a base branch
from
+62 −30
Open

Fix: Satisfy all with multiple Require directives (issue #1304) #1577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 52 additions & 28 deletions scheduler/auth.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2000,40 +2000,64 @@ cupsdIsAuthorized(cupsd_client_t *con, /* I - Connection */
}
#endif /* HAVE_AUTHORIZATION_H */


int name_result = 0; // 0=not matched, 1=matched


for (name = (char *)cupsArrayFirst(best->names);
name;
name = (char *)cupsArrayNext(best->names))
name;
name = (char *)cupsArrayNext(best->names))
{
if (!_cups_strcasecmp(name, "@OWNER") && owner &&
((pw && !strcmp(pw->pw_name, ownername)) ||
(!pw && type == CUPSD_AUTH_NONE && !_cups_strcasecmp(username, ownername))))
return (HTTP_STATUS_OK);
else if (!_cups_strcasecmp(name, "@SYSTEM"))
{
/* Do @SYSTEM later, when every other entry fails */
continue;
}
else if (name[0] == '@')
{
if (cupsdCheckGroup(username, pw, name + 1))
return (HTTP_STATUS_OK);
}
else if (pw && !strcmp(pw->pw_name, name))
return (HTTP_STATUS_OK);
else if (!pw && type == CUPSD_AUTH_NONE && !_cups_strcasecmp(username, name))
return (HTTP_STATUS_OK);
if (!_cups_strcasecmp(name, "@SYSTEM"))
continue; // baad mein check hoga

if (!_cups_strcasecmp(name, "@OWNER") && owner &&
((pw && !strcmp(pw->pw_name, ownername)) ||
(!pw && type == CUPSD_AUTH_NONE && !_cups_strcasecmp(username, ownername))))
{
name_result = 1;
}
else if (name[0] == '@')
{
if (cupsdCheckGroup(username, pw, name + 1))
name_result = 1;
}
else if (pw && !strcmp(pw->pw_name, name))
name_result = 1;
else if (!pw && type == CUPSD_AUTH_NONE && !_cups_strcasecmp(username, name))
name_result = 1;
}

// @SYSTEM check
for (name = (char *)cupsArrayFirst(best->names);
name;
name = (char *)cupsArrayNext(best->names))
name;
name = (char *)cupsArrayNext(best->names))
{
if (!_cups_strcasecmp(name, "@SYSTEM"))
{
for (i = 0; i < NumSystemGroups; i ++)
if (cupsdCheckGroup(username, pw, SystemGroups[i]) && check_admin_access(con))
return (HTTP_STATUS_OK);
}
if (!_cups_strcasecmp(name, "@SYSTEM"))
{
for (i = 0; i < NumSystemGroups; i ++)
{
if (cupsdCheckGroup(username, pw, SystemGroups[i]) && check_admin_access(con))
{
name_result = 1;
break;
}
}
}
}


if (best->satisfy == CUPSD_AUTH_SATISFY_ALL)
{
if (name_result)
return (HTTP_STATUS_OK);
else
return (HTTP_STATUS_FORBIDDEN);
}
else
{
if (name_result)
return (HTTP_STATUS_OK);
}
}
else
Expand Down
12 changes: 10 additions & 2 deletions scheduler/conf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2453,9 +2453,17 @@ parse_aaa(cupsd_location_t *loc, /* I - Location */

if (!_cups_strcasecmp(value, "valid-user") ||
!_cups_strcasecmp(value, "user"))
loc->level = CUPSD_AUTH_USER;
{
// Only set level if not already set to USER
if (loc->level == CUPSD_AUTH_ANON)
loc->level = CUPSD_AUTH_USER;
}
else if (!_cups_strcasecmp(value, "group"))
loc->level = CUPSD_AUTH_GROUP;
{
// Only upgrade to GROUP if no USER level set yet
if (loc->level == CUPSD_AUTH_ANON)
loc->level = CUPSD_AUTH_GROUP;
}
else
{
cupsdLogMessage(CUPSD_LOG_WARN, "Unknown Require type %s on line %d of %s.",
Expand Down
Loading