Skip to content

Reject invalid CHC ingestConfiguration.baseURL #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ErikGaida wants to merge 1 commit into
base: development
Choose a base branch
from
+46 −0
Open

Reject invalid CHC ingestConfiguration.baseURL #196

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 46 additions & 0 deletions src/5gmsaf/msaf-m1-sm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ static const nf_server_interface_metadata_t
M1_METRICSREPORTINGPROVISIONING_API_VERSION
};

static void _discard_pending_content_hosting_configuration_upload(msaf_application_server_state_node_t *as_state, const char *resource_id);
static void _policy_template_extra_validation(msaf_api_policy_template_t **policy_template, const char **parse_err, char **err_parameter);
static void _policy_template_remove_read_only(msaf_api_policy_template_t *policy_template);

Expand Down Expand Up @@ -2156,6 +2157,7 @@ void msaf_m1_state_functional(ogs_fsm_t *s, msaf_event_t *e)

SWITCH(message->h.method)
CASE(OGS_SBI_HTTP_METHOD_POST)
int discard_pending_chc_upload = 0;

if (response->status == 201) {

Expand All @@ -2177,25 +2179,40 @@ void msaf_m1_state_functional(ogs_fsm_t *s, msaf_event_t *e)
}
if (response->status == 405) {
ogs_error("Content Hosting Configuration resource already exist at the specified path\n");
discard_pending_chc_upload = 1;
}
if (response->status == 413) {
ogs_error("Payload too large\n");
discard_pending_chc_upload = 1;
}
if (response->status == 414) {
ogs_error("URI too long\n");
discard_pending_chc_upload = 1;
}
if (response->status == 415) {
ogs_error("Unsupported media type\n");
discard_pending_chc_upload = 1;
}
if (response->status == 422) {
ogs_error("Unprocessable Entity\n");
discard_pending_chc_upload = 1;
}
if (response->status == 500) {
ogs_error("Internal server error\n");
discard_pending_chc_upload = 1;
}
if (response->status == 503) {
ogs_error("Service unavailable\n");
discard_pending_chc_upload = 1;
}
if (discard_pending_chc_upload) {
_discard_pending_content_hosting_configuration_upload(as_state, message->h.resource.component[1]);
}
next_action_for_application_server(as_state);
break;
CASE(OGS_SBI_HTTP_METHOD_PUT)
int discard_pending_chc_upload = 0;

if (response->status == 200 || response->status == 204) {

ogs_debug("[%s] Method [%s] with Response [%d] recieved for Content Hosting Configuration [%s]", message->h.resource.component[0], message->h.method, response->status, message->h.resource.component[1]);
Expand All @@ -2215,21 +2232,30 @@ void msaf_m1_state_functional(ogs_fsm_t *s, msaf_event_t *e)
}
if (response->status == 404) {
ogs_error("Not Found\n");
discard_pending_chc_upload = 1;
}
if (response->status == 413) {
ogs_error("Payload too large\n");
discard_pending_chc_upload = 1;
}
if (response->status == 414) {
ogs_error("URI too long\n");
discard_pending_chc_upload = 1;
}
if (response->status == 415) {
ogs_error("Unsupported Media Type\n");
discard_pending_chc_upload = 1;
}
if (response->status == 500) {
ogs_error("Internal Server Error\n");
discard_pending_chc_upload = 1;
}
if (response->status == 503) {
ogs_error("Service Unavailable\n");
discard_pending_chc_upload = 1;
}
if (discard_pending_chc_upload) {
_discard_pending_content_hosting_configuration_upload(as_state, message->h.resource.component[1]);
}
next_action_for_application_server(as_state);
break;
Expand Down Expand Up @@ -2640,6 +2666,26 @@ void msaf_m1_state_functional(ogs_fsm_t *s, msaf_event_t *e)
}
}

static void _discard_pending_content_hosting_configuration_upload(msaf_application_server_state_node_t *as_state, const char *resource_id)
{
resource_id_node_t *content_hosting_configuration = NULL;

if (!as_state || !resource_id) return;

ogs_list_for_each(&as_state->upload_content_hosting_configurations, content_hosting_configuration) {
if (!strcmp(content_hosting_configuration->state, resource_id))
break;
}

if (content_hosting_configuration) {
ogs_debug("Discarding pending Content Hosting Configuration upload [%s]", content_hosting_configuration->state);
ogs_list_remove(&as_state->upload_content_hosting_configurations, content_hosting_configuration);
if (content_hosting_configuration->state)
ogs_free(content_hosting_configuration->state);
ogs_free(content_hosting_configuration);
}
}

static void _policy_template_extra_validation(msaf_api_policy_template_t **policy_temp_ptr, const char **parse_err, char **err_parameter)
{
msaf_api_policy_template_t *policy_template = *policy_temp_ptr;
Expand Down