diff options
| author | Anders Svensson <[email protected]> | 2015-03-27 17:02:26 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2015-03-27 17:02:26 +0100 |
| commit | 45f33f09d56af793a2142ab402d73868be30b223 (patch) | |
| tree | 7ca20b645e56555f498c18e44ab3b8ea8a1f73a4 /lib/diameter/test/diameter_codec_test.erl | |
| parent | cbceea683c9f718bc6f0140c2402a7f74455ea14 (diff) | |
| parent | 39acfdb005626ae1bf2f68808f9e8116637c7121 (diff) | |
| download | otp-45f33f09d56af793a2142ab402d73868be30b223.tar.gz otp-45f33f09d56af793a2142ab402d73868be30b223.tar.bz2 otp-45f33f09d56af793a2142ab402d73868be30b223.zip | |
Merge branch 'anders/diameter/hardening/OTP-12628' into maint
* anders/diameter/hardening/OTP-12628:
Remove potentially large error reason in call to diameter_lib:log/4
Limit FQDN in DiameterURI to 255 octets
Limit DiameterURI ports to 0-65535 digits on decode
Add service_opt() incoming_maxlen
Add guard to reject {spawn_opt, false} as transport/service_opt()
Diffstat (limited to 'lib/diameter/test/diameter_codec_test.erl')
| -rw-r--r-- | lib/diameter/test/diameter_codec_test.erl | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/diameter/test/diameter_codec_test.erl b/lib/diameter/test/diameter_codec_test.erl index 854b71ba93..5f1dbfbd61 100644 --- a/lib/diameter/test/diameter_codec_test.erl +++ b/lib/diameter/test/diameter_codec_test.erl @@ -352,15 +352,19 @@ values('DiameterURI') -> {[], ["aaa" ++ S ++ "://diameter.se" ++ P ++ Tr ++ Pr || S <- ["", "s"], - P <- ["", ":1234"], + P <- ["", ":1234", ":0", ":65535"], Tr <- ["" | [";transport=" ++ X || X <- ["tcp", "sctp", "udp"]]], Pr <- ["" | [";protocol=" ++ X || X <- ["diameter","radius","tacacs+"]]], Tr /= ";transport=udp" - orelse (Pr /= ";protocol=diameter" andalso Pr /= "")], - ["aaa://diameter.se;transport=udp;protocol=diameter", + orelse (Pr /= ";protocol=diameter" andalso Pr /= "")] + ++ ["aaa://" ++ lists:duplicate(255, $x)], + ["aaa://diameter.se:65536", + "aaa://diameter.se:-1", + "aaa://diameter.se;transport=udp;protocol=diameter", "aaa://diameter.se;transport=udp", + "aaa://" ++ lists:duplicate(256, $x), "aaa://:3868", "aaax://diameter.se", "aaa://diameter.se;transport=tcpx", |