tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-28 16:14:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update url parser

Browse Source 
fixes #9768
This commit is contained in:
Jean Flach 2015-07-29 13:09:42 +02:00
parent 0b495d1858
commit 2414dee602
5 changed files with 68 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/remote/httputility.cpp
View File

@ -40,9 +40,9 @@ Dictionary::Ptr HttpUtility::FetchRequestParameters(HttpRequest& request)
if (!result) if (!result)
result = new Dictionary(); result = new Dictionary();
typedef std::pair<String, Value> kv_pair; typedef std::pair<String, std::vector<String> > kv_pair;
BOOST_FOREACH(const kv_pair& kv, request.RequestUrl->GetQuery()) { BOOST_FOREACH(const kv_pair& kv, request.RequestUrl->GetQuery()) {
result->Set(kv.first, kv.second); result->Set(kv.first, Array::FromVector(kv.second));
} }
return result; return result;

2
lib/remote/url-characters.hpp
View File

@ -22,7 +22,7 @@
#define ALPHA "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" #define ALPHA "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
#define NUMERIC "0123456789" #define NUMERIC "0123456789"
#define UNRESERVED ALPHA NUMERIC "-._~" #define UNRESERVED ALPHA NUMERIC "-._~" "%"
#define GEN_DELIMS ":/?#[]@" #define GEN_DELIMS ":/?#[]@"
#define SUB_DELIMS "!$&'()*+,;=" #define SUB_DELIMS "!$&'()*+,;="
#define RESERVED GEN_DELIMS SUB-DELIMS #define RESERVED GEN_DELIMS SUB-DELIMS

127
lib/remote/url.cpp
View File

