*/
#define _GNU_SOURCE
-#define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO
#include <stdlib.h>
#include "afb-cred.h"
#include "verbose.h"
-static int check_permission(const char *permission, struct afb_xreq *xreq);
-
-int afb_auth_check(const struct afb_auth *auth, struct afb_xreq *xreq)
+int afb_auth_check(struct afb_xreq *xreq, const struct afb_auth *auth)
{
switch (auth->type) {
default:
return afb_context_check_loa(&xreq->context, auth->loa);
case afb_auth_Permission:
- return xreq->cred && auth->text && check_permission(auth->text, xreq);
+ return afb_auth_has_permission(xreq, auth->text);
case afb_auth_Or:
- return afb_auth_check(auth->first, xreq) || afb_auth_check(auth->next, xreq);
+ return afb_auth_check(xreq, auth->first) || afb_auth_check(xreq, auth->next);
case afb_auth_And:
- return afb_auth_check(auth->first, xreq) && afb_auth_check(auth->next, xreq);
+ return afb_auth_check(xreq, auth->first) && afb_auth_check(xreq, auth->next);
case afb_auth_Not:
- return !afb_auth_check(auth->first, xreq);
+ return !afb_auth_check(xreq, auth->first);
case afb_auth_Yes:
return 1;
static cynara *handle;
static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-static int check_permission(const char *permission, struct afb_xreq *xreq)
+int afb_auth_has_permission(struct afb_xreq *xreq, const char *permission)
{
int rc;
+ if (!xreq->cred) {
+ /* case of permission for self */
+ return 1;
+ }
+ if (!permission) {
+ ERROR("Got a null permission!");
+ return 0;
+ }
+
/* cynara isn't reentrant */
pthread_mutex_lock(&mutex);
/*********************************************************************************/
#else
-static int check_permission(const char *permission, struct afb_xreq *xreq)
+int afb_auth_has_permission(struct afb_xreq *xreq, const char *permission)
{
- WARNING("Granting permission %s by default of backend", permission);
- return 1;
+ WARNING("Granting permission %s by default of backend", permission ?: "(null)");
+ return !!permission;
}
#endif