res_pjsip_sdp_rtp: Accept DTLS attributes in top level, not just media session.
[asterisk/asterisk.git] / res / res_ari_bridges.c
index fe72df7..1a91af9 100644 (file)
@@ -58,17 +58,19 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_get_bridges_cb(
+static void ast_ari_bridges_list_cb(
+       struct ast_tcptls_session_instance *ser,
        struct ast_variable *get_params, struct ast_variable *path_vars,
        struct ast_variable *headers, struct ast_ari_response *response)
 {
-       struct ast_get_bridges_args args = {};
+       struct ast_ari_bridges_list_args args = {};
+       RAII_VAR(struct ast_json *, body, NULL, ast_json_unref);
 #if defined(AST_DEVMODE)
        int is_valid;
        int code;
 #endif /* AST_DEVMODE */
 
-       ast_ari_get_bridges(headers, &args, response);
+       ast_ari_bridges_list(headers, &args, response);
 #if defined(AST_DEVMODE)
        code = response->response_code;
 
@@ -100,6 +102,27 @@ static void ast_ari_get_bridges_cb(
 fin: __attribute__((unused))
        return;
 }
+int ast_ari_bridges_create_parse_body(
+       struct ast_json *body,
+       struct ast_ari_bridges_create_args *args)
+{
+       struct ast_json *field;
+       /* Parse query parameters out of it */
+       field = ast_json_object_get(body, "type");
+       if (field) {
+               args->type = ast_json_string_get(field);
+       }
+       field = ast_json_object_get(body, "bridgeId");
+       if (field) {
+               args->bridge_id = ast_json_string_get(field);
+       }
+       field = ast_json_object_get(body, "name");
+       if (field) {
+               args->name = ast_json_string_get(field);
+       }
+       return 0;
+}
+
 /*!
  * \brief Parameter parsing callback for /bridges.
  * \param get_params GET parameters in the HTTP request.
@@ -107,12 +130,14 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_new_bridge_cb(
+static void ast_ari_bridges_create_cb(
+       struct ast_tcptls_session_instance *ser,
        struct ast_variable *get_params, struct ast_variable *path_vars,
        struct ast_variable *headers, struct ast_ari_response *response)
 {
-       struct ast_new_bridge_args args = {};
+       struct ast_ari_bridges_create_args args = {};
        struct ast_variable *i;
+       RAII_VAR(struct ast_json *, body, NULL, ast_json_unref);
 #if defined(AST_DEVMODE)
        int is_valid;
        int code;
@@ -122,9 +147,34 @@ static void ast_ari_new_bridge_cb(
                if (strcmp(i->name, "type") == 0) {
                        args.type = (i->value);
                } else
+               if (strcmp(i->name, "bridgeId") == 0) {
+                       args.bridge_id = (i->value);
+               } else
+               if (strcmp(i->name, "name") == 0) {
+                       args.name = (i->value);
+               } else
                {}
        }
-       ast_ari_new_bridge(headers, &args, response);
+       /* Look for a JSON request entity */
+       body = ast_http_get_json(ser, headers);
+       if (!body) {
+               switch (errno) {
+               case EFBIG:
+                       ast_ari_response_error(response, 413, "Request Entity Too Large", "Request body too large");
+                       goto fin;
+               case ENOMEM:
+                       ast_ari_response_error(response, 500, "Internal Server Error", "Error processing request");
+                       goto fin;
+               case EIO:
+                       ast_ari_response_error(response, 400, "Bad Request", "Error parsing request body");
+                       goto fin;
+               }
+       }
+       if (ast_ari_bridges_create_parse_body(body, &args)) {
+               ast_ari_response_alloc_failed(response);
+               goto fin;
+       }
+       ast_ari_bridges_create(headers, &args, response);
 #if defined(AST_DEVMODE)
        code = response->response_code;
 
@@ -156,6 +206,109 @@ static void ast_ari_new_bridge_cb(
 fin: __attribute__((unused))
        return;
 }
+int ast_ari_bridges_create_or_update_with_id_parse_body(
+       struct ast_json *body,
+       struct ast_ari_bridges_create_or_update_with_id_args *args)
+{
+       struct ast_json *field;
+       /* Parse query parameters out of it */
+       field = ast_json_object_get(body, "type");
+       if (field) {
+               args->type = ast_json_string_get(field);
+       }
+       field = ast_json_object_get(body, "name");
+       if (field) {
+               args->name = ast_json_string_get(field);
+       }
+       return 0;
+}
+
+/*!
+ * \brief Parameter parsing callback for /bridges/{bridgeId}.
+ * \param get_params GET parameters in the HTTP request.
+ * \param path_vars Path variables extracted from the request.
+ * \param headers HTTP headers.
+ * \param[out] response Response to the HTTP request.
+ */
+static void ast_ari_bridges_create_or_update_with_id_cb(
+       struct ast_tcptls_session_instance *ser,
+       struct ast_variable *get_params, struct ast_variable *path_vars,
+       struct ast_variable *headers, struct ast_ari_response *response)
+{
+       struct ast_ari_bridges_create_or_update_with_id_args args = {};
+       struct ast_variable *i;
+       RAII_VAR(struct ast_json *, body, NULL, ast_json_unref);
+#if defined(AST_DEVMODE)
+       int is_valid;
+       int code;
+#endif /* AST_DEVMODE */
+
+       for (i = get_params; i; i = i->next) {
+               if (strcmp(i->name, "type") == 0) {
+                       args.type = (i->value);
+               } else
+               if (strcmp(i->name, "name") == 0) {
+                       args.name = (i->value);
+               } else
+               {}
+       }
+       for (i = path_vars; i; i = i->next) {
+               if (strcmp(i->name, "bridgeId") == 0) {
+                       args.bridge_id = (i->value);
+               } else
+               {}
+       }
+       /* Look for a JSON request entity */
+       body = ast_http_get_json(ser, headers);
+       if (!body) {
+               switch (errno) {
+               case EFBIG:
+                       ast_ari_response_error(response, 413, "Request Entity Too Large", "Request body too large");
+                       goto fin;
+               case ENOMEM:
+                       ast_ari_response_error(response, 500, "Internal Server Error", "Error processing request");
+                       goto fin;
+               case EIO:
+                       ast_ari_response_error(response, 400, "Bad Request", "Error parsing request body");
+                       goto fin;
+               }
+       }
+       if (ast_ari_bridges_create_or_update_with_id_parse_body(body, &args)) {
+               ast_ari_response_alloc_failed(response);
+               goto fin;
+       }
+       ast_ari_bridges_create_or_update_with_id(headers, &args, response);
+#if defined(AST_DEVMODE)
+       code = response->response_code;
+
+       switch (code) {
+       case 0: /* Implementation is still a stub, or the code wasn't set */
+               is_valid = response->message == NULL;
+               break;
+       case 500: /* Internal Server Error */
+       case 501: /* Not Implemented */
+               is_valid = 1;
+               break;
+       default:
+               if (200 <= code && code <= 299) {
+                       is_valid = ast_ari_validate_bridge(
+                               response->message);
+               } else {
+                       ast_log(LOG_ERROR, "Invalid error response %d for /bridges/{bridgeId}\n", code);
+                       is_valid = 0;
+               }
+       }
+
+       if (!is_valid) {
+               ast_log(LOG_ERROR, "Response validation failed for /bridges/{bridgeId}\n");
+               ast_ari_response_error(response, 500,
+                       "Internal Server Error", "Response validation failed");
+       }
+#endif /* AST_DEVMODE */
+
+fin: __attribute__((unused))
+       return;
+}
 /*!
  * \brief Parameter parsing callback for /bridges/{bridgeId}.
  * \param get_params GET parameters in the HTTP request.
@@ -163,12 +316,14 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_get_bridge_cb(
+static void ast_ari_bridges_get_cb(
+       struct ast_tcptls_session_instance *ser,
        struct ast_variable *get_params, struct ast_variable *path_vars,
        struct ast_variable *headers, struct ast_ari_response *response)
 {
-       struct ast_get_bridge_args args = {};
+       struct ast_ari_bridges_get_args args = {};
        struct ast_variable *i;
+       RAII_VAR(struct ast_json *, body, NULL, ast_json_unref);
 #if defined(AST_DEVMODE)
        int is_valid;
        int code;
@@ -180,7 +335,7 @@ static void ast_ari_get_bridge_cb(
                } else
                {}
        }
-       ast_ari_get_bridge(headers, &args, response);
+       ast_ari_bridges_get(headers, &args, response);
 #if defined(AST_DEVMODE)
        code = response->response_code;
 
@@ -220,12 +375,14 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_delete_bridge_cb(
+static void ast_ari_bridges_destroy_cb(
+       struct ast_tcptls_session_instance *ser,
        struct ast_variable *get_params, struct ast_variable *path_vars,
        struct ast_variable *headers, struct ast_ari_response *response)
 {
-       struct ast_delete_bridge_args args = {};
+       struct ast_ari_bridges_destroy_args args = {};
        struct ast_variable *i;
+       RAII_VAR(struct ast_json *, body, NULL, ast_json_unref);
 #if defined(AST_DEVMODE)
        int is_valid;
        int code;
@@ -237,7 +394,7 @@ static void ast_ari_delete_bridge_cb(
                } else
                {}
        }
-       ast_ari_delete_bridge(headers, &args, response);
+       ast_ari_bridges_destroy(headers, &args, response);
 #if defined(AST_DEVMODE)
        code = response->response_code;
 
@@ -270,6 +427,48 @@ static void ast_ari_delete_bridge_cb(
 fin: __attribute__((unused))
        return;
 }
+int ast_ari_bridges_add_channel_parse_body(
+       struct ast_json *body,
+       struct ast_ari_bridges_add_channel_args *args)
+{
+       struct ast_json *field;
+       /* Parse query parameters out of it */
+       field = ast_json_object_get(body, "channel");
+       if (field) {
+               /* If they were silly enough to both pass in a query param and a
+                * JSON body, free up the query value.
+                */
+               ast_free(args->channel);
+               if (ast_json_typeof(field) == AST_JSON_ARRAY) {
+                       /* Multiple param passed as array */
+                       size_t i;
+                       args->channel_count = ast_json_array_size(field);
+                       args->channel = ast_malloc(sizeof(*args->channel) * args->channel_count);
+
+                       if (!args->channel) {
+                               return -1;
+                       }
+
+                       for (i = 0; i < args->channel_count; ++i) {
+                               args->channel[i] = ast_json_string_get(ast_json_array_get(field, i));
+                       }
+               } else {
+                       /* Multiple param passed as single value */
+                       args->channel_count = 1;
+                       args->channel = ast_malloc(sizeof(*args->channel) * args->channel_count);
+                       if (!args->channel) {
+                               return -1;
+                       }
+                       args->channel[0] = ast_json_string_get(field);
+               }
+       }
+       field = ast_json_object_get(body, "role");
+       if (field) {
+               args->role = ast_json_string_get(field);
+       }
+       return 0;
+}
+
 /*!
  * \brief Parameter parsing callback for /bridges/{bridgeId}/addChannel.
  * \param get_params GET parameters in the HTTP request.
@@ -277,12 +476,14 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_add_channel_to_bridge_cb(
+static void ast_ari_bridges_add_channel_cb(
+       struct ast_tcptls_session_instance *ser,
        struct ast_variable *get_params, struct ast_variable *path_vars,
        struct ast_variable *headers, struct ast_ari_response *response)
 {
-       struct ast_add_channel_to_bridge_args args = {};
+       struct ast_ari_bridges_add_channel_args args = {};
        struct ast_variable *i;
+       RAII_VAR(struct ast_json *, body, NULL, ast_json_unref);
 #if defined(AST_DEVMODE)
        int is_valid;
        int code;
@@ -300,8 +501,16 @@ static void ast_ari_add_channel_to_bridge_cb(
                                goto fin;
                        }
 
-                       args.channel_count = ast_app_separate_args(
-                               args.channel_parse, ',', vals, ARRAY_LEN(vals));
+                       if (strlen(args.channel_parse) == 0) {
+                               /* ast_app_separate_args can't handle "" */
+                               args.channel_count = 1;
+                               vals[0] = args.channel_parse;
+                       } else {
+                               args.channel_count = ast_app_separate_args(
+                                       args.channel_parse, ',', vals,
+                                       ARRAY_LEN(vals));
+                       }
+
                        if (args.channel_count == 0) {
                                ast_ari_response_alloc_failed(response);
                                goto fin;
@@ -335,7 +544,26 @@ static void ast_ari_add_channel_to_bridge_cb(
                } else
                {}
        }
