Issue #1981: Fix sticky problem

Issue #1981: WIP Fix MultiProvider constructor

Issue #1981: WIP Fix MultiProvider configuration. Fix disabled extension. Fix tlv value.

Issue #1981: WIP Fix SmsSession remove hacked tlvs, add proper tlvs to outbound and sip request

Issue #1981: WIP Fix SmsSession typo dest_network_id to destination_network_id

Issue #1981: WIP. Fix Accounts Extensions DAO. Fix ExtensionConfig to json to XMLConfig mapping. Add example account mappings

Issue #1981: WIP. Dao changes. Table changes. Multiprovider Extensions. SMSService changes. ExtensionController fixes.

Issue #1981: Make changes to SmsSession objects

Issue #1981: Add ExtensionResponse subclasses. Handle Session specific Extension customization by modifying the SmsSession configuration.

Author: abdulazizali77

restcomm/pom.xml

@@ -164,6 +164,8 @@
 		<module>restcomm.email.api</module>
 		<module>restcomm.extension.api</module>
 		<module>restcomm.extension.controller</module>
+		<!--FIXME: temporary will move to telscale-->
+		<module>restcomm.extension.multiprovider</module>
 		<module>restcomm.identity</module>
 		<module>restcomm.mrb</module>
                 <module>restcomm.mrb.api</module>

restcomm/restcomm.application/src/main/webapp/WEB-INF/conf/extensions.xml

@@ -11,11 +11,9 @@
 	MA 02110-1301 USA, or see the FSF site: http://www.fsf.org. -->
 
 <extensions>
-    <!--
-    <extension>
-        <name>ExampleExtension</name>
-        <class>org.restcomm.connect.ExampleExtension</class>
+    <!-- extension name="MultiProvider">
+        <name>MultiProvider</name>
+        <class>org.restcomm.connect.extension.multiprovider.MultiProvider</class>
         <enabled>true</enabled>
-    </extension>
-    -->
+    </extension-->
 </extensions>

restcomm/restcomm.application/src/main/webapp/WEB-INF/data/hsql/restcomm.script

@@ -21,12 +21,15 @@ CREATE MEMORY TABLE "restcomm_gateways"("sid" VARCHAR(34) NOT NULL PRIMARY KEY,"
 CREATE MEMORY TABLE "restcomm_media_servers" ( "ms_id" INT GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1) NOT NULL, "local_ip" VARCHAR(34) NOT NULL, "local_port" INT NOT NULL, "remote_ip" VARCHAR(34) NOT NULL UNIQUE, "remote_port" INT NOT NULL, "compatibility" VARCHAR(34) DEFAULT 'rms', "response_timeout" VARCHAR(34), "external_address" VARCHAR(34))
 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 PUBLIC."restcomm_accounts_extensions" ("account_sid" VARCHAR(34) NOT NULL, "extension_sid" VARCHAR(34) NOT NULL, PRIMARY KEY("account_sid", "extension_sid"), "configuration_data" VARCHAR(16777216))
 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 USER SA PASSWORD ""
 GRANT DBA TO SA
 SET WRITE_DELAY 10
 SET SCHEMA PUBLIC
 INSERT INTO "restcomm_accounts" VALUES('ACae6e420f425248d6a26948c17a9e2acf','2012-04-24 00:00:00.000000000','2012-04-24 00:00:00.000000000','[email protected]','Default Administrator Account',NULL,'Full','uninitialized','77f8c12cc7b8f8423e5c38b035249166','Administrator','/2012-04-24/Accounts/ACae6e420f425248d6a26948c17a9e2acf')
