libtransport.git Changeset - af6c160261c2

Changeset - af6c160261c2

Parent rev.

Child rev.

[Not reviewed]

3 5 3

Jan Kaluza - 10 years ago 2016-01-20 15:02:41
jkaluza@redhat.com

Web interface: support service.base_location=/something/ to override default '/' root location used by the web interface

8 files changed with 43 insertions and 14 deletions:

spectrum_manager/src/html/footer.shtml

spectrum_manager/src/html/header.shtml

rename

spectrum_manager/src/html/instances/index.shtml

spectrum_manager/src/html/instances/register.shtml

spectrum_manager/src/html/js/app.js

spectrum_manager/src/html/login/index.shtml

spectrum_manager/src/managerconfig.cpp

spectrum_manager/src/server.cpp

0 comments (0 inline, 0 general)

spectrum_manager/src/html/footer.shtml

➞

Show inline comments

@@ @@ -5,6 +5,7 @@ @@
     <div id="footer_wrap" class="outer">
       <footer class="inner">
         <p class="copyright">Spectrum 2 developed by <a href="https://github.com/hanzz">Jan Kaluza - HanzZ</a></p>
       </footer>
     </div>
 </body></html>
 <!--#call replace_base_url -->

spectrum_manager/src/html/header.shtml

➞

Show inline comments

file renamed from spectrum_manager/src/html/header.html to spectrum_manager/src/html/header.shtml

spectrum_manager/src/html/instances/index.shtml

➞

Show inline comments

-<!--#include virtual="/header.html" -->
+<!--#include virtual="/header.shtml" -->
 <script type="text/javascript">
 $(function() {
 	show_instances();
 });
 </script>
-<!--#include virtual="/footer.html" -->
+<!--#include virtual="/footer.shtml" -->

spectrum_manager/src/html/instances/register.shtml

➞

Show inline comments

-<!--#include virtual="/header.html" -->
+<!--#include virtual="/header.shtml" -->
 <h2>Register Spectrum 2 instance</h2>
 <form action="/api/v1/instances/register" class="basic-grey" method="POST">
 <h1>Register Spectrum 2 instance
 	<span id="description"></span>
 </h1>
@@ @@ -26,7 +26,7 @@ @@
 <script type="text/javascript">
 $(function() {
 	fill_instances_register_form();
 });
 </script>
-<!--#include virtual="/footer.html" -->
+<!--#include virtual="/footer.shtml" -->

spectrum_manager/src/html/js/app.js

➞