-       ast_ari_add_channel_to_bridge(headers, &args, response);
+       /* Look for a JSON request entity */
+       body = ast_http_get_json(ser, headers);
+       if (!body) {
+               switch (errno) {
+               case EFBIG:
+                       ast_ari_response_error(response, 413, "Request Entity Too Large", "Request body too large");
+                       goto fin;
+               case ENOMEM:
+                       ast_ari_response_error(response, 500, "Internal Server Error", "Error processing request");
+                       goto fin;
+               case EIO:
+                       ast_ari_response_error(response, 400, "Bad Request", "Error parsing request body");
+                       goto fin;
+               }
+       }
+       if (ast_ari_bridges_add_channel_parse_body(body, &args)) {
+               ast_ari_response_alloc_failed(response);
+               goto fin;
+       }
+       ast_ari_bridges_add_channel(headers, &args, response);
 #if defined(AST_DEVMODE)
        code = response->response_code;
 
@@ -345,9 +573,10 @@ static void ast_ari_add_channel_to_bridge_cb(
                break;
        case 500: /* Internal Server Error */
        case 501: /* Not Implemented */
+       case 400: /* Channel not found */
        case 404: /* Bridge not found */
-       case 409: /* Bridge not in Stasis application */
-       case 422: /* Channel not found, or not in Stasis application */
+       case 409: /* Bridge not in Stasis application; Channel currently recording */
+       case 422: /* Channel not in Stasis application */
                is_valid = 1;
                break;
        default:
@@ -372,6 +601,44 @@ fin: __attribute__((unused))
        ast_free(args.channel);
        return;
 }
