StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Remove deprecated/unused toxdns1 code

Browse Source
This commit is contained in:
tux3 2015-12-04 03:37:07 +01:00
parent 6a7479912e
commit 1874c0ce4d
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
2 changed files with 0 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
src/net/toxdns.cpp
View File

@ -111,64 +111,6 @@ QByteArray ToxDNS::fetchLastTextRecord(const QString& record, bool silent)
return result; return result;
} }
QString ToxDNS::queryTox1(const QString& record, bool silent)
{
QString realRecord = record, toxId;
realRecord.replace("@", "._tox.");
const QString entry = fetchLastTextRecord(realRecord, silent);
if (entry.isEmpty())
return toxId;
// Check toxdns protocol version
int verx = entry.indexOf("v=");
if (verx)
{
verx += 2;
int verend = entry.indexOf(';', verx);
if (verend)
{
QString ver = entry.mid(verx, verend-verx);
if (ver != "tox1")
{
if (!silent)
showWarning(tr("The version of Tox DNS used by this server is not supported", "Error with the DNS"));
return toxId;
}
}
}
// Get the tox id
int idx = entry.indexOf("id=");
if (idx < 0)
{
if (!silent)
showWarning(tr("The DNS lookup does not contain any Tox ID", "Error with the DNS"));
return toxId;
}
idx += 3;
if (entry.length() < idx + static_cast<int>(TOX_HEX_ID_LENGTH))
{
if (!silent)
showWarning(tr("The DNS lookup does not contain a valid Tox ID", "Error with the DNS"));
return toxId;
}
toxId = entry.mid(idx, TOX_HEX_ID_LENGTH);
if (!ToxId::isToxId(toxId))
{
if (!silent)
showWarning(tr("The DNS lookup does not contain a valid Tox ID", "Error with the DNS"));
return toxId;
}
return toxId;
}
QString ToxDNS::queryTox3(const tox3_server& server, const QString &record, bool silent) QString ToxDNS::queryTox3(const tox3_server& server, const QString &record, bool silent)
{ {
QByteArray nameData = record.left(record.indexOf('@')).toUtf8(), id, realRecord; QByteArray nameData = record.left(record.indexOf('@')).toUtf8(), id, realRecord;
@ -245,20 +187,6 @@ fallbackOnTox1:
if (tox_dns3) if (tox_dns3)
tox_dns3_kill(tox_dns3); tox_dns3_kill(tox_dns3);
#if TOX1_SILENT_FALLBACK
toxIdStr = queryTox1(record, silent);
#elif TOX1_ASK_FALLBACK
QMessageBox::StandardButton btn =
QMessageBox::warning(nullptr, "qTox",
tr("It appears that qTox has to use the old toxdns1 protocol to access the DNS record of your friend's Tox ID.\n"
"Unfortunately toxdns1 is not secure, and you are at risk of someone hijacking what is sent between you and the ToxDNS service.\n"
"Should toxdns1 be used anyway?\n"
"If unsure press 'No', so that the request to the ToxDNS service will not be made using an insecure protocol."),
QMessageBox::Yes|QMessageBox::No, QMessageBox::No);
if (btn == QMessageBox::Yes)
queryTox1(record, silent);
#endif
return toxIdStr; return toxIdStr;
} }
@ -300,25 +228,6 @@ ToxId ToxDNS::resolveToxAddress(const QString &address, bool silent)
server.pubkey = (uint8_t*)pubkey.data(); server.pubkey = (uint8_t*)pubkey.data();
toxId = ToxId(queryTox3(server, address, silent)); toxId = ToxId(queryTox3(server, address, silent));
} }
else
{
#if TOX1_SILENT_FALLBACK
toxId = ToxId::fromString(queryTox1(address, silent));
#elif TOX1_ASK_FALLBACK
QMessageBox::StandardButton btn =
QMessageBox::warning(nullptr, "qTox",
tr("It appears that qTox has to use the old toxdns1 protocol to access the DNS record of your friend's Tox ID.\n"
"Unfortunately toxdns1 is not secure, and you are at risk of someone hijacking what is sent between you and the ToxDNS service.\n"
"Should toxdns1 be used anyway?\n"
"If unsure press 'No', so that the request to the ToxDNS service will not be made using an insecure protocol."),
QMessageBox::Yes|QMessageBox::No, QMessageBox::No);
if (btn == QMessageBox::Ok)
toxId = ToxId(queryTox1(address, silent));
#else
return toxId;
#endif
}
return toxId; return toxId;
} }
} }

8
src/net/toxdns.h
View File

@ -26,12 +26,6 @@
#include <QDnsLookup> #include <QDnsLookup>
#include <QObject> #include <QObject>
/// Tox1 is not encrypted, it's unsafe
#define TOX1_SILENT_FALLBACK 0
/// That said if the user insists ...
#define TOX1_ASK_FALLBACK 1
/// Handles tox1 and tox3 DNS queries /// Handles tox1 and tox3 DNS queries
class ToxDNS : public QObject class ToxDNS : public QObject
{ {
@ -50,8 +44,6 @@ public:
public: public:
/// Tries to map a text string to a ToxId struct, will query Tox DNS records if necessary /// Tries to map a text string to a ToxId struct, will query Tox DNS records if necessary
static ToxId resolveToxAddress(const QString& address, bool silent=true); static ToxId resolveToxAddress(const QString& address, bool silent=true);
static QString queryTox1(const QString& record, bool silent=true); ///< Record should look like user@domain.tld. Do *NOT* use tox1 without a good reason, it's unsafe.
static QString queryTox3(const tox3_server& server, const QString& record, bool silent=true); ///< Record should look like user@domain.tld, will *NOT* fallback on queryTox1 anymore static QString queryTox3(const tox3_server& server, const QString& record, bool silent=true); ///< Record should look like user@domain.tld, will *NOT* fallback on queryTox1 anymore
protected: protected: