ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-27 14:35:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Consolidate parseUrl arguments into a struct

Browse Source
This commit is contained in:
wilsonianb
2016-08-23 15:48:32 -07:00
committed by seelabs
parent 80dfb7d72d
commit 74977ab3db
6 changed files with 44 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ripple/basics/StringUtilities.h
View File

@@ -83,8 +83,15 @@ uint64_t uintFromHex (std::string const& strSrc);
std::pair<Blob, bool> strUnHex (std::string const& strSrc);
bool parseUrl (std::string const& strUrl, std::string& strScheme,
std::string& strDomain, int& iPort, std::string& strPath);
struct parsedURL
{
std::string scheme;
std::string domain;
boost::optional<std::uint16_t> port;
std::string path;
};
bool parseUrl (parsedURL& pUrl, std::string const& strUrl);
std::string trim_whitespace (std::string str);

23
src/ripple/basics/impl/StringUtilities.cpp
View File

@@ -91,26 +91,27 @@ uint64_t uintFromHex (std::string const& strSrc)
}
// TODO Callers should be using beast::URL and beast::parse_URL instead.
bool parseUrl (std::string const& strUrl, std::string& strScheme, std::string& strDomain, int& iPort, std::string& strPath)
bool parseUrl (parsedURL& pUrl, std::string const& strUrl)
{
// scheme://username:password@hostname:port/rest
static boost::regex reUrl ("(?i)\\`\\s*([[:alpha:]][-+.[:alpha:][:digit:]]*)://([^:/]+)(?::(\\d+))?(/.*)?\\s*?\\'");
boost::smatch smMatch;
boost::smatch smMatch;
bool bMatch = boost::regex_match (strUrl, smMatch, reUrl); // Match status code.
bool bMatch = boost::regex_match (strUrl, smMatch, reUrl); // Match status code.
if (bMatch)
{
std::string strPort;
strScheme = smMatch[1];
strDomain = smMatch[2];
strPort = smMatch[3];
strPath = smMatch[4];
boost::algorithm::to_lower (strScheme);
iPort = strPort.empty () ? -1 : beast::lexicalCast <int> (strPort);
pUrl.scheme = smMatch[1];
boost::algorithm::to_lower (pUrl.scheme);
pUrl.domain = smMatch[2];
if (smMatch[3].length ())
{
pUrl.port = beast::lexicalCast <std::uint16_t> (
std::string (smMatch[3]));
}
pUrl.path = smMatch[4];
}
return bMatch;

2
src/ripple/net/RPCCall.h
View File

@@ -46,7 +46,7 @@ int fromCommandLine (
void fromNetwork (
boost::asio::io_service& io_service,
std::string const& strIp, const int iPort,
std::string const& strIp, const std::uint16_t iPort,
std::string const& strUsername, std::string const& strPassword,
std::string const& strPath, std::string const& strMethod,
Json::Value const& jvParams, const bool bSSL, bool quiet,

2
src/ripple/net/impl/RPCCall.cpp
View File

@@ -1390,7 +1390,7 @@ int fromCommandLine (
void fromNetwork (
boost::asio::io_service& io_service,
std::string const& strIp, const int iPort,
std::string const& strIp, const std::uint16_t iPort,
std::string const& strUsername, std::string const& strPassword,
std::string const& strPath, std::string const& strMethod,
Json::Value const& jvParams, const bool bSSL, const bool quiet,

15
src/ripple/net/impl/RPCSub.cpp
View File

@@ -47,19 +47,20 @@ public:
, j_ (logs.journal ("RPCSub"))
, logs_ (logs)
{
std::string strScheme;
parsedURL pUrl;
if (!parseUrl (strUrl, strScheme, mIp, mPort, mPath))
if (!parseUrl (pUrl, strUrl))
Throw<std::runtime_error> ("Failed to parse url.");
else if (strScheme == "https")
else if (pUrl.scheme == "https")
mSSL = true;
else if (strScheme != "http")
else if (pUrl.scheme != "http")
Throw<std::runtime_error> ("Only http and https is supported.");
mSeq = 1;
if (mPort < 0)
mPort = mSSL ? 443 : 80;
mIp = pUrl.domain;
mPort = (! pUrl.port) ? (mSSL ? 443 : 80) : *pUrl.port;
mPath = pUrl.path;
JLOG (j_.info()) <<
"RPCCall::fromNetwork sub: ip=" << mIp <<
@@ -186,7 +187,7 @@ private:
std::string mUrl;
std::string mIp;
int mPort;
std::uint16_t mPort;
bool mSSL;
std::string mUsername;
std::string mPassword;

29
src/test/basics/StringUtilities_test.cpp
View File

@@ -64,23 +64,20 @@ public:
{
testcase ("parseUrl");
std::string strScheme;
std::string strDomain;
int iPort;
std::string strPath;
parsedURL pUrl;
BEAST_EXPECT (parseUrl ("lower://domain", strScheme, strDomain, iPort, strPath));
BEAST_EXPECT(strScheme == "lower");
BEAST_EXPECT(strDomain == "domain");
BEAST_EXPECT(iPort == -1);
BEAST_EXPECT(strPath == "");
BEAST_EXPECT(parseUrl ("UPPER://domain:234/", strScheme, strDomain, iPort, strPath));
BEAST_EXPECT(strScheme == "upper");
BEAST_EXPECT(iPort == 234);
BEAST_EXPECT(strPath == "/");
BEAST_EXPECT(parseUrl ("Mixed://domain/path", strScheme, strDomain, iPort, strPath));
BEAST_EXPECT(strScheme == "mixed");
BEAST_EXPECT(strPath == "/path");
BEAST_EXPECT(parseUrl (pUrl, "lower://domain"));
BEAST_EXPECT(pUrl.scheme == "lower");
BEAST_EXPECT(pUrl.domain == "domain");
BEAST_EXPECT(! pUrl.port);
BEAST_EXPECT(pUrl.path == "");
BEAST_EXPECT(parseUrl (pUrl, "UPPER://domain:234/"));
BEAST_EXPECT(pUrl.scheme == "upper");
BEAST_EXPECT(*pUrl.port == 234);
BEAST_EXPECT(pUrl.path == "/");
BEAST_EXPECT(parseUrl (pUrl, "Mixed://domain/path"));
BEAST_EXPECT(pUrl.scheme == "mixed");
BEAST_EXPECT(pUrl.path == "/path");
}
void testToString ()