+int ast_ari_bridges_remove_channel_parse_body(
+       struct ast_json *body,
+       struct ast_ari_bridges_remove_channel_args *args)
+{
+       struct ast_json *field;
+       /* Parse query parameters out of it */
+       field = ast_json_object_get(body, "channel");
+       if (field) {
+               /* If they were silly enough to both pass in a query param and a
+                * JSON body, free up the query value.
+                */
+               ast_free(args->channel);
+               if (ast_json_typeof(field) == AST_JSON_ARRAY) {
+                       /* Multiple param passed as array */
+                       size_t i;
+                       args->channel_count = ast_json_array_size(field);
+                       args->channel = ast_malloc(sizeof(*args->channel) * args->channel_count);
+
+                       if (!args->channel) {
+                               return -1;
+                       }
+
+                       for (i = 0; i < args->channel_count; ++i) {
+                               args->channel[i] = ast_json_string_get(ast_json_array_get(field, i));
+                       }
+               } else {
+                       /* Multiple param passed as single value */
+                       args->channel_count = 1;
+                       args->channel = ast_malloc(sizeof(*args->channel) * args->channel_count);
+                       if (!args->channel) {
+                               return -1;
+                       }
+                       args->channel[0] = ast_json_string_get(field);
+               }
+       }
+       return 0;
+}
+
 /*!
  * \brief Parameter parsing callback for /bridges/{bridgeId}/removeChannel.
  * \param get_params GET parameters in the HTTP request.
@@ -379,12 +646,14 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_remove_channel_from_bridge_cb(
+static void ast_ari_bridges_remove_channel_cb(
+       struct ast_tcptls_session_instance *ser,
        struct ast_variable *get_params, struct ast_variable *path_vars,
        struct ast_variable *headers, struct ast_ari_response *response)
 {
-       struct ast_remove_channel_from_bridge_args args = {};
+       struct ast_ari_bridges_remove_channel_args args = {};
        struct ast_variable *i;
+       RAII_VAR(struct ast_json *, body, NULL, ast_json_unref);
 #if defined(AST_DEVMODE)
        int is_valid;
        int code;
@@ -402,8 +671,16 @@ static void ast_ari_remove_channel_from_bridge_cb(
                                goto fin;
                        }
 
-                       args.channel_count = ast_app_separate_args(
-                               args.channel_parse, ',', vals, ARRAY_LEN(vals));
+                       if (strlen(args.channel_parse) == 0) {
+                               /* ast_app_separate_args can't handle "" */
+                               args.channel_count = 1;
+                               vals[0] = args.channel_parse;
+                       } else {
+                               args.channel_count = ast_app_separate_args(
+                                       args.channel_parse, ',', vals,
+                                       ARRAY_LEN(vals));
+                       }
+
                        if (args.channel_count == 0) {
                                ast_ari_response_alloc_failed(response);
                                goto fin;
@@ -434,7 +711,26 @@ static void ast_ari_remove_channel_from_bridge_cb(
                } else
                {}
        }
