check 'vhost' validity in 'http raw dvr api' (#2435)

pull/2452/head
Xiaoniu 4 years ago committed by GitHub
parent d02ba80db1
commit f986b5956b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -3171,6 +3171,8 @@ srs_error_t SrsConfig::raw_disable_vhost(string vhost, bool& applied)
applied = false;
SrsConfDirective* conf = root->get("vhost", vhost);
srs_assert(conf);
conf->get_or_create("enabled")->set_arg0("off");
if ((err = do_reload_vhost_removed(vhost)) != srs_success) {
@ -3189,6 +3191,8 @@ srs_error_t SrsConfig::raw_enable_vhost(string vhost, bool& applied)
applied = false;
SrsConfDirective* conf = root->get("vhost", vhost);
srs_assert(conf);
conf->get_or_create("enabled")->set_arg0("on");
if ((err = do_reload_vhost_added(vhost)) != srs_success) {
@ -3207,6 +3211,8 @@ srs_error_t SrsConfig::raw_enable_dvr(string vhost, string stream, bool& applied
applied = false;
SrsConfDirective* conf = root->get("vhost", vhost);
srs_assert(conf);
conf = conf->get_or_create("dvr")->get_or_create("dvr_apply");
if (conf->args.size() == 1 && (conf->arg0() == "all" || conf->arg0() == "none")) {
@ -3233,6 +3239,8 @@ srs_error_t SrsConfig::raw_disable_dvr(string vhost, string stream, bool& applie
applied = false;
SrsConfDirective* conf = root->get("vhost", vhost);
srs_assert(conf);
conf = conf->get_or_create("dvr")->get_or_create("dvr_apply");
std::vector<string>::iterator it;

@ -1207,6 +1207,11 @@ srs_error_t SrsGoApiRaw::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage*
return srs_api_response_code(w, r, ERROR_SYSTEM_CONFIG_RAW_NOT_ALLOWED);
}
// the vhost must exists.
if (!_srs_config->get_vhost(value, false)) {
return srs_api_response_code(w, r, ERROR_SYSTEM_CONFIG_RAW_PARAMS);
}
if (!_srs_config->get_dvr_enabled(value)) {
return srs_api_response_code(w, r, ERROR_SYSTEM_CONFIG_RAW_NOT_ALLOWED);
}

Loading…
Cancel
Save