0.6.1: ttyd console via random base path instead of basic auth (no browser prompt in the iframe)
This commit is contained in:
1 parent
21c259ec4f
commit
642a11f505
4 files changed
+18
-19
No files matched your search
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"appname": "VM Manager",
|
||||
"version": "0.6.0",
|
||||
"version": "0.6.1",
|
||||
"rootfolder": "/mnt/Daten/extensions/vmmngr",
|
||||
"vm_source": "auto",
|
||||
"bridges": ["ix0bridge"],
|
||||
|
||||
+6
-8
@@ -193,9 +193,10 @@ vmm_nav('dashboard');
|
||||
<td class="celltag"><?=gettext('Web terminal');?></td>
|
||||
<td class="celldata">
|
||||
<?php if ($con !== null): ?>
|
||||
<a class="formbtn" href="http://<?=vmm_h((string)$con['host']);?>:<?=(int)$con['port'];?>/" target="_blank">console öffnen</a>
|
||||
<span class="vmm-mono" style="margin-left:8px;"><?=vmm_h((string)$con['user']);?> / <?=vmm_h((string)$con['pass']);?></span>
|
||||
<?php $conUrl = $con['url'] ?? ('http://' . $con['host'] . ':' . (int)$con['port'] . '/'); ?>
|
||||
<a class="formbtn" href="<?=vmm_h($conUrl);?>" target="_blank"><?=gettext('open in a tab');?></a>
|
||||
<button type="submit" class="formbtn" name="act" value="console_stop:<?=vmm_h($name);?>" style="margin-left:8px;"><?=gettext('Stop');?></button>
|
||||
<div style="opacity:.75;margin-top:4px;"><?=gettext('The URL contains a random token - treat it like a password.');?></div>
|
||||
<?php else: ?>
|
||||
<button type="submit" class="formbtn" name="act" value="console_start:<?=vmm_h($name);?>"><?=gettext('Start web console');?></button>
|
||||
<span style="opacity:.75;margin-left:8px;"><?=gettext('ttyd serves the serial console (text only) with basic auth.');?></span>
|
||||
@@ -206,18 +207,15 @@ vmm_nav('dashboard');
|
||||
</table>
|
||||
|
||||
<?php if ($con !== null): ?>
|
||||
<?php $conUrl = 'http://' . $con['host'] . ':' . (int)$con['port'] . '/'; ?>
|
||||
<?php $conUrl = $con['url'] ?? ('http://' . $con['host'] . ':' . (int)$con['port'] . '/'); ?>
|
||||
<table class="area_data_settings" style="width:100%;border-collapse:collapse;">
|
||||
<colgroup><col class="area_data_settings_col_tag"><col class="area_data_settings_col_data"></colgroup>
|
||||
<thead><?php html_separator2(); html_titleline2(gettext('Web console'), 2); ?></thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td colspan="2" class="celldata">
|
||||
<div style="margin-bottom:6px;opacity:.8;font-size:12px;">
|
||||
<?=gettext('If the frame asks for a login: user');?>
|
||||
<strong><?=vmm_h((string)$con['user']);?></strong>,
|
||||
<?=gettext('password');?> <strong><?=vmm_h((string)$con['pass']);?></strong>
|
||||
· <a href="<?=vmm_h($conUrl);?>" target="_blank"><?=gettext('open in a tab');?></a>
|
||||
<div style="margin-bottom:6px;opacity:.75;font-size:12px;">
|
||||
<?=gettext('No login prompt - the URL itself carries the token.');?>
|
||||
</div>
|
||||
<iframe src="<?=vmm_h($conUrl);?>" style="width:100%;height:440px;border:1px solid rgba(127,127,127,.4);border-radius:4px;background:#000;"></iframe>
|
||||
</td>
|
||||
|
||||
Reference in new issue
Block a user