-       ast_ari_remove_channel_from_bridge(headers, &args, response);
+       /* Look for a JSON request entity */
+       body = ast_http_get_json(ser, headers);
+       if (!body) {
+               switch (errno) {
+               case EFBIG:
+                       ast_ari_response_error(response, 413, "Request Entity Too Large", "Request body too large");
+                       goto fin;
+               case ENOMEM:
+                       ast_ari_response_error(response, 500, "Internal Server Error", "Error processing request");
+                       goto fin;
+               case EIO:
+                       ast_ari_response_error(response, 400, "Bad Request", "Error parsing request body");
+                       goto fin;
+               }
+       }
+       if (ast_ari_bridges_remove_channel_parse_body(body, &args)) {
+               ast_ari_response_alloc_failed(response);
+               goto fin;
+       }
+       ast_ari_bridges_remove_channel(headers, &args, response);
 #if defined(AST_DEVMODE)
        code = response->response_code;
 
@@ -444,6 +740,10 @@ static void ast_ari_remove_channel_from_bridge_cb(
                break;
        case 500: /* Internal Server Error */
        case 501: /* Not Implemented */
+       case 400: /* Channel not found */
+       case 404: /* Bridge not found */
+       case 409: /* Bridge not in Stasis application */
+       case 422: /* Channel not in this bridge */
                is_valid = 1;
                break;
        default:
@@ -468,19 +768,34 @@ fin: __attribute__((unused))
        ast_free(args.channel);
        return;
 }
+int ast_ari_bridges_start_moh_parse_body(
+       struct ast_json *body,
+       struct ast_ari_bridges_start_moh_args *args)
+{
+       struct ast_json *field;
+       /* Parse query parameters out of it */
+       field = ast_json_object_get(body, "mohClass");
+       if (field) {
+               args->moh_class = ast_json_string_get(field);
+       }
+       return 0;
+}
+
 /*!
- * \brief Parameter parsing callback for /bridges/{bridgeId}/mohStart.
+ * \brief Parameter parsing callback for /bridges/{bridgeId}/moh.
  * \param get_params GET parameters in the HTTP request.
  * \param path_vars Path variables extracted from the request.
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_moh_start_bridge_cb(
+static void ast_ari_bridges_start_moh_cb(
+       struct ast_tcptls_session_instance *ser,
        struct ast_variable *get_params, struct ast_variable *path_vars,
        struct ast_variable *headers, struct ast_ari_response *response)
 {
-       struct ast_moh_start_bridge_args args = {};
+       struct ast_ari_bridges_start_moh_args args = {};
        struct ast_variable *i;
+       RAII_VAR(struct ast_json *, body, NULL, ast_json_unref);
 #if defined(AST_DEVMODE)
        int is_valid;
        int code;
@@ -498,7 +813,26 @@ static void ast_ari_moh_start_bridge_cb(
                } else
                {}
        }
-       ast_ari_moh_start_bridge(headers, &args, response);
+       /* Look for a JSON request entity */
+       body = ast_http_get_json(ser, headers);
+       if (!body) {
+               switch (errno) {
+               case EFBIG:
+                       ast_ari_response_error(response, 413, "Request Entity Too Large", "Request body too large");
+                       goto fin;
+               case ENOMEM:
+                       ast_ari_response_error(response, 500, "Internal Server Error", "Error processing request");
+                       goto fin;
+               case EIO:
+                       ast_ari_response_error(response, 400, "Bad Request", "Error parsing request body");
+                       goto fin;
+               }
+       }
+       if (ast_ari_bridges_start_moh_parse_body(body, &args)) {
+               ast_ari_response_alloc_failed(response);
+               goto fin;
+       }
+       ast_ari_bridges_start_moh(headers, &args, response);
 #if defined(AST_DEVMODE)
        code = response->response_code;
 
