extend/expand the result of authorization amqp query

* trusted methods do not need to check for a password

* renames AUTHORIZATION_SET_AUTH TO AUTHORIZATIO_SETUP_AUTH for better code visibility/understanding

Author: lazedo

kamailio/authorization.cfg

@@ -75,12 +75,19 @@ route[AUTHORIZATION_CHECK]
 {
     route(KZ_AUTHORIZATION_SETUP);
     routes(AUTHORIZATION_CHECK);
-
-    if (isflagset(FLAG_REGISTERED_ENDPOINT)) {
-        route(AUTHORIZATION_SET_AUTHZ);
+    if(isflagset(FLAG_REGISTERED_ENDPOINT)) {
+        route(AUTHORIZATION_SETUP_AUTHZ);
     }
 }
 
+
+route[AUTHORIZATION_SETUP_AUTHZ]
+{
+    $xavp(authz=>token) = $xavp(ulattrs=>token);
+    $xavp(authz[0]=>endpoint_id) = $(xavp(ulattrs=>token){re.subst,/(.*)@(.*)/\1/});
+    $xavp(authz[0]=>account_id) = $(xavp(ulattrs=>token){re.subst,/(.*)@(.*)/\2/});
+}
+
 route[AUTHORIZATION_CHECK_TRUSTED]
 {
     if (isflagset(FLAG_AUTHORIZED)) return;
@@ -92,13 +99,6 @@ route[AUTHORIZATION_CHECK_TRUSTED]
     }
 }
 
-route[AUTHORIZATION_SET_AUTHZ]
-{
-    $xavp(authz=>token) = $xavp(ulattrs=>token);
-    $xavp(authz[0]=>endpoint_id) = $(xavp(ulattrs=>token){re.subst,/(.*)@(.*)/\1/});
-    $xavp(authz[0]=>account_id) = $(xavp(ulattrs=>token){re.subst,/(.*)@(.*)/\2/});
-}
-
 route[HANDLE_AUTHORIZATION_KAZOO]
 {
     $var(amqp_payload_request) = $_s({"Event-Category" : "directory" , "Event-Name" : "authn_req", "Method" : "$avp(auth-method)", "Auth-Nonce" : "$adn", "Auth-Realm" : "$avp(auth-domain)", "Auth-User" : "$avp(auth-user)", "From" : "$fu", "To" : "$tu", "Orig-IP" : "$si", "Orig-Port" : "$sp", "User-Agent" : "$avp(auth-ua)", "Contact" : "$avp(auth-contact)", "Call-ID" : "$ci" });
@@ -152,25 +152,9 @@ onreply_route[KZ_AUTHORIZATION_CHECK_REPLY]
 
 route[KZ_AUTHORIZATION_CHECK_RESPONSE]
 {
-    $var(retcode) = pv_auth_check("$avp(auth-domain)", "$vn(password)", "0", "0");
-    if ($var(retcode) != 1) {
-        xlog("L_WARNING", "end - auth failed $var(retcode)\n");
-        routes(KZ_AUTHORIZATION_FAILED_AUTH);
-        switch($var(retcode)) {
-            case -4:
-            case -5:
-            case -6:
-                xlog("L_INFO", "end - auth check failed due to nonce or missing creds, challenging\n");
-                auth_challenge("$avp(auth-domain)", "1");
-                exit;
-                break;
-            default:
-                send_reply("403", "Forbidden");
-                exit;
-        }
-    }
+    route_if_exists($_s(KZ_AUTHORIZATION_CHECK_RESPONSE_$(kzR{kz.json,Auth-Method}{s.toupper})));
 
-    xlog("L_INFO", "$(rm{s.tolower}) was authorized by kazoo via amqp\n");
+    xlog("L_INFO", "$(rm{s.tolower}) was authorized with $(kzR{kz.json,Auth-Method}) by kazoo via amqp\n");
     setflag(FLAG_REQUEST_AUTHORIZED_BY_KAZOO);
 
     consume_credentials();
@@ -183,7 +167,6 @@ route[KZ_AUTHORIZATION_CHECK_RESPONSE]
     $xavp(hf[0]=>X-AUTH-Token) = $xavp(authz=>token);
 
     setflag(FLAG_AUTHORIZED);
-    # treat req as if it was from a reg'd endpoint despite absent location record
     setflag(FLAG_REGISTERED_ENDPOINT);
 
     # flag that contact alias needs to be added for subscribe
@@ -200,6 +183,28 @@ route[KZ_AUTHORIZATION_CHECK_RESPONSE]
     exit;
 }
 
+route[KZ_AUTHORIZATION_CHECK_RESPONSE_PASSWORD]
+{
+    $var(retcode) = pv_auth_check("$avp(auth-domain)", "$vn(password)", "0", "0");
+    if ($var(retcode) != 1) {
+        xlog("L_WARNING", "end - auth failed $var(retcode)\n");
+        routes(KZ_AUTHORIZATION_FAILED_AUTH);
+        switch($var(retcode)) {
+            case -4:
+            case -5:
+            case -6:
+                xlog("L_INFO", "end - auth check failed due to nonce or missing creds, challenging\n");
+                auth_challenge("$avp(auth-domain)", "1");
+                exit;
+                break;
+            default:
+                send_reply("403", "Forbidden");
+                exit;
+        }
+    }
+
+}
+
 route[HANDLE_AUTHORIZATION]
 {
 

kamailio/registrar-role.cfg

@@ -425,7 +425,7 @@ route[SAVE_LOCATION]
        $var(AdvIP) = "[" + $RAi + "]";
     }
 
-    route(AUTHORIZATION_SET_AUTHZ);
+    route(AUTHORIZATION_SETUP_AUTHZ);
     route(PUBLISH_REGISTRATION);
     routes(ON_REGISTRATION);