From aaff5f36b836c65a72fb38a27e31a88d199a3155 Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Wed, 25 Mar 2015 06:27:05 +0100
Subject: Add guard to reject {spawn_opt, false} as transport/service_opt()

It was possible to configure the option, but doing so caused the service
to fail when starting a watchdog process:

   {function_clause,
       [{diameter_service,'-spawn_opts/1-lc$^0/1-0-',
            [false],
            [{file,"base/diameter_service.erl"},{line,846}]},
        {diameter_service,start,5,
            [{file,"base/diameter_service.erl"},{line,820}]},
        {diameter_service,start,3,
            [{file,"base/diameter_service.erl"},{line,782}]},
        {diameter_service,handle_call,3,
            [{file,"base/diameter_service.erl"},{line,385}]},
        {gen_server,try_handle_call,4,[{file,"gen_server.erl"},{line,607}]},
        {gen_server,handle_msg,5,[{file,"gen_server.erl"},{line,639}]},
        {proc_lib,init_p_do_apply,3,[{file,"proc_lib.erl"},{line,237}]}]}

Tests for the option in the config suite were also missing.

Bungled in commit 78b3dc6.
---
 lib/diameter/test/diameter_config_SUITE.erl | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'lib/diameter/test/diameter_config_SUITE.erl')

diff --git a/lib/diameter/test/diameter_config_SUITE.erl b/lib/diameter/test/diameter_config_SUITE.erl
index 77f7aace1b..ea77aa3716 100644
--- a/lib/diameter/test/diameter_config_SUITE.erl
+++ b/lib/diameter/test/diameter_config_SUITE.erl
@@ -85,6 +85,9 @@
          {string_decode,
           [[true], [false]],
           [[0], [x]]},
+         {spawn_opt,
+          [[[]], [[monitor, link]]],
+          [[false]]},
          {invalid_option,  %% invalid service options are rejected
           [],
           [[x],
@@ -186,6 +189,9 @@
          {private,
           [[x]],
           []},
+         {spawn_opt,
+          [[[]], [[monitor, link]]],
+          [[false]]},
          {invalid_option,  %% invalid transport options are silently ignored
           [[x],
            [x,x]],
-- 
cgit v1.2.3


From 545ff7783cebddc2ca5b2af67a6f13b1a01a4d03 Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Wed, 25 Mar 2015 07:21:46 +0100
Subject: Add service_opt() incoming_maxlen

To bound the length of incoming messages that will be decoded. A message
longer than the specified number of bytes is discarded. An
incoming_maxlen_exceeded counter is incremented to make note of the
occurrence.

The motivation is to prevent a sufficiently malicious peer from
generating significant load by sending long messages with many AVPs for
diameter to decode. The 24-bit message length header accomodates

  (16#FFFFFF - 20) div 12 = 1398099

Unsigned32 AVPs for example, which the current record-valued decode is
too slow with in practice. A bound of 16#FFFF bytes allows for 5461
small AVPs, which is probably more than enough for the majority of
applications, but the default is the full 16#FFFFFF.
---
 lib/diameter/test/diameter_config_SUITE.erl | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lib/diameter/test/diameter_config_SUITE.erl')

diff --git a/lib/diameter/test/diameter_config_SUITE.erl b/lib/diameter/test/diameter_config_SUITE.erl
index ea77aa3716..bbdf672291 100644
--- a/lib/diameter/test/diameter_config_SUITE.erl
+++ b/lib/diameter/test/diameter_config_SUITE.erl
@@ -85,6 +85,9 @@
          {string_decode,
           [[true], [false]],
           [[0], [x]]},
+         {incoming_maxlen,
+          [[0], [65536], [16#FFFFFF]],
+          [[-1], [1 bsl 24], [infinity], [false]]},
          {spawn_opt,
           [[[]], [[monitor, link]]],
           [[false]]},
-- 
cgit v1.2.3