From e91ce698f6d0f77775c0f4ec88444dd92c5588ed Mon Sep 17 00:00:00 2001
From: Arthur Britto <ahbritto@gmail.com>
Date: Sat, 29 Dec 2012 14:59:44 -0800
Subject: [PATCH] Add support for parsing port in urls.

---
 src/cpp/ripple/UniqueNodeList.cpp |  8 ++++++--
 src/cpp/ripple/utils.cpp          | 31 ++++++++++++++++++++++---------
 src/cpp/ripple/utils.h            |  2 +-
 3 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/cpp/ripple/UniqueNodeList.cpp b/src/cpp/ripple/UniqueNodeList.cpp
index 4a78c343e..ad7e56348 100644
--- a/src/cpp/ripple/UniqueNodeList.cpp
+++ b/src/cpp/ripple/UniqueNodeList.cpp
@@ -800,11 +800,13 @@ void UniqueNodeList::getIpsUrl(const RippleAddress& naNodePublic, section secSit
 	std::string	strIpsUrl;
 	std::string	strScheme;
 	std::string	strDomain;
+	int			iPort;
 	std::string	strPath;
 
 	if (sectionSingleB(secSite, SECTION_IPS_URL, strIpsUrl)
 		&& !strIpsUrl.empty()
-		&& parseUrl(strIpsUrl, strScheme, strDomain, strPath)
+		&& parseUrl(strIpsUrl, strScheme, strDomain, iPort, strPath)
+		&& -1 == iPort
 		&& strScheme == "https")
 	{
 		HttpsClient::httpsGet(
@@ -841,11 +843,13 @@ void UniqueNodeList::getValidatorsUrl(const RippleAddress& naNodePublic, section
 	std::string strValidatorsUrl;
 	std::string	strScheme;
 	std::string	strDomain;
+	int			iPort;
 	std::string	strPath;
 
 	if (sectionSingleB(secSite, SECTION_VALIDATORS_URL, strValidatorsUrl)
 		&& !strValidatorsUrl.empty()
-		&& parseUrl(strValidatorsUrl, strScheme, strDomain, strPath)
+		&& parseUrl(strValidatorsUrl, strScheme, strDomain, iPort, strPath)
+		&& -1 == iPort
 		&& strScheme == "https")
 	{
 		HttpsClient::httpsGet(
diff --git a/src/cpp/ripple/utils.cpp b/src/cpp/ripple/utils.cpp
index 197d56ebc..760ea7a6b 100644
--- a/src/cpp/ripple/utils.cpp
+++ b/src/cpp/ripple/utils.cpp
@@ -193,21 +193,27 @@ bool parseIpPort(const std::string& strSource, std::string& strIP, int& iPort)
 	return bValid;
 }
 
-bool parseUrl(const std::string& strUrl, std::string& strScheme, std::string& strDomain, std::string& strPath)
+bool parseUrl(const std::string& strUrl, std::string& strScheme, std::string& strDomain, int& iPort, std::string& strPath)
 {
 	// scheme://username:password@hostname:port/rest
-	static boost::regex	reUrl("(?i)\\`\\s*([[:alpha:]][-+.[:alpha:][:digit:]]*)://([^/]+)(/.*)?\\s*?\\'");
+	static boost::regex	reUrl("(?i)\\`\\s*([[:alpha:]][-+.[:alpha:][:digit:]]*)://([^:/]+)(?::(\\d+))?(/.*)?\\s*?\\'");
 	boost::smatch	smMatch;
 
 	bool	bMatch	= boost::regex_match(strUrl, smMatch, reUrl);			// Match status code.
 
 	if (bMatch)
 	{
+		std::string	strPort;
+
 		strScheme	= smMatch[1];
 		strDomain	= smMatch[2];
-		strPath		= smMatch[3];
+		strPort		= smMatch[3];
+		strPath		= smMatch[4];
 
 		boost::algorithm::to_lower(strScheme);
+
+		iPort	= strPort.empty() ? -1 : lexical_cast_s<int>(strPort);
+		// std::cerr << strUrl << " : " << bMatch << " : '" << strDomain << "' : '" << strPort << "' : " << iPort << " : '" << strPath << "'" << std::endl;
 	}
 	// std::cerr << strUrl << " : " << bMatch << " : '" << strDomain << "' : '" << strPath << "'" << std::endl;
 
@@ -296,9 +302,10 @@ BOOST_AUTO_TEST_CASE( ParseUrl )
 {
 	std::string	strScheme;
 	std::string	strDomain;
+	int			iPort;
 	std::string	strPath;
 
-	if (!parseUrl("lower://domain", strScheme, strDomain, strPath))
+	if (!parseUrl("lower://domain", strScheme, strDomain, iPort, strPath))
 		BOOST_FAIL("parseUrl: lower://domain failed");
 
 	if (strScheme != "lower")
@@ -307,19 +314,25 @@ BOOST_AUTO_TEST_CASE( ParseUrl )
 	if (strDomain != "domain")
 		BOOST_FAIL("parseUrl: lower://domain : domain failed");
 
+	if (iPort != -1)
+		BOOST_FAIL("parseUrl: lower://domain : port failed");
+
 	if (strPath != "")
 		BOOST_FAIL("parseUrl: lower://domain : path failed");
 
-	if (!parseUrl("UPPER://domain/", strScheme, strDomain, strPath))
-		BOOST_FAIL("parseUrl: UPPER://domain/ failed");
+	if (!parseUrl("UPPER://domain:234/", strScheme, strDomain, iPort, strPath))
+		BOOST_FAIL("parseUrl: UPPER://domain:234/ failed");
 
 	if (strScheme != "upper")
-		BOOST_FAIL("parseUrl: UPPER://domain : scheme failed");
+		BOOST_FAIL("parseUrl: UPPER://domain:234/ : scheme failed");
+
+	if (iPort != 234)
+		BOOST_FAIL(boost::str(boost::format("parseUrl: UPPER://domain:234/ : port failed: %d") % iPort));
 
 	if (strPath != "/")
-		BOOST_FAIL("parseUrl: UPPER://domain : scheme failed");
+		BOOST_FAIL("parseUrl: UPPER://domain:234/ : path failed");
 
-	if (!parseUrl("Mixed://domain/path", strScheme, strDomain, strPath))
+	if (!parseUrl("Mixed://domain/path", strScheme, strDomain, iPort, strPath))
 		BOOST_FAIL("parseUrl: Mixed://domain/path failed");
 
 	if (strScheme != "mixed")
diff --git a/src/cpp/ripple/utils.h b/src/cpp/ripple/utils.h
index cc7be6c01..752078048 100644
--- a/src/cpp/ripple/utils.h
+++ b/src/cpp/ripple/utils.h
@@ -265,7 +265,7 @@ template<typename T, typename U> T range_check_cast(const U& value, const T& min
 	return static_cast<T>(value);
 }
 
-bool parseUrl(const std::string& strUrl, std::string& strScheme, std::string& strDomain, std::string& strPath);
+bool parseUrl(const std::string& strUrl, std::string& strScheme, std::string& strDomain, int& iPort, std::string& strPath);
 
 #endif