@ -36,9 +36,7 @@ Url::Url(const String& base_url)
size_t pHelper = url.Find(":"); size_t pHelper = url.Find(":");
if (pHelper == String::NPos) { if (pHelper != String::NPos) {
m_Scheme = "";
} else {
if (!ParseScheme(url.SubStr(0, pHelper))) if (!ParseScheme(url.SubStr(0, pHelper)))
BOOST_THROW_EXCEPTION(std::invalid_argument("Invalid URL Scheme.")); BOOST_THROW_EXCEPTION(std::invalid_argument("Invalid URL Scheme."));
url = url.SubStr(pHelper + 1); url = url.SubStr(pHelper + 1);
@ -51,9 +49,7 @@ Url::Url(const String& base_url)
return; return;
} }
if (*(url.Begin() + 1) != '/') if (*(url.Begin() + 1) == '/') {
m_Authority = "";
else {
pHelper = url.Find("/", 2); pHelper = url.Find("/", 2);
if (pHelper == String::NPos) if (pHelper == String::NPos)
@ -105,22 +101,33 @@ const std::vector<String>& Url::GetPath(void) const
return m_Path; return m_Path;
} }
const std::map<String,Value>& Url::GetQuery(void) const const std::map<String, std::vector<String> >& Url::GetQuery(void) const
{ {
return m_Query; return m_Query;
} }
Value Url::GetQueryElement(const String& name) const String Url::GetQueryElement(const String& name) const
{ {
std::map<String, Value>::const_iterator it = m_Query.find(name); std::map<String, std::vector<String> >::const_iterator it = m_Query.find(name);
if (it == m_Query.end()) if (it == m_Query.end())
return Empty; return String();
return it->second.back();
}
const std::vector<String>& Url::GetQueryElements(const String& name) const
{
std::map<String, std::vector<String> >::const_iterator it = m_Query.find(name);
if (it == m_Query.end()) {
static std::vector<String> emptyVector;
return emptyVector;
}
return it->second; return it->second;
} }
String Url::GetFragment(void) const String Url::GetFragment(void) const
{ {
return m_Fragment; return m_Fragment;
@ -128,7 +135,7 @@ String Url::GetFragment(void) const
String Url::Format(void) const String Url::Format(void) const
{ {
String url = ""; String url;
if (!m_Scheme.IsEmpty()) if (!m_Scheme.IsEmpty())
url += m_Scheme + ":"; url += m_Scheme + ":";
@ -145,9 +152,9 @@ String Url::Format(void) const
} }
} }
String param = ""; String param;
if (!m_Query.empty()) { if (!m_Query.empty()) {
typedef std::pair<String, Value> kv_pair; typedef std::pair<String, std::vector<String> > kv_pair;
BOOST_FOREACH (const kv_pair& kv, m_Query) { BOOST_FOREACH (const kv_pair& kv, m_Query) {
String key = Utility::EscapeString(kv.first, ACQUERY, false); String key = Utility::EscapeString(kv.first, ACQUERY, false);
@ -155,28 +162,15 @@ String Url::Format(void) const
param = "?"; param = "?";
else else
param += "&"; param += "&";
String temp;
BOOST_FOREACH (const String s, kv.second) {
if (!temp.IsEmpty())
temp += "&";
Value val = kv.second; temp += key + "[]=" + Utility::EscapeString(s, ACQUERY, false);
if (val.IsEmpty())
param += key;
else {
if (val.IsObjectType<Array>()) {
Array::Ptr arr = val;
String temp = "";
ObjectLock olock(arr);
BOOST_FOREACH (const String& sArrIn, arr) {
if (!temp.IsEmpty())
temp += "&";
temp += key + "[]=" + Utility::EscapeString(sArrIn, ACQUERY, false);
}
param += temp;
} else
param += key + "=" + Utility::EscapeString(kv.second, ACQUERY, false);
} }
param += temp;
} }
} }
@ -200,9 +194,9 @@ bool Url::ParseScheme(const String& scheme)
bool Url::ParseAuthority(const String& authority) bool Url::ParseAuthority(const String& authority)
{ {
//TODO parse all Authorities
m_Authority = authority.SubStr(2); m_Authority = authority.SubStr(2);
return (ValidateToken(m_Authority, ACHOST)); //Just safe the Authority and don't care about the details
return (ValidateToken(m_Authority, ACHOST GEN_DELIMS));
} }
bool Url::ParsePath(const String& path) bool Url::ParsePath(const String& path)
@ -236,56 +230,41 @@ bool Url::ParseQuery(const String& query)
BOOST_FOREACH(const String& token, tokens) { BOOST_FOREACH(const String& token, tokens) {
size_t pHelper = token.Find("="); size_t pHelper = token.Find("=");
if (pHelper == 0)
// /?foo=bar&=bar == invalid
return false;
String key = token.SubStr(0, pHelper); String key = token.SubStr(0, pHelper);
String value = Empty; String value = Empty;
if (pHelper != String::NPos) { if (pHelper != token.GetLength()-1)
if (pHelper == token.GetLength() - 1) value = token.SubStr(pHelper+1);
return false;
value = token.SubStr(pHelper + 1); if (!ValidateToken(value, ACQUERY))
if (!ValidateToken(value, ACQUERY))
return false;
else
value = Utility::UnescapeString(value);
} else
String key = token;
if (key.IsEmpty())
return false; return false;
value = Utility::UnescapeString(value);
pHelper = key.Find("[]"); pHelper = key.Find("[]");
if (pHelper != String::NPos) { if (pHelper == 0 || (pHelper != String::NPos && pHelper != key.GetLength()-2))
return false;
if (key.GetLength() < 3) key = key.SubStr(0, pHelper);
return false;
if (!ValidateToken(key, ACQUERY))
return false;
key = key.SubStr(0, key.GetLength() - 2); key = Utility::UnescapeString(key);
key = Utility::UnescapeString(key);
if (!ValidateToken(value, ACQUERY)) std::map<String, std::vector<String> >::iterator it = m_Query.find(key);
return false;
std::map<String, Value>::iterator it = m_Query.find(key); if (it == m_Query.end()) {
m_Query[key] = std::vector<String>();
if (it == m_Query.end()) { m_Query[key].push_back(value);
Array::Ptr tmp = new Array(); } else
tmp->Add(Utility::UnescapeString(value)); m_Query[key].push_back(value);
m_Query[key] = tmp;
} else if (m_Query[key].IsObjectType<Array>()){
Array::Ptr arr = it->second;
arr->Add(Utility::UnescapeString(value));
} else
return false;
} else {
key = Utility::UnescapeString(key);
if (m_Query.find(key) == m_Query.end() && ValidateToken(key, ACQUERY))
m_Query[key] = Utility::UnescapeString(value);
else
return false;
}
} }
return true; return true;

