diff --git a/src/output/output_http.cpp b/src/output/output_http.cpp index a0fd37a6..5e6e4d2a 100644 --- a/src/output/output_http.cpp +++ b/src/output/output_http.cpp @@ -282,6 +282,14 @@ namespace Mist { if ((*it)["type"].asStringRef() == "uint" || (*it)["type"].asStringRef() == "int" || (*it)["type"].asStringRef() == "debug"){ p[it.key()] = JSON::Value(p[it.key()].asInt()).asString(); } + if ((*it)["type"].asStringRef() == "inputlist" && p[it.key()].isArray()){ + jsonForEach(p[it.key()], iVal){ + (*iVal) = iVal->asString(); + argarr[argnum++] = (char*)((*it)["option"].c_str()); + argarr[argnum++] = (char*)((*iVal).c_str()); + } + continue; + } } if (p[it.key()].asStringRef().size() > 0){ argarr[argnum++] = (char*)((*it)["option"].c_str()); @@ -312,7 +320,8 @@ namespace Mist { if (connector == "HTTP" || connector == "HTTP.exe"){ //restore from values in the environment, regardless of configged settings if (getenv("MIST_HTTP_pubaddr")){ - p["pubaddr"] = getenv("MIST_HTTP_pubaddr"); + std::string pubAddrs = getenv("MIST_HTTP_pubaddr"); + p["pubaddr"] = JSON::fromString(pubAddrs); } }else{ //find connector in config diff --git a/src/output/output_http_internal.cpp b/src/output/output_http_internal.cpp index 2dcc0ef4..712f2c82 100644 --- a/src/output/output_http_internal.cpp +++ b/src/output/output_http_internal.cpp @@ -46,7 +46,8 @@ namespace Mist { myConn.setHost(host); } if (config->getString("pubaddr").size()){ - setenv("MIST_HTTP_pubaddr", config->getString("pubaddr").c_str(), 1); + std::string pubAddrs = config->getOption("pubaddr", true).toString(); + setenv("MIST_HTTP_pubaddr", pubAddrs.c_str(), 1); } if (config->getOption("wrappers",true).size() == 0 || config->getString("wrappers") == ""){ JSON::Value & wrappers = config->getOption("wrappers",true); @@ -149,7 +150,7 @@ namespace Mist { capa["optional"]["pubaddr"]["name"] = "Public address"; capa["optional"]["pubaddr"]["help"] = "Full public address this output is available as, if being proxied"; capa["optional"]["pubaddr"]["default"] = ""; - capa["optional"]["pubaddr"]["type"] = "str"; + capa["optional"]["pubaddr"]["type"] = "inputlist"; capa["optional"]["pubaddr"]["option"] = "--public-address"; } @@ -196,15 +197,12 @@ namespace Mist { if (conncapa.isMember("player_url")){tmp["player_url"] = conncapa["player_url"].asStringRef();} tmp["simul_tracks"] = most_simul; tmp["total_matches"] = total_matches; - if (url.path.size()){ - tmp["url"] = url.protocol + "://" + url.host + ":" + url.port + "/" + url.path + rel; - }else{ - tmp["url"] = url.protocol + "://" + url.host + ":" + url.port + rel; - } + tmp["url"] = url.link(rel).getUrl(); sources.insert(tmp); } void addSources(std::string & streamname, std::set & sources, HTTP::URL url, JSON::Value & conncapa, JSON::Value & strmMeta, const std::string & useragent){ + url.path += "/"; if (strmMeta.isMember("live") && conncapa.isMember("exceptions") && conncapa["exceptions"].isObject() && conncapa["exceptions"].size()){ jsonForEach(conncapa["exceptions"], ex){ if (ex.key() == "live"){ @@ -264,15 +262,15 @@ namespace Mist { std::string relurl; size_t found = rel.find('$'); if (found != std::string::npos){ - relurl = rel.substr(0, found) + Encodings::URL::encode(streamname) + rel.substr(found+1); + relurl = rel.substr(1, found-1) + Encodings::URL::encode(streamname) + rel.substr(found+1); }else{ - relurl = "/"; + relurl = ""; } jsonForEach(conncapa["methods"], it) { if (it->isMember("url_rel")){ size_t foundb = (*it)["url_rel"].asStringRef().find('$'); if (foundb != std::string::npos){ - relurl = (*it)["url_rel"].asStringRef().substr(0, foundb) + Encodings::URL::encode(streamname) + (*it)["url_rel"].asStringRef().substr(foundb+1); + relurl = (*it)["url_rel"].asStringRef().substr(1, foundb-1) + Encodings::URL::encode(streamname) + (*it)["url_rel"].asStringRef().substr(foundb+1); } } if (!strmMeta.isMember("live") || !it->isMember("nolive")){ @@ -298,6 +296,7 @@ namespace Mist { fullURL.port = altURL.port; fullURL.path = altURL.path; } + if (mistPath.size()){fullURL = mistPath;} std::string uAgent = H.GetHeader("User-Agent"); std::string forceType = ""; @@ -454,17 +453,30 @@ namespace Mist { if (outURL.protocol.find(':') != std::string::npos){ outURL.protocol.erase(outURL.protocol.find(':')); } - if (prots.getIndice(i).hasMember("pubaddr") && prots.getIndice(i).getMember("pubaddr").asString().size()){ - HTTP::URL altURL(prots.getIndice(i).getMember("pubaddr").asString()); - outURL.protocol = altURL.protocol; - if (altURL.host.size()){outURL.host = altURL.host;} - outURL.port = altURL.port; - outURL.path = altURL.path; + JSON::Value pubAddrs; + pubAddrs.append(""); + if (prots.getIndice(i).hasMember("pubaddr") && prots.getIndice(i).getMember("pubaddr").getType() == DTSC_STR){ + if (prots.getIndice(i).getMember("pubaddr").asString().size()){ + pubAddrs[0u] = prots.getIndice(i).getMember("pubaddr").asString(); + } + } + if (prots.getIndice(i).hasMember("pubaddr") && prots.getIndice(i).getMember("pubaddr").getType() == DTSC_ARR){ + pubAddrs = prots.getIndice(i).getMember("pubaddr").asJSON(); + } + if (mistPath.size()){ + pubAddrs.null(); + pubAddrs.append(mistPath); } //and a URL - then list the URL JSON::Value capa_json = capa.asJSON(); if (capa.getMember("url_rel") || capa.getMember("methods")){ - addSources(streamName, sources, outURL, capa_json, json_resp["meta"], useragent); + jsonForEach(pubAddrs, jit){ + HTTP::URL altURL = outURL; + if (jit->asString().size()){altURL = jit->asString();} + if (!altURL.host.size()){altURL.host = outURL.host;} + if (!altURL.protocol.size()){altURL.protocol = outURL.protocol;} + addSources(streamName, sources, altURL, capa_json, json_resp["meta"], useragent); + } } //Make note if this connector can be depended upon by other connectors if (capa.getMember("provides")){ @@ -476,7 +488,14 @@ namespace Mist { //if it depends on this connector and has a URL, list it if (conns.count(connectors.getIndiceName(j)) && connectors.getIndice(j).getMember("deps").asString() == cProv && connectors.getIndice(j).getMember("methods")){ JSON::Value subcapa_json = connectors.getIndice(j).asJSON(); - addSources(streamName, sources, outURL, subcapa_json, json_resp["meta"], useragent); + + jsonForEach(pubAddrs, jit){ + HTTP::URL altURL = outURL; + if (jit->asString().size()){altURL = jit->asString();} + if (!altURL.host.size()){altURL.host = outURL.host;} + if (!altURL.protocol.size()){altURL.protocol = outURL.protocol;} + addSources(streamName, sources, altURL, subcapa_json, json_resp["meta"], useragent); + } } } } @@ -495,6 +514,8 @@ namespace Mist { void OutHTTP::onHTTP(){ std::string method = H.method; + if (H.GetHeader("X-Mst-Path").size()){mistPath = H.GetHeader("X-Mst-Path");} + //Handle certbot validations if (H.url.substr(0, 28) == "/.well-known/acme-challenge/"){ std::string cbToken = H.url.substr(28); @@ -682,6 +703,7 @@ namespace Mist { fullURL.port = altURL.port; fullURL.path = altURL.path; } + if (mistPath.size()){fullURL = mistPath;} std::string response; std::string rURL = H.url; H.Clean(); @@ -864,6 +886,7 @@ namespace Mist { bool OutHTTP::websocketHandler(){ stayConnected = true; std::string reqHost = HTTP::URL(H.GetHeader("Host")).host; + if (H.GetHeader("X-Mst-Path").size()){mistPath = H.GetHeader("X-Mst-Path");} std::string useragent = H.GetVar("ua"); if (!useragent.size()){ useragent = H.GetHeader("User-Agent"); diff --git a/src/output/output_http_internal.h b/src/output/output_http_internal.h index f0342f68..5fb25412 100644 --- a/src/output/output_http_internal.h +++ b/src/output/output_http_internal.h @@ -20,6 +20,8 @@ namespace Mist { virtual bool onFinish(){ return stayConnected; } + private: + std::string mistPath; }; } diff --git a/src/output/output_https.cpp b/src/output/output_https.cpp index 12ac051f..3b2fd15c 100644 --- a/src/output/output_https.cpp +++ b/src/output/output_https.cpp @@ -45,7 +45,7 @@ namespace Mist{ capa["optional"]["pubaddr"]["name"] = "Public address"; capa["optional"]["pubaddr"]["help"] = "Full public address this output is available as, if being proxied"; capa["optional"]["pubaddr"]["default"] = ""; - capa["optional"]["pubaddr"]["type"] = "str"; + capa["optional"]["pubaddr"]["type"] = "inputlist"; capa["optional"]["pubaddr"]["option"] = "--public-address"; config = cfg; } @@ -102,9 +102,12 @@ namespace Mist{ args.push_back(Util::getMyPath() + "MistOutHTTP"); args.push_back("--ip"); args.push_back(myConn.getHost()); - if (config->getString("pubaddr").size()){ - args.push_back("--public-address"); - args.push_back(config->getString("pubaddr")); + if (config->getOption("pubaddr", true).size()){ + JSON::Value pubAddrs = config->getOption("pubaddr", true); + jsonForEach(pubAddrs, jIt){ + args.push_back("--public-address"); + args.push_back(jIt->asStringRef()); + } } args.push_back(""); Util::Procs::socketList.insert(fd[0]);