libtransport.git Changeset - 8eb12094c6a8

Changeset - 8eb12094c6a8

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Jan Kaluza - 10 years ago 2016-01-22 07:37:25
jkaluza@redhat.com

Web interface: Fix garbage in status message caused

2 files changed with 8 insertions and 7 deletions:

spectrum_manager/src/APIServer.cpp

spectrum_manager/src/server.cpp

0 comments (0 inline, 0 general)

spectrum_manager/src/APIServer.cpp

➞

Show inline comments

+}
 void APIServer::send_ack(struct mg_connection *conn, bool error, const std::string &message) {
 	Document json;
 	json.SetObject();
 	json.AddMember("error", error, json.GetAllocator());
 	json.AddMember("message", message.c_str(), json.GetAllocator());
 	send_json(conn, json);
+}
 void APIServer::serve_instances(Server *server, Server::session *session, struct mg_connection *conn, struct http_message *hm) {
 // 	std::string jid = get_http_var(hm, "jid");
 // 	if (!jid.empty()) {
 // 		serve_instance(conn, hm, jid);
 // 		return;
 // 	}
 	// rapidjson stores const char* pointer to status, so we have to keep
 	// the std::string stored out of BOOST_FOREACH scope, otherwise the
 	// const char * returned by c_str() would be invalid during send_json.
 	std::vector<std::string> statuses;
 	std::vector<std::string> list = show_list(m_config, false);
 	Document json;
 	json.SetObject();
 	json.AddMember("error", 0, json.GetAllocator());
 	Value instances(kArrayType);
 	BOOST_FOREACH(std::string &id, list) {
 		Value instance;
 		instance.SetObject();
 		instance.AddMember("id", id.c_str(), json.GetAllocator());
 		instance.AddMember("name", id.c_str(), json.GetAllocator());
 		std::string status = server->send_command(id, "status");
 		if (status.empty()) {
 			status = "Cannot get the instance status.";
+		}
 		instance.AddMember("status", status.c_str(), json.GetAllocator());
 		statuses.push_back(status);
 		instance.AddMember("status", statuses.back().c_str(), json.GetAllocator());
 		bool running = true;
 		if (status.find("Running") == std::string::npos) {
 			running = false;
+		}
 		instance.AddMember("running", running, json.GetAllocator());
 		UserInfo info;
 		m_storage->getUser(session->user, info);
 		std::string username = "";
 		int type = (int) TYPE_STRING;
 		m_storage->getUserSetting(info.id, id, type, username);

spectrum_manager/src/server.cpp

➞

Show inline comments

 	Server:session *session = get_session(hm);
 	mg_printf(conn, "HTTP/1.1 302 Found\r\n"
 		"Set-Cookie: session=%s; max-age=0\r\n"
 		"Set-Cookie: admin=%s; max-age=0\r\n"
 		"Location: %s%s\r\n\r\n",
 		session->session_id, session->admin ? "1" : "0", host.c_str(), CONFIG_STRING(m_config, "service.base_location").c_str());
 	sessions.erase(session->session_id);
 	delete session;
+}
 void Server::serve_oauth2(struct mg_connection *conn, struct http_message *hm) {
 // 	http://slack.spectrum.im/oauth2/localhostxmpp?code=14830663267.19140123492.e7f78a836d&state=534ab3b6-8bf1-4974-8274-847df8490bc5
 	std::cout << "OAUTH2 handler\n";
+}
 void Server::event_handler(struct mg_connection *conn, int ev, void *p) {
 	struct http_message *hm = (struct http_message *) p;
 	if (ev == MG_EV_SSI_CALL) {
 		mbuf_resize(&conn->send_mbuf, conn->send_mbuf.size * 2);
 		std::string resp(conn->send_mbuf.buf, conn->send_mbuf.len);
 		boost::replace_all(resp, "href=\"/", std::string("href=\"") + CONFIG_STRING(m_config, "service.base_location"));
 		boost::replace_all(resp, "src=\"/", std::string("src=\"") + CONFIG_STRING(m_config, "service.base_location"));
 		boost::replace_all(resp, "action=\"/", std::string("action=\"") + CONFIG_STRING(m_config, "service.base_location"));

0 comments (0 inline, 0 general)