[prev in list] [next in list] [prev in thread] [next in thread]
List: asterisk-dev
Subject: Re: [asterisk-dev] [Code Review] Fix authentication regression in
From: "irroot" <reviewboard () asterisk ! org>
Date: 2011-09-29 14:41:55
Message-ID: 20110929144155.28706.95707 () hotblack ! digium ! com
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviewboard.asterisk.org/r/1464/#review4453
-----------------------------------------------------------
/branches/1.8/res/res_jabber.c
<https://reviewboard.asterisk.org/r/1464/#comment8597>
This needs to be tidied up to conform with guidelines.
=
if (something {
} else {
}
/branches/1.8/res/res_jabber.c
<https://reviewboard.asterisk.org/r/1464/#comment8598>
Please while you in the code clean up white space AKA red blocks.
- irroot
On Sept. 28, 2011, 3:39 p.m., jrose wrote:
> =
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviewboard.asterisk.org/r/1464/
> -----------------------------------------------------------
> =
> (Updated Sept. 28, 2011, 3:39 p.m.)
> =
> =
> Review request for Asterisk Developers.
> =
> =
> Summary
> -------
> =
> Component mode makes Asterisk attempt to use send_raw every time the conn=
ection times out in order to keep the jabber connection alive. This was be=
ing skipped over by the mentioned r333265 patch in order to avoid segfaults=
that would happen if we tried to send messages to disconnected jabber serv=
ers.
> =
> Fixing this was primarily accomplished by splitting send_raw with a helpe=
r method so that the conditional evaluation added by r333265 can be bypasse=
d explicitly. In this case, since we know that we are sending a keep alive=
to a server we haven't already disconnected from, using aji_send_raw witho=
ut the extra conditions seems safe.
> =
> =
> This addresses bug ASTERISK-18626.
> https://issues.asterisk.org/jira/browse/ASTERISK-18626
> =
> =
> Diffs
> -----
> =
> /branches/1.8/res/res_jabber.c 337971 =
> =
> Diff: https://reviewboard.asterisk.org/r/1464/diff
> =
> =
> Testing
> -------
> =
> I tested this locally on my machine using Openfire. I'm under the impres=
sion Michael Young did some similar testing. In addition, Robert Dailey (t=
he reporter) has been testing this as well and said it was working so far. =
He mentioned that he'd report if anything happened that needs addressed, a=
nd it's been going for at least most of today so far.
> =
> =
> Thanks,
> =
> jrose
> =
>
[Attachment #5 (text/html)]
<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border: 1px #c9c399 \
solid;"> <tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="https://reviewboard.asterisk.org/r/1464/">https://reviewboard.asterisk.org/r/1464/</a>
</td>
</tr>
</table>
<br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="https://reviewboard.asterisk.org/r/1464/diff/1/?file=20904#file20904line1476" \
style="color: black; font-weight: bold; text-decoration: \
underline;">/branches/1.8/res/res_jabber.c</a> <span style="font-weight: normal;">
(Diff revision 1)
</span>
</th>
</tr>
</thead>
<tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
<tr>
<td colspan="2"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">static \
int aji_send_raw(struct aji_client *client, const char *xmlstr)</pre></td> <td \
colspan="2"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">static int \
aji_send_raw_full(struct aji_client *client, const char *xmlstr, int \
keep_alive)</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">1468</font></th> <td bgcolor="#fdfebc" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="k">if</span><span class="p">((</span><span class="n">client</span><span \
class="o">-></span><span class="n">timeout</span> <span class="o">!=</span> <span \
class="mi">0</span> <span class="o">&&</span> <span \
class="n">client</span><span class="o">-></span><span class="n">state</span> <span \
class="o">==</span> <span class="n">AJI_CONNECTED</span><span class="p">)</span> \
<span class="o">||</span> <span class="p">(</span><span class="n">client</span><span \
class="o">-></span><span class="n">state</span> <span class="o">==</span> <span \
class="n">AJI_CONNECTING</span><span class="p">))</span></pre></td> <th \
bgcolor="#e9eaa8" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">1476</font></th> <td bgcolor="#fdfebc" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="k">if</span><span class="p">(</span><span class="n"><span \
class="hl">keep_alive</span></span><span class="hl"> </span><span class="o"><span \
class="hl">||</span></span><span class="hl"> </span><span class="p">(</span><span \
class="n">client</span><span class="o">-></span><span class="n">timeout</span> \
<span class="o">!=</span> <span class="mi">0</span> <span class="o">&&</span> \
<span class="n">client</span><span class="o">-></span><span class="n">state</span> \
<span class="o">==</span> <span class="n">AJI_CONNECTED</span><span \
class="p">)</span> <span class="o">||</span> <span class="p">(</span><span \
class="n">client</span><span class="o">-></span><span class="n">state</span> <span \
class="o">==</span> <span class="n">AJI_CONNECTING</span><span \
class="p">))</span></pre></td> </tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">1469</font></th> <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="p">{</span></pre></td> <th bgcolor="#f0f0f0" style="border-left: 1px solid \
#C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font \
size="2">1477</font></th> <td bgcolor="#ffffff" width="50%"><pre style="font-size: \
8pt; line-height: 140%; margin: 0; "> <span class="p">{</span></pre></td> </tr>
<tr>
<th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">1470</font></th> <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="n">ret</span> <span class="o">=</span> <span \
class="n">iks_send_raw</span><span class="p">(</span><span \
class="n">client</span><span class="o">-></span><span class="n">p</span><span \
class="p">,</span> <span class="n">xmlstr</span><span class="p">);</span></pre></td> \
<th bgcolor="#f0f0f0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">1478</font></th> <td bgcolor="#ffffff" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="n">ret</span> <span class="o">=</span> <span \
class="n">iks_send_raw</span><span class="p">(</span><span \
class="n">client</span><span class="o">-></span><span class="n">p</span><span \
class="p">,</span> <span class="n">xmlstr</span><span class="p">);</span></pre></td> \
</tr>
<tr>
<th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">1471</font></th> <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="p">}</span></pre></td> <th bgcolor="#f0f0f0" style="border-left: 1px solid \
#C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font \
size="2">1479</font></th> <td bgcolor="#ffffff" width="50%"><pre style="font-size: \
8pt; line-height: 140%; margin: 0; "> <span class="p">}</span></pre></td> </tr>
<tr>
<th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">1472</font></th> <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="k">else</span> \
<span class="p">{</span></pre></td> <th bgcolor="#f0f0f0" style="border-left: 1px \
solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font \
size="2">1480</font></th> <td bgcolor="#ffffff" width="50%"><pre style="font-size: \
8pt; line-height: 140%; margin: 0; "> <span class="k">else</span> <span \
class="p">{</span></pre></td> </tr>
<tr>
<th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">1473</font></th> <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="n">ast_log</span><span class="p">(</span><span \
class="n">LOG_WARNING</span><span class="p">,</span> <span class="s">"JABBER: \
Unable to send message to %s, we are not connected"</span><span \
class="p">,</span> <span class="n">client</span><span class="o">-></span><span \
class="n">name</span><span class="p">);</span></pre></td> <th bgcolor="#f0f0f0" \
style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">1481</font></th> <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="n">ast_log</span><span class="p">(</span><span \
class="n">LOG_WARNING</span><span class="p">,</span> <span class="s">"JABBER: \
Unable to send message to %s, we are not connected"</span><span \
class="p">,</span> <span class="n">client</span><span class="o">-></span><span \
class="n">name</span><span class="p">);</span></pre></td> </tr>
</tbody>
</table>
<pre style="margin-left: 2em; white-space: pre-wrap; white-space: -moz-pre-wrap; \
white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">This needs \
to be tidied up to conform with guidelines.
if (something {
} else {
}</pre>
</div>
<br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="https://reviewboard.asterisk.org/r/1464/diff/1/?file=20904#file20904line1731" \
style="color: black; font-weight: bold; text-decoration: \
underline;">/branches/1.8/res/res_jabber.c</a> <span style="font-weight: normal;">
(Diff revision 1)
</span>
</th>
</tr>
</thead>
<tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
<tr>
<td colspan="4"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">static \
int aji_act_hook(void *data, int type, iks *node)</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">1723</font></th> <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="kt">char</span> <span class="n">secret</span><span class="p">[</span><span \
class="mi">160</span><span class="p">],</span> <span class="n">shasum</span><span \
class="p">[</span><span class="mi">320</span><span class="p">],</span> <span \
class="o">*</span><span class="n">handshake</span><span class="p">;</span></pre></td> \
<th bgcolor="#f0f0f0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">1731</font></th> <td bgcolor="#ffffff" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="kt">char</span> <span class="n">secret</span><span class="p">[</span><span \
class="mi">160</span><span class="p">],</span> <span class="n">shasum</span><span \
class="p">[</span><span class="mi">320</span><span class="p">],</span> <span \
class="o">*</span><span class="n">handshake</span><span class="p">;</span></pre></td> \
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2"></font></th> <td bgcolor="#c5ffc4" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> <th \
bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">1732</font></th> <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span \
class="ew"> </span></pre></td> </tr>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2"></font></th> <td bgcolor="#c5ffc4" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> <th \
bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">1733</font></th> <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="n">client</span><span class="o">-></span><span class="n">state</span> <span \
class="o">=</span> <span class="n">AJI_CONNECTING</span><span \
class="p">;</span></pre></td> </tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">1724</font></th> <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> <th \
bgcolor="#f0f0f0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">1734</font></th> <td bgcolor="#ffffff" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> \
</tr>
<tr>
<th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">1725</font></th> <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="n">sprintf</span><span class="p">(</span><span class="n">secret</span><span \
class="p">,</span> <span class="s">"%s%s"</span><span class="p">,</span> \
<span class="n">pak</span><span class="o">-></span><span class="n">id</span><span \
class="p">,</span> <span class="n">client</span><span class="o">-></span><span \
class="n">password</span><span class="p">);</span></pre></td> <th bgcolor="#f0f0f0" \
style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">1735</font></th> <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="n">sprintf</span><span class="p">(</span><span class="n">secret</span><span \
class="p">,</span> <span class="s">"%s%s"</span><span class="p">,</span> \
<span class="n">pak</span><span class="o">-></span><span class="n">id</span><span \
class="p">,</span> <span class="n">client</span><span class="o">-></span><span \
class="n">password</span><span class="p">);</span></pre></td> </tr>
</tbody>
</table>
<pre style="margin-left: 2em; white-space: pre-wrap; white-space: -moz-pre-wrap; \
white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Please \
while you in the code clean up white space AKA red blocks.</pre> </div>
<br />
<p>- irroot</p>
<br />
<p>On September 28th, 2011, 3:39 p.m., jrose wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" \
style="background-image: \
url('https://reviewboard.asterisk.org/media/rb/images/review_request_box_top_bg.png'); \
background-position: left top; background-repeat: repeat-x; border: 1px black \
solid;"> <tr>
<td>
<div>Review request for Asterisk Developers.</div>
<div>By jrose.</div>
<p style="color: grey;"><i>Updated Sept. 28, 2011, 3:39 p.m.</i></p>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: \
1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">Component mode makes Asterisk attempt to use send_raw every time the \
connection times out in order to keep the jabber connection alive. This was being \
skipped over by the mentioned r333265 patch in order to avoid segfaults that would \
happen if we tried to send messages to disconnected jabber servers.
Fixing this was primarily accomplished by splitting send_raw with a helper method so \
that the conditional evaluation added by r333265 can be bypassed explicitly. In this \
case, since we know that we are sending a keep alive to a server we haven't \
already disconnected from, using aji_send_raw without the extra conditions seems \
safe.</pre> </td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: \
1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">I tested this locally on my machine using Openfire. I'm under the \
impression Michael Young did some similar testing. In addition, Robert Dailey (the \
reporter) has been testing this as well and said it was working so far. He mentioned \
that he'd report if anything happened that needs addressed, and it's been \
going for at least most of today so far.</pre> </td>
</tr>
</table>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Bugs: </b>
<a href="https://issues.asterisk.org/jira/browse/ASTERISK-18626">ASTERISK-18626</a>
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>/branches/1.8/res/res_jabber.c <span style="color: grey">(337971)</span></li>
</ul>
<p><a href="https://reviewboard.asterisk.org/r/1464/diff/" style="margin-left: \
3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>
--
_____________________________________________________________________
-- Bandwidth and Colocation Provided by http://www.api-digital.com --
asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/asterisk-dev
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic