From 79fbf9d47fe35afc03384ab85327e814416f5f02 Mon Sep 17 00:00:00 2001
From: Jeff Becker <ampernand@gmail.com>
Date: Thu, 30 Jun 2016 07:35:30 -0400
Subject: [PATCH 1/2] add RouterInfo hash to web ui

---
 HTTPServer.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/HTTPServer.cpp b/HTTPServer.cpp
index be3b9b58..9eed80d9 100644
--- a/HTTPServer.cpp
+++ b/HTTPServer.cpp
@@ -58,6 +58,7 @@ namespace http {
 		"  .tunnel.another     { color: #434343; }\r\n"
 		"  caption { font-size: 1.5em; text-align: center; color: #894C84; }\r\n"
 		"  table { width: 100%; border-collapse: collapse; text-align: center; }\r\n"
+		"  .private { background: black; color: black; } .private:hover { background: black; color: white } \r\n"
 		"</style>\r\n";
 
 	const char HTTP_PAGE_TUNNELS[] = "tunnels";
@@ -205,6 +206,7 @@ namespace http {
 			s << numKBytesSent / 1024 / 1024 << " GiB";
 		s << " (" << (double) i2p::transport::transports.GetOutBandwidth () / 1024 << " KiB/s)<br>\r\n";
 		s << "<b>Data path:</b> " << i2p::fs::GetDataDir() << "<br>\r\n<br>\r\n";
+		s << "<b>Router Ident:</b> <span class='private'>" << i2p::context.GetRouterInfo().GetIdentHashBase64()<< "</span><br>\r\n";
 		s << "<b>Our external address:</b>" << "<br>\r\n" ;
 		for (auto address : i2p::context.GetRouterInfo().GetAddresses())
 		{

From 28ab1230e2a97f9693eac1d9d7f32681b7a9f9fd Mon Sep 17 00:00:00 2001
From: xcps <xcps@yandex.com>
Date: Thu, 30 Jun 2016 07:59:58 -0400
Subject: [PATCH 2/2] '@' can exist in url path

---
 HTTP.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/HTTP.cpp b/HTTP.cpp
index 31567bbd..7fd87c55 100644
--- a/HTTP.cpp
+++ b/HTTP.cpp
@@ -81,7 +81,8 @@ namespace http {
       }
       /* user[:pass] */
       pos_c = url.find('@', pos_p);
-      if (pos_c != std::string::npos) {
+      std::size_t pos_slash = url.find('/', pos_p);
+      if (pos_c != std::string::npos && (pos_slash == std::string::npos || pos_slash > pos_c)) {
         std::size_t delim = url.find(':', pos_p);
         if (delim != std::string::npos && delim < pos_c) {
           user = url.substr(pos_p, delim - pos_p);
@@ -90,7 +91,7 @@ namespace http {
         } else {
           user = url.substr(pos_p, pos_c - pos_p);
         }
-        pos_p = pos_c + 1;
+        pos_p = pos_c + 1;        
       }
       /* hostname[:port][/path] */
       pos_c = url.find_first_of(":/", pos_p);