@@ -517,13 +851,13 @@ static void ast_ari_moh_start_bridge_cb(
                        is_valid = ast_ari_validate_void(
                                response->message);
                } else {
-                       ast_log(LOG_ERROR, "Invalid error response %d for /bridges/{bridgeId}/mohStart\n", code);
+                       ast_log(LOG_ERROR, "Invalid error response %d for /bridges/{bridgeId}/moh\n", code);
                        is_valid = 0;
                }
        }
 
        if (!is_valid) {
-               ast_log(LOG_ERROR, "Response validation failed for /bridges/{bridgeId}/mohStart\n");
+               ast_log(LOG_ERROR, "Response validation failed for /bridges/{bridgeId}/moh\n");
                ast_ari_response_error(response, 500,
                        "Internal Server Error", "Response validation failed");
        }
@@ -533,18 +867,20 @@ fin: __attribute__((unused))
        return;
 }
 /*!
- * \brief Parameter parsing callback for /bridges/{bridgeId}/mohStop.
+ * \brief Parameter parsing callback for /bridges/{bridgeId}/moh.
  * \param get_params GET parameters in the HTTP request.
  * \param path_vars Path variables extracted from the request.
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_moh_stop_bridge_cb(
+static void ast_ari_bridges_stop_moh_cb(
+       struct ast_tcptls_session_instance *ser,
        struct ast_variable *get_params, struct ast_variable *path_vars,
        struct ast_variable *headers, struct ast_ari_response *response)
 {
-       struct ast_moh_stop_bridge_args args = {};
+       struct ast_ari_bridges_stop_moh_args args = {};
        struct ast_variable *i;
+       RAII_VAR(struct ast_json *, body, NULL, ast_json_unref);
 #if defined(AST_DEVMODE)
        int is_valid;
        int code;
@@ -556,7 +892,7 @@ static void ast_ari_moh_stop_bridge_cb(
                } else
                {}
        }
-       ast_ari_moh_stop_bridge(headers, &args, response);
+       ast_ari_bridges_stop_moh(headers, &args, response);
 #if defined(AST_DEVMODE)
        code = response->response_code;
 
@@ -575,13 +911,13 @@ static void ast_ari_moh_stop_bridge_cb(
                        is_valid = ast_ari_validate_void(
                                response->message);
                } else {
-                       ast_log(LOG_ERROR, "Invalid error response %d for /bridges/{bridgeId}/mohStop\n", code);
+                       ast_log(LOG_ERROR, "Invalid error response %d for /bridges/{bridgeId}/moh\n", code);
                        is_valid = 0;
                }
        }
 
        if (!is_valid) {
-               ast_log(LOG_ERROR, "Response validation failed for /bridges/{bridgeId}/mohStop\n");
+               ast_log(LOG_ERROR, "Response validation failed for /bridges/{bridgeId}/moh\n");
                ast_ari_response_error(response, 500,
                        "Internal Server Error", "Response validation failed");
        }
@@ -590,6 +926,35 @@ static void ast_ari_moh_stop_bridge_cb(
 fin: __attribute__((unused))
        return;
 }
+int ast_ari_bridges_play_parse_body(
+       struct ast_json *body,
+       struct ast_ari_bridges_play_args *args)
+{
+       struct ast_json *field;
+       /* Parse query parameters out of it */
+       field = ast_json_object_get(body, "media");
+       if (field) {
+               args->media = ast_json_string_get(field);
+       }
+       field = ast_json_object_get(body, "lang");
+       if (field) {
+               args->lang = ast_json_string_get(field);
+       }
+       field = ast_json_object_get(body, "offsetms");
+       if (field) {
+               args->offsetms = ast_json_integer_get(field);
+       }
+       field = ast_json_object_get(body, "skipms");
+       if (field) {
+               args->skipms = ast_json_integer_get(field);
+       }
+       field = ast_json_object_get(body, "playbackId");
+       if (field) {
+               args->playback_id = ast_json_string_get(field);
+       }
+       return 0;
+}
+
 /*!
  * \brief Parameter parsing callback for /bridges/{bridgeId}/play.
  * \param get_params GET parameters in the HTTP request.
@@ -597,12 +962,14 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_play_on_bridge_cb(
+static void ast_ari_bridges_play_cb(
+       struct ast_tcptls_session_instance *ser,
        struct ast_variable *get_params, struct ast_variable *path_vars,
        struct ast_variable *headers, struct ast_ari_response *response)
 {
-       struct ast_play_on_bridge_args args = {};
+       struct ast_ari_bridges_play_args args = {};
        struct ast_variable *i;
+       RAII_VAR(struct ast_json *, body, NULL, ast_json_unref);
 #if defined(AST_DEVMODE)
        int is_valid;
        int code;
@@ -621,6 +988,9 @@ static void ast_ari_play_on_bridge_cb(
                if (strcmp(i->name, "skipms") == 0) {
                        args.skipms = atoi(i->value);
                } else
+               if (strcmp(i->name, "playbackId") == 0) {
+                       args.playback_id = (i->value);
+               } else
                {}
        }
        for (i = path_vars; i; i = i->next) {
@@ -629,7 +999,26 @@ static void ast_ari_play_on_bridge_cb(
                } else
                {}
        }
-       ast_ari_play_on_bridge(headers, &args, response);
+       /* Look for a JSON request entity */
+       body = ast_http_get_json(ser, headers);
+       if (!body) {
+               switch (errno) {
+               case EFBIG:
+                       ast_ari_response_error(response, 413, "Request Entity Too Large", "Request body too large");
+                       goto fin;
+               case ENOMEM:
+                       ast_ari_response_error(response, 500, "Internal Server Error", "Error processing request");
+                       goto fin;
+               case EIO:
+                       ast_ari_response_error(response, 400, "Bad Request", "Error parsing request body");
+                       goto fin;
+               }
+       }
+       if (ast_ari_bridges_play_parse_body(body, &args)) {
+               ast_ari_response_alloc_failed(response);
+               goto fin;
+       }
+       ast_ari_bridges_play(headers, &args, response);
 #if defined(AST_DEVMODE)
        code = response->response_code;
 
