kumi/danicoin
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #274

Browse source 
b18368b Allow name@domain.tld for OpenAlias lookups (Thomas Winget)
This commit is contained in:
Riccardo Spagni 2015-05-13 11:07:12 +02:00
parent 8005a0c7a1 b18368b635
commit 85589274aa
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/common/dns_utils.cpp
View file

@ -205,13 +205,15 @@ std::vector<std::string> DNSResolver::get_ipv4(const std::string& url, bool& dns
dnssec_valid = false; dnssec_valid = false;
char urlC[1000]; // waaaay too big, but just in case... char urlC[1000]; // waaaay too big, but just in case...
strncpy(urlC, url.c_str(), 999); std::string url_copy{url};
urlC[999] = '\0'; if (!check_address_syntax(url_copy))
if (!check_address_syntax(urlC))
{ {
return addresses; return addresses;
} }
strncpy(urlC, url_copy.c_str(), 999);
urlC[999] = '\0';
// destructor takes care of cleanup // destructor takes care of cleanup
ub_result_ptr result; ub_result_ptr result;
@ -239,14 +241,15 @@ std::vector<std::string> DNSResolver::get_ipv6(const std::string& url, bool& dns
dnssec_valid = false; dnssec_valid = false;
char urlC[1000]; // waaaay too big, but just in case... char urlC[1000]; // waaaay too big, but just in case...
strncpy(urlC, url.c_str(), 999); std::string url_copy{url};
urlC[999] = '\0'; if (!check_address_syntax(url_copy))
if (!check_address_syntax(urlC))
{ {
return addresses; return addresses;
} }
strncpy(urlC, url_copy.c_str(), 999);
urlC[999] = '\0';
ub_result_ptr result; ub_result_ptr result;
// call DNS resolver, blocking. if return value not zero, something went wrong // call DNS resolver, blocking. if return value not zero, something went wrong
@ -273,14 +276,15 @@ std::vector<std::string> DNSResolver::get_txt_record(const std::string& url, boo
dnssec_valid = false; dnssec_valid = false;
char urlC[1000]; // waaaay too big, but just in case... char urlC[1000]; // waaaay too big, but just in case...
strncpy(urlC, url.c_str(), 999); std::string url_copy{url};
urlC[999] = '\0'; if (!check_address_syntax(url_copy))
if (!check_address_syntax(urlC))
{ {
return records; return records;
} }
strncpy(urlC, url_copy.c_str(), 999);
urlC[999] = '\0';
ub_result_ptr result; ub_result_ptr result;
// call DNS resolver, blocking. if return value not zero, something went wrong // call DNS resolver, blocking. if return value not zero, something went wrong
@ -314,13 +318,17 @@ DNSResolver& DNSResolver::instance()
return *staticInstance; return *staticInstance;
} }
bool DNSResolver::check_address_syntax(const std::string& addr) bool DNSResolver::check_address_syntax(std::string& addr)
{ {
// if string doesn't contain a dot, we won't consider it a url for now. // if string doesn't contain a dot, we won't consider it a url for now.
if (addr.find(".") == std::string::npos) auto first_dot = addr.find(".");
if (first_dot == std::string::npos)
{ {
return false; return false;
} }
// allow name@domain.tld to work
addr.replace(first_dot, 1, "@");
return true; return true;
} }

5
src/common/dns_utils.h
View file

@ -112,11 +112,14 @@ private:
/** /**
* @brief Checks a string to see if it looks like a URL * @brief Checks a string to see if it looks like a URL
* *
* If the address looks good, but contains one @ symbol, replace that with a .
* e.g. donate@getmonero.org becomes donate.getmonero.org
*
* @param addr the string to be checked * @param addr the string to be checked
* *
* @return true if it looks enough like a URL, false if not * @return true if it looks enough like a URL, false if not
*/ */
bool check_address_syntax(const std::string& addr); bool check_address_syntax(std::string& addr);
DNSResolverData *m_data; DNSResolverData *m_data;
}; // class DNSResolver }; // class DNSResolver