<p>Joshua Colp <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/14537">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Joshua Colp: Looks good to me, but someone else must approve; Approved for Submit
  George Joseph: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">res_ari: Fix create request body parameter parsing.<br><br>If parameters were passed in the body as JSON to the<br>create route they were not being parsed before checking<br>to ensure that required fields were set.<br><br>This change moves the parsing so it occurs before<br>checking.<br><br>ASTERISK-28940<br><br>Change-Id: I898b4c3c7ae1cde19a6840e59f498822701cf5cf<br>---<br>M res/ari/resource_channels.c<br>1 file changed, 12 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/res/ari/resource_channels.c b/res/ari/resource_channels.c</span><br><span>index 7cf4137..81944f8 100644</span><br><span>--- a/res/ari/resource_channels.c</span><br><span>+++ b/res/ari/resource_channels.c</span><br><span>@@ -1790,18 +1790,6 @@</span><br><span>   struct ast_format_cap *request_cap;</span><br><span>  struct ast_channel *originator;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     if (!ast_strlen_zero(args->originator) && !ast_strlen_zero(args->formats)) {</span><br><span style="color: hsl(0, 100%, 40%);">-              ast_ari_response_error(response, 400, "Bad Request",</span><br><span style="color: hsl(0, 100%, 40%);">-                  "Originator and formats can't both be specified");</span><br><span style="color: hsl(0, 100%, 40%);">-                return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-       if (ast_strlen_zero(args->endpoint)) {</span><br><span style="color: hsl(0, 100%, 40%);">-               ast_ari_response_error(response, 400, "Bad Request",</span><br><span style="color: hsl(0, 100%, 40%);">-                  "Endpoint must be specified");</span><br><span style="color: hsl(0, 100%, 40%);">-                return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>    /* Parse any query parameters out of the body parameter */</span><br><span>   if (args->variables) {</span><br><span>            struct ast_json *json_variables;</span><br><span>@@ -1814,6 +1802,18 @@</span><br><span>            }</span><br><span>    }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ast_strlen_zero(args->originator) && !ast_strlen_zero(args->formats)) {</span><br><span style="color: hsl(120, 100%, 40%);">+            ast_ari_response_error(response, 400, "Bad Request",</span><br><span style="color: hsl(120, 100%, 40%);">+                        "Originator and formats can't both be specified");</span><br><span style="color: hsl(120, 100%, 40%);">+              return;</span><br><span style="color: hsl(120, 100%, 40%);">+       }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   if (ast_strlen_zero(args->endpoint)) {</span><br><span style="color: hsl(120, 100%, 40%);">+             ast_ari_response_error(response, 400, "Bad Request",</span><br><span style="color: hsl(120, 100%, 40%);">+                        "Endpoint must be specified");</span><br><span style="color: hsl(120, 100%, 40%);">+              return;</span><br><span style="color: hsl(120, 100%, 40%);">+       }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  chan_data = ast_calloc(1, sizeof(*chan_data));</span><br><span>       if (!chan_data) {</span><br><span>            ast_ari_response_alloc_failed(response);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/14537">change 14537</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/14537"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 16 </div>
<div style="display:none"> Gerrit-Change-Id: I898b4c3c7ae1cde19a6840e59f498822701cf5cf </div>
<div style="display:none"> Gerrit-Change-Number: 14537 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-Reviewer: sungtae kim <pchero21@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>