8
lib/remote/url.hpp
View File

@ -23,6 +23,7 @@
#include "remote/i2-remote.hpp" #include "remote/i2-remote.hpp"
#include "base/object.hpp" #include "base/object.hpp"
#include "base/string.hpp" #include "base/string.hpp"
#include "base/array.hpp"
#include "base/value.hpp" #include "base/value.hpp"
#include <map> #include <map>
#include <vector> #include <vector>
@ -47,15 +48,16 @@ public:
String GetScheme(void) const; String GetScheme(void) const;
String GetAuthority(void) const; String GetAuthority(void) const;
const std::vector<String>& GetPath(void) const; const std::vector<String>& GetPath(void) const;
const std::map<String,Value>& GetQuery(void) const; const std::map<String, std::vector<String> >& GetQuery(void) const;
Value GetQueryElement(const String& name) const; String GetQueryElement(const String& name) const;
const std::vector<String>& GetQueryElements(const String& name) const;
String GetFragment(void) const; String GetFragment(void) const;
private: private:
String m_Scheme; String m_Scheme;
String m_Authority; String m_Authority;
std::vector<String> m_Path; std::vector<String> m_Path;
std::map<String,Value> m_Query; std::map<String, std::vector<String> > m_Query;
String m_Fragment; String m_Fragment;
bool ParseScheme(const String& scheme); bool ParseScheme(const String& scheme);

14
test/remote-url.cpp
View File

@ -48,10 +48,9 @@ BOOST_AUTO_TEST_CASE(parameters)
BOOST_CHECK(url->GetQueryElement("rair") == "robert"); BOOST_CHECK(url->GetQueryElement("rair") == "robert");
BOOST_CHECK(url->GetQueryElement("rain") == "karl"); BOOST_CHECK(url->GetQueryElement("rain") == "karl");
BOOST_CHECK(url->GetQueryElement("foo").IsObjectType<Array>()); std::vector<String> test = url->GetQueryElements("foo");
Array::Ptr test = url->GetQueryElement("foo"); BOOST_CHECK(test.size() == 1);
BOOST_CHECK(test->GetLength() == 1); BOOST_CHECK(test[0] == "bar");
BOOST_CHECK(test->Get(0) == "bar");
} }
BOOST_AUTO_TEST_CASE(format) BOOST_AUTO_TEST_CASE(format)
@ -71,12 +70,13 @@ BOOST_AUTO_TEST_CASE(format)
BOOST_AUTO_TEST_CASE(illegal_legal_strings) BOOST_AUTO_TEST_CASE(illegal_legal_strings)
{ {
BOOST_CHECK_THROW(new Url("/?foo=barr&foo[]=bazz"), std::invalid_argument); BOOST_CHECK(new Url("/?foo=barr&foo[]=bazz"));
BOOST_CHECK_THROW(new Url("/?]=gar"), std::invalid_argument); BOOST_CHECK_THROW(new Url("/?]=gar"), std::invalid_argument);
BOOST_CHECK_THROW(new Url("/#?[]"), std::invalid_argument); BOOST_CHECK_THROW(new Url("/#?[]"), std::invalid_argument);
BOOST_CHECK_THROW(new Url("/?foo=bar&foo=ba"), std::invalid_argument); BOOST_CHECK(new Url("/?foo=bar&foo=ba"));
BOOST_CHECK_THROW(new Url("/?foo=bar&[]=d"), std::invalid_argument); BOOST_CHECK_THROW(new Url("/?foo=bar&[]=d"), std::invalid_argument);
BOOST_CHECK_THROW(new Url("/?fo=&bar=garOA"), std::invalid_argument); BOOST_CHECK(new Url("/?fo=&bar=garOA"));
BOOST_CHECK(new Url("https://127.0.0.1:5665/demo?type=Service&filter=service.state%3E0"));
BOOST_CHECK(new Url("/?foo=baz??&\?\?=/?")); BOOST_CHECK(new Url("/?foo=baz??&\?\?=/?"));
BOOST_CHECK(new Url("/")); BOOST_CHECK(new Url("/"));
BOOST_CHECK(new Url("///////")); BOOST_CHECK(new Url("///////"));