Updates on execution points for Feature Access Control

gvagenas · gvagenas · commit 50b4e900a22c · 2018-01-16T12:00:51.000+02:00
This close #RESTCOMM-1519
diff --git a/restcomm/restcomm.extension.api/src/main/java/org/restcomm/connect/extension/api/ApiRequest.java b/restcomm/restcomm.extension.api/src/main/java/org/restcomm/connect/extension/api/ApiRequest.java
@@ -26,7 +26,7 @@
  */
 public class ApiRequest {
     public static enum Type {
-        INCOMINGPHONENUMBER, CREATE_CALL, CREATE_SMS, CREATE_USSD
+        INCOMINGPHONENUMBER, CREATE_CALL, CREATE_SMS, CREATE_USSD, CREATE_SUBACCOUNT
     };
 
     final String requestedAccountSid;
diff --git a/restcomm/restcomm.extension.controller/src/main/java/org/restcomm/connect/extension/controller/ExtensionController.java b/restcomm/restcomm.extension.controller/src/main/java/org/restcomm/connect/extension/controller/ExtensionController.java
@@ -1,5 +1,6 @@
 package org.restcomm.connect.extension.controller;
 
+import org.restcomm.connect.extension.api.ApiRequest;
 import org.restcomm.connect.extension.api.ExtensionResponse;
 import org.restcomm.connect.extension.api.ExtensionType;
 import org.restcomm.connect.extension.api.IExtensionRequest;
@@ -121,7 +122,6 @@ public ExtensionResponse executePreInboundAction(final IExtensionRequest er, Lis
         ExtensionResponse response = new ExtensionResponse();
 //        response.setAllowed(true);
         if (extensions != null && extensions.size() > 0) {
-
             for (RestcommExtensionGeneric extension : extensions) {
                 if(logger.isInfoEnabled()) {
                     logger.info( extension.getName()+" is enabled="+extension.isEnabled());
@@ -143,4 +143,29 @@ public ExtensionResponse executePostInboundAction(final IExtensionRequest er,  L
         //TODO: implement actual calls
         return response;
     }
+
+    public ExtensionResponse executePreApiAction(final ApiRequest apiRequest, List<RestcommExtensionGeneric> extensions) {
+        ExtensionResponse response = new ExtensionResponse();
+
+        if (extensions != null && extensions.size() > 0) {
+            for (RestcommExtensionGeneric extension : extensions) {
+                if(logger.isInfoEnabled()) {
+                    logger.info( extension.getName()+" is enabled="+extension.isEnabled());
+                }
+                if (extension.isEnabled()) {
+                    response = extension.preApiAction(apiRequest);
+                    //fail fast
+                    if (!response.isAllowed())
+                        break;
+                }
+            }
+        }
+        return response;
+    }
+
+    public ExtensionResponse executePostApiAction(final ApiRequest apiRequest, List<RestcommExtensionGeneric> extensions) {
+        ExtensionResponse response = new ExtensionResponse();
+        //TODO: implement actual calls
+        return response;
+    }
 }
diff --git a/restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/AccountsEndpoint.java b/restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/AccountsEndpoint.java
@@ -38,8 +38,7 @@
 import org.restcomm.connect.dao.entities.IncomingPhoneNumber;
 import org.restcomm.connect.dao.entities.Organization;
 import org.restcomm.connect.dao.entities.RestCommResponse;
-import org.restcomm.connect.extension.api.ExtensionResponse;
-import org.restcomm.connect.extension.api.IExtensionFeatureAccessRequest;
+import org.restcomm.connect.extension.api.ApiRequest;
 import org.restcomm.connect.extension.controller.ExtensionController;
 import org.restcomm.connect.http.client.rcmlserver.RcmlserverApi;
 import org.restcomm.connect.http.client.rcmlserver.RcmlserverNotifications;
@@ -55,7 +54,6 @@
 import org.restcomm.connect.identity.passwords.PasswordValidatorFactory;
 import org.restcomm.connect.provisioning.number.api.PhoneNumberProvisioningManager;
 import org.restcomm.connect.provisioning.number.api.PhoneNumberProvisioningManagerProvider;
-import org.restcomm.connect.telephony.api.FeatureAccessRequest;
 
 import javax.annotation.PostConstruct;
 import javax.servlet.ServletContext;
@@ -382,10 +380,9 @@ protected Response putAccount(final MultivaluedMap<String, String> data, final M
         final Sid sid = userIdentityContext.getEffectiveAccount().getSid();
 
         ExtensionController ec = ExtensionController.getInstance();
-        IExtensionFeatureAccessRequest far = new FeatureAccessRequest(FeatureAccessRequest.Feature.SUBACCOUNTS, sid);
-        ExtensionResponse er = ec.executePreInboundAction(far, extensions);
+        ApiRequest apiRequest = new ApiRequest(sid.toString(), data, ApiRequest.Type.CREATE_SUBACCOUNT);
 
-        if (er.isAllowed()) {
+        if (executePostApiAction(apiRequest)) {
             final Account parent = accountsDao.getAccount(sid);
             Account account = null;
             try {
@@ -430,6 +427,8 @@ protected Response putAccount(final MultivaluedMap<String, String> data, final M
                 return status(CONFLICT).entity("The email address used for the new account is already in use.").build();
             }
 
+            executePostApiAction(apiRequest);
+
             if (APPLICATION_JSON_TYPE == responseType) {
                 return ok(gson.toJson(account), APPLICATION_JSON).build();
             } else if (APPLICATION_XML_TYPE == responseType) {
@@ -443,6 +442,7 @@ protected Response putAccount(final MultivaluedMap<String, String> data, final M
                 final String errMsg = "Creation of sub-accounts is not Allowed";
                 logger.debug(errMsg);
             }
+            executePostApiAction(apiRequest);
             String errMsg = "Creation of sub-accounts is not Allowed";
             return status(Response.Status.FORBIDDEN).entity(errMsg).build();
         }
diff --git a/restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/SecuredEndpoint.java b/restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/SecuredEndpoint.java
@@ -25,15 +25,14 @@
 import org.apache.shiro.authz.Permission;
 import org.apache.shiro.authz.SimpleRole;
 import org.apache.shiro.authz.permission.WildcardPermissionResolver;
-import org.restcomm.connect.dao.exceptions.AccountHierarchyDepthCrossed;
+import org.restcomm.connect.commons.dao.Sid;
 import org.restcomm.connect.dao.AccountsDao;
 import org.restcomm.connect.dao.DaoManager;
 import org.restcomm.connect.dao.OrganizationsDao;
 import org.restcomm.connect.dao.entities.Account;
 import org.restcomm.connect.dao.entities.Organization;
-import org.restcomm.connect.commons.dao.Sid;
+import org.restcomm.connect.dao.exceptions.AccountHierarchyDepthCrossed;
 import org.restcomm.connect.extension.api.ApiRequest;
-import org.restcomm.connect.extension.api.ExtensionResponse;
 import org.restcomm.connect.extension.api.ExtensionType;
 import org.restcomm.connect.extension.api.RestcommExtensionGeneric;
 import org.restcomm.connect.extension.controller.ExtensionController;
@@ -439,20 +438,13 @@ protected String getAdministratorRole() {
     }
 
     protected boolean executePreApiAction(final ApiRequest apiRequest) {
-        if (extensions != null && extensions.size() > 0) {
-            for (RestcommExtensionGeneric extension : extensions) {
-                if (extension.isEnabled()) {
-                    ExtensionResponse response = extension.preApiAction(apiRequest);
-                    if (!response.isAllowed())
-                        return false;
-                }
-            }
-        }
-        return true;
+        ExtensionController ec = ExtensionController.getInstance();
+        return ec.executePreApiAction(apiRequest, extensions).isAllowed();
     }
 
     protected boolean executePostApiAction(final ApiRequest apiRequest) {
-        return false;
+        ExtensionController ec = ExtensionController.getInstance();
+        return ec.executePostApiAction(apiRequest, extensions).isAllowed();
     }
 
 }
diff --git a/restcomm/restcomm.interpreter/src/main/java/org/restcomm/connect/interpreter/BaseVoiceInterpreter.java b/restcomm/restcomm.interpreter/src/main/java/org/restcomm/connect/interpreter/BaseVoiceInterpreter.java
@@ -1587,6 +1587,7 @@ public void execute(final Object message) throws Exception {
                     String errMsg = "ASR feature is not allowed";
                     notification(WARNING_NOTIFICATION, 11001, errMsg);
                     call.tell(new Hangup(errMsg), source);
+                    return;
                 }
                 ec.executePostOutboundAction(er, extensions);
             }
diff --git a/restcomm/restcomm.sms/src/main/java/org/restcomm/connect/sms/SmsService.java b/restcomm/restcomm.sms/src/main/java/org/restcomm/connect/sms/SmsService.java
@@ -393,6 +393,7 @@ private boolean redirectToHostedSmsApp(final ActorRef self, final SipServletRequ
                     final StartInterpreter start = new StartInterpreter(session);
                     interpreter.tell(start, self);
                     isFoundHostedApp = true;
+                    ec.executePostOutboundAction(far, extensions);
                 } else {
                     if (logger.isDebugEnabled()) {
                         final String errMsg = "Inbound SMS is not Allowed";
diff --git a/restcomm/restcomm.telephony.api/src/main/java/org/restcomm/connect/telephony/api/FeatureAccessRequest.java b/restcomm/restcomm.telephony.api/src/main/java/org/restcomm/connect/telephony/api/FeatureAccessRequest.java
@@ -7,8 +7,7 @@ public class FeatureAccessRequest implements IExtensionFeatureAccessRequest {
 
     public enum Feature {
         OUTBOUND_VOICE("outbound-voice"), INBOUND_VOICE("inbound-voice"), OUTBOUND_SMS("outbound-sms"),
-        INBOUND_SMS("inbound-sms"), ASR("asr"), OUTBOUND_USSD("outbound-ussd"), INBOUND_USSD("inbound_ussd"),
-        SUBACCOUNTS("subaccounts");
+        INBOUND_SMS("inbound-sms"), ASR("asr"), OUTBOUND_USSD("outbound-ussd"), INBOUND_USSD("inbound_ussd");
 
         private final String text;
 
diff --git a/restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/CallManager.java b/restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/CallManager.java
@@ -1323,6 +1323,7 @@ private boolean redirectToHostedVoiceApp (final ActorRef self, final SipServletR
                         call.tell(request, self);
                         interpreter.tell(new StartInterpreter(call), self);
                         isFoundHostedApp = true;
+                        ec.executePostOutboundAction(far, extensions);
                     }
                 }
             } else {

Original file line number	Diff line number	Diff line change
`@@ -1587,6 +1587,7 @@ public void execute(final Object message) throws Exception {`
`1587`	`1587`	`String errMsg = "ASR feature is not allowed";`
`1588`	`1588`	`notification(WARNING_NOTIFICATION, 11001, errMsg);`
`1589`	`1589`	`call.tell(new Hangup(errMsg), source);`
	`1590`	`+ return;`
`1590`	`1591`	`}`
`1591`	`1592`	`ec.executePostOutboundAction(er, extensions);`
`1592`	`1593`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1323,6 +1323,7 @@ private boolean redirectToHostedVoiceApp (final ActorRef self, final SipServletR`
`1323`	`1323`	`call.tell(request, self);`
`1324`	`1324`	`interpreter.tell(new StartInterpreter(call), self);`
`1325`	`1325`	`isFoundHostedApp = true;`
	`1326`	`+ ec.executePostOutboundAction(far, extensions);`
`1326`	`1327`	`}`
`1327`	`1328`	`}`
`1328`	`1329`	`} else {`