From: Tom Carpay Date: Thu, 24 Jun 2021 13:20:32 +0000 (+0200) Subject: remove tests for svcparam semantics X-Git-Tag: release-1.13.2rc1~42^2~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9cd15f7ebf62237316e8477526cb134e9af3a36b;p=thirdparty%2Funbound.git remove tests for svcparam semantics --- diff --git a/testdata/svcb.tdir/failure-cases.zone b/testdata/svcb.tdir/failure-cases.zone deleted file mode 100644 index 9ca222ea9..000000000 --- a/testdata/svcb.tdir/failure-cases.zone +++ /dev/null @@ -1,95 +0,0 @@ -$ORIGIN failure-cases. -$TTL 3600 - - -@ SOA primary admin 1 3600 1800 7200 3600 - NS primary -primary A 127.0.0.1 - -; This example has multiple instances of the same SvcParamKey - -f01 SVCB 1 foo.example.com. ( - key123=abc key123=def - ) -; In the next examples the SvcParamKeys are missing their values. - -f02 SVCB 1 foo.example.com. mandatory - -; In the next examples the SvcParamKeys are missing their values. - -f03 SVCB 1 foo.example.com. alpn - -; In the next examples the SvcParamKeys are missing their values. - -f04 SVCB 1 foo.example.com. port - -; In the next examples the SvcParamKeys are missing their values. - -f05 SVCB 1 foo.example.com. ipv4hint - -; In the next examples the SvcParamKeys are missing their values. - -f06 SVCB 1 foo.example.com. ipv6hint - -; The "no-default-alpn" SvcParamKey value MUST be empty - -f07 SVCB 1 foo.example.com. no-default-alpn=abc - -; In this record a mandatory SvcParam is missing - -f08 SVCB 1 foo.example.com. mandatory=key123 - -; The "mandatory" SvcParamKey MUST not be included in mandatory list - -f09 SVCB 1 foo.example.com. mandatory=mandatory - -; Here there are multiple instances of the same SvcParamKey in the mandatory list - -f10 SVCB 1 foo.example.com. ( - mandatory=key123,key123 key123=abc - ) - -; This example has multiple instances of the same SvcParamKey - -f11 HTTPS 1 foo.example.com. ( - key123=abc key123=def - ) - -; In the next examples the SvcParamKeys are missing their values. - -f12 HTTPS 1 foo.example.com. mandatory - -; In the next examples the SvcParamKeys are missing their values. - -f13 HTTPS 1 foo.example.com. alpn - -; In the next examples the SvcParamKeys are missing their values. - -f14 HTTPS 1 foo.example.com. port - -; In the next examples the SvcParamKeys are missing their values. - -f15 HTTPS 1 foo.example.com. ipv4hint - -; In the next examples the SvcParamKeys are missing their values. - -f16 HTTPS 1 foo.example.com. ipv6hint - -; The "no-default-alpn" SvcParamKey value MUST be empty - -f17 HTTPS 1 foo.example.com. no-default-alpn=abc - -; In this record a mandatory SvcParam is missing - -f18 HTTPS 1 foo.example.com. mandatory=key123 - -; The "mandatory" SvcParamKey MUST not be included in mandatory list - -f19 HTTPS 1 foo.example.com. mandatory=mandatory - -; Here there are multiple instances of the same SvcParamKey in the mandatory list - -f20 HTTPS 1 foo.example.com. ( - mandatory=key123,key123 key123=abc - ) - diff --git a/testdata/svcb.tdir/svcb.failure-cases-01 b/testdata/svcb.tdir/svcb.failure-cases-01 index 497098b1f..c60151692 100644 --- a/testdata/svcb.tdir/svcb.failure-cases-01 +++ b/testdata/svcb.tdir/svcb.failure-cases-01 @@ -3,8 +3,7 @@ $TTL 3600 @ SOA primary admin 0 0 0 0 0 -; This example has multiple instances of the same SvcParamKey +; Here there are multiple instances of the same SvcParamKey in the mandatory list -f01 SVCB 1 foo.example.com. ( - key123=abc key123=def - ) +f21 HTTPS 1 foo.example.com. ech="123" +f21 HTTPS 1 foo.example.com. echconfig="123" diff --git a/testdata/svcb.tdir/svcb.failure-cases-02 b/testdata/svcb.tdir/svcb.failure-cases-02 index 73656171f..9d6f0186d 100644 --- a/testdata/svcb.tdir/svcb.failure-cases-02 +++ b/testdata/svcb.tdir/svcb.failure-cases-02 @@ -3,6 +3,6 @@ $TTL 3600 @ SOA primary admin 0 0 0 0 0 -; In the next examples the SvcParamKeys are missing their values. +; Port must be a positive number < 65536 -f02 SVCB 1 foo.example.com. mandatory +f22 HTTPS 1 foo.example.com. port=65536 diff --git a/testdata/svcb.tdir/svcb.failure-cases-03 b/testdata/svcb.tdir/svcb.failure-cases-03 index 8ae6c4ab2..bb819daae 100644 --- a/testdata/svcb.tdir/svcb.failure-cases-03 +++ b/testdata/svcb.tdir/svcb.failure-cases-03 @@ -3,6 +3,6 @@ $TTL 3600 @ SOA primary admin 0 0 0 0 0 -; In the next examples the SvcParamKeys are missing their values. +; 65 SvcParams is too many SvcParams; the limit is 64 -f03 SVCB 1 foo.example.com. alpn +f23 HTTPS 1 foo.example.com. ( key11=a key12=a key13=a key14=a key15=a key16=a key17=a key18=a key19=a key110=a key111=a key112=a key113=a key114=a key115=a key116=a key117=a key118=a key119=a key120=a key121=a key122=a key123=a key124=a key125=a key126=a key127=a key128=a key129=a key130=a key131=a key132=a key133=a key134=a key135=a key136=a key137=a key138=a key139=a key140=a key141=a key142=a key143=a key144=a key145=a key146=a key147=a key148=a key149=a key150=a key151=a key152=a key153=a key154=a key155=a key156=a key157=a key158=a key159=a key160=a key161=a key162=a key163=a key164=a key165=a ) \ No newline at end of file diff --git a/testdata/svcb.tdir/svcb.failure-cases-04 b/testdata/svcb.tdir/svcb.failure-cases-04 index 5aa32a83e..ae02ac417 100644 --- a/testdata/svcb.tdir/svcb.failure-cases-04 +++ b/testdata/svcb.tdir/svcb.failure-cases-04 @@ -3,6 +3,6 @@ $TTL 3600 @ SOA primary admin 0 0 0 0 0 -; In the next examples the SvcParamKeys are missing their values. +; 256 is too many characters for an alpn; maximum is 255 -f04 SVCB 1 foo.example.com. port +f23 HTTPS 1 foo.example.com. ( alpn="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" ) \ No newline at end of file diff --git a/testdata/svcb.tdir/svcb.failure-cases-05 b/testdata/svcb.tdir/svcb.failure-cases-05 deleted file mode 100644 index 4b2f95cc0..000000000 --- a/testdata/svcb.tdir/svcb.failure-cases-05 +++ /dev/null @@ -1,8 +0,0 @@ -$ORIGIN failure-cases. -$TTL 3600 - -@ SOA primary admin 0 0 0 0 0 - -; In the next examples the SvcParamKeys are missing their values. - -f05 SVCB 1 foo.example.com. ipv4hint diff --git a/testdata/svcb.tdir/svcb.failure-cases-06 b/testdata/svcb.tdir/svcb.failure-cases-06 deleted file mode 100644 index a111846f1..000000000 --- a/testdata/svcb.tdir/svcb.failure-cases-06 +++ /dev/null @@ -1,8 +0,0 @@ -$ORIGIN failure-cases. -$TTL 3600 - -@ SOA primary admin 0 0 0 0 0 - -; In the next examples the SvcParamKeys are missing their values. - -f06 SVCB 1 foo.example.com. ipv6hint diff --git a/testdata/svcb.tdir/svcb.failure-cases-07 b/testdata/svcb.tdir/svcb.failure-cases-07 deleted file mode 100644 index a8512ad4c..000000000 --- a/testdata/svcb.tdir/svcb.failure-cases-07 +++ /dev/null @@ -1,8 +0,0 @@ -$ORIGIN failure-cases. -$TTL 3600 - -@ SOA primary admin 0 0 0 0 0 - -; The "no-default-alpn" SvcParamKey value MUST be empty - -f07 SVCB 1 foo.example.com. no-default-alpn=abc diff --git a/testdata/svcb.tdir/svcb.failure-cases-08 b/testdata/svcb.tdir/svcb.failure-cases-08 deleted file mode 100644 index 4bbf618cd..000000000 --- a/testdata/svcb.tdir/svcb.failure-cases-08 +++ /dev/null @@ -1,8 +0,0 @@ -$ORIGIN failure-cases. -$TTL 3600 - -@ SOA primary admin 0 0 0 0 0 - -; In this record a mandatory SvcParam is missing - -f08 SVCB 1 foo.example.com. mandatory=key123 diff --git a/testdata/svcb.tdir/svcb.failure-cases-09 b/testdata/svcb.tdir/svcb.failure-cases-09 deleted file mode 100644 index 408e937d4..000000000 --- a/testdata/svcb.tdir/svcb.failure-cases-09 +++ /dev/null @@ -1,9 +0,0 @@ -$ORIGIN failure-cases. -$TTL 3600 - -@ SOA primary admin 0 0 0 0 0 - -; The "mandatory" SvcParamKey MUST not be included in mandatory list - -f09 SVCB 1 foo.example.com. mandatory=mandatory - diff --git a/testdata/svcb.tdir/svcb.failure-cases-10 b/testdata/svcb.tdir/svcb.failure-cases-10 deleted file mode 100644 index b1e6ccf5f..000000000 --- a/testdata/svcb.tdir/svcb.failure-cases-10 +++ /dev/null @@ -1,10 +0,0 @@ -$ORIGIN failure-cases. -$TTL 3600 - -@ SOA primary admin 0 0 0 0 0 - -; Here there are multiple instances of the same SvcParamKey in the mandatory list - -f10 SVCB 1 foo.example.com. ( - mandatory=key123,key123 key123=abc - ) diff --git a/testdata/svcb.tdir/svcb.failure-cases-11 b/testdata/svcb.tdir/svcb.failure-cases-11 deleted file mode 100644 index ee4d5a431..000000000 --- a/testdata/svcb.tdir/svcb.failure-cases-11 +++ /dev/null @@ -1,10 +0,0 @@ -$ORIGIN failure-cases. -$TTL 3600 - -@ SOA primary admin 0 0 0 0 0 - -; This example has multiple instances of the same SvcParamKey - -f01 HTTPS 1 foo.example.com. ( - key123=abc key123=def - ) diff --git a/testdata/svcb.tdir/svcb.failure-cases-12 b/testdata/svcb.tdir/svcb.failure-cases-12 deleted file mode 100644 index e57fa8819..000000000 --- a/testdata/svcb.tdir/svcb.failure-cases-12 +++ /dev/null @@ -1,8 +0,0 @@ -$ORIGIN failure-cases. -$TTL 3600 - -@ SOA primary admin 0 0 0 0 0 - -; In the next examples the SvcParamKeys are missing their values. - -f02 HTTPS 1 foo.example.com. mandatory diff --git a/testdata/svcb.tdir/svcb.failure-cases-13 b/testdata/svcb.tdir/svcb.failure-cases-13 deleted file mode 100644 index 52f3e6242..000000000 --- a/testdata/svcb.tdir/svcb.failure-cases-13 +++ /dev/null @@ -1,8 +0,0 @@ -$ORIGIN failure-cases. -$TTL 3600 - -@ SOA primary admin 0 0 0 0 0 - -; In the next examples the SvcParamKeys are missing their values. - -f03 HTTPS 1 foo.example.com. alpn diff --git a/testdata/svcb.tdir/svcb.failure-cases-14 b/testdata/svcb.tdir/svcb.failure-cases-14 deleted file mode 100644 index 3525d26d3..000000000 --- a/testdata/svcb.tdir/svcb.failure-cases-14 +++ /dev/null @@ -1,8 +0,0 @@ -$ORIGIN failure-cases. -$TTL 3600 - -@ SOA primary admin 0 0 0 0 0 - -; In the next examples the SvcParamKeys are missing their values. - -f04 HTTPS 1 foo.example.com. port diff --git a/testdata/svcb.tdir/svcb.failure-cases-15 b/testdata/svcb.tdir/svcb.failure-cases-15 deleted file mode 100644 index 1ab513725..000000000 --- a/testdata/svcb.tdir/svcb.failure-cases-15 +++ /dev/null @@ -1,8 +0,0 @@ -$ORIGIN failure-cases. -$TTL 3600 - -@ SOA primary admin 0 0 0 0 0 - -; In the next examples the SvcParamKeys are missing their values. - -f05 HTTPS 1 foo.example.com. ipv4hint diff --git a/testdata/svcb.tdir/svcb.failure-cases-16 b/testdata/svcb.tdir/svcb.failure-cases-16 deleted file mode 100644 index 78bed5c24..000000000 --- a/testdata/svcb.tdir/svcb.failure-cases-16 +++ /dev/null @@ -1,8 +0,0 @@ -$ORIGIN failure-cases. -$TTL 3600 - -@ SOA primary admin 0 0 0 0 0 - -; In the next examples the SvcParamKeys are missing their values. - -f06 HTTPS 1 foo.example.com. ipv6hint diff --git a/testdata/svcb.tdir/svcb.failure-cases-17 b/testdata/svcb.tdir/svcb.failure-cases-17 deleted file mode 100644 index 84aede049..000000000 --- a/testdata/svcb.tdir/svcb.failure-cases-17 +++ /dev/null @@ -1,8 +0,0 @@ -$ORIGIN failure-cases. -$TTL 3600 - -@ SOA primary admin 0 0 0 0 0 - -; The "no-default-alpn" SvcParamKey value MUST be empty - -f07 HTTPS 1 foo.example.com. no-default-alpn=abc diff --git a/testdata/svcb.tdir/svcb.failure-cases-18 b/testdata/svcb.tdir/svcb.failure-cases-18 deleted file mode 100644 index 0ecbc545f..000000000 --- a/testdata/svcb.tdir/svcb.failure-cases-18 +++ /dev/null @@ -1,8 +0,0 @@ -$ORIGIN failure-cases. -$TTL 3600 - -@ SOA primary admin 0 0 0 0 0 - -; In this record a mandatory SvcParam is missing - -f08 HTTPS 1 foo.example.com. mandatory=key123 diff --git a/testdata/svcb.tdir/svcb.failure-cases-19 b/testdata/svcb.tdir/svcb.failure-cases-19 deleted file mode 100644 index 576556490..000000000 --- a/testdata/svcb.tdir/svcb.failure-cases-19 +++ /dev/null @@ -1,9 +0,0 @@ -$ORIGIN failure-cases. -$TTL 3600 - -@ SOA primary admin 0 0 0 0 0 - -; The "mandatory" SvcParamKey MUST not be included in mandatory list - -f09 HTTPS 1 foo.example.com. mandatory=mandatory - diff --git a/testdata/svcb.tdir/svcb.failure-cases-20 b/testdata/svcb.tdir/svcb.failure-cases-20 deleted file mode 100644 index fc4781eaa..000000000 --- a/testdata/svcb.tdir/svcb.failure-cases-20 +++ /dev/null @@ -1,10 +0,0 @@ -$ORIGIN failure-cases. -$TTL 3600 - -@ SOA primary admin 0 0 0 0 0 - -; Here there are multiple instances of the same SvcParamKey in the mandatory list - -f10 HTTPS 1 foo.example.com. ( - mandatory=key123,key123 key123=abc - ) diff --git a/testdata/svcb.tdir/svcb.failure-cases-21 b/testdata/svcb.tdir/svcb.failure-cases-21 deleted file mode 100644 index c60151692..000000000 --- a/testdata/svcb.tdir/svcb.failure-cases-21 +++ /dev/null @@ -1,9 +0,0 @@ -$ORIGIN failure-cases. -$TTL 3600 - -@ SOA primary admin 0 0 0 0 0 - -; Here there are multiple instances of the same SvcParamKey in the mandatory list - -f21 HTTPS 1 foo.example.com. ech="123" -f21 HTTPS 1 foo.example.com. echconfig="123" diff --git a/testdata/svcb.tdir/svcb.failure-cases-22 b/testdata/svcb.tdir/svcb.failure-cases-22 deleted file mode 100644 index 9d6f0186d..000000000 --- a/testdata/svcb.tdir/svcb.failure-cases-22 +++ /dev/null @@ -1,8 +0,0 @@ -$ORIGIN failure-cases. -$TTL 3600 - -@ SOA primary admin 0 0 0 0 0 - -; Port must be a positive number < 65536 - -f22 HTTPS 1 foo.example.com. port=65536 diff --git a/testdata/svcb.tdir/svcb.failure-cases-23 b/testdata/svcb.tdir/svcb.failure-cases-23 deleted file mode 100644 index bb819daae..000000000 --- a/testdata/svcb.tdir/svcb.failure-cases-23 +++ /dev/null @@ -1,8 +0,0 @@ -$ORIGIN failure-cases. -$TTL 3600 - -@ SOA primary admin 0 0 0 0 0 - -; 65 SvcParams is too many SvcParams; the limit is 64 - -f23 HTTPS 1 foo.example.com. ( key11=a key12=a key13=a key14=a key15=a key16=a key17=a key18=a key19=a key110=a key111=a key112=a key113=a key114=a key115=a key116=a key117=a key118=a key119=a key120=a key121=a key122=a key123=a key124=a key125=a key126=a key127=a key128=a key129=a key130=a key131=a key132=a key133=a key134=a key135=a key136=a key137=a key138=a key139=a key140=a key141=a key142=a key143=a key144=a key145=a key146=a key147=a key148=a key149=a key150=a key151=a key152=a key153=a key154=a key155=a key156=a key157=a key158=a key159=a key160=a key161=a key162=a key163=a key164=a key165=a ) \ No newline at end of file diff --git a/testdata/svcb.tdir/svcb.failure-cases-24 b/testdata/svcb.tdir/svcb.failure-cases-24 deleted file mode 100644 index ae02ac417..000000000 --- a/testdata/svcb.tdir/svcb.failure-cases-24 +++ /dev/null @@ -1,8 +0,0 @@ -$ORIGIN failure-cases. -$TTL 3600 - -@ SOA primary admin 0 0 0 0 0 - -; 256 is too many characters for an alpn; maximum is 255 - -f23 HTTPS 1 foo.example.com. ( alpn="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" ) \ No newline at end of file diff --git a/testdata/svcb.tdir/svcb.test b/testdata/svcb.tdir/svcb.test index ac6e90d3f..c997fbb07 100644 --- a/testdata/svcb.tdir/svcb.test +++ b/testdata/svcb.tdir/svcb.test @@ -53,144 +53,24 @@ fi # check all the failure cases if $PRE/readzone svcb.failure-cases-01 -then - echo "Failure case 1: Multiple instances of the same SvcParamKey" - echo "Incorrectly succeeded" - exit 1 - -elif $PRE/readzone svcb.failure-cases-02 -then - echo "Failure case 2: a SvcParamKey is missing a value" - echo "Incorrectly succeeded" - exit 1 - -elif $PRE/readzone svcb.failure-cases-03 -then - echo "Failure case 3: a SvcParamKey is missing a value" - echo "Incorrectly succeeded" - exit 1 - -elif $PRE/readzone svcb.failure-cases-04 -then - echo "Failure case 4: a SvcParamKey is missing a value" - echo "Incorrectly succeeded" - exit 1 - -elif $PRE/readzone svcb.failure-cases-05 -then - echo "Failure case 5: a SvcParamKey is missing a value" - echo "Incorrectly succeeded" - exit 1 - -elif $PRE/readzone svcb.failure-cases-06 -then - echo "Failure case 6: a SvcParamKey is missing a value" - echo "Incorrectly succeeded" - exit 1 - -elif $PRE/readzone svcb.failure-cases-07 -then - echo "Failure case 7: The \no-default-alpn\" SvcParamKey value MUST be empty - echo "Incorrectly succeeded" - exit 1 - -elif $PRE/readzone svcb.failure-cases-08 -then - echo "Failure case 8: a mandatory SvcParam is missing" - echo "Incorrectly succeeded" - exit 1 - -elif $PRE/readzone svcb.failure-cases-09 -then - echo "Failure case 9: The \"mandatory\" SvcParamKey MUST not be included in mandatory list" - echo "Incorrectly succeeded" - exit 1 - -elif $PRE/readzone svcb.failure-cases-10 -then - echo "Failure case 10: multiple instances of the same SvcParamKey in the mandatory list" - echo "Incorrectly succeeded" - exit 1 - -elif $PRE/readzone svcb.failure-cases-11 -then - echo "Failure case 11: Multiple instances of the same SvcParamKey" - echo "Incorrectly succeeded" - exit 1 - -elif $PRE/readzone svcb.failure-cases-12 -then - echo "Failure case 12: a SvcParamKey is missing a value" - echo "Incorrectly succeeded" - exit 1 - -elif $PRE/readzone svcb.failure-cases-13 -then - echo "Failure case 13: a SvcParamKey is missing a value" - echo "Incorrectly succeeded" - exit 1 - -elif $PRE/readzone svcb.failure-cases-14 -then - echo "Failure case 14: a SvcParamKey is missing a value" - echo "Incorrectly succeeded" - exit 1 - -elif $PRE/readzone svcb.failure-cases-15 -then - echo "Failure case 15: a SvcParamKey is missing a value" - echo "Incorrectly succeeded" - exit 1 - -elif $PRE/readzone svcb.failure-cases-16 -then - echo "Failure case 16: a SvcParamKey is missing a value" - echo "Incorrectly succeeded" - exit 1 - -elif $PRE/readzone svcb.failure-cases-17 -then - echo "Failure case 17: The \no-default-alpn\" SvcParamKey value MUST be empty - echo "Incorrectly succeeded" - exit 1 - -elif $PRE/readzone svcb.failure-cases-18 -then - echo "Failure case 18: a mandatory SvcParam is missing" - echo "Incorrectly succeeded" - exit 1 - -elif $PRE/readzone svcb.failure-cases-19 -then - echo "Failure case 19: The \"mandatory\" SvcParamKey MUST not be included in mandatory list" - echo "Incorrectly succeeded" - exit 1 - -elif $PRE/readzone svcb.failure-cases-20 -then - echo "Failure case 20: multiple instances of the same SvcParamKey in the mandatory list" - echo "Incorrectly succeeded" - exit 1 - -elif $PRE/readzone svcb.failure-cases-21 then echo "Failure case 21: ech value is not base64 encoded" echo "Incorrectly succeeded" exit 1 -elif $PRE/readzone svcb.failure-cases-22 +elif $PRE/readzone svcb.failure-cases-02 then echo "Failure case 22: port value needs to be a positive integer < 65536" echo "Incorrectly succeeded" exit 1 -elif $PRE/readzone svcb.failure-cases-23 +elif $PRE/readzone svcb.failure-cases-03 then echo "Failure case 23: 65 SvcParams is too many SvcParams; the limit is 64" echo "Incorrectly succeeded" exit 1 -elif $PRE/readzone svcb.failure-cases-23 +elif $PRE/readzone svcb.failure-cases-04 then echo "Failure case 24: 256 is too many characters for an alpn; maximum is 255" echo "Incorrectly succeeded"