Browse Source

Remove webconsole, fixes RCE via json-rpc. Thanks @lb0x

pull/663/head
billz 2 years ago
parent
commit
dd5ab7bdc2
  1. 15
      app/css/custom.php
  2. 10
      app/css/lightsout.css
  3. 0
      includes/adblock.php
  4. 0
      includes/internetRoute.php
  5. 938
      includes/webconsole.php
  6. 6
      templates/system.php
  7. 11
      templates/system/console.php

15
app/css/custom.php

@ -129,21 +129,6 @@ i.fa.fa-bars:hover{
float: left;
}
.webconsole {
width:100%;
height:100%;
border:1px solid;
}
#console {
height:500px;
}
.systemtabcontent {
height:100%;
min-height:500px;
}
.service-status {
border-width: 0;
}

10
app/css/lightsout.css

@ -357,16 +357,6 @@ color: #d2d2d2 !important
border-color: #404040;
}
.webconsole {
width: 100%;
height: 20rem;
border: 1px solid #404040;
}
#console {
height: 500px;
}
tspan, rect {
fill: #d2d2d2;
}

0
includes/adblock.php

0
includes/internetRoute.php

938
includes/webconsole.php
File diff suppressed because it is too large
View File

6
templates/system.php

@ -16,19 +16,13 @@
<li role="presentation" class="nav-item"><a class="nav-link active" id="basictab" href="#basic" aria-controls="basic" role="tab" data-toggle="tab"><?php echo _("Basic"); ?></a></li>
<li role="presentation" class="nav-item"><a class="nav-link" id="languagetab" href="#language" aria-controls="language" role="tab" data-toggle="tab"><?php echo _("Language"); ?></a></li>
<li role="presentation" class="nav-item"><a class="nav-link" id="advancedtab" href="#advanced" aria-controls="advanced" role="tab" data-toggle="tab"><?php echo _("Advanced"); ?></a></li>
<li role="presentation" class="nav-item"><a class="nav-link" id="consoletab" href="#console" aria-controls="console" role="tab" data-toggle="tab"><?php echo _("Console"); ?></a></li>
</ul>
<div class="systemtabcontent tab-content">
<!-- Tab panes -->
<div class="tab-content">
<?php echo renderTemplate("system/basic", $__template_data) ?>
<?php echo renderTemplate("system/language", $__template_data) ?>
<?php echo renderTemplate("system/advanced", $__template_data) ?>
<?php echo renderTemplate("system/console", $__template_data) ?>
</div><!-- /.tab-content -->
</div><!-- /.systemtabcontent -->
</form>
</div><!-- /.card-body -->
<div class="card-footer"></div>

11
templates/system/console.php

@ -1,11 +0,0 @@
<!-- console tab -->
<div role="tabpanel" class="tab-pane" id="console">
<div class="row">
<div class="col-lg-12 mt-3">
<?php if (!RASPI_MONITOR_ENABLED) : ?>
<iframe src="/includes/webconsole.php" class="webconsole"></iframe>
<?php endif ?>
</div>
</div>
</div>
Loading…
Cancel
Save