Skip to content

Commit

Permalink
Merge pull request #5378 from mind04/backports-40
Browse files Browse the repository at this point in the history 
Backports to rel/auth-4.0.x
  • Loading branch information
@Habbie
Habbie committed Jun 13, 2017
2 parents d9e4790 + 1b947d2 commit aefec92
Show file tree
Hide file tree
Showing 22 changed files with 127 additions and 82 deletions.
2 changes: 1 addition & 1 deletion modules/luabackend/luabackend.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public:
void lookup(const QType &qtype, const DNSName &qname, DNSPacket *p, int domain_id);
bool get(DNSResourceRecord &rr);
//! fills the soadata struct with the SOA details. Returns false if there is no SOA.
bool getSOA(const string &name, SOAData &soadata, DNSPacket *p=0);
bool getSOA(const DNSName &name, SOAData &soadata, DNSPacket *p=0);


// MASTER BACKEND
Expand Down
4 changes: 2 additions & 2 deletions modules/luabackend/minimal.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,15 +176,15 @@ bool LUABackend::get(DNSResourceRecord &rr) {
return !rr.content.empty();
}

bool LUABackend::getSOA(const string &name, SOAData &soadata, DNSPacket *p) {
bool LUABackend::getSOA(const DNSName &name, SOAData &soadata, DNSPacket *p) {
if (logging)
L << Logger::Info << backend_name << "(getsoa) BEGIN" << endl;

dnspacket = p;

lua_rawgeti(lua, LUA_REGISTRYINDEX, f_lua_getsoa);

lua_pushstring(lua, name.c_str());
lua_pushstring(lua, name.toString().c_str());

if(lua_pcall(lua, 1, 1, f_lua_exec_error) != 0) {
string e = backend_name + lua_tostring(lua, -1);
Expand Down
60 changes: 22 additions & 38 deletions modules/opendbxbackend/odbxbackend.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,6 @@ inline string& strbind( const string& search, const string& replace, string& sub



inline string& toLowerByRef( string& str )
{
for( unsigned int i = 0; i < str.length(); i++ )
{
str[i] = dns_tolower( str[i] );
}

return str;
}



OdbxBackend::OdbxBackend( const string& suffix )
{
vector<string> hosts;
Expand Down Expand Up @@ -105,7 +93,7 @@ OdbxBackend::~OdbxBackend()



bool OdbxBackend::getDomainInfo( const string& domain, DomainInfo& di )
bool OdbxBackend::getDomainInfo( const DNSName& domain, DomainInfo& di )
{
const char* tmp;

Expand All @@ -115,7 +103,7 @@ bool OdbxBackend::getDomainInfo( const string& domain, DomainInfo& di )
DLOG( L.log( m_myname + " getDomainInfo()", Logger::Debug ) );

string stmt = getArg( "sql-zoneinfo" );
string& stmtref = strbind( ":name", escape( toLower( domain ), READ ), stmt );
string& stmtref = strbind( ":name", escape( domain.makeLowerCase().toStringRootDot(), READ ), stmt );

if( !execStmt( stmtref.c_str(), stmtref.size(), READ ) ) { return false; }
if( !getRecord( READ ) ) { return false; }
Expand Down Expand Up @@ -170,7 +158,7 @@ bool OdbxBackend::getDomainInfo( const string& domain, DomainInfo& di )

if( ( tmp = odbx_field_value( m_result, 1 ) ) != NULL )
{
di.zone = DNSName(string( tmp, odbx_field_length( m_result, 1 ) ));
di.zone = DNSName(string( tmp, odbx_field_length( m_result, 1 ) ));
}

if( ( tmp = odbx_field_value( m_result, 0 ) ) != NULL )
Expand Down Expand Up @@ -201,7 +189,7 @@ bool OdbxBackend::getSOA( const DNSName& domain, SOAData& sd, DNSPacket* p )
DLOG( L.log( m_myname + " getSOA()", Logger::Debug ) );

string stmt = getArg( "sql-lookupsoa" );
string& stmtref = strbind( ":name", escape( domain.toStringNoDot(), READ ), stmt );
string& stmtref = strbind( ":name", escape( domain.makeLowerCase().toStringRootDot(), READ ), stmt );

if( !execStmt( stmtref.c_str(), stmtref.size(), READ ) ) { return false; }
if( !getRecord( READ ) ) { return false; }
Expand Down Expand Up @@ -234,12 +222,12 @@ bool OdbxBackend::getSOA( const DNSName& domain, SOAData& sd, DNSPacket* p )

if( sd.nameserver.empty() )
{
sd.nameserver = DNSName(arg()["default-soa-name"]);
sd.nameserver = DNSName(arg()["default-soa-name"]);
}

if( sd.hostmaster.empty() )
{
sd.hostmaster = DNSName("hostmaster") + DNSName(domain);
sd.hostmaster = DNSName("hostmaster") + DNSName(domain);
}

sd.db = this;
Expand All @@ -263,7 +251,7 @@ bool OdbxBackend::list( const DNSName& target, int zoneid, bool include_disabled
{
DLOG( L.log( m_myname + " list()", Logger::Debug ) );

m_qname.clear();
m_qname.clear();
m_result = NULL;

int len = snprintf( m_buffer, sizeof( m_buffer ) - 1, "%d", zoneid );
Expand Down Expand Up @@ -322,7 +310,7 @@ void OdbxBackend::lookup( const QType& qtype, const DNSName& qname, DNSPacket* d
{
if( qtype.getCode() == QType::ANY )
{
stmt = getArg( "sql-lookupid" );
stmt = getArg( "sql-lookupid" );
} else {
stmt = getArg( "sql-lookuptypeid" );
stmtref = strbind( ":type", qtype.getName(), stmt );
Expand All @@ -345,8 +333,7 @@ void OdbxBackend::lookup( const QType& qtype, const DNSName& qname, DNSPacket* d
stmtref = strbind( ":id", string( m_buffer, len ), stmtref );
}

string tmp = qname.toStringNoDot();
stmtref = strbind( ":name", escape( toLowerByRef( tmp ), READ ), stmtref );
stmtref = strbind( ":name", escape( qname.makeLowerCase().toStringRootDot(), READ ), stmtref );

if( !execStmt( stmtref.c_str(), stmtref.size(), READ ) )
{
Expand Down Expand Up @@ -387,7 +374,7 @@ bool OdbxBackend::get( DNSResourceRecord& rr )

if( m_qname.empty() && ( tmp = odbx_field_value( m_result, 1 ) ) != NULL )
{
rr.qname = DNSName( string(tmp, odbx_field_length( m_result, 1 ) ));
rr.qname = DNSName( string(tmp, odbx_field_length( m_result, 1 ) ));
}

if( ( tmp = odbx_field_value( m_result, 2 ) ) != NULL )
Expand Down Expand Up @@ -509,14 +496,14 @@ void OdbxBackend::setNotified( uint32_t domain_id, uint32_t serial )



bool OdbxBackend::isMaster( const string& domain, const string& ip )
bool OdbxBackend::isMaster( const DNSName& domain, const string& ip )
{
try
{
DLOG( L.log( m_myname + " isMaster()", Logger::Debug ) );

string stmt = getArg( "sql-master" );
string& stmtref = strbind( ":name", escape( toLower( domain ), READ ), stmt );
string& stmtref = strbind( ":name", escape( domain.makeLowerCase().toStringRootDot(), READ ), stmt );

if( !execStmt( stmtref.c_str(), stmtref.size(), READ ) ) { return false; }
if( !getRecord( READ ) ) { return false; }
Expand Down Expand Up @@ -589,7 +576,7 @@ void OdbxBackend::getUpdatedMasters( vector<DomainInfo>* updated )



bool OdbxBackend::superMasterBackend( const string& ip, const string& domain, const vector<DNSResourceRecord>& set, string *nameserver, string* account, DNSBackend** ddb )
bool OdbxBackend::superMasterBackend( const string& ip, const DNSName& domain, const vector<DNSResourceRecord>& set, string *nameserver, string* account, DNSBackend** ddb )
{
try
{
Expand Down Expand Up @@ -633,7 +620,7 @@ bool OdbxBackend::superMasterBackend( const string& ip, const string& domain, co



bool OdbxBackend::createSlaveDomain( const string& ip, const string& domain, const string &nameserver, const string& account )
bool OdbxBackend::createSlaveDomain( const string& ip, const DNSName& domain, const string &nameserver, const string& account )
{
try
{
Expand All @@ -645,8 +632,7 @@ bool OdbxBackend::createSlaveDomain( const string& ip, const string& domain, con
return false;
}

string tmp = domain;
int len = snprintf( m_buffer, sizeof( m_buffer ) - 1, getArg( "sql-insert-slave" ).c_str(), escape( toLowerByRef( tmp ), WRITE ).c_str(),
int len = snprintf( m_buffer, sizeof( m_buffer ) - 1, getArg( "sql-insert-slave" ).c_str(), escape( domain.makeLowerCase().toStringRootDot(), WRITE ).c_str(),
escape( ip, WRITE ).c_str(), escape( account, WRITE ).c_str() );

if( len < 0 )
Expand Down Expand Up @@ -686,8 +672,6 @@ bool OdbxBackend::feedRecord( const DNSResourceRecord& rr, string *ordername )
return false;
}

string tmp = rr.qname.toStringNoDot();

unsigned int priority=0;
string content(rr.content);

Expand All @@ -700,7 +684,7 @@ bool OdbxBackend::feedRecord( const DNSResourceRecord& rr, string *ordername )
}

int len = snprintf( m_buffer, sizeof( m_buffer ) - 1, getArg( "sql-insert-record" ).c_str(), rr.domain_id,
escape( toLowerByRef( tmp ), WRITE ).c_str(), rr.qtype.getName().c_str(), rr.ttl, priority,
escape( rr.qname.makeLowerCase().toStringRootDot(), WRITE ).c_str(), rr.qtype.getName().c_str(), rr.ttl, priority,
escape( content, WRITE ).c_str() );

if( len < 0 )
Expand Down Expand Up @@ -728,7 +712,7 @@ bool OdbxBackend::feedRecord( const DNSResourceRecord& rr, string *ordername )



bool OdbxBackend::startTransaction( const string& domain, int zoneid )
bool OdbxBackend::startTransaction( const DNSName& domain, int zoneid )
{
try
{
Expand All @@ -740,8 +724,8 @@ bool OdbxBackend::startTransaction( const string& domain, int zoneid )
return false;
}

string stmtref = getArg( "sql-transactbegin" );
if( !execStmt( stmtref.c_str(), stmtref.size(), WRITE ) ) { return false; }
string stmtref = getArg( "sql-transactbegin" );
if( !execStmt( stmtref.c_str(), stmtref.size(), WRITE ) ) { return false; }
int len = snprintf( m_buffer, sizeof( m_buffer ) - 1, "%d", zoneid );

if( len < 0 )
Expand All @@ -757,9 +741,9 @@ bool OdbxBackend::startTransaction( const string& domain, int zoneid )
}

if(zoneid >= 0) {
string stmt = getArg( "sql-zonedelete" );
stmtref = strbind( ":id", string( m_buffer, len ), stmt );
if( !execStmt( stmtref.c_str(), stmtref.size(), WRITE ) ) { return false; }
string stmt = getArg( "sql-zonedelete" );
stmtref = strbind( ":id", string( m_buffer, len ), stmt );
if( !execStmt( stmtref.c_str(), stmtref.size(), WRITE ) ) { return false; }
}
}
catch ( std::exception& e )
Expand Down
22 changes: 11 additions & 11 deletions modules/opendbxbackend/odbxbackend.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,15 @@ public:
bool list( const DNSName& target, int domain_id, bool include_disabled=false );
bool get( DNSResourceRecord& rr );

bool startTransaction( const string& domain, int domain_id );
bool commitTransaction();
bool abortTransaction();
bool startTransaction( const DNSName& domain, int domain_id ) override;
bool commitTransaction() override;
bool abortTransaction() override;

bool isMaster( const string& domain, const string& ip );
bool getDomainInfo( const string& domain, DomainInfo& di );
bool feedRecord( const DNSResourceRecord& rr, string *ordername=0 );
bool createSlaveDomain( const string& ip, const string& domain, const string &nameserver, const string& account );
bool superMasterBackend( const string& ip, const string& domain, const vector<DNSResourceRecord>& nsset, string *nameserver, string* account, DNSBackend** ddb );
bool isMaster( const DNSName& domain, const string& ip ) override;
bool getDomainInfo( const DNSName& domain, DomainInfo& di ) override;
bool feedRecord( const DNSResourceRecord& rr, string *ordername=0 ) override;
bool createSlaveDomain( const string& ip, const DNSName& domain, const string &nameserver, const string& account ) override;
bool superMasterBackend( const string& ip, const DNSName& domain, const vector<DNSResourceRecord>& nsset, string *nameserver, string* account, DNSBackend** ddb ) override;

void getUpdatedMasters( vector<DomainInfo>* updated );
void getUnfreshSlaveInfos( vector<DomainInfo>* unfresh );
Expand Down Expand Up @@ -166,11 +166,11 @@ public:
OdbxLoader()
{
BackendMakers().report( &factory );
L<< Logger::Info << "[opendbxbackend] This is the opendbx backend version " VERSION
L<< Logger::Info << "[opendbxbackend] This is the opendbx backend version " VERSION
#ifndef REPRODUCIBLE
<< " (" __DATE__ " " __TIME__ ")"
<< " (" __DATE__ " " __TIME__ ")"
#endif
<< " reporting" << endl;
<< " reporting" << endl;
}
};

Expand Down
2 changes: 1 addition & 1 deletion modules/opendbxbackend/odbxprivate.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ bool OdbxBackend::getDomainList( const string& stmt, vector<DomainInfo>* list, b

if( ( tmp = odbx_field_value( m_result, 1 ) ) != NULL )
{
di.zone = DNSName( string(tmp, odbx_field_length( m_result, 1 )) );
di.zone = DNSName( string(tmp, odbx_field_length( m_result, 1 )) );
}

if( ( tmp = odbx_field_value( m_result, 0 ) ) != NULL )
Expand Down
5 changes: 5 additions & 0 deletions pdns/dbdnsseckeeper.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ pthread_rwlock_t DNSSECKeeper::s_keycachelock = PTHREAD_RWLOCK_INITIALIZER;
AtomicCounter DNSSECKeeper::s_ops;
time_t DNSSECKeeper::s_last_prune;

bool DNSSECKeeper::doesDNSSEC()
{
return d_keymetadb->doesDNSSEC();
}

bool DNSSECKeeper::isSecuredZone(const DNSName& zone)
{
if(isPresigned(zone))
Expand Down
11 changes: 7 additions & 4 deletions pdns/dnsname.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,15 @@ public:
DNSName makeRelative(const DNSName& zone) const;
DNSName makeLowerCase() const
{
DNSName ret;
ret.d_storage = d_storage;
for(auto & c : ret.d_storage) {
DNSName ret(*this);
ret.makeUsLowerCase();
return ret;
}
void makeUsLowerCase()
{
for(auto & c : d_storage) {
c=dns2_tolower(c);
}
return ret;
}
void makeUsRelative(const DNSName& zone);
DNSName labelReverse() const;
Expand Down
1 change: 1 addition & 0 deletions pdns/dnsseckeeper.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ public:
if(d_ourDB)
delete d_keymetadb;
}
bool doesDNSSEC();
bool isSecuredZone(const DNSName& zone);
static uint64_t dbdnssecCacheSizes(const std::string& str);
keyset_t getEntryPoints(const DNSName& zname);
Expand Down
1 change: 1 addition & 0 deletions pdns/lua-auth.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ bool AuthLua::axfrfilter(const ComboAddress& remote, const DNSName& zone, const
lua_pop(d_lua, 1); // table

// cerr<<"Adding content '"<<rr.content<<"' with place "<<(int)rr.d_place<<" \n";
rr.qname.makeUsLowerCase();
out.push_back(rr);
}
lua_pop(d_lua, 2); // c
Expand Down
2 changes: 1 addition & 1 deletion pdns/packethandler.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1308,7 +1308,7 @@ DNSPacket *PacketHandler::questionOrRecurse(DNSPacket *p, bool *shouldRecurse)
if(addCDS(p,r, sd))
goto sendit;
}
else if(p->qtype.getCode() == QType::NSEC3PARAM)
else if(p->qtype.getCode() == QType::NSEC3PARAM && d_dk.isSecuredZone(sd.qname))
{
if(addNSEC3PARAM(p,r, sd))
goto sendit;
Expand Down
6 changes: 3 additions & 3 deletions pdns/pdnsutil.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,10 @@ bool rectifyZone(DNSSECKeeper& dk, const DNSName& zone)
DNSResourceRecord rr;
set<DNSName> qnames, nsset, dsnames, insnonterm, delnonterm;
map<DNSName,bool> nonterm;
bool doent=true;
vector<DNSResourceRecord> rrs;

while(sd.db->get(rr)) {
rr.qname.makeUsLowerCase();
if (rr.qtype.getCode())
{
rrs.push_back(rr);
Expand All @@ -175,8 +175,7 @@ bool rectifyZone(DNSSECKeeper& dk, const DNSName& zone)
dsnames.insert(rr.qname);
}
else
if(doent)
delnonterm.insert(rr.qname);
delnonterm.insert(rr.qname);
}

NSEC3PARAMRecordContent ns3pr;
Expand Down Expand Up @@ -227,6 +226,7 @@ bool rectifyZone(DNSSECKeeper& dk, const DNSName& zone)
sd.db->startTransaction(zone, -1);

bool realrr=true;
bool doent=true;
uint32_t maxent = ::arg().asNum("max-ent-entries");

dononterm:;
Expand Down
Loading

0 comments on commit aefec92

Please sign in to comment.