@@ -663,6 +1052,165 @@ static void ast_ari_play_on_bridge_cb(
 fin: __attribute__((unused))
        return;
 }
+int ast_ari_bridges_play_with_id_parse_body(
+       struct ast_json *body,
+       struct ast_ari_bridges_play_with_id_args *args)
+{
+       struct ast_json *field;
+       /* Parse query parameters out of it */
+       field = ast_json_object_get(body, "media");
+       if (field) {
+               args->media = ast_json_string_get(field);
+       }
+       field = ast_json_object_get(body, "lang");
+       if (field) {
+               args->lang = ast_json_string_get(field);
+       }
+       field = ast_json_object_get(body, "offsetms");
+       if (field) {
+               args->offsetms = ast_json_integer_get(field);
+       }
+       field = ast_json_object_get(body, "skipms");
+       if (field) {
+               args->skipms = ast_json_integer_get(field);
+       }
+       return 0;
+}
+
+/*!
+ * \brief Parameter parsing callback for /bridges/{bridgeId}/play/{playbackId}.
+ * \param get_params GET parameters in the HTTP request.
+ * \param path_vars Path variables extracted from the request.
+ * \param headers HTTP headers.
+ * \param[out] response Response to the HTTP request.
+ */
+static void ast_ari_bridges_play_with_id_cb(
+       struct ast_tcptls_session_instance *ser,
+       struct ast_variable *get_params, struct ast_variable *path_vars,
+       struct ast_variable *headers, struct ast_ari_response *response)
+{
+       struct ast_ari_bridges_play_with_id_args args = {};
+       struct ast_variable *i;
+       RAII_VAR(struct ast_json *, body, NULL, ast_json_unref);
+#if defined(AST_DEVMODE)
+       int is_valid;
+       int code;
+#endif /* AST_DEVMODE */
+
+       for (i = get_params; i; i = i->next) {
+               if (strcmp(i->name, "media") == 0) {
+                       args.media = (i->value);
+               } else
+               if (strcmp(i->name, "lang") == 0) {
+                       args.lang = (i->value);
+               } else
+               if (strcmp(i->name, "offsetms") == 0) {
+                       args.offsetms = atoi(i->value);
+               } else
+               if (strcmp(i->name, "skipms") == 0) {
+                       args.skipms = atoi(i->value);
+               } else
+               {}
+       }
+       for (i = path_vars; i; i = i->next) {
+               if (strcmp(i->name, "bridgeId") == 0) {
+                       args.bridge_id = (i->value);
+               } else
+               if (strcmp(i->name, "playbackId") == 0) {
+                       args.playback_id = (i->value);
+               } else
+               {}
+       }
+       /* Look for a JSON request entity */
+       body = ast_http_get_json(ser, headers);
+       if (!body) {
+               switch (errno) {
+               case EFBIG:
+                       ast_ari_response_error(response, 413, "Request Entity Too Large", "Request body too large");
+                       goto fin;
+               case ENOMEM:
+                       ast_ari_response_error(response, 500, "Internal Server Error", "Error processing request");
+                       goto fin;
+               case EIO:
+                       ast_ari_response_error(response, 400, "Bad Request", "Error parsing request body");
+                       goto fin;
+               }
+       }
+       if (ast_ari_bridges_play_with_id_parse_body(body, &args)) {
+               ast_ari_response_alloc_failed(response);
+               goto fin;
+       }
+       ast_ari_bridges_play_with_id(headers, &args, response);
+#if defined(AST_DEVMODE)
+       code = response->response_code;
+
+       switch (code) {
+       case 0: /* Implementation is still a stub, or the code wasn't set */
+               is_valid = response->message == NULL;
+               break;
+       case 500: /* Internal Server Error */
+       case 501: /* Not Implemented */
+       case 404: /* Bridge not found */
+       case 409: /* Bridge not in a Stasis application */
+               is_valid = 1;
+               break;
+       default:
+               if (200 <= code && code <= 299) {
+                       is_valid = ast_ari_validate_playback(
+                               response->message);
+               } else {
+                       ast_log(LOG_ERROR, "Invalid error response %d for /bridges/{bridgeId}/play/{playbackId}\n", code);
+                       is_valid = 0;
+               }
+       }
+
+       if (!is_valid) {
+               ast_log(LOG_ERROR, "Response validation failed for /bridges/{bridgeId}/play/{playbackId}\n");
+               ast_ari_response_error(response, 500,
+                       "Internal Server Error", "Response validation failed");
+       }
+#endif /* AST_DEVMODE */
+
+fin: __attribute__((unused))
+       return;
+}
+int ast_ari_bridges_record_parse_body(
+       struct ast_json *body,
+       struct ast_ari_bridges_record_args *args)
+{
+       struct ast_json *field;
+       /* Parse query parameters out of it */
+       field = ast_json_object_get(body, "name");
+       if (field) {
+               args->name = ast_json_string_get(field);
+       }
+       field = ast_json_object_get(body, "format");
+       if (field) {
+               args->format = ast_json_string_get(field);
+       }
+       field = ast_json_object_get(body, "maxDurationSeconds");
+       if (field) {
+               args->max_duration_seconds = ast_json_integer_get(field);
+       }
+       field = ast_json_object_get(body, "maxSilenceSeconds");
+       if (field) {
+               args->max_silence_seconds = ast_json_integer_get(field);
+       }
+       field = ast_json_object_get(body, "ifExists");
+       if (field) {
+               args->if_exists = ast_json_string_get(field);
+       }
+       field = ast_json_object_get(body, "beep");
+       if (field) {
+               args->beep = ast_json_is_true(field);
+       }
+       field = ast_json_object_get(body, "terminateOn");
+       if (field) {
+               args->terminate_on = ast_json_string_get(field);
+       }
+       return 0;
+}
+
 /*!
  * \brief Parameter parsing callback for /bridges/{bridgeId}/record.
  * \param get_params GET parameters in the HTTP request.
@@ -670,12 +1218,14 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_record_bridge_cb(
+static void ast_ari_bridges_record_cb(
+       struct ast_tcptls_session_instance *ser,
        struct ast_variable *get_params, struct ast_variable *path_vars,
        struct ast_variable *headers, struct ast_ari_response *response)
 {
-       struct ast_record_bridge_args args = {};
+       struct ast_ari_bridges_record_args args = {};
        struct ast_variable *i;
+       RAII_VAR(struct ast_json *, body, NULL, ast_json_unref);
 #if defined(AST_DEVMODE)
        int is_valid;
        int code;
@@ -711,7 +1261,26 @@ static void ast_ari_record_bridge_cb(
                } else
                {}
        }
-       ast_ari_record_bridge(headers, &args, response);
+       /* Look for a JSON request entity */
+       body = ast_http_get_json(ser, headers);
+       if (!body) {
+               switch (errno) {
+               case EFBIG:
+                       ast_ari_response_error(response, 413, "Request Entity Too Large", "Request body too large");
+                       goto fin;
+               case ENOMEM:
+                       ast_ari_response_error(response, 500, "Internal Server Error", "Error processing request");
+                       goto fin;
+               case EIO:
+                       ast_ari_response_error(response, 400, "Bad Request", "Error parsing request body");
+                       goto fin;
+               }
+       }
+       if (ast_ari_bridges_record_parse_body(body, &args)) {
+               ast_ari_response_alloc_failed(response);
+               goto fin;
+       }
+       ast_ari_bridges_record(headers, &args, response);
 #if defined(AST_DEVMODE)
        code = response->response_code;
 
