CLOUDOPS-391: Fix integration test sql files. Cleanup PermissionsUtil…

…, remove userIdentityContext use
RestComm · Sep 30, 2017 · f661c64 · f661c64
1 parent 419fbaa
commit f661c64
Show file tree

Hide file tree

Showing 70 changed files with 179 additions and 41 deletions.
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
@@ -404,7 +404,7 @@ protected Response putAccount(final MultivaluedMap<String, String> data, final M
     private void processPermissionsData(Account account, MultivaluedMap<String, String> data) {
         String permissionSidString = data.getFirst("PermissionSid");
 
-        if(!permissionSidString.isEmpty()){
+        if(data.containsKey("PermissionSid") && !permissionSidString.isEmpty()){
             //check if accounts permissions exists first
             //if ap exists, just update value
             //if not create new ap from perm,check if permission exists first
@@ -413,12 +413,12 @@ private void processPermissionsData(Account account, MultivaluedMap<String, Stri
             if(ap != null){
                 String permissionValue = data.getFirst("PermissionValue");
 
-                ap.setValue(permissionValue.isEmpty() ? true: Boolean.valueOf(permissionValue));
+                ap.setValue((permissionValue==null || permissionValue.isEmpty()) ? true: Boolean.valueOf(permissionValue));
                 accountsDao.updateAccountPermissions(account.getSid(), ap);
             }else if(ap==null && perm!=null){
                 String permissionValue = data.getFirst("PermissionValue");
                 ap = new AccountPermission(perm.getSid(), perm.getName());
-                ap.setValue(permissionValue.isEmpty() ? true: Boolean.valueOf(permissionValue));
+                ap.setValue((permissionValue==null || permissionValue.isEmpty()) ? true: Boolean.valueOf(permissionValue));
                 accountsDao.addAccountPermission(account.getSid(), ap);
             }else{
                 //permission doesnt exist

diff --git a/...omm.identity/src/main/java/org/restcomm/connect/identity/permissions/PermissionsUtil.java b/...omm.identity/src/main/java/org/restcomm/connect/identity/permissions/PermissionsUtil.java
@@ -78,6 +78,7 @@ public AuthOutcome checkPermission(String neededPermissionString, Sid accountSid
         //should get union of permissions
         //FIXME: should an account have more than one role??
         Set<String> roleNames = new HashSet<String>();
+        roleNames.add(accountsDao.getAccount(accountSid).getRole());
         Set<Permission> allRolePermissions = new HashSet<Permission>();
         for (String roleName: roleNames) {
             SimpleRole simpleRole = restcommRoles.getRole(roleName);

diff --git a/...restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/PermissionsTest.java b/...restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/PermissionsTest.java
@@ -217,9 +217,6 @@ public static WebArchive createWebArchiveNoGw() {
         archive.addAsWebInfResource("restcomm.xml", "conf/restcomm.xml");
         archive.addAsWebInfResource("restcomm.script_permissions_test", "data/hsql/restcomm.script");
         // archive.addAsWebInfResource("restcomm.properties", "data/hsql/restcomm.properties");
-
-        archive.delete("/WEB-INF/conf/mybatis.xml");
-        archive.addAsWebInfResource("mybatis_win.xml", "conf/mybatis.xml");
         return archive;
     }
 }
diff --git a/restcomm/restcomm.testsuite/src/test/resources/mybatis_win.xml b/restcomm/restcomm.testsuite/src/test/resources/mybatis_win.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD Config 3.0//EN" "http://mybatis.org/dtd/mybatis-3-config.dtd">
+<!--
+  @author thomas.quintana@telestax.com (Thomas Quintana)
+-->
+<configuration>
+<environments default="production">
+      <environment id="production">
+      <transactionManager type="JDBC"/>
+      <dataSource type="POOLED">
+        <property name="driver" value="org.hsqldb.jdbcDriver"/>
+        <property name="url" value="jdbc:hsqldb:file://${data}/restcomm;ifexists=true;hsqldb.write_delay=false;shutdown=true"/>
+        <property name="username" value="sa"/>
+        <property name="password" value=""/>
+      </dataSource>
+    </environment>
+    <!-- <environment id="mariadb">
+      <transactionManager type="JDBC"/>
+      <dataSource type="POOLED">
+        <property name="driver" value="com.mysql.jdbc.Driver"/>
+        <property name="url" value="jdbc:mysql://192.168.8.102:3306/restcomm"/>
+        <property name="username" value="root"/>
+        <property name="password" value="1234"/>
+      </dataSource>
+    </environment> -->
+
+  </environments>
+
+
+  <mappers>
+    <mapper url="file:///${sql}/accounts.xml"/>
+    <mapper url="file:///${sql}/applications.xml"/>
+    <mapper url="file:///${sql}/available-phone-numbers.xml"/>
+    <mapper url="file:///${sql}/call-detail-records.xml"/>
+    <mapper url="file:///${sql}/conference-detail-records.xml"/>
+    <mapper url="file:///${sql}/clients.xml"/>
+    <mapper url="file:///${sql}/http-cookies.xml"/>
+    <mapper url="file:///${sql}/incoming-phone-numbers.xml"/>
+    <mapper url="file:///${sql}/notifications.xml"/>
+    <mapper url="file:///${sql}/outgoing-caller-ids.xml"/>
+    <mapper url="file:///${sql}/registrations.xml"/>
+    <mapper url="file:///${sql}/recordings.xml"/>
+    <mapper url="file:///${sql}/sand-boxes.xml"/>
+    <mapper url="file:///${sql}/short-codes.xml"/>
+    <mapper url="file:///${sql}/sms-messages.xml"/>
+    <mapper url="file:///${sql}/transcriptions.xml"/>
+    <mapper url="file:///${sql}/gateways.xml"/>
+    <mapper url="file:///${sql}/announcements.xml"/>
+    <mapper url="file:///${sql}/usage.xml"/>
+    <mapper url="file:///${sql}/instanceId.xml"/>
+    <mapper url="file:///${sql}/media-servers.xml"/>
+    <mapper url="file:///${sql}/media-resource-broker-entity.xml"/>
+    <mapper url="file:///${sql}/extensions-configuration.xml"/>
+    <mapper url="file:///${sql}/geolocation.xml"/>
+    <mapper url="file:///${sql}/permissions.xml"/>
+  </mappers>
+</configuration>
diff --git a/...restcomm.testsuite/src/test/resources/org/restcomm/connect/telephony/restcomm_no_auth.xml b/...restcomm.testsuite/src/test/resources/org/restcomm/connect/telephony/restcomm_no_auth.xml
@@ -97,7 +97,7 @@
 		<!-- Each permission is represented as three columns Domain:Action:Target
 			Possible actions are Create, Read, Modify, Delete. -->
 		<security-roles>
-			<role name="Developer">
+			<role name="Administrator"><permission>*:*:*</permission></role><role name="Developer">
 				<permission>RestComm:*:Accounts</permission>
 				<permission>RestComm:*:Applications</permission>
 				<permission>RestComm:*:Announcements</permission>

diff --git a/...tcomm.testsuite/src/test/resources/org/restcomm/connect/ussd/restcomm.script_ussdPullTest b/...tcomm.testsuite/src/test/resources/org/restcomm/connect/ussd/restcomm.script_ussdPullTest
@@ -23,6 +23,8 @@ CREATE MEMORY TABLE "restcomm_media_servers" ( "ms_id" INT GENERATED BY DEFAULT
 CREATE MEMORY TABLE "restcomm_media_resource_broker_entity" ("conference_sid" VARCHAR(34) NOT NULL, "slave_ms_id" VARCHAR(34) NOT NULL, "slave_ms_bridge_ep_id" VARCHAR(34),"slave_ms_cnf_ep_id" VARCHAR(34),"is_bridged_together" BOOLEAN DEFAULT FALSE,PRIMARY KEY ("conference_sid" , "slave_ms_id"))
 CREATE MEMORY TABLE PUBLIC."restcomm_extensions_configuration"("sid" VARCHAR(34) NOT NULL PRIMARY KEY,"extension" VARCHAR(255) NOT NULL,"configuration_data" VARCHAR(16777216),"configuration_type" VARCHAR(255) NOT NULL,"date_created" TIMESTAMP NOT NULL,"date_updated" TIMESTAMP, "enabled" BOOLEAN DEFAULT TRUE NOT NULL)
 CREATE MEMORY TABLE "restcomm_geolocation"("sid" VARCHAR(34) NOT NULL PRIMARY KEY, "date_created" DATETIME NOT NULL, "date_updated" DATETIME NOT NULL, "date_executed" DATETIME NOT NULL, "account_sid" VARCHAR(34) NOT NULL, "source" VARCHAR(30), "device_identifier" VARCHAR(30) NOT NULL, "geolocation_type" VARCHAR(15) NOT NULL, "response_status" VARCHAR(30), "cell_id" VARCHAR(10), "location_area_code" VARCHAR(10), "mobile_country_code" INTEGER, "mobile_network_code" VARCHAR(3), "network_entity_address" BIGINT, "age_of_location_info" INTEGER, "device_latitude" VARCHAR(15), "device_longitude" VARCHAR(15), "accuracy" BIGINT, "physical_address" VARCHAR(50), "internet_address" VARCHAR(50), "formatted_address" VARCHAR(200), "location_timestamp" DATETIME, "event_geofence_latitude" VARCHAR(15), "event_geofence_longitude" VARCHAR(15), "radius" BIGINT, "geolocation_positioning_type" VARCHAR(15), "last_geolocation_response" VARCHAR(10), "cause" VARCHAR(150), "api_version" VARCHAR(10) NOT NULL, "uri" LONGVARCHAR NOT NULL)
+CREATE MEMORY TABLE "restcomm_permissions"("sid" VARCHAR(34) NOT NULL PRIMARY KEY, "name" VARCHAR(16777216) NOT NULL)
+CREATE MEMORY TABLE "restcomm_accounts_permissions"("account_sid" VARCHAR(34) NOT NULL, "permission_sid" VARCHAR(34) NOT NULL, PRIMARY KEY("account_sid", "permission_sid"), "value" BOOLEAN NOT NULL)
 CREATE USER SA PASSWORD ""
 GRANT DBA TO SA
 SET WRITE_DELAY 10

diff --git a/...stcomm.testsuite/src/test/resources/org/restcomm/connect/ussd/restcomm_conf_ussd_push.xml b/...stcomm.testsuite/src/test/resources/org/restcomm/connect/ussd/restcomm_conf_ussd_push.xml
@@ -98,7 +98,7 @@
 		<!-- Each permission is represented as three columns Domain:Action:Target
 			Possible actions are Create, Read, Modify, Delete. -->
 		<security-roles>
-			<role name="Developer">
+			<role name="Administrator"><permission>*:*:*</permission></role><role name="Developer">
 				<permission>RestComm:*:Accounts</permission>
 				<permission>RestComm:*:Applications</permission>
 				<permission>RestComm:*:Announcements</permission>

diff --git a/restcomm/restcomm.testsuite/src/test/resources/record-withActionUrl.xml b/restcomm/restcomm.testsuite/src/test/resources/record-withActionUrl.xml
@@ -1,4 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Response>
-	<Record action="http://127.0.0.1:8090/test" method="POST" finishOnKey="#" maxLength="10" playBeep="true"/>
+	<!--Record 
+	action="http://127.0.0.1:8090/test" 
+	method="POST" 
+	finishOnKey="#" 
+	maxLength="10" 
+	playBeep="true"/-->
+
+	<Record
+        action="https://127.0.0.1:8090/test"
+        method="POST"
+        maxLength="60"
+        timeout="5"
+        finishOnKey="#"
+        transcribe="true"
+        transcribeCallback="transcribe.jsp"
+        playBeep="false"
+    />
+    <Gather timeout="30" finishOnKey="#">
+        <Say voice="man" language="en" loop="1">Hello World!</Say>
+        <Play loop="1">https://127.0.0.1:8080/restcomm/audio/hello-world.wav</Play>
+        <Pause length="1"/>
+    </Gather>
 </Response>
diff --git a/restcomm/restcomm.testsuite/src/test/resources/restcomm-EmailEndpoint.xml b/restcomm/restcomm.testsuite/src/test/resources/restcomm-EmailEndpoint.xml
@@ -111,7 +111,7 @@
 		<!-- Each permission is represented as three columns Domain:Action:Target
 			Possible actions are Create, Read, Modify, Delete. -->
 		<security-roles>
-			<role name="Developer">
+			<role name="Administrator"><permission>*:*:*</permission></role><role name="Developer">
 				<permission>RestComm:*:Accounts</permission>
 				<permission>RestComm:*:Applications</permission>
 				<permission>RestComm:*:Announcements</permission>

diff --git a/restcomm/restcomm.testsuite/src/test/resources/restcomm-accountRemoval.xml b/restcomm/restcomm.testsuite/src/test/resources/restcomm-accountRemoval.xml
@@ -173,7 +173,7 @@
 		<!-- Each permission is represented as three columns Domain:Action:Target
 			Possible actions are Create, Read, Modify, Delete. -->
 		<security-roles>
-			<role name="Developer">
+			<role name="Administrator"><permission>*:*:*</permission></role><role name="Developer">
 				<permission>RestComm:*:Accounts</permission>
 				<permission>RestComm:*:Applications</permission>
 				<permission>RestComm:*:Announcements</permission>

diff --git a/restcomm/restcomm.testsuite/src/test/resources/restcomm-corsRelax.xml b/restcomm/restcomm.testsuite/src/test/resources/restcomm-corsRelax.xml
@@ -193,7 +193,7 @@
         <!-- Each permission is represented as three columns Domain:Action:Target
             Possible actions are Create, Read, Modify, Delete. -->
         <security-roles>
-            <role name="Developer">
+            <role name="Administrator"><permission>*:*:*</permission></role><role name="Developer">
                 <permission>RestComm:*:Accounts</permission>
                 <permission>RestComm:*:Applications</permission>
                 <permission>RestComm:*:Announcements</permission>

diff --git a/restcomm/restcomm.testsuite/src/test/resources/restcomm-delay-ringing-error.xml b/restcomm/restcomm.testsuite/src/test/resources/restcomm-delay-ringing-error.xml
@@ -117,7 +117,7 @@
 		<!-- Each permission is represented as three columns Domain:Action:Target
 			Possible actions are Create, Read, Modify, Delete. -->
 		<security-roles>
-			<role name="Developer">
+			<role name="Administrator"><permission>*:*:*</permission></role><role name="Developer">
 				<permission>RestComm:*:Accounts</permission>
 				<permission>RestComm:*:Applications</permission>
 				<permission>RestComm:*:Announcements</permission>

diff --git a/restcomm/restcomm.testsuite/src/test/resources/restcomm-delay.xml b/restcomm/restcomm.testsuite/src/test/resources/restcomm-delay.xml
@@ -117,7 +117,7 @@
 		<!-- Each permission is represented as three columns Domain:Action:Target
 			Possible actions are Create, Read, Modify, Delete. -->
 		<security-roles>
-			<role name="Developer">
+			<role name="Administrator"><permission>*:*:*</permission></role><role name="Developer">
 				<permission>RestComm:*:Accounts</permission>
 				<permission>RestComm:*:Applications</permission>
 				<permission>RestComm:*:Announcements</permission>

diff --git a/restcomm/restcomm.testsuite/src/test/resources/restcomm-embeddedMMS.xml b/restcomm/restcomm.testsuite/src/test/resources/restcomm-embeddedMMS.xml
@@ -103,7 +103,7 @@
 		<!-- Each permission is represented as three columns Domain:Action:Target
 			Possible actions are Create, Read, Modify, Delete. -->
 		<security-roles>
-			<role name="Developer">
+			<role name="Administrator"><permission>*:*:*</permission></role><role name="Developer">
 				<permission>RestComm:*:Accounts</permission>
 				<permission>RestComm:*:Applications</permission>
 				<permission>RestComm:*:Announcements</permission>

diff --git a/restcomm/restcomm.testsuite/src/test/resources/restcomm-ims-delay.xml b/restcomm/restcomm.testsuite/src/test/resources/restcomm-ims-delay.xml
@@ -127,7 +127,7 @@
 		<!-- Each permission is represented as three columns Domain:Action:Target
 			Possible actions are Create, Read, Modify, Delete. -->
 		<security-roles>
-			<role name="Developer">
+			<role name="Administrator"><permission>*:*:*</permission></role><role name="Developer">
 				<permission>RestComm:*:Accounts</permission>
 				<permission>RestComm:*:Applications</permission>
 				<permission>RestComm:*:Announcements</permission>

diff --git a/restcomm/restcomm.testsuite/src/test/resources/restcomm-ims.xml b/restcomm/restcomm.testsuite/src/test/resources/restcomm-ims.xml
@@ -127,7 +127,7 @@
 		<!-- Each permission is represented as three columns Domain:Action:Target
 			Possible actions are Create, Read, Modify, Delete. -->
 		<security-roles>
-			<role name="Developer">
+			<role name="Administrator"><permission>*:*:*</permission></role><role name="Developer">
 				<permission>RestComm:*:Accounts</permission>
 				<permission>RestComm:*:Applications</permission>
 				<permission>RestComm:*:Announcements</permission>

diff --git a/restcomm/restcomm.testsuite/src/test/resources/restcomm-smpp.xml b/restcomm/restcomm.testsuite/src/test/resources/restcomm-smpp.xml
@@ -126,7 +126,7 @@
 		<!-- Each permission is represented as three columns Domain:Action:Target
 			Possible actions are Create, Read, Modify, Delete. -->
 		<security-roles>
-			<role name="Developer">
+			<role name="Administrator"><permission>*:*:*</permission></role><role name="Developer">
 				<permission>RestComm:*:Accounts</permission>
 				<permission>RestComm:*:Applications</permission>
 				<permission>RestComm:*:Announcements</permission>

diff --git a/restcomm/restcomm.testsuite/src/test/resources/restcomm.script b/restcomm/restcomm.testsuite/src/test/resources/restcomm.script
@@ -23,6 +23,8 @@ CREATE MEMORY TABLE "restcomm_media_servers" ( "ms_id" INT GENERATED BY DEFAULT
 CREATE MEMORY TABLE "restcomm_media_resource_broker_entity" ("conference_sid" VARCHAR(34) NOT NULL, "slave_ms_id" VARCHAR(34) NOT NULL, "slave_ms_bridge_ep_id" VARCHAR(34),"slave_ms_cnf_ep_id" VARCHAR(34),"is_bridged_together" BOOLEAN DEFAULT FALSE,PRIMARY KEY ("conference_sid" , "slave_ms_id"))
 CREATE MEMORY TABLE PUBLIC."restcomm_extensions_configuration"("sid" VARCHAR(34) NOT NULL PRIMARY KEY,"extension" VARCHAR(255) NOT NULL,"configuration_data" VARCHAR(16777216),"configuration_type" VARCHAR(255) NOT NULL,"date_created" TIMESTAMP NOT NULL,"date_updated" TIMESTAMP, "enabled" BOOLEAN DEFAULT TRUE NOT NULL)
 CREATE MEMORY TABLE "restcomm_geolocation"("sid" VARCHAR(34) NOT NULL PRIMARY KEY, "date_created" DATETIME NOT NULL, "date_updated" DATETIME NOT NULL, "date_executed" DATETIME NOT NULL, "account_sid" VARCHAR(34) NOT NULL, "source" VARCHAR(30), "device_identifier" VARCHAR(30) NOT NULL, "geolocation_type" VARCHAR(15) NOT NULL, "response_status" VARCHAR(30), "cell_id" VARCHAR(10), "location_area_code" VARCHAR(10), "mobile_country_code" INTEGER, "mobile_network_code" VARCHAR(3), "network_entity_address" BIGINT, "age_of_location_info" INTEGER, "device_latitude" VARCHAR(15), "device_longitude" VARCHAR(15), "accuracy" BIGINT, "physical_address" VARCHAR(50), "internet_address" VARCHAR(50), "formatted_address" VARCHAR(200), "location_timestamp" DATETIME, "event_geofence_latitude" VARCHAR(15), "event_geofence_longitude" VARCHAR(15), "radius" BIGINT, "geolocation_positioning_type" VARCHAR(15), "last_geolocation_response" VARCHAR(10), "cause" VARCHAR(150), "api_version" VARCHAR(10) NOT NULL, "uri" LONGVARCHAR NOT NULL)
+CREATE MEMORY TABLE "restcomm_permissions"("sid" VARCHAR(34) NOT NULL PRIMARY KEY, "name" VARCHAR(16777216) NOT NULL)
+CREATE MEMORY TABLE "restcomm_accounts_permissions"("account_sid" VARCHAR(34) NOT NULL, "permission_sid" VARCHAR(34) NOT NULL, PRIMARY KEY("account_sid", "permission_sid"), "value" BOOLEAN NOT NULL)
 CREATE USER SA PASSWORD ""
 GRANT DBA TO SA
 SET WRITE_DELAY 10

diff --git a/restcomm/restcomm.testsuite/src/test/resources/restcomm.script-smpp b/restcomm/restcomm.testsuite/src/test/resources/restcomm.script-smpp
@@ -23,6 +23,8 @@ CREATE MEMORY TABLE "restcomm_media_servers" ( "ms_id" INT GENERATED BY DEFAULT
 CREATE MEMORY TABLE "restcomm_media_resource_broker_entity" ("conference_sid" VARCHAR(34) NOT NULL, "slave_ms_id" VARCHAR(34) NOT NULL, "slave_ms_bridge_ep_id" VARCHAR(34),"slave_ms_cnf_ep_id" VARCHAR(34),"is_bridged_together" BOOLEAN DEFAULT FALSE,PRIMARY KEY ("conference_sid" , "slave_ms_id"))
 CREATE MEMORY TABLE PUBLIC."restcomm_extensions_configuration"("sid" VARCHAR(34) NOT NULL PRIMARY KEY,"extension" VARCHAR(255) NOT NULL,"configuration_data" VARCHAR(16777216),"configuration_type" VARCHAR(255) NOT NULL,"date_created" TIMESTAMP NOT NULL,"date_updated" TIMESTAMP)
 CREATE MEMORY TABLE PUBLIC."restcomm_extensions_configuration_specific"("sid" VARCHAR(34) NOT NULL PRIMARY KEY,"specific_sid" VARCHAR(34) NOT NULL, "extension" VARCHAR(255) NOT NULL,"configuration_data" VARCHAR(16777216),"configuration_type" VARCHAR(255) NOT NULL,"date_created" TIMESTAMP NOT NULL,"date_updated" TIMESTAMP)
+CREATE MEMORY TABLE "restcomm_permissions"("sid" VARCHAR(34) NOT NULL PRIMARY KEY, "name" VARCHAR(16777216) NOT NULL)
+CREATE MEMORY TABLE "restcomm_accounts_permissions"("account_sid" VARCHAR(34) NOT NULL, "permission_sid" VARCHAR(34) NOT NULL, PRIMARY KEY("account_sid", "permission_sid"), "value" BOOLEAN NOT NULL)
 CREATE USER SA PASSWORD ""
 GRANT DBA TO SA
 SET WRITE_DELAY 10

diff --git a/restcomm/restcomm.testsuite/src/test/resources/restcomm.script_DialRecording b/restcomm/restcomm.testsuite/src/test/resources/restcomm.script_DialRecording
@@ -23,6 +23,8 @@ CREATE MEMORY TABLE "restcomm_media_servers" ( "ms_id" INT GENERATED BY DEFAULT
 CREATE MEMORY TABLE "restcomm_media_resource_broker_entity" ("conference_sid" VARCHAR(34) NOT NULL, "slave_ms_id" VARCHAR(34) NOT NULL, "slave_ms_bridge_ep_id" VARCHAR(34),"slave_ms_cnf_ep_id" VARCHAR(34),"is_bridged_together" BOOLEAN DEFAULT FALSE,PRIMARY KEY ("conference_sid" , "slave_ms_id"))
 CREATE MEMORY TABLE PUBLIC."restcomm_extensions_configuration"("sid" VARCHAR(34) NOT NULL PRIMARY KEY,"extension" VARCHAR(255) NOT NULL,"configuration_data" VARCHAR(16777216),"configuration_type" VARCHAR(255) NOT NULL,"date_created" TIMESTAMP NOT NULL,"date_updated" TIMESTAMP)
 CREATE MEMORY TABLE PUBLIC."restcomm_extensions_configuration_specific"("sid" VARCHAR(34) NOT NULL PRIMARY KEY,"specific_sid" VARCHAR(34) NOT NULL, "extension" VARCHAR(255) NOT NULL,"configuration_data" VARCHAR(16777216),"configuration_type" VARCHAR(255) NOT NULL,"date_created" TIMESTAMP NOT NULL,"date_updated" TIMESTAMP)
+CREATE MEMORY TABLE "restcomm_permissions"("sid" VARCHAR(34) NOT NULL PRIMARY KEY, "name" VARCHAR(16777216) NOT NULL)
+CREATE MEMORY TABLE "restcomm_accounts_permissions"("account_sid" VARCHAR(34) NOT NULL, "permission_sid" VARCHAR(34) NOT NULL, PRIMARY KEY("account_sid", "permission_sid"), "value" BOOLEAN NOT NULL)
 CREATE USER SA PASSWORD ""
 GRANT DBA TO SA
 SET WRITE_DELAY 10

diff --git a/restcomm/restcomm.testsuite/src/test/resources/restcomm.script_ReferMessageTest b/restcomm/restcomm.testsuite/src/test/resources/restcomm.script_ReferMessageTest
@@ -23,6 +23,8 @@ CREATE MEMORY TABLE "restcomm_media_servers" ( "ms_id" INT GENERATED BY DEFAULT
 CREATE MEMORY TABLE "restcomm_media_resource_broker_entity" ("conference_sid" VARCHAR(34) NOT NULL, "slave_ms_id" VARCHAR(34) NOT NULL, "slave_ms_bridge_ep_id" VARCHAR(34),"slave_ms_cnf_ep_id" VARCHAR(34),"is_bridged_together" BOOLEAN DEFAULT FALSE,PRIMARY KEY ("conference_sid" , "slave_ms_id"))
 CREATE MEMORY TABLE PUBLIC."restcomm_extensions_configuration"("sid" VARCHAR(34) NOT NULL PRIMARY KEY,"extension" VARCHAR(255) NOT NULL,"configuration_data" VARCHAR(16777216),"configuration_type" VARCHAR(255) NOT NULL,"date_created" TIMESTAMP NOT NULL,"date_updated" TIMESTAMP)
 CREATE MEMORY TABLE PUBLIC."restcomm_extensions_configuration_specific"("sid" VARCHAR(34) NOT NULL PRIMARY KEY,"specific_sid" VARCHAR(34) NOT NULL, "extension" VARCHAR(255) NOT NULL,"configuration_data" VARCHAR(16777216),"configuration_type" VARCHAR(255) NOT NULL,"date_created" TIMESTAMP NOT NULL,"date_updated" TIMESTAMP)
+CREATE MEMORY TABLE "restcomm_permissions"("sid" VARCHAR(34) NOT NULL PRIMARY KEY, "name" VARCHAR(16777216) NOT NULL)
+CREATE MEMORY TABLE "restcomm_accounts_permissions"("account_sid" VARCHAR(34) NOT NULL, "permission_sid" VARCHAR(34) NOT NULL, PRIMARY KEY("account_sid", "permission_sid"), "value" BOOLEAN NOT NULL)
 CREATE USER SA PASSWORD ""
 GRANT DBA TO SA
 SET WRITE_DELAY 10