Implement afb_req_has_permission

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

diff --git a/src/afb-auth.c b/src/afb-auth.c
index 900ec4c..9d54a03 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,19 +43,16 @@ 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:
-               if (xreq->cred && auth->text)
-                       return check_permission(auth->text, xreq);
-               /* TODO: handle case of self permission */
-               return 1;
+               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;
@@ -73,10 +68,19 @@ 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_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);
 
@@ -99,10 +103,10 @@ 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_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