GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2025-12-13 01:30:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

enbaled x509 vnc by default

Browse Source
This commit is contained in:
Devaev Maxim 2021-02-15 05:35:50 +03:00
parent dc5a07adb3
commit 308832f986
16 changed files with 76 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configs/kvmd/main/v0-hdmi-rpi.yaml
View File

@ -60,8 +60,8 @@ vnc:
streamer:
unix: /run/kvmd/ustreamer.sock
# server:
# tls:
# x509:
# cert: /etc/kvmd/nginx/ssl/server.crt
# key: /etc/kvmd/nginx/ssl/server.key
server:
tls:
x509:
cert: /etc/kvmd/vnc/ssl/server.crt
key: /etc/kvmd/vnc/ssl/server.key

10
configs/kvmd/main/v0-hdmi-rpi2.yaml
View File

@ -61,8 +61,8 @@ vnc:
streamer:
unix: /run/kvmd/ustreamer.sock
# server:
# tls:
# x509:
# cert: /etc/kvmd/nginx/ssl/server.crt
# key: /etc/kvmd/nginx/ssl/server.key
server:
tls:
x509:
cert: /etc/kvmd/vnc/ssl/server.crt
key: /etc/kvmd/vnc/ssl/server.key

10
configs/kvmd/main/v0-hdmi-rpi3.yaml
View File

@ -60,8 +60,8 @@ vnc:
streamer:
unix: /run/kvmd/ustreamer.sock
# server:
# tls:
# x509:
# cert: /etc/kvmd/nginx/ssl/server.crt
# key: /etc/kvmd/nginx/ssl/server.key
server:
tls:
x509:
cert: /etc/kvmd/vnc/ssl/server.crt
key: /etc/kvmd/vnc/ssl/server.key

10
configs/kvmd/main/v0-hdmi-zerow.yaml
View File

@ -61,8 +61,8 @@ vnc:
streamer:
unix: /run/kvmd/ustreamer.sock
# server:
# tls:
# x509:
# cert: /etc/kvmd/nginx/ssl/server.crt
# key: /etc/kvmd/nginx/ssl/server.key
server:
tls:
x509:
cert: /etc/kvmd/vnc/ssl/server.crt
key: /etc/kvmd/vnc/ssl/server.key

10
configs/kvmd/main/v0-hdmiusb-rpi.yaml
View File

@ -72,8 +72,8 @@ vnc:
streamer:
unix: /run/kvmd/ustreamer.sock
# server:
# tls:
# x509:
# cert: /etc/kvmd/nginx/ssl/server.crt
# key: /etc/kvmd/nginx/ssl/server.key
server:
tls:
x509:
cert: /etc/kvmd/vnc/ssl/server.crt
key: /etc/kvmd/vnc/ssl/server.key

10
configs/kvmd/main/v0-hdmiusb-rpi2.yaml
View File

@ -72,8 +72,8 @@ vnc:
streamer:
unix: /run/kvmd/ustreamer.sock
# server:
# tls:
# x509:
# cert: /etc/kvmd/nginx/ssl/server.crt
# key: /etc/kvmd/nginx/ssl/server.key
server:
tls:
x509:
cert: /etc/kvmd/vnc/ssl/server.crt
key: /etc/kvmd/vnc/ssl/server.key

10
configs/kvmd/main/v0-hdmiusb-rpi3.yaml
View File

@ -72,8 +72,8 @@ vnc:
streamer:
unix: /run/kvmd/ustreamer.sock
# server:
# tls:
# x509:
# cert: /etc/kvmd/nginx/ssl/server.crt
# key: /etc/kvmd/nginx/ssl/server.key
server:
tls:
x509:
cert: /etc/kvmd/vnc/ssl/server.crt
key: /etc/kvmd/vnc/ssl/server.key

10
configs/kvmd/main/v0-hdmiusb-zerow.yaml
View File

@ -72,8 +72,8 @@ vnc:
streamer:
unix: /run/kvmd/ustreamer.sock
# server:
# tls:
# x509:
# cert: /etc/kvmd/nginx/ssl/server.crt
# key: /etc/kvmd/nginx/ssl/server.key
server:
tls:
x509:
cert: /etc/kvmd/vnc/ssl/server.crt
key: /etc/kvmd/vnc/ssl/server.key

10
configs/kvmd/main/v2-hdmi-rpi3.yaml
View File

@ -62,8 +62,8 @@ vnc:
streamer:
unix: /run/kvmd/ustreamer.sock
# server:
# tls:
# x509:
# cert: /etc/kvmd/nginx/ssl/server.crt
# key: /etc/kvmd/nginx/ssl/server.key
server:
tls:
x509:
cert: /etc/kvmd/vnc/ssl/server.crt
key: /etc/kvmd/vnc/ssl/server.key

10
configs/kvmd/main/v2-hdmi-rpi4.yaml
View File