@@ -721,6 +1290,10 @@ static void ast_ari_record_bridge_cb(
                break;
        case 500: /* Internal Server Error */
        case 501: /* Not Implemented */
+       case 400: /* Invalid parameters */
+       case 404: /* Bridge not found */
+       case 409: /* Bridge is not in a Stasis application; A recording with the same name already exists on the system and can not be overwritten because it is in progress or ifExists=fail */
+       case 422: /* The format specified is unknown on this system */
                is_valid = 1;
                break;
        default:
@@ -748,7 +1321,7 @@ fin: __attribute__((unused))
 static struct stasis_rest_handlers bridges_bridgeId_addChannel = {
        .path_segment = "addChannel",
        .callbacks = {
-               [AST_HTTP_POST] = ast_ari_add_channel_to_bridge_cb,
+               [AST_HTTP_POST] = ast_ari_bridges_add_channel_cb,
        },
        .num_children = 0,
        .children = {  }
@@ -757,25 +1330,27 @@ static struct stasis_rest_handlers bridges_bridgeId_addChannel = {
 static struct stasis_rest_handlers bridges_bridgeId_removeChannel = {
        .path_segment = "removeChannel",
        .callbacks = {
-               [AST_HTTP_POST] = ast_ari_remove_channel_from_bridge_cb,
+               [AST_HTTP_POST] = ast_ari_bridges_remove_channel_cb,
        },
        .num_children = 0,
        .children = {  }
 };
 /*! \brief REST handler for /api-docs/bridges.{format} */
-static struct stasis_rest_handlers bridges_bridgeId_mohStart = {
-       .path_segment = "mohStart",
+static struct stasis_rest_handlers bridges_bridgeId_moh = {
+       .path_segment = "moh",
        .callbacks = {
-               [AST_HTTP_POST] = ast_ari_moh_start_bridge_cb,
+               [AST_HTTP_POST] = ast_ari_bridges_start_moh_cb,
+               [AST_HTTP_DELETE] = ast_ari_bridges_stop_moh_cb,
        },
        .num_children = 0,
        .children = {  }
 };
 /*! \brief REST handler for /api-docs/bridges.{format} */
-static struct stasis_rest_handlers bridges_bridgeId_mohStop = {
-       .path_segment = "mohStop",
+static struct stasis_rest_handlers bridges_bridgeId_play_playbackId = {
+       .path_segment = "playbackId",
+       .is_wildcard = 1,
        .callbacks = {
-               [AST_HTTP_POST] = ast_ari_moh_stop_bridge_cb,
+               [AST_HTTP_POST] = ast_ari_bridges_play_with_id_cb,
        },
        .num_children = 0,
        .children = {  }
@@ -784,16 +1359,16 @@ static struct stasis_rest_handlers bridges_bridgeId_mohStop = {
 static struct stasis_rest_handlers bridges_bridgeId_play = {
        .path_segment = "play",
        .callbacks = {
-               [AST_HTTP_POST] = ast_ari_play_on_bridge_cb,
+               [AST_HTTP_POST] = ast_ari_bridges_play_cb,
        },
-       .num_children = 0,
-       .children = {  }
+       .num_children = 1,
+       .children = { &bridges_bridgeId_play_playbackId, }
 };
 /*! \brief REST handler for /api-docs/bridges.{format} */
 static struct stasis_rest_handlers bridges_bridgeId_record = {
        .path_segment = "record",
        .callbacks = {
-               [AST_HTTP_POST] = ast_ari_record_bridge_cb,
+               [AST_HTTP_POST] = ast_ari_bridges_record_cb,
        },
        .num_children = 0,
        .children = {  }
@@ -803,18 +1378,19 @@ static struct stasis_rest_handlers bridges_bridgeId = {
        .path_segment = "bridgeId",
        .is_wildcard = 1,
        .callbacks = {
-               [AST_HTTP_GET] = ast_ari_get_bridge_cb,
-               [AST_HTTP_DELETE] = ast_ari_delete_bridge_cb,
+               [AST_HTTP_POST] = ast_ari_bridges_create_or_update_with_id_cb,
+               [AST_HTTP_GET] = ast_ari_bridges_get_cb,
+               [AST_HTTP_DELETE] = ast_ari_bridges_destroy_cb,
        },
-       .num_children = 6,
-       .children = { &bridges_bridgeId_addChannel,&bridges_bridgeId_removeChannel,&bridges_bridgeId_mohStart,&bridges_bridgeId_mohStop,&bridges_bridgeId_play,&bridges_bridgeId_record, }
+       .num_children = 5,
+       .children = { &bridges_bridgeId_addChannel,&bridges_bridgeId_removeChannel,&bridges_bridgeId_moh,&bridges_bridgeId_play,&bridges_bridgeId_record, }
 };
 /*! \brief REST handler for /api-docs/bridges.{format} */
 static struct stasis_rest_handlers bridges = {
        .path_segment = "bridges",
        .callbacks = {
-               [AST_HTTP_GET] = ast_ari_get_bridges_cb,
-               [AST_HTTP_POST] = ast_ari_new_bridge_cb,
+               [AST_HTTP_GET] = ast_ari_bridges_list_cb,
+               [AST_HTTP_POST] = ast_ari_bridges_create_cb,
        },
        .num_children = 1,
        .children = { &bridges_bridgeId, }
@@ -836,6 +1412,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Bridge resources",
+       .support_level = AST_MODULE_SUPPORT_CORE,
        .load = load_module,
        .unload = unload_module,
        .nonoptreq = "res_ari,res_stasis",