Show inline comments

 function show_instances() {
-	$.get("/api/v1/instances", function(data) {
+	$.get($.cookie("base_location") + "api/v1/instances", function(data) {
 		$("#main_content").html("<h2>List of Spectrum 2 instances</h2><table id='main_result'><tr><th>Name<th>Status</th><th>Actions</th></tr>");
 		var admin = $.cookie("admin") == "1";
 		$.each(data.instances, function(i, instance) {
 			if (instance.running) {
 				if (admin) {
@@ @@ -23,21 +23,21 @@ function show_instances() { @@
+			}
 			var row = '<tr>'
 			row += '<td>' + instance.name + '</td>'
 			row += '<td>' + instance.status + '</td>'
 			if (command == 'register') {
-				row += '<td><a class="button_command" href="/instances/register.shtml?id=' + instance.id + '">' + command + '</a>' + '</td></tr>';
+				row += '<td><a class="button_command" href="' + $.cookie("base_location") + 'instances/register.shtml?id=' + instance.id + '">' + command + '</a>' + '</td></tr>';
 				$("#main_result  > tbody:last-child").append(row);
+			}
 			else if (command == "") {
 				row += '<td></td></tr>';
 				$("#main_result  > tbody:last-child").append(row);
+			}
 			else {
-				row += '<td><a class="button_command" href="/api/v1/instances/' + command + '/' + instance.id + '">' + command + '</a>' + '</td></tr>';
+				row += '<td><a class="button_command" href="' + $.cookie("base_location") +  'api/v1/instances/' + command + '/' + instance.id + '">' + command + '</a>' + '</td></tr>';
 				$("#main_result  > tbody:last-child").append(row);
 				$(".button_command").click(function(e) {
 					e.preventDefault();
 					$(this).parent().empty().progressbar( {value: false} ).css('height', '1em');
 					var url = $(this).attr('href');
@@ @@ -65,13 +65,13 @@ function getQueryParams(qs) { @@
+}
 function fill_instances_register_form() {
 	var query = getQueryParams(document.location.search);
 	$("#instance").attr("value", query.id);
-	$.get("/api/v1/instances/register_form/" + query.id, function(data) {
+	$.get($.cookie("base_location") + "api/v1/instances/register_form/" + query.id, function(data) {
 		$("#jid_desc").html(data.username_label + ":");
 		$("#uin_desc").html(data.legacy_username_label + ":");
 		$("#password_desc").html(data.password_label + ":");
 		$("#jid").attr("placeholder", data.username_label);
 		$("#uin").attr("placeholder", data.legacy_username_label);

spectrum_manager/src/html/login/index.shtml

➞

Show inline comments

@@ @@ -66,7 +66,8 @@ @@
 </body></html>
@@ \ No newline at end of file @@
 </body></html>
 <!--#call replace_base_url -->
@@ \ No newline at end of file @@

spectrum_manager/src/managerconfig.cpp

➞

Show inline comments

 		("service.admin_username", value<std::string>()->default_value(""), "Administrator username.")
 		("service.admin_password", value<std::string>()->default_value(""), "Administrator password.")
 		("service.port", value<int>()->default_value(8081), "Web interface port.")
 		("service.cert", value<std::string>()->default_value(""), "Web interface certificate in PEM format when TLS should be used.")
 		("service.config_directory", value<std::string>()->default_value("/etc/spectrum2/transports/"), "Directory with spectrum2 configuration files. One .cfg file per one instance")
 		("service.data_dir", value<std::string>()->default_value("/var/lib/spectrum2_manager/html"), "Directory to store Spectrum 2 manager data")
 		("service.base_location", value<std::string>()->default_value("/"), "Base location of the web interface")
 		("servers.server", value<std::vector<std::string> >()->multitoken(), "Server.")
 		("database.type", value<std::string>()->default_value("none"), "Database type.")
 		("database.database", value<std::string>()->default_value("/var/lib/spectrum2/$jid/database.sql"), "Database used to store data")
 		("database.server", value<std::string>()->default_value("localhost"), "Database server.")
 		("database.user", value<std::string>()->default_value(""), "Database user.")
 		("database.password", value<std::string>()->default_value(""), "Database Password.")

spectrum_manager/src/server.cpp

➞

Show inline comments

 	if (check_password(user, password) && (session = new_session(user)) != NULL) {
 		std::cout << "User authorized\n";
 		mg_printf(conn, "HTTP/1.1 302 Found\r\n"
 			"Set-Cookie: session=%s; max-age=3600; http-only\r\n"  // Session ID
 			"Set-Cookie: user=%s\r\n"  // Set user, needed by Javascript code
 			"Set-Cookie: admin=%s\r\n"  // Set user, needed by Javascript code
 			"Set-Cookie: base_location=%s\r\n"  // Set user, needed by Javascript code
 			"Set-Cookie: original_url=/; max-age=0\r\n"  // Delete original_url
 			"Location: %s/instances\r\n\r\n",
 			session->session_id, session->user, session->admin ? "1" : "0", host.c_str());
 			"Location: %s%sinstances\r\n\r\n",
 			session->session_id, session->user, session->admin ? "1" : "0", CONFIG_STRING(m_config, "service.base_location").c_str(), host.c_str(), CONFIG_STRING(m_config, "service.base_location").c_str());
 	} else {
 		// Authentication failure, redirect to login.
 		redirect_to(conn, hm, "/login");
+	}
+}
 		else {
 			host += "http://";
+		}
 		host += std::string(host_hdr->p, host_hdr->len);
+	}
 	where = where + 1;
 	mg_printf(conn, "HTTP/1.1 302 Found\r\n"
 		"Set-Cookie: original_url=/\r\n"
 		"Location: %s%s\r\n\r\n", host.c_str(), where);
+		"Location: %s%s%s\r\n\r\n", host.c_str(), CONFIG_STRING(m_config, "service.base_location").c_str(), where);
+}
 void Server::print_html(struct mg_connection *conn, struct http_message *hm, const std::string &html) {
 	mg_printf(conn,
 			"HTTP/1.1 200 OK\r\n"
 			"Content-Type: text/html\r\n"
+	}
 	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/\r\n\r\n",
 		session->session_id, session->admin ? "1" : "0", host.c_str());
 		"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_users_add(struct mg_connection *conn, struct http_message *hm) {
 	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"));
 		strcpy(conn->send_mbuf.buf, resp.c_str());
 		mbuf_trim(&conn->send_mbuf);
 		return;
+	}
 	if (ev != MG_EV_HTTP_REQUEST) {
 		return;
+	}
 	hm->uri.p += CONFIG_STRING(m_config, "service.base_location").size() - 1;
 	hm->uri.len -= CONFIG_STRING(m_config, "service.base_location").size() - 1;
 	if (!is_authorized(conn, hm)) {
 		redirect_to(conn, hm, "/login");
 	} else if (mg_vcmp(&hm->uri, "/authorize") == 0) {
 		authorize(conn, hm);
 // 	} else if (mg_vcmp(&hm->uri, "/") == 0) {
 // 		serve_instances(conn, hm);
 // 		serve_users_remove(conn, hm);
 	} else if (has_prefix(&hm->uri, "/oauth2")) {
 		serve_oauth2(conn, hm);
 	} else if (has_prefix(&hm->uri, "/api/v1/")) {
 		m_apiServer->handleRequest(this, get_session(hm), conn, hm);
 	} else {
 		if (hm->uri.p[hm->uri.len - 1] != '/') {
 			std::string url(hm->uri.p, hm->uri.len);
 			if (url.find(".") == std::string::npos) {
 				url += "/";
 				redirect_to(conn, hm, url.c_str());
 				conn->flags |= MG_F_SEND_AND_CLOSE;
 				return;
+			}
+		}
 		mg_serve_http(conn, hm, s_http_server_opts);
+	}
 	conn->flags |= MG_F_SEND_AND_CLOSE;
+}

0 comments (0 inline, 0 general)