afb-auth: export method to check a single permission

[src/app-framework-binder.git] / src / afb-auth.c

diff --git a/src/afb-auth.c b/src/afb-auth.c
index 82e6fd2..17d355b 100644 (file)
--- a/src/afb-auth.c
+++ b/src/afb-auth.c
@@ -29,9 +29,7 @@
 #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:
@@ -45,16 +43,19 @@ int afb_auth_check(const struct afb_auth *auth, struct afb_xreq *xreq)
                return afb_context_check_loa(&xreq->context, auth->loa);
 
        case afb_auth_Permission:
-               return xreq->cred && auth->text && check_permission(auth->text, xreq);
+               if (xreq->cred && auth->text)
+                       return afb_auth_check_permission(xreq, auth->text);
+               /* TODO: handle case of self permission */
+               return 1;
 
        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;
@@ -70,7 +71,7 @@ int afb_auth_check(const struct afb_auth *auth, struct afb_xreq *xreq)
 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_check_permission(struct afb_xreq *xreq, const char *permission)
 {
        int rc;
 
@@ -96,7 +97,7 @@ static int check_permission(const char *permission, struct afb_xreq *xreq)
 
 /*********************************************************************************/
 #else
-static int check_permission(const char *permission, struct afb_xreq *xreq)
+int afb_auth_check_permission(struct afb_xreq *xreq, const char *permission)
 {
        WARNING("Granting permission %s by default of backend", permission);
        return 1;