197 lines
14 KiB
Diff
197 lines
14 KiB
Diff
commit 28093c6d7d9bafbb9763fc6d9b7f222642e8a835
|
|
Author: wouter <wouter@be551aaa-1e26-0410-a405-d3ace91eadb9>
|
|
Date: Thu Apr 22 15:01:02 2010 +0000
|
|
|
|
- Fix validation failure for qtype ANY caused by a RRSIG parse failure.
|
|
The validator error message was 'no signatures from ...'.
|
|
|
|
diff --git a/testcode/unitmsgparse.c b/testcode/unitmsgparse.c
|
|
index 43e4377..d1ef854 100644
|
|
--- a/testcode/unitmsgparse.c
|
|
+++ b/testcode/unitmsgparse.c
|
|
@@ -45,6 +45,7 @@
|
|
#include "util/data/msgparse.h"
|
|
#include "util/data/msgreply.h"
|
|
#include "util/data/msgencode.h"
|
|
+#include "util/data/dname.h"
|
|
#include "util/alloc.h"
|
|
#include "util/regional.h"
|
|
#include "util/net_help.h"
|
|
@@ -54,6 +55,8 @@
|
|
static int vbmp = 0;
|
|
/** if matching within a section should disregard the order of RRs. */
|
|
static int matches_nolocation = 0;
|
|
+/** see if RRSIGs are properly matched to RRsets. */
|
|
+static int check_rrsigs = 0;
|
|
|
|
/** match two rr lists */
|
|
static int
|
|
@@ -318,6 +321,76 @@ perftestpkt(ldns_buffer* pkt, struct alloc_cache* alloc, ldns_buffer* out,
|
|
regional_destroy(region);
|
|
}
|
|
|
|
+/** debug print a packet that failed */
|
|
+static void
|
|
+print_packet_rrsets(struct query_info* qinfo, struct reply_info* rep)
|
|
+{
|
|
+ size_t i;
|
|
+ ldns_rr_list* l;
|
|
+ ldns_buffer* buf = ldns_buffer_new(65536);
|
|
+ log_query_info(0, "failed query", qinfo);
|
|
+ printf(";; ANSWER SECTION (%d rrsets)\n", (int)rep->an_numrrsets);
|
|
+ for(i=0; i<rep->an_numrrsets; i++) {
|
|
+ l = packed_rrset_to_rr_list(rep->rrsets[i], buf);
|
|
+ printf("; rrset %d\n", (int)i);
|
|
+ ldns_rr_list_print(stdout, l);
|
|
+ ldns_rr_list_deep_free(l);
|
|
+ }
|
|
+ printf(";; AUTHORITY SECTION (%d rrsets)\n", (int)rep->ns_numrrsets);
|
|
+ for(i=rep->an_numrrsets; i<rep->an_numrrsets+rep->ns_numrrsets; i++) {
|
|
+ l = packed_rrset_to_rr_list(rep->rrsets[i], buf);
|
|
+ printf("; rrset %d\n", (int)i);
|
|
+ ldns_rr_list_print(stdout, l);
|
|
+ ldns_rr_list_deep_free(l);
|
|
+ }
|
|
+ printf(";; ADDITIONAL SECTION (%d rrsets)\n", (int)rep->ar_numrrsets);
|
|
+ for(i=rep->an_numrrsets+rep->ns_numrrsets; i<rep->rrset_count; i++) {
|
|
+ l = packed_rrset_to_rr_list(rep->rrsets[i], buf);
|
|
+ printf("; rrset %d\n", (int)i);
|
|
+ ldns_rr_list_print(stdout, l);
|
|
+ ldns_rr_list_deep_free(l);
|
|
+ }
|
|
+ printf(";; packet end\n");
|
|
+ ldns_buffer_free(buf);
|
|
+}
|
|
+
|
|
+/** check that there is no data element that matches the RRSIG */
|
|
+static int
|
|
+no_data_for_rrsig(struct reply_info* rep, struct ub_packed_rrset_key* rrsig)
|
|
+{
|
|
+ size_t i;
|
|
+ for(i=0; i<rep->rrset_count; i++) {
|
|
+ if(ntohs(rep->rrsets[i]->rk.type) == LDNS_RR_TYPE_RRSIG)
|
|
+ continue;
|
|
+ if(query_dname_compare(rep->rrsets[i]->rk.dname,
|
|
+ rrsig->rk.dname) == 0)
|
|
+ /* only name is compared right now */
|
|
+ return 0;
|
|
+ }
|
|
+ return 1;
|
|
+}
|
|
+
|
|
+/** check RRSIGs in packet */
|
|
+static void
|
|
+check_the_rrsigs(struct query_info* qinfo, struct reply_info* rep)
|
|
+{
|
|
+ /* every RRSIG must be matched to an RRset */
|
|
+ size_t i;
|
|
+ for(i=0; i<rep->rrset_count; i++) {
|
|
+ struct ub_packed_rrset_key* s = rep->rrsets[i];
|
|
+ if(ntohs(s->rk.type) == LDNS_RR_TYPE_RRSIG) {
|
|
+ /* see if really a problem, i.e. is there a data
|
|
+ * element. */
|
|
+ if(no_data_for_rrsig(rep, rep->rrsets[i]))
|
|
+ continue;
|
|
+ log_dns_msg("rrsig failed for packet", qinfo, rep);
|
|
+ print_packet_rrsets(qinfo, rep);
|
|
+ printf("failed rrset is nr %d\n", (int)i);
|
|
+ unit_assert(0);
|
|
+ }
|
|
+ }
|
|
+}
|
|
+
|
|
/** test a packet */
|
|
static void
|
|
testpkt(ldns_buffer* pkt, struct alloc_cache* alloc, ldns_buffer* out,
|
|
@@ -355,6 +428,8 @@ testpkt(ldns_buffer* pkt, struct alloc_cache* alloc, ldns_buffer* out,
|
|
(unsigned)ldns_buffer_limit(pkt),
|
|
(unsigned)ldns_buffer_limit(out));
|
|
test_buffers(pkt, out);
|
|
+ if(check_rrsigs)
|
|
+ check_the_rrsigs(&qi, rep);
|
|
|
|
if(ldns_buffer_limit(out) > lim) {
|
|
ret = reply_info_encode(&qi, rep, id, flags, out,
|
|
@@ -519,7 +594,9 @@ void msgparse_test()
|
|
|
|
matches_nolocation = 1; /* RR order not important for the next test */
|
|
testfromdrillfile(pkt, &alloc, out, "testdata/test_packets.6");
|
|
+ check_rrsigs = 1;
|
|
testfromdrillfile(pkt, &alloc, out, "testdata/test_packets.7");
|
|
+ check_rrsigs = 0;
|
|
matches_nolocation = 0;
|
|
|
|
/* cleanup */
|
|
diff --git a/testdata/test_packets.7 b/testdata/test_packets.7
|
|
index 4f71c2c..357fa40 100644
|
|
--- a/testdata/test_packets.7
|
|
+++ b/testdata/test_packets.7
|
|
@@ -17,3 +17,21 @@ A608C7155005EBEDCA2176A559EFAF28D5DA1E91F540874BAA1C46BB08B1BAAE1812699A18139CF0
|
|
13BBDA2EC641FB23993A72ED6606C8C85E0D1660CC1770769697CEE7EB8E6474714984D7FF41FBBE48FF4A70669101BF00320340B82DC590B2C19D0006841121DC6AC933002E00010000012C007D000105030000012C4B11ADE94AEA20E9FC600673776974636802636800561C052414445D427CE00A40ACE2DA2EC168523823830CA724B087B8116F46B3CD051C5EC5874F6FC75CF6BA846279E469C474A75F9334242BB66FDD367C73B8BBC3F8748736BC5E6AED8B9B7C5FB5FE2DEDFBF46B403BC173DE958C038CFCCAC933002E00010000012C007D001C05030000012C4B11ADE94AEA20E9FC600673776974636802636800A6F44063C12A5A8BF5BCFADD
|
|
745C5B3915E463DA478131E636347EED414675023BBCA5BA2AABEC2FA3DF976A2343B4AA3403D1AFA3D470D25812BD1A319FBB5B833244D0FA18A59BB69ABB77BBDB3D7F62740D3871A69A5B9D43331D78AB8AE8C91B002E00010000012C007D000105030000012C4B11ADE94AEA20E9FC6006737769746368026368008906D2CFEFC3AA652125DD021CAB6392EBC4A9B4B3CFE3B07E4AFE7DA3263C7B8CE5DC3B66DA45D120E75B3D49ADC1F7D2E9A04A31760698FCFDEAB4AC82915D8E0AD2494DB4F11C02E115C3BD47DC8E57EDA7805BF0E7820A445F93A07698DF0000291000000080000000
|
|
|
|
+;-- es.net IN ANY about RRSIG ordering.
|
|
+687D8410000100150000000E026573036E65740000FF0001C00C00060001000151800027036E7331C00C0A686F73746D6173746572C00C77CECF4300001C2000000E100012750000000258C00C002E000100015180011A00300502000151804BE2932A4BD0101A2522026573036E657400AF2107A80A9D98A0712FF20826B95D8E686FFF023BEEAD1019045569D94D1493C84C819446ECB5489EBC6B556F4BE4B51A8E9CAC8BAA69F2B74948B78CBB197044E3D3A9E0E5EA958254637984D34BAE34167E1437D275E01C4B7C04C34053333514E1FE7EAC7C4777B02F24356F1F775526E19F54A21D3A134DC74DE153F9267008F5605D3BE38E61352BA9495D77
|
|
+97A76735BD68350CD648F40F95ADA4B25464A615E7CD4870E23C21D681F5C68C3DE9477D2EC7216FDF3269F5993428D0F1A4B7E203A04AB6807836263FDD7D6796BE6D84478B906B802DEBDCB1E0870481388503F0396CAD24147BC819A855E6CBCE98526ECAF8423450E30CB4F59C7062C069002E000100015180009A00300502000151804BE2932A4BD0101A4BA3026573036E657400602356C2D379E94F97D2900473D118288D46CFBCAAFF73D8A6FDF0B4305E8B338DD53A90106CDD78BF82A1AEC20B7C02067FDE1BEEC912E5581687BB32DD8BDC7E84B3F844F01E198E75C179194447C13B568886B33933FF35370060440D64E2DB7446962CA348C199
|
|
+DDFE4AA252AFFDEB3A818D1BF45CD795EA0907332B4508C18F002E000100015180009A00060502000151804BE2932A4BD0101A4BA3026573036E6574004FFB07563C6F88028C0E09CF163BAC777065BDCC826C583A3B3ABD525D6AF5101A6D5533888E5BAAA33DE28B52330815E14034506C4C69EDE8AD1A1F00B486C670FE0DC2F3B5F7210EBAC66695CC8679F2CA2353666A143A2E3E87377DCD8D3E6E450934BBD4CC6F9EE033E11D05CA3F44B1A64A2666E3AF2A8710F16FF8CC33C235002E000100000258009A002F0502000002584BE2932A4BD0101A4BA3026573036E6574003D2DDC713285C7338263BD338AFEEAB77571054B1F483A7BADC87BAF32
|
|
+0740A8D1B8B28CB23E04A80F90979704B44FE379103F4D91482D0EBC1D7005E326668F30B2A434F9DE76BB90DFEF2BFEDEE8CAD62164CA089651AB31498F18ED9A1E5694B4D460FFA4E667950322B2A75E8FD408B6A54EDB00257CE44AC865D1567346C2DB002E000100000258009A00100502000002584BE2932A4BD0101A4BA3026573036E6574004367180234A327C0AF72B3963518FC6E53A43E92CE6F5560E383FE8E7EF258FEA28BA666C026A90DAB67F46FBA4FF82F2704FEB3A27E25F3A8E6874B78938D70C5A20D94BEC90596B55C594F94A1438B14C8F890CE61D9630EFD897DEA9B3995D2C668469F62DB9346BB6AAF2EB6F3EE20EC31EAC80BCB
|
|
+962105A64CCD5783EFC381002E000100000258009A000F0502000002584BE2932A4BD0101A4BA3026573036E657400D36D367D4D95060CB2952870BE9E826E6F7835CF6517FF83957F5097B6FC401FE5815B8895D02C68E23A47D7015A3DCE9FDE63AF9D9E1D697016444355633D0BE03177B35BE54980B241C12978A7F3EBF2420861EBFAA028CAF9FCBBF54C069869BFB7F9AB9E60D4791ACCA276AE698EB6EF7582235977E158DA8530EC84327EC427002E000100000258009A00010502000002584BE2932A4BD0101A4BA3026573036E65740068E7176D8561B49621F80DB36DC12A3C5DCD2DE5FE3973F5D7DE15769F099F2A1A9BB088042E794747E3AB
|
|
+BB4AE48651F815D5D38BE7F4FB94F08F51FC209246296BE108111E90A7A5E2A5A79D305F81DBE313569B72598F36F3CFAA02FD9F321FBC2BDA10861F1D537D48DDF80BBF4B228724636FD79C06C4487365F602E6F5C4CD002E000100000258009A00020502000002584BE2932A4BD0101A4BA3026573036E657400BAA98093DDB57F38CA58C599EEED47F16AA20C1CCF668FF0A022AFAAC97059A28C50FE63034E58FBE361059B43FCBAE3876AC6AE8450987B8A00BEC29093267B9B655E645B7478294FF5E149984459A39D191585463BD80F635C21DBCF30462E60E4EACF8EECC25E4D02C181954CCBB8BDF5D19882CF6F9E982B1BEBEF14797DC573003000
|
|
+0100015180008801000305030100017D08356710D7E8A11F9B4C29E5E0F6B65F18CE64B4AAFAD7EA0E08DB85013CD777436CB8BC4EE33C0B4E6EEDFBE4227B25354F2EA2F978EE3222F3F32C1D4D3AF0F6014A527981FC5A0D2B65BF78B86A1D37965A98CAE3746CBB250655C2200FB9B8EBCC8C0AFD3182738F246AD0DAACA3199C54F08CF5F666477281872710E7C573003000010001518000880100030503010001DF43A43270EA741D5E79034C5E46A8310C9CFC7BD65C532D815D6B8C245EFF8F0C365DE400B6CDAC0124B00E08017DFB98D91133D5C18251EE0868852AD9E7FED091B393DAD1CD57381A5A1E7EA74E8FB4B708DB0F93B9EA4296EA4A71
|
|
+6E3572F168779CB5288880699413B3FFD4B7432EBE2AA2767B8EA6CB576A65C5163A3DC5730030000100015180010801010305030100017DA2FA058940109205AA36338EB8AA8B5B0D9788C4229368D371DBDE4BD24F0805C60EDD8DF223D250F23D189CDC434F388A91D6CEC1A9D6F305817409ACA784F381DFFD7EC3EC688FFE16D2AC57BD7F0B625EFC3099B3A9A5EDA1742460229669DD67D81F12069877F6AFA497F81EB12D179B183F5C8185B2786B790BEAFB6D02E0F94C780065511CF46AF80D40055022867DF712869CC262C0D315B92DFA96D58BC2336DAB5D1258DD60406913D116DC2EC1135D89C6D2092C35A19C67959743B407A3C30F3C6B8B
|
|
+C4763504FE12541EDD947A5FBE8E402D31816D1824867E2CD89AEE5FF6ED7A2D683B8C5E6B7B5972BDFF355BFD9128F0D0EDB59A60F321C573003000010001518001080101030503010001DD8EC709089B6D74BAF2D294E4C626CF789B89A74B7E320D7002A03D0F94EA62DF1F19717FE8C4BFD732DA495E481353C78167255CC6256A98ACBFF5977B81A48C5E2A5AF23E8377423C4034D5D84E9E3548B9D0A07955586F67324B6B5720CC4456D86AEE3A21A4EBED9BA13358C8127D182A5083739B042D7E06307E417D020DD68EC0628E9C8279AF0F7E608A3C5D51AB33BF7C32EBD27B45D72B1AD5752BB485D52488FBA9A1B5BF3B2B50F074F481171E4B65
|
|
+3AF846E58FE46DEB3491FA683959B38B893BF55721CED8FC4A64DBEDB6BF1C7FADE650EE219A01E81DD0212B89259319CA5DC81F26821A5CC29B4CC1059AE28227B89B8816039E43C35E33C57300300001000151800108018103050301000188F31BEFA3466D6FCAF11E0D1954D2011D6EAECF922D9E1B8D620095A0D15E7CFF8EA33F8E2A8C3B3F45A1ADACFED62E3E4EDC884AEF8A7CADBCFF8EDF2158730136D01BDB6D057BEBF3D35A92ADB5E8ACB1152FE1244B2D36DCB500E952CFB6D744BF7DBAB24A901B984F869FF47113C9515D53FE1A57293B01C24195A1D40580566CDAE5B04348CB60507267BB38F34839EE959D43FB9605652157014059FDBD
|
|
+39EB0836D4043A63F8660D241006F757DB92B35B39B5ABCA32A16A81C65C9F53DA79A99F1134CF3ED5304F189434AF787A3A10D63862E6C2E5FBA08B6EF6701783DB00CB41851DF13070947EEC090FCED3539F3F494170BD90E68F99453DF9C573002F00010000025800220B726573657276652D3132380231340131026573036E657400000762018000000380CA7C0010000100000258009C9B763D73706631206D7820613A6D61696C312E65732E6E657420613A6D61696C322E65732E6E657420613A6D61696C332E65732E6E657420613A6D61696C342E65732E6E657420613A6D61696C2E65732E6E657420613A6D61696C67772E65732E6E657420613A
|
|
+706F7374616C312E65732E6E657420613A706F7374616C322E65732E6E657420613A706F7374616C332E65732E6E6574207E616C6CCA7C000F00010000025800090032046D61696CCA7CCA7C00010001000002580004C6800370CA7C00020001000002580009066E732D616F61CA7CCA7C00020001000002580002C024CA7C00020001000002580009066E732D6C766BCA7CCB4300010001000002580004C0BC1609CB43001C000100000258001020010400FFFFFFFFFFFFFFFFFFFFFF81C02400010001000151800004C680020AC024001C000100000258001020010400001400020000000000000010CB6600010001000002580004C67CFC16CB66001C0001
|
|
+00000258001020010400600000000000000000000022CB8900010001000002580004C681FC22CB89001C000100000258001020010400091000010000000000000002CB43002E000100000258009A00010503000002584BE2932A4BD0101A4BA3026573036E657400B425467E45E411066B99B85420FB7E844D734F414FFAF6B9528867B3DF808733BF479A0F125C84179401306579994AB8D84DF0173E2824527CEDA45C75ED4D818722EEB2D5A37641108B112D9A6D832D29A507C35DBBEBD46D50DE9915E924F53F55B5A2A263A48B48209FB50A13A7DF40AE697B1BCCE71A2B95C1BB9E47ACCACB43002E000100000258009A001C0503000002584BE2932A
|
|
+4BD0101A4BA3026573036E6574002588E73F85BE8FAFD09628232906913DB78592B59F9C3C95A4AD1334D383C1326EE0C6FCF38892D8BB74631D680A6E4DB2D603D32394BC7B4EC798A1511667D246A0C30B33D03AB144C3704AA80AFCA27F197B2F83F20A9F0D2835C7C0A9B49E47E7CF2E192DC7DBF4635C39ECCCB291DB4B2832E0B8FF430A75726500194D9EC024002E000100015180009A00010503000151804BE2932A4BD0101A4BA3026573036E6574000E9F4098B1EF4F429B802007E3A9EA8E267A1F78EA7241AADD120A74CEBF70DC1DF76065A2CE0CDAA51AAB2F68411D9DEDC1F9DBEB3AB114A1FCBE122610756DE205EEC576CA5E62BD02497F
|
|
+84D5DDB7110AC7F2BF02485B3E7B28FC1EB2999724B64D811270B085D1D10E184295D423F0141D652BD7E97633AC2E98C2819EDAC024002E000100000258009A001C0503000002584BE2932A4BD0101A4BA3026573036E657400936ADA283A90836E92BD42E2B6C8A0299147BCB8E47D9D4464C4151FCC99DC4F2D1C39FB691F6E322715B22F61E7BB8D5507982A3119674B350C569BDC2CD95C708EC73B4E5DEA516D053A4FD725326FFC5B0D0562B542BA96124D9FFBBF787CA0BBE6960951CC2FDD074376A1D184287C2C56A93FBBC1C7FFAA6977B30AE808CB66002E000100000258009A00010503000002584BE2932A4BD0101A4BA3026573036E657400
|
|
+0CE145578E56BB359606C9B85538450D2BCA3E9AD0DEFC8FF865DA646F900B9CBC7325B7F04706B60E2770107E62894FE9CF3B1A432F0FB53C5C7A8F37D0F60354C7D52F4DF88BDD4C46774AA728DFC1C807EF5276641CA28774F323C7326B7C1D99DFCB9498C6E096392009AA972B83F0583A5D1002CA26B59B5C97F6A8309C0000291000000080000000
|
|
+
|
|
diff --git a/util/data/msgparse.c b/util/data/msgparse.c
|
|
index 2db8832..ae6dfc1 100644
|
|
--- a/util/data/msgparse.c
|
|
+++ b/util/data/msgparse.c
|
|
@@ -335,16 +335,20 @@ moveover_rrsigs(ldns_buffer* pkt, struct regional* region,
|
|
struct rr_parse* sig = sigset->rr_first;
|
|
struct rr_parse* prev = NULL;
|
|
struct rr_parse* insert;
|
|
+ struct rr_parse* nextsig;
|
|
while(sig) {
|
|
+ nextsig = sig->next;
|
|
if(pkt_rrsig_covered_equals(pkt, sig->ttl_data,
|
|
dataset->type)) {
|
|
if(duplicate) {
|
|
/* new */
|
|
insert = (struct rr_parse*)regional_alloc(
|
|
region, sizeof(struct rr_parse));
|
|
+ if(!insert) return 0;
|
|
insert->outside_packet = 0;
|
|
insert->ttl_data = sig->ttl_data;
|
|
insert->size = sig->size;
|
|
+ /* prev not used */
|
|
} else {
|
|
/* remove from sigset */
|
|
if(prev) prev->next = sig->next;
|
|
@@ -354,6 +358,7 @@ moveover_rrsigs(ldns_buffer* pkt, struct regional* region,
|
|
sigset->rr_count--;
|
|
sigset->size -= sig->size;
|
|
insert = sig;
|
|
+ /* prev not changed */
|
|
}
|
|
/* add to dataset */
|
|
dataset->rrsig_count++;
|
|
@@ -363,9 +368,9 @@ moveover_rrsigs(ldns_buffer* pkt, struct regional* region,
|
|
else dataset->rrsig_first = insert;
|
|
dataset->rrsig_last = insert;
|
|
dataset->size += insert->size;
|
|
- }
|
|
- prev = sig;
|
|
- sig = sig->next;
|
|
+ } else
|
|
+ prev = sig;
|
|
+ sig = nextsig;
|
|
}
|
|
return 1;
|
|
}
|