PISTON-914: escape CAV comma/singlequote in originate strings (2600hz…

…#6049)

- also encode JSON CAVs and give json_cav_ prefix

applications/ecallmgr/src/ecallmgr_fs_xml.erl

@@ -781,10 +781,21 @@ kazoo_var_to_fs_var_fold(K, V, Acc) ->
 
 -spec kazoo_cavs_to_fs_vars_fold(kz_json:key(), kz_json:json_term(), iolist()) -> iolist().
 kazoo_cavs_to_fs_vars_fold(K, V, Acc) ->
-    [list_to_binary([?APPLICATION_VAR_PREFIX, kz_term:to_list(K), "='", kz_term:to_list(V), "'"])
+    {Prefix, V1} = kazoo_cav_prefix_and_value(V),
+    [list_to_binary([Prefix, kz_term:to_list(K), "='", V1, "'"])
      | Acc
     ].
 
+-spec kazoo_cav_prefix_and_value(kz_json:json_term()) -> {string(), string()}.
+kazoo_cav_prefix_and_value(V) ->
+    {Prefix, Encoded} = case kz_json:is_json_object(V) of
+                            'true' -> {?JSON_APPLICATION_VAR_PREFIX, kz_json:encode(V)};
+                            'false' -> {?APPLICATION_VAR_PREFIX, V}
+                        end,
+    %% Escape all embedded single quotes and commas so that FS can consume them
+    Escaped = re:replace(Encoded, <<"([,'])">>, <<"\\\\\\g1">>, ['global', {'return', 'binary'}]),
+    {Prefix, kz_term:to_list(Escaped)}.
+
 -spec codec_mappings(kz_term:ne_binary()) -> kz_term:ne_binary().
 codec_mappings(<<"G722_32">>) ->
     <<"G7221@32000h">>;