+INSERT INTO "restcomm_accounts" VALUES('ACae6e420f425248d6a26948c17a9e2acg','2012-04-24 00:00:00.000000000','2012-04-24 00:00:00.000000000','[email protected]','Second Administrator Account',NULL,'Full','uninitialized','77f8c12cc7b8f8423e5c38b035249166','Administrator','/2012-04-24/Accounts/ACae6e420f425248d6a26948c17a9e2acg')
+INSERT INTO "restcomm_accounts" VALUES('ACae6e420f425248d6a26948c17a9e2ach','2012-04-24 00:00:00.000000000','2012-04-24 00:00:00.000000000','[email protected]','Third Administrator Account',NULL,'Full','uninitialized','77f8c12cc7b8f8423e5c38b035249166','Administrator','/2012-04-24/Accounts/ACae6e420f425248d6a26948c17a9e2ach')
 INSERT INTO "restcomm_applications" VALUES('AP73926e7113fa4d95981aa96b76eca854','2015-09-23 06:56:04.108000','2015-09-23 06:56:04.108000','rvdCollectVerbDemo','ACae6e420f425248d6a26948c17a9e2acf','2012-04-24',FALSE,'/2012-04-24/Accounts/ACae6e420f425248d6a26948c17a9e2acf/Applications/AP73926e7113fa4d95981aa96b76eca854','/restcomm-rvd/services/apps/AP73926e7113fa4d95981aa96b76eca854/controller','voice')
 INSERT INTO "restcomm_applications" VALUES('AP81cf45088cba4abcac1261385916d582','2015-09-23 06:56:17.977000','2015-09-23 06:56:17.977000','rvdESDemo','ACae6e420f425248d6a26948c17a9e2acf','2012-04-24',FALSE,'/2012-04-24/Accounts/ACae6e420f425248d6a26948c17a9e2acf/Applications/AP81cf45088cba4abcac1261385916d582','/restcomm-rvd/services/apps/AP81cf45088cba4abcac1261385916d582/controller','voice')
 INSERT INTO "restcomm_applications" VALUES('APb70c33bf0b6748f09eaec97030af36f3','2015-09-23 06:56:26.120000','2015-09-23 06:56:26.120000','rvdSayVerbDemo','ACae6e420f425248d6a26948c17a9e2acf','2012-04-24',FALSE,'/2012-04-24/Accounts/ACae6e420f425248d6a26948c17a9e2acf/Applications/APb70c33bf0b6748f09eaec97030af36f3','/restcomm-rvd/services/apps/APb70c33bf0b6748f09eaec97030af36f3/controller','voice')
@@ -42,3 +45,7 @@ INSERT INTO "restcomm_incoming_phone_numbers" VALUES('PN46678e5b01d44973bf184f65
 INSERT INTO "restcomm_incoming_phone_numbers" VALUES('PNb43ed9e641364277b6432547ff1109e9','2014-02-17 22:37:19.392000000','2014-02-17 22:37:19.392000000','RVD external services app, customer ID 1 or 2 ','ACae6e420f425248d6a26948c17a9e2acf','+1241','2012-04-24',FALSE,NULL,'POST',NULL,'POST',NULL,'POST','AP81cf45088cba4abcac1261385916d582',NULL,'POST',NULL,'POST',NULL,'/2012-04-24/Accounts/ACae6e420f425248d6a26948c17a9e2acf/IncomingPhoneNumbers/PNb43ed9e641364277b6432547ff1109e9',NULL,NULL,NULL,NULL, TRUE,'0.0', NULL, NULL)
 INSERT INTO "restcomm_clients" VALUES('CLa2b99142e111427fbb489c3de357f60a','2013-11-04 12:52:44.144000000','2013-11-04 12:52:44.144000000','ACae6e420f425248d6a26948c17a9e2acf','2012-04-24','alice','alice','1234',1,NULL,'POST',NULL,'POST',NULL,'/2012-04-24/Accounts/ACae6e420f425248d6a26948c17a9e2acf/Clients/CLa2b99142e111427fbb489c3de357f60a')
 INSERT INTO "restcomm_clients" VALUES('CL3003328d0de04ba68f38de85b732ed56','2013-11-04 16:33:39.248000000','2013-11-04 16:33:39.248000000','ACae6e420f425248d6a26948c17a9e2acf','2012-04-24','bob','bob','1234',1,NULL,'POST',NULL,'POST',NULL,'/2012-04-24/Accounts/ACae6e420f425248d6a26948c17a9e2acf/Clients/CL3003328d0de04ba68f38de85b732ed56')
+INSERT INTO "restcomm_accounts_extensions" VALUES('ACae6e420f425248d6a26948c17a9e2acf','EX00000000000000000000000000000005','{"outbound-sms": [{"destination_network_id": "1000"}]}')
+INSERT INTO "restcomm_accounts_extensions" VALUES('ACae6e420f425248d6a26948c17a9e2acg','EX00000000000000000000000000000005','{"outbound-sms": [{"destination_network_id": "2000"}]}')
+INSERT INTO "restcomm_accounts_extensions" VALUES('ACae6e420f425248d6a26948c17a9e2ach','EX00000000000000000000000000000005','{"outbound-sms": [{"destination_network_id": "3000"}]}')
+INSERT INTO "restcomm_extensions_configuration" VALUES('EX00000000000000000000000000000005','multi_provider','{"outbound-sms": [{"destination_network_id": "1"}]}','JSON','2012-04-24 00:00:00.000000','2012-04-24 00:00:00.000000',TRUE)

restcomm/restcomm.application/src/main/webapp/WEB-INF/scripts/mariadb/init.sql

@@ -381,6 +381,13 @@ date_updated DATETIME,
 enabled  BOOLEAN NOT NULL DEFAULT TRUE
 );
 
+CREATE TABLE restcomm_accounts_extensions (
+account_sid VARCHAR(34) NOT NULL,
+extension_sid VARCHAR(34) NOT NULL,
+extension_blob CLOB,
+PRIMARY KEY (account_sid, extension_sid)
+);
+
 INSERT INTO restcomm_accounts VALUES (
 "ACae6e420f425248d6a26948c17a9e2acf",
 Date("2012-04-24"),

restcomm/restcomm.application/src/main/webapp/WEB-INF/scripts/mariadb/sql/extensions-configuration.xml

@@ -61,4 +61,9 @@
   <select id="getDateUpdatedBySid" parameterType="String" resultType="date">
     SELECT date_updated FROM restcomm_extensions_configuration WHERE sid=#{sid};
   </select>
+
+  <select id="getExtensionClob" parameterType="map" resultType="hashmap">
+    SELECT configuration_data FROM restcomm_accounts_extensions 
+    WHERE account_sid=#{account_sid} AND extension_sid=#{extension_sid};
+  </select>
 </mapper>

restcomm/restcomm.application/src/main/webapp/WEB-INF/sql/extensions-configuration.xml

@@ -67,4 +67,9 @@
     <select id="getDateUpdatedBySid" parameterType="String" resultType="date">
         SELECT "date_updated" FROM "restcomm_extensions_configuration" WHERE "sid"=#{sid};
     </select>
+
+    <select id="getExtensionClob" parameterType="map" resultType="hashmap">
+        SELECT "configuration_data", "account_sid" AS "sid", "extension_sid" AS "extension" FROM "restcomm_accounts_extensions"  
+        WHERE "account_sid"=#{account_sid} AND "extension_sid"=#{extension_sid};
+    </select>
 </mapper>

restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/ExtensionsConfigurationDao.java

@@ -97,4 +97,7 @@ public interface ExtensionsConfigurationDao {
      * @return
      */
     boolean validate(ExtensionConfiguration extensionConfiguration);
+
+    /**/
+    ExtensionConfiguration getExtensionClob(String accountSid, String extensionSid);
 }

restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/mybatis/MybatisExtensionsConfigurationDao.java

@@ -259,6 +259,13 @@ private ExtensionConfiguration toExtensionConfiguration(final Map<String, Object
         return new ExtensionConfiguration(sid, extension, enabled, confData, confType, dateCreated, dateUpdated);
     }
 
+    private ExtensionConfiguration toAccountsExtensionConfiguration(final Map<String, Object> map) {
+        final Sid sid = new Sid((String)map.get("extension"));
+        final String extension = (String) map.get("extension");
+        final Object confData = map.get("configuration_data");
+        return new ExtensionConfiguration(sid, extension, true, confData, null, null, null);
+    }
+
     private Map<String, Object> toMap(final ExtensionConfiguration extensionConfiguration) {
         final Map<String, Object> map = new HashMap<String, Object>();
         map.put("sid", DaoUtils.writeSid(extensionConfiguration.getSid()));
@@ -276,4 +283,22 @@ private Map<String, Object> toMap(final ExtensionConfiguration extensionConfigur
         map.put("enabled", extensionConfiguration.isEnabled());
         return map;
     }
+
+    @Override
+    public ExtensionConfiguration getExtensionClob(String accountSid, String extensionSid) {
+        final SqlSession session = sessions.openSession();
+        ExtensionConfiguration extensionConfiguration = null;
+        try {
+            Map<String, Object> params = new HashMap<String, Object>();
+            params.put("account_sid", accountSid.toString());
+            params.put("extension_sid", extensionSid.toString());
+            final Map<String, Object> result  = session.selectOne(namespace + "getExtensionClob", params);
+            if (result != null) {
+                extensionConfiguration = toAccountsExtensionConfiguration(result);
+            }
+            return extensionConfiguration;
+        } finally {
+            session.close();
+        }
+    }
 }

restcomm/restcomm.extension.api/src/main/java/org/restcomm/connect/extension/api/ExtensionRequest.java

@@ -0,0 +1,27 @@
+package org.restcomm.connect.extension.api;
+import org.apache.commons.configuration.Configuration;
+
+public class ExtensionRequest {
+    private Object payload;
+    private Configuration configuration;
+
+    public ExtensionRequest() {}
+
+    public Object getObject() {
+        return payload;
+    }
+
+    public void setObject(Object object) {
+        this.payload = object;
+    }
+
+    public void setConfiguration(Configuration configuration) {
+        // TODO Auto-generated method stub
+        this.configuration = configuration;
+    }
+    public Configuration getConfiguration() {
+        // TODO Auto-generated method stub
+        return this.configuration;
+    }
+
+}

restcomm/restcomm.extension.api/src/main/java/org/restcomm/connect/extension/api/ExtensionResponse.java

@@ -26,7 +26,7 @@
  */
 public class ExtensionResponse {
     private Object object;
-    private boolean allowed;
+    private boolean allowed = true;
 
     public ExtensionResponse() {}
 

restcomm/restcomm.extension.api/src/main/java/org/restcomm/connect/extension/api/MessageExtensionResponse.java

@@ -0,0 +1,3 @@
+package org.restcomm.connect.extension.api;
+public class MessageExtensionResponse extends ExtensionResponse {
+}

restcomm/restcomm.extension.api/src/main/java/org/restcomm/connect/extension/api/NodeExtensionResponse.java

@@ -0,0 +1,3 @@
+package org.restcomm.connect.extension.api;
+public class NodeExtensionResponse extends ExtensionResponse {
+}

restcomm/restcomm.extension.api/src/main/java/org/restcomm/connect/extension/api/SessionExtensionResponse.java

@@ -0,0 +1,11 @@
+package org.restcomm.connect.extension.api;
+import org.apache.commons.configuration.Configuration;
+public class SessionExtensionResponse extends ExtensionResponse {
+
+    public void setConfiguration(Configuration configuration){
+        super.setObject(configuration);
+    }
+    public Configuration getConfiguration(){
+        return (Configuration) super.getObject();
+    }
+}

restcomm/restcomm.extension.api/src/main/java/org/restcomm/connect/extension/api/SystemExtensionResponse.java

@@ -0,0 +1,3 @@
+package org.restcomm.connect.extension.api;
+public class SystemExtensionResponse extends ExtensionResponse {
+}

restcomm/restcomm.extension.api/src/main/java/org/restcomm/connect/extension/api/TransactionExtensionResponse.java

@@ -0,0 +1,4 @@
+package org.restcomm.connect.extension.api;
+public class TransactionExtensionResponse extends ExtensionResponse {
+
+}

restcomm/restcomm.extension.controller/src/main/java/org/restcomm/connect/extension/controller/ExtensionBootstrapper.java

@@ -47,10 +47,11 @@ public ExtensionBootstrapper(final ServletContext context, final Configuration c
 
     public void start() throws ClassNotFoundException, IllegalAccessException, InstantiationException {
 
-        List<HierarchicalConfiguration> exts = ((XMLConfiguration)configuration).configurationsAt("extensions.extension");
+        List<HierarchicalConfiguration> exts = ((XMLConfiguration)configuration).configurationsAt("extension");
 
         for (HierarchicalConfiguration ext: exts) {
-            String name = ext.getString("[@name]");
+            String name = ext.getString("name");
+            String extensionSid = ext.getString("extension_sid");
             String className = ext.getString("class");
             boolean enabled = ext.getBoolean("enabled");
             if (enabled) {