@ -76,8 +76,8 @@ vnc:
# h264:
# sink: "kvmd::ustreamer::h264"
# server:
# tls:
# x509:
# cert: /etc/kvmd/nginx/ssl/server.crt
# key: /etc/kvmd/nginx/ssl/server.key
server:
tls:
x509:
cert: /etc/kvmd/vnc/ssl/server.crt
key: /etc/kvmd/vnc/ssl/server.key

10
configs/kvmd/main/v2-hdmi-zerow.yaml
View File

@ -63,8 +63,8 @@ vnc:
streamer:
unix: /run/kvmd/ustreamer.sock
# server:
# tls:
# x509:
# cert: /etc/kvmd/nginx/ssl/server.crt
# key: /etc/kvmd/nginx/ssl/server.key
server:
tls:
x509:
cert: /etc/kvmd/vnc/ssl/server.crt
key: /etc/kvmd/vnc/ssl/server.key

10
configs/kvmd/main/v2-hdmiusb-generic.yaml
View File

@ -70,8 +70,8 @@ vnc:
streamer:
unix: /run/kvmd/ustreamer.sock
# server:
# tls:
# x509:
# cert: /etc/kvmd/nginx/ssl/server.crt
# key: /etc/kvmd/nginx/ssl/server.key
server:
tls:
x509:
cert: /etc/kvmd/vnc/ssl/server.crt
key: /etc/kvmd/vnc/ssl/server.key

10
configs/kvmd/main/v2-hdmiusb-rpi4.yaml
View File

@ -74,8 +74,8 @@ vnc:
streamer:
unix: /run/kvmd/ustreamer.sock
# server:
# tls:
# x509:
# cert: /etc/kvmd/nginx/ssl/server.crt
# key: /etc/kvmd/nginx/ssl/server.key
server:
tls:
x509:
cert: /etc/kvmd/vnc/ssl/server.crt
key: /etc/kvmd/vnc/ssl/server.key

2
kvmd/apps/__init__.py
View File

@ -585,7 +585,7 @@ def _get_config_scheme() -> Dict:
"tls": {
"ciphers": Option("ALL:@SECLEVEL=0", type=_make_ifarg(valid_ssl_ciphers, "")),
"timeout": Option(5.0, type=valid_float_f01),
"timeout": Option(30.0, type=valid_float_f01),
"x509": {
"cert": Option("", type=_make_ifarg(valid_abs_file, "")),
"key": Option("", type=_make_ifarg(valid_abs_file, "")),

10
web/vnc/index.html
View File

@ -45,13 +45,13 @@
<div class="start"><a style="display:inline-block; margin-top:4px; color:#5c90bc; text-decoration:none" href="/">&nbsp;&nbsp;&larr;&nbsp;&nbsp; [ Pi-KVM Index ]</a>
<hr>
<p class="text">This Pi-KVM device has running <b>kvmd-vnc</b> daemon and provides VNC access to the server.</p>
<p class="text"><b>WARNING!</b> We strongly don't recommend you to use VNC in untrusted networks.
The current implementation does not use encryption, and your passwords are transmitted
over the network in a plain text.
<p class="text"><b>WARNING!</b> We strongly don't recommend you to use VNC in untrusted networks without
enabled X.509 or TLS encryption. Otherwise your passwords are transmitted in a plain text
over the network.
</p>
<p class="text">
Your VNC client must support Tight JPEG compression, password authentication and allow
connection without encryption. <a href="https://tigervnc.org">TigerVNC</a> is a good choice.
Your VNC client must support Tight JPEG compression and password authentication.
<a href="https://tigervnc.org">TigerVNC</a> is a good choice.
On Linux, this client will most likely be available for installation from the repository.
It can also be called vncviewer.
</p>

10
web/vnc/index.pug
View File

@ -9,12 +9,12 @@ block start
p(class="text")
| This Pi-KVM device has running #[b kvmd-vnc] daemon and provides VNC access to the server.
p(class="text")
| #[b WARNING!] We strongly don't recommend you to use VNC in untrusted networks.
| The current implementation does not use encryption, and your passwords are transmitted
| over the network in a plain text.
| #[b WARNING!] We strongly don't recommend you to use VNC in untrusted networks without
| enabled X.509 or TLS encryption. Otherwise your passwords are transmitted in a plain text
| over the network.
p(class="text")
| Your VNC client must support Tight JPEG compression, password authentication and allow
| connection without encryption. #[a(href="https://tigervnc.org") TigerVNC] is a good choice.
| Your VNC client must support Tight JPEG compression and password authentication.
| #[a(href="https://tigervnc.org") TigerVNC] is a good choice.
| On Linux, this client will most likely be available for installation from the repository.
| It can also be called vncviewer.
div(id="vnc-text" class="code" style="max-height:200px")