This repository has been archived by the owner on Dec 13, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 240
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(security): remove command test execution - CVE 2018-16405 (#7864)
* fix(security): remove command test execution - CVE 2019-16405
- Loading branch information
Showing
9 changed files
with
141 additions
and
543 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
204 changes: 108 additions & 96 deletions
204
www/include/configuration/configObject/command/formCommand.ihtml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,100 +1,112 @@ | ||
| {$form.javascript} | ||
| <form {$form.attributes}> | ||
| <div id="validFormTop"> | ||
| {if $o == "a" || $o == "c"} | ||
| <p class="oreonbutton">{$form.submitC.html}{$form.submitA.html} {$form.reset.html}</p> | ||
| {else if $o == "w"} | ||
| <p class="oreonbutton">{$form.change.html}</p> | ||
| {/if} | ||
| </div> | ||
| <div id='tab1' class='tab'> | ||
| <table class="formTable table"> | ||
| <tr class="ListHeader"> | ||
| <td class="FormHeader" colspan="2"> | ||
| <h3>| {$form.header.title}</h3> | ||
| </td> | ||
| </tr> | ||
| <tr class="list_lvl_1"> | ||
| <td class="ListColLvl1_name" colspan="2"> | ||
| <h4>{$form.header.information}</h4> | ||
| </td> | ||
| </tr> | ||
| <tr class="list_one"><td class="FormRowField"><img class="helpTooltip" name="command_name"> {$form.command_name.label}</td><td class="FormRowValue">{$form.command_name.html}</td></tr> | ||
| <tr class="list_two"><td class="FormRowField"><img class="helpTooltip" name="command_type"> {$form.command_type.label}</td><td class="FormRowValue">{$form.command_type.html}</td></tr> | ||
| <tr class="list_one"> | ||
| <td class="FormRowField"><img class="helpTooltip" name="command_line_help"> {$form.command_line.label}</td> | ||
| <td> | ||
| <table border="0"> | ||
| <tr> | ||
| <td> | ||
| {$form.command_line.html} | ||
| </td> | ||
| {if $o == "a" || $o == "c"} | ||
| <td> | ||
| | ||
| <input type="button" value=" < < " onclick="insertValueQuery(1)" /> | ||
| | ||
| {$form.resource.html} | ||
| <br /><br /> | ||
| | ||
| <input type="button" value=" < < " onclick="insertValueQuery(2)" /> | ||
| | ||
| {$form.plugins.html} | ||
| <img alt='{$cmd_help}' title='{$cmd_help}' src='./img/icons/info.png' class='ico-14' onClick="window.open('main.php?p=60801&command_name='+ document.Form.plugins.value + '&o=h&min=1','','toolbar=no,location=no,directories=no,status=no,scrollbars=yes,resizable=yes,copyhistory=no, width=700, height=400');"> | ||
| <br /><br /> | ||
| | ||
| <input type="button" value=" < < " onclick="insertValueQuery(3)" /> | ||
| | ||
| {$form.macros.html} | ||
| </td> | ||
| {/if} | ||
| </tr> | ||
| </table> | ||
| </td> | ||
| </tr> | ||
| <tr class="list_two"><td class="FormRowField"><img class="helpTooltip" name="enable_shell"> {$form.enable_shell.label}</td><td class="FormRowValue">{$form.enable_shell.html}</td></tr> | ||
| <tr class="list_two"><td class="FormRowField"><img class="helpTooltip" name="arg_example"> {$form.command_example.label}</td><td class="FormRowValue">{if $o != "w"}{$form.command_example.html} {$form.command_hostaddress.label} {$form.command_hostaddress.html} <img alt='{$cmd_play}' title='{$cmd_play}' src='./img/icones/16x16/media_play.gif' onClick="window.open('main.php?p=60801&command_hostaddress='+ document.Form.command_hostaddress.value +'&command_example='+ document.Form.command_example.value +'&command_line='+ document.Form.command_line.value + '&o=p&min=1','','toolbar=no,location=no,directories=no,status=no,scrollbars=yes,resizable=yes,copyhistory=no, width=700, height=400');">{/if}</td></tr> | ||
| <tr class="list_one"> | ||
| <td class="FormRowField"><img class="helpTooltip" name="arg_description"> {$arg_desc_label}</td> | ||
| <td class="FormRowValue"> | ||
| {if $o != "w"}{$form.desc_arg.html} {$form.clear_arg.html}<br/><br/>{/if} | ||
| <div id="listOfArgDiv"> | ||
| {$form.listOfArg.html} | ||
| </div> | ||
| </td> | ||
| </tr> | ||
| <tr class="list_one"> | ||
| <td class="FormRowField"><img class="helpTooltip" name="macro_description"> {$macro_desc_label}</td> | ||
| <td class="FormRowValue"> | ||
| <div id="listOfMacroDiv"> | ||
| {$form.desc_macro.html} | ||
| </div> | ||
| <div id="listOfArgDiv"> | ||
| {$form.listOfMacros.html} | ||
| </div> | ||
| </td> | ||
| </tr> | ||
| <tr class="list_lvl_1"> | ||
| <td class="ListColLvl1_name" colspan="2"> | ||
| <h4>{$form.header.furtherInfos}</h4> | ||
| </td> | ||
| </tr> | ||
| <tr class="list_one"><td class="FormRowField"><img class="helpTooltip" name="connectors"> {$form.connectors.label}</td><td class="FormRowValue">{$form.connectors.html}</td></tr> | ||
| <tr class="list_two"><td class="FormRowField"><img class="helpTooltip" name="graph_template"> {$form.graph_id.label}</td><td class="FormRowValue">{$form.graph_id.html}</td></tr> | ||
| <tr class="list_one"><td class="FormRowField"><img class="helpTooltip" name="command_activate"> {$form.command_activate.label}</td><td class="FormRowValue">{$form.command_activate.html}</td></tr> | ||
| <tr class="list_two"><td class="FormRowField"><img class="helpTooltip" name="command_comment"> {$form.command_comment.label}</td><td class="FormRowValue">{$form.command_comment.html}</td></tr> | ||
| {if $o == "a" || $o == "c"} | ||
| <tr class="list_lvl_2"><td class="ListColLvl2_name" colspan="2">{$form.required._note}</td></tr> | ||
| {/if} | ||
| </table> | ||
| </div> | ||
| <div id="validForm"> | ||
| {if $o == "a" || $o == "c"} | ||
| <p class="oreonbutton">{$form.submitC.html}{$form.submitA.html} {$form.reset.html}</p> | ||
| {else if $o == "w"} | ||
| <p class="oreonbutton">{$form.change.html}</p> | ||
| {/if} | ||
| </div> | ||
| {$form.hidden} | ||
| <div id="validFormTop"> | ||
| {if $o == "a" || $o == "c"} | ||
| <p class="oreonbutton">{$form.submitC.html}{$form.submitA.html} {$form.reset.html}</p> | ||
| {else if $o == "w"} | ||
| <p class="oreonbutton">{$form.change.html}</p> | ||
| {/if} | ||
| </div> | ||
| <div id='tab1' class='tab'> | ||
| <table class="formTable table"> | ||
| <tr class="ListHeader"> | ||
| <td class="FormHeader" colspan="2"><h3>| {$form.header.title}</h3></td> | ||
| </tr> | ||
| <tr class="list_lvl_1"> | ||
| <td class="ListColLvl1_name" colspan="2"><h4>{$form.header.information}</h4></td> | ||
| </tr> | ||
| <tr class="list_one"> | ||
| <td class="FormRowField"><img class="helpTooltip" name="command_name"> {$form.command_name.label}</td> | ||
| <td class="FormRowValue">{$form.command_name.html}</td> | ||
| </tr> | ||
| <tr class="list_two"> | ||
| <td class="FormRowField"><img class="helpTooltip" name="command_type"> {$form.command_type.label}</td> | ||
| <td class="FormRowValue">{$form.command_type.html}</td> | ||
| </tr> | ||
| <tr class="list_one"> | ||
| <td class="FormRowField"><img class="helpTooltip" name="command_line_help"> {$form.command_line.label}</td> | ||
| <td> | ||
| <table border="0"> | ||
| <tr> | ||
| <td> {$form.command_line.html}</td> | ||
| {if $o == "a" || $o == "c"} | ||
| <td> | ||
| | ||
| <input type="button" value=" < < " onclick="insertValueQuery(1)" /> | ||
| | ||
| {$form.resource.html} | ||
| <br /><br /> | ||
| | ||
| <input type="button" value=" < < " onclick="insertValueQuery(2)" /> | ||
| | ||
| {$form.plugins.html} | ||
| <img alt='{$cmd_help}' title='{$cmd_help}' src='./img/icons/info.png' class='ico-14' onClick="window.open('main.php?p=60801&command_name='+ document.Form.plugins.value + '&o=h&min=1','','toolbar=no,location=no,directories=no,status=no,scrollbars=yes,resizable=yes,copyhistory=no, width=700, height=400');"> | ||
| <br /><br /> | ||
| | ||
| <input type="button" value=" < < " onclick="insertValueQuery(3)" /> | ||
| | ||
| {$form.macros.html} | ||
| </td> | ||
| {/if} | ||
| </tr> | ||
| </table> | ||
| </td> | ||
| </tr> | ||
| <tr class="list_two"> | ||
| <td class="FormRowField"><img class="helpTooltip" name="enable_shell"> {$form.enable_shell.label}</td> | ||
| <td class="FormRowValue">{$form.enable_shell.html}</td> | ||
| </tr> | ||
| <tr class="list_one"> | ||
| <td class="FormRowField"><img class="helpTooltip" name="arg_example"> {$form.command_example.label}</td> | ||
| <td class="FormRowValue">{if $o != "w"}{$form.command_example.html}{/if}</td> | ||
| </tr> | ||
| <tr class="list_two"> | ||
| <td class="FormRowField"><img class="helpTooltip" name="arg_description"> {$arg_desc_label}</td> | ||
| <td class="FormRowValue"> | ||
| {if $o != "w"}{$form.desc_arg.html} {$form.clear_arg.html}<br/><br/>{/if} | ||
| <div id="listOfArgDiv">{$form.listOfArg.html}</div> | ||
| </td> | ||
| </tr> | ||
| <tr class="list_one"> | ||
| <td class="FormRowField"><img class="helpTooltip" name="macro_description"> {$macro_desc_label}</td> | ||
| <td class="FormRowValue"> | ||
| <div id="listOfMacroDiv">{$form.desc_macro.html}</div> | ||
| <div id="listOfArgDiv">{$form.listOfMacros.html}</div> | ||
| </td> | ||
| </tr> | ||
| <tr class="list_lvl_1"> | ||
| <td class="ListColLvl1_name" colspan="2"><h4>{$form.header.furtherInfos}</h4></td> | ||
| </tr> | ||
| <tr class="list_one"> | ||
| <td class="FormRowField"><img class="helpTooltip" name="connectors"> {$form.connectors.label}</td> | ||
| <td class="FormRowValue">{$form.connectors.html}</td> | ||
| </tr> | ||
| <tr class="list_two"> | ||
| <td class="FormRowField"><img class="helpTooltip" name="graph_template"> {$form.graph_id.label}</td> | ||
| <td class="FormRowValue">{$form.graph_id.html}</td> | ||
| </tr> | ||
| <tr class="list_one"> | ||
| <td class="FormRowField"><img class="helpTooltip" name="command_activate"> {$form.command_activate.label}</td> | ||
| <td class="FormRowValue">{$form.command_activate.html}</td> | ||
| </tr> | ||
| <tr class="list_two"> | ||
| <td class="FormRowField"><img class="helpTooltip" name="command_comment"> {$form.command_comment.label}</td> | ||
| <td class="FormRowValue">{$form.command_comment.html}</td> | ||
| </tr> | ||
| {if $o == "a" || $o == "c"} | ||
| <tr class="list_lvl_2"> | ||
| <td class="ListColLvl2_name" colspan="2">{$form.required._note}</td> | ||
| </tr> | ||
| {/if} | ||
| </table> | ||
| </div> | ||
| <div id="validForm"> | ||
| {if $o == "a" || $o == "c"} | ||
| <p class="oreonbutton">{$form.submitC.html}{$form.submitA.html} {$form.reset.html}</p> | ||
| {elseif $o == "w"} | ||
| <p class="oreonbutton">{$form.change.html}</p> | ||
| {/if} | ||
| </div> | ||
| {$form.hidden} | ||
| </form> | ||
| {$helptext} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 0 additions & 26 deletions
26
www/include/configuration/configObject/command/minCommand.ihtml
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.