Skip to content

Commit

Permalink
Tidy
Browse files Browse the repository at this point in the history
  • Loading branch information
@omoerbeek
omoerbeek committed Jul 23, 2024
1 parent 7123e83 commit f7127f3
Show file tree
Hide file tree
Showing 8 changed files with 78 additions and 67 deletions.
6 changes: 4 additions & 2 deletions pdns/axfr-retriever.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,11 @@ int AXFRRetriever::getChunk(Resolver::res_t &res, vector<DNSRecord>* records, ui
err = parseResult(mdp, DNSName(), 0, 0, &res);

if (!err) {
for(const auto& answer : mdp.d_answers)
if (answer.d_type == QType::SOA)
for(const auto& answer : mdp.d_answers) {
if (answer.d_type == QType::SOA) {
d_soacount++;
}
}
}
}
else {
Expand Down
18 changes: 11 additions & 7 deletions pdns/dnsreplay.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,11 @@ static void WeOrigSlowQueriesDelta(int& weOutstanding, int& origOutstanding, int

static void compactAnswerSet(MOADNSParser::answers_t orig, set<DNSRecord>& compacted)
{
for(MOADNSParser::answers_t::const_iterator i=orig.begin(); i != orig.end(); ++i)
if(i->d_place==DNSResourceRecord::ANSWER)
compacted.insert(*i);
for (const auto& rec : orig) {
if (rec.d_place == DNSResourceRecord::ANSWER) {
compacted.insert(rec);
}
}
}

static bool isRcodeOk(int rcode)
Expand All @@ -261,10 +263,12 @@ static bool isRootReferral(const MOADNSParser::answers_t& answers)
bool ok=true;
for(MOADNSParser::answers_t::const_iterator iter = answers.begin(); iter != answers.end(); ++iter) {
// cerr<<(int)iter->d_place<<", "<<iter->d_name<<" "<<iter->d_type<<", # "<<answers.size()<<endl;

Check notice

Code scanning / CodeQL

Commented-out code Note

This comment appears to contain commented-out code.
if(iter->d_place!=2)
ok=false;
if(!iter->d_name.isRoot() || iter->d_type!=QType::NS)
ok=false;
if (iter->d_place != 2) {
ok = false;
}
if (!iter->d_name.isRoot() || iter->d_type != QType::NS) {
ok = false;
}
}
return ok;
}
Expand Down
29 changes: 14 additions & 15 deletions pdns/ixfr.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -263,36 +263,33 @@ vector<pair<vector<DNSRecord>, vector<DNSRecord>>> getIXFRDeltas(const ComboAddr
throw std::runtime_error("The first record of the IXFR answer for zone '"+zone.toLogString()+"' from primary '"+primary.toStringWithPort()+"' is not a SOA ("+QType(r.d_type).toString()+")");
}

auto sr = getRR<SOARecordContent>(r);
if (!sr) {
auto soaRecord = getRR<SOARecordContent>(r);
if (!soaRecord) {
throw std::runtime_error("Error getting the content of the first SOA record of the IXFR answer for zone '"+zone.toLogString()+"' from primary '"+primary.toStringWithPort()+"'");
}

if(sr->d_st.serial == getRR<SOARecordContent>(oursr)->d_st.serial) {
if(soaRecord->d_st.serial == getRR<SOARecordContent>(oursr)->d_st.serial) {
// we are up to date
return ret;
}
primarySOA = std::move(sr);
primarySOA = std::move(soaRecord);
++primarySOACount;
} else if (r.d_type == QType::SOA) {
auto sr = getRR<SOARecordContent>(r);
if (!sr) {
auto soaRecord = getRR<SOARecordContent>(r);
if (!soaRecord) {
throw std::runtime_error("Error getting the content of SOA record of IXFR answer for zone '"+zone.toLogString()+"' from primary '"+primary.toStringWithPort()+"'");
}

// we hit a marker SOA record
if (primarySOA->d_st.serial == sr->d_st.serial) {
if (primarySOA->d_st.serial == soaRecord->d_st.serial) {
++primarySOACount;
}
}
// When we see the 2nd record, we can decide what the style is
if (records.size() == 1 && style == Unknown) {
if (r.d_type != QType::SOA) {
// Non-empty AXFR style has a non-SOA record following the first SOA
style = AXFR;
}
else if (primarySOACount == expectedSOAForAXFR) {
// Empty zone AXFR style: start SOA is immediately followed by end marker SOA
if (r.d_type != QType::SOA || primarySOACount == expectedSOAForAXFR) {
// 1. Non-empty AXFR style has a non-SOA record following the first SOA
// 2. Empty zone AXFR style: start SOA is immediately followed by end marker SOA
style = AXFR;
}
else {
Expand All @@ -302,11 +299,13 @@ vector<pair<vector<DNSRecord>, vector<DNSRecord>>> getIXFRDeltas(const ComboAddr
}

if(r.d_place != DNSResourceRecord::ANSWER) {
if(r.d_type == QType::TSIG)
if (r.d_type == QType::TSIG) {
continue;
}

if(r.d_type == QType::OPT)
if (r.d_type == QType::OPT) {
continue;
}

throw std::runtime_error("Unexpected record (" +QType(r.d_type).toString()+") in non-answer section ("+std::to_string(r.d_place)+") in IXFR response for zone '"+zone.toLogString()+"' from primary '"+primary.toStringWithPort());
}
Expand Down
4 changes: 2 additions & 2 deletions pdns/ixfrdist.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1224,8 +1224,8 @@ static void tcpWorker(int tid) {
for (auto &answer : mdp.d_answers) {
// from dnsparser.hh:
// typedef vector<pair<DNSRecord, uint16_t > > answers_t;
if (answer.first.d_type == QType::SOA && answer.first.d_place == DNSResourceRecord::AUTHORITY) {
clientSOA = getRR<SOARecordContent>(answer.first);
if (answer.d_type == QType::SOA && answer.d_place == DNSResourceRecord::AUTHORITY) {
clientSOA = getRR<SOARecordContent>(answer);
if (clientSOA != nullptr) {
break;
}
Expand Down
12 changes: 6 additions & 6 deletions pdns/nsec3dig.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,16 +171,16 @@ try
{
// cerr<<"got nsec3 ["<<i->first.d_name<<"]"<<endl;
// cerr<<i->first.d_content->getZoneRepresentation()<<endl;
const auto r = getRR<NSEC3RecordContent>(*i);
if (!r) {
const auto nsec3Record = getRR<NSEC3RecordContent>(*i);
if (!nsec3Record) {
continue;
}
// nsec3.insert(new nsec3()
// cerr<<toBase32Hex(r.d_nexthash)<<endl;
nsec3s.emplace(toLower(i->d_name.getRawLabel(0)), toBase32Hex(r->d_nexthash));
nsec3salt = r->d_salt;
nsec3iters = r->d_iterations;
nsec3t.emplace(toLower(i->d_name.getRawLabel(0)), r->numberOfTypesSet());
nsec3s.emplace(toLower(i->d_name.getRawLabel(0)), toBase32Hex(nsec3Record->d_nexthash));
nsec3salt = nsec3Record->d_salt;
nsec3iters = nsec3Record->d_iterations;
nsec3t.emplace(toLower(i->d_name.getRawLabel(0)), nsec3Record->numberOfTypesSet());
}
else
{
Expand Down
59 changes: 31 additions & 28 deletions pdns/rfc2136handler.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -768,13 +768,14 @@ int PacketHandler::processUpdate(DNSPacket& packet) { // NOLINT(readability-func

// Check if all the records provided are within the zone
for(const auto & answer : mdp.d_answers) {
const DNSRecord *rr = &answer;
const DNSRecord *dnsRecord = &answer;
// Skip this check for other field types (like the TSIG - which is in the additional section)
// For a TSIG, the label is the dnskey, so it does not pass the endOn validation.
if (! (rr->d_place == DNSResourceRecord::ANSWER || rr->d_place == DNSResourceRecord::AUTHORITY))
if (dnsRecord->d_place != DNSResourceRecord::ANSWER && dnsRecord->d_place != DNSResourceRecord::AUTHORITY) {
continue;
}

if (!rr->d_name.isPartOf(di.zone)) {
if (!dnsRecord->d_name.isPartOf(di.zone)) {
g_log<<Logger::Error<<msgPrefix<<"Received update/record out of zone, sending NotZone."<<endl;
return RCode::NotZone;
}
Expand All @@ -790,11 +791,11 @@ int PacketHandler::processUpdate(DNSPacket& packet) { // NOLINT(readability-func

// 3.2.1 and 3.2.2 - Prerequisite check
for(const auto & answer : mdp.d_answers) {
const DNSRecord *rr = &answer;
if (rr->d_place == DNSResourceRecord::ANSWER) {
int res = checkUpdatePrerequisites(rr, &di);
const DNSRecord *dnsRecord = &answer;
if (dnsRecord->d_place == DNSResourceRecord::ANSWER) {
int res = checkUpdatePrerequisites(dnsRecord, &di);
if (res>0) {
g_log<<Logger::Error<<msgPrefix<<"Failed PreRequisites check for "<<rr->d_name<<", returning "<<RCode::to_s(res)<<endl;
g_log<<Logger::Error<<msgPrefix<<"Failed PreRequisites check for "<<dnsRecord->d_name<<", returning "<<RCode::to_s(res)<<endl;
di.backend->abortTransaction();
return res;
}
Expand All @@ -807,16 +808,17 @@ int PacketHandler::processUpdate(DNSPacket& packet) { // NOLINT(readability-func
typedef std::map<rrSetKey_t, rrVector_t> RRsetMap_t;
RRsetMap_t preReqRRsets;
for(const auto& i: mdp.d_answers) {
const DNSRecord* rr = &i;
if (rr->d_place == DNSResourceRecord::ANSWER) {
const DNSRecord* dnsRecord = &i;
if (dnsRecord->d_place == DNSResourceRecord::ANSWER) {
// Last line of 3.2.3
if (rr->d_class != QClass::IN && rr->d_class != QClass::NONE && rr->d_class != QClass::ANY)
if (dnsRecord->d_class != QClass::IN && dnsRecord->d_class != QClass::NONE && dnsRecord->d_class != QClass::ANY) {
return RCode::FormErr;
}

if (rr->d_class == QClass::IN) {
rrSetKey_t key = {rr->d_name, QType(rr->d_type)};
if (dnsRecord->d_class == QClass::IN) {
rrSetKey_t key = {dnsRecord->d_name, QType(dnsRecord->d_type)};
rrVector_t *vec = &preReqRRsets[key];
vec->push_back(DNSResourceRecord::fromWire(*rr));
vec->push_back(DNSResourceRecord::fromWire(*dnsRecord));
}
}
}
Expand Down Expand Up @@ -855,9 +857,9 @@ int PacketHandler::processUpdate(DNSPacket& packet) { // NOLINT(readability-func
uint changedRecords = 0;
// 3.4.1 - Prescan section
for(const auto & answer : mdp.d_answers) {
const DNSRecord *rr = &answer;
if (rr->d_place == DNSResourceRecord::AUTHORITY) {
int res = checkUpdatePrescan(rr);
const DNSRecord *dnsRecord = &answer;
if (dnsRecord->d_place == DNSResourceRecord::AUTHORITY) {
int res = checkUpdatePrescan(dnsRecord);
if (res>0) {
g_log<<Logger::Error<<msgPrefix<<"Failed prescan check, returning "<<res<<endl;
di.backend->abortTransaction();
Expand Down Expand Up @@ -901,29 +903,30 @@ int PacketHandler::processUpdate(DNSPacket& packet) { // NOLINT(readability-func

vector<const DNSRecord *> cnamesToAdd, nonCnamesToAdd;
for(const auto & answer : mdp.d_answers) {
const DNSRecord *rr = &answer;
if (rr->d_place == DNSResourceRecord::AUTHORITY) {
const DNSRecord *dnsRecord = &answer;
if (dnsRecord->d_place == DNSResourceRecord::AUTHORITY) {
/* see if it's permitted by policy */
if (this->d_update_policy_lua != nullptr) {
if (!this->d_update_policy_lua->updatePolicy(rr->d_name, QType(rr->d_type), di.zone, packet)) {
g_log<<Logger::Warning<<msgPrefix<<"Refusing update for " << rr->d_name << "/" << QType(rr->d_type).toString() << ": Not permitted by policy"<<endl;
if (!this->d_update_policy_lua->updatePolicy(dnsRecord->d_name, QType(dnsRecord->d_type), di.zone, packet)) {
g_log<<Logger::Warning<<msgPrefix<<"Refusing update for " << dnsRecord->d_name << "/" << QType(dnsRecord->d_type).toString() << ": Not permitted by policy"<<endl;
continue;
} else {
g_log<<Logger::Debug<<msgPrefix<<"Accepting update for " << rr->d_name << "/" << QType(rr->d_type).toString() << ": Permitted by policy"<<endl;
g_log<<Logger::Debug<<msgPrefix<<"Accepting update for " << dnsRecord->d_name << "/" << QType(dnsRecord->d_type).toString() << ": Permitted by policy"<<endl;
}
}

if (rr->d_class == QClass::NONE && rr->d_type == QType::NS && rr->d_name == di.zone)
nsRRtoDelete.push_back(rr);
else if (rr->d_class == QClass::IN && rr->d_ttl > 0) {
if (rr->d_type == QType::CNAME) {
cnamesToAdd.push_back(rr);
if (dnsRecord->d_class == QClass::NONE && dnsRecord->d_type == QType::NS && dnsRecord->d_name == di.zone) {
nsRRtoDelete.push_back(dnsRecord);
}
else if (dnsRecord->d_class == QClass::IN && dnsRecord->d_ttl > 0) {
if (dnsRecord->d_type == QType::CNAME) {
cnamesToAdd.push_back(dnsRecord);
} else {
nonCnamesToAdd.push_back(rr);
nonCnamesToAdd.push_back(dnsRecord);
}
}
else
changedRecords += performUpdate(msgPrefix, rr, &di, isPresigned, &narrow, &haveNSEC3, &ns3pr, &updatedSerial);
changedRecords += performUpdate(msgPrefix, dnsRecord, &di, isPresigned, &narrow, &haveNSEC3, &ns3pr, &updatedSerial);
}
}
for (const auto &rr : cnamesToAdd) {
Expand Down
7 changes: 5 additions & 2 deletions pdns/saxfr.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

StatBag S;

// NOLINTNEXTLINE(readability-function-cognitive-complexity)
int main(int argc, char** argv)
try
{
Expand Down Expand Up @@ -144,9 +145,11 @@ try
throw PDNSException(string("Remote server refused: ") + std::to_string(mdp.d_header.rcode));
}
for(MOADNSParser::answers_t::const_iterator i=mdp.d_answers.begin(); i!=mdp.d_answers.end(); ++i) {
if(i->first.d_type != QType::TKEY) continue;
if (i->d_type != QType::TKEY) {
continue;
}
// recover TKEY record
tkrc = TKEYRecordContent(i->first.getContent()->getZoneRepresentation());
tkrc = TKEYRecordContent(i->getContent()->getZoneRepresentation());
input = tkrc.d_key;
}
}
Expand Down
10 changes: 5 additions & 5 deletions pdns/tcpreceiver.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1189,10 +1189,10 @@ int TCPNameserver::doIXFR(std::unique_ptr<DNSPacket>& q, int outsock)
uint32_t serial = 0;
MOADNSParser mdp(false, q->getString());
for(const auto & answer : mdp.d_answers) {
const DNSRecord *rr = &answer;
if (rr->d_type == QType::SOA && rr->d_place == DNSResourceRecord::AUTHORITY) {
const DNSRecord *dnsRecord = &answer;
if (dnsRecord->d_type == QType::SOA && dnsRecord->d_place == DNSResourceRecord::AUTHORITY) {
vector<string>parts;
stringtok(parts, rr->getContent()->getZoneRepresentation());
stringtok(parts, dnsRecord->getContent()->getZoneRepresentation());
if (parts.size() >= 3) {
try {
pdns::checked_stoi_into(serial, parts[2]);
Expand All @@ -1209,8 +1209,8 @@ int TCPNameserver::doIXFR(std::unique_ptr<DNSPacket>& q, int outsock)
sendPacket(outpacket,outsock);
return 0;
}
} else if (rr->d_type != QType::TSIG && rr->d_type != QType::OPT) {
g_log<<Logger::Warning<<logPrefix<<"additional records in IXFR query, type: "<<QType(rr->d_type).toString()<<endl;
} else if (dnsRecord->d_type != QType::TSIG && dnsRecord->d_type != QType::OPT) {
g_log<<Logger::Warning<<logPrefix<<"additional records in IXFR query, type: "<<QType(dnsRecord->d_type).toString()<<endl;
outpacket->setRcode(RCode::FormErr);
sendPacket(outpacket,outsock);
return 0;
Expand Down

0 comments on commit f7127f3

Please sign in to comment.