From 9b3e1137722276cb471a24591f8b8ab7adaca276 Mon Sep 17 00:00:00 2001 From: Devaev Maxim Date: Tue, 14 Jul 2020 12:28:57 +0300 Subject: [PATCH] pug --- Makefile | 22 +++++-- testenv/Dockerfile | 4 +- web/base.pug | 58 +++++++++++++++++ web/index.html | 149 +++++++++++++++++++++---------------------- web/index.pug | 43 +++++++++++++ web/ipmi/index.html | 92 ++++++++++++-------------- web/ipmi/index.pug | 20 ++++++ web/login/index.html | 112 ++++++++++++++++---------------- web/login/index.pug | 26 ++++++++ web/start.pug | 14 ++++ web/vnc/index.html | 92 ++++++++++++-------------- web/vnc/index.pug | 20 ++++++ 12 files changed, 410 insertions(+), 242 deletions(-) create mode 100644 web/base.pug create mode 100644 web/index.pug create mode 100644 web/ipmi/index.pug create mode 100644 web/login/index.pug create mode 100644 web/start.pug create mode 100644 web/vnc/index.pug diff --git a/Makefile b/Makefile index 85f110b5..b8af3d14 100644 --- a/Makefile +++ b/Makefile @@ -132,11 +132,23 @@ run-vnc: testenv regen: testenv - for file in kvmd/keyboard/mappings.py hid/src/keymap.h; do \ - docker run --user `id -u`:`id -g` --rm \ - --volume `pwd`:/src \ - -it $(TESTENV_IMAGE) bash -c "cd src && ./genmap.py keymap.in $$file.mako $$file"; \ - done + docker run --user `id -u`:`id -g` --rm \ + --volume `pwd`:/src \ + -it $(TESTENV_IMAGE) bash -c "cd src \ + && ./genmap.py keymap.in kvmd/keyboard/mappings.py.mako kvmd/keyboard/mappings.py \ + && ./genmap.py keymap.in hid/src/keymap.h.mako hid/src/keymap.h \ + " + + +pug: testenv + docker run --user `id -u`:`id -g` --rm \ + --volume `pwd`:/src \ + -it $(TESTENV_IMAGE) bash -c "cd src \ + && pug --pretty web/index.pug -o web \ + && pug --pretty web/login/index.pug -o web/login \ + && pug --pretty web/ipmi/index.pug -o web/ipmi \ + && pug --pretty web/vnc/index.pug -o web/vnc \ + " release: diff --git a/testenv/Dockerfile b/testenv/Dockerfile index 9d9e99f9..74927eca 100644 --- a/testenv/Dockerfile +++ b/testenv/Dockerfile @@ -27,7 +27,9 @@ RUN pacman -Syu --noconfirm \ npm \ && (pacman -Sc --noconfirm || true) -RUN npm install htmlhint -g +RUN npm install htmlhint -g \ + && npm install pug \ + && npm install pug-cli -g ARG USTREAMER_MIN_VERSION ENV USTREAMER_MIN_VERSION $USTREAMER_MIN_VERSION diff --git a/web/base.pug b/web/base.pug new file mode 100644 index 00000000..98e94a67 --- /dev/null +++ b/web/base.pug @@ -0,0 +1,58 @@ +doctype html + +// + ============================================================================== + # # + # KVMD - The main Pi-KVM daemon. # + # # + # Copyright (C) 2018 Maxim Devaev # + # # + # This program is free software: you can redistribute it and/or modify # + # it under the terms of the GNU General Public License as published by # + # the Free Software Foundation, either version 3 of the License, or # + # (at your option) any later version. # + # # + # This program is distributed in the hope that it will be useful, # + # but WITHOUT ANY WARRANTY; without even the implied warranty of # + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # + # GNU General Public License for more details. # + # # + # You should have received a copy of the GNU General Public License # + # along with this program. If not, see . # + # # + ============================================================================== + +- var css_dir = "/share/css" +- var js_dir = "/share/js" +- var svg_dir = "/share/svg" + +- var title = "" +- var main_js = "" +- var body_class = "" +- var css_list = ["vars", "main"] + +block vars + +html(lang="en") + head + meta(charset="utf-8") + title #{title} + + link(rel="apple-touch-icon" sizes="180x180" href="/share/apple-touch-icon.png") + link(rel="icon" type="image/png" sizes="32x32" href="/share/favicon-32x32.png") + link(rel="icon" type="image/png" sizes="16x16" href="/share/favicon-16x16.png") + link(rel="manifest" href="/share/site.webmanifest") + link(rel="mask-icon" href="/share/safari-pinned-tab.svg" color="#5bbad5") + meta(name="msapplication-TileColor" content="#2b5797") + meta(name="theme-color" content="#ffffff") + + each name in css_list + link(rel="stylesheet" href=`${css_dir}/${name}.css`) + + if main_js + script(type="module") + | import {main} from "#{js_dir}/#{main_js}.js"; + | main(); + + body(class=body_class) + block body diff --git a/web/index.html b/web/index.html index 9be88ae8..75739260 100644 --- a/web/index.html +++ b/web/index.html @@ -1,5 +1,6 @@ - - +============================================================================== +--> - - - Pi-KVM Index - - - - - - - - - - - - - - - - - - - - -
-
- - - - - -
- - - - - - - -
Open Source & Open Hardware IP-KVM
Copyright © 2018 Pi-KVM Developers Team
-
-
- - - - - -
Server:
-
-
-

Loading ...

-
-
-

- Please note that when you are working with a KVM session or another application that captures the keyboard, - you can't use some keyboard shortcuts such as Ctrl+Alt+Del (which will be caught by your OS) or Ctrl+W (caught by your browser). -

-

- To override this limitation you can use Google Chrome - or Chromium in application mode. -

-
-
-

- Full documentation, source code, hardware schematics and legal information - can be found in our official website. -

-
-
- - + + + Pi-KVM Index + + + + + + + + + + + + + + + + +
+
+ + + + + +
+ + + + + + + +
Open Source & Open Hardware IP-KVM
Copyright © 2018 Pi-KVM Developers Team
+
+
+ + + + +
+ Server:
+
+
+

Loading ...

+
+
+

+ Please note that when you are working with a KVM session or another application that captures the keyboard, + you can't use some keyboard shortcuts such as Ctrl+Alt+Del (which will be caught by your OS) or Ctrl+W (caught by your browser). +

+

To override this limitation you can use Google Chrome + or Chromium in application mode. +

+
+
+

+ Full documentation, source code, hardware schematics and legal information + can be found in our official website. +

+
+
+ + \ No newline at end of file diff --git a/web/index.pug b/web/index.pug new file mode 100644 index 00000000..6dbb7df9 --- /dev/null +++ b/web/index.pug @@ -0,0 +1,43 @@ +extends start.pug + +append vars + - title = "Pi-KVM Index" + - main_js = "index/main" + - css_list = css_list.concat(["window", "modal", "index/index"]) + +block start + table + tr + td(valign="top" class="logo") + img(class="svg-gray" src=`${svg_dir}/logo.svg` alt="Open Source Hardware" height="40") + td(valign="top") + table + tr + td(colspan="2" class="title") Open Source & Open Hardware IP-KVM + tr + td(colspan="2" class="copyright") Copyright © 2018 Pi-KVM Developers Team + + hr + table + td(class="server") + td Server: + td + a(id="kvmd-meta-server-host" target="_blank" href="/api/info") + + hr + div(id="apps-box") + h4 Loading ... + + hr + p(class="text") + | Please note that when you are working with a KVM session or another application that captures the keyboard, + | you can't use some keyboard shortcuts such as Ctrl+Alt+Del (which will be caught by your OS) or Ctrl+W (caught by your browser). + p(class="text") + | To override this limitation you can use #[a(target="_blank" href="https://google.com/chrome") Google Chrome] + | or #[a(target="_blank" href="https://chromium.org/Home") Chromium] in application mode. + div(id="app-text" class="code") + + hr + p(class="text") + | Full documentation, source code, hardware schematics and legal information + | can be found in our #[a(target="_blank" href="https://pikvm.org") official website]. diff --git a/web/ipmi/index.html b/web/ipmi/index.html index 07fda012..70a0f1ed 100644 --- a/web/ipmi/index.html +++ b/web/ipmi/index.html @@ -1,5 +1,6 @@ - - +============================================================================== +--> - - - Pi-KVM IPMI Info - - - - - - - - - - - - - - - - - -
-
- -   ←   [ Pi-KVM Index ] - -
-

- This Pi-KVM device has running kvmd-ipmi daemon and provides IPMI 2.0 interface for some basic - BMC operations like on/off/reset the server. -

-

- WARNING! We strongly don't recommend you to use IPMI in untrusted networks because - this protocol is completely unsafe by design. In short, the authentication process for IPMI mandates - that the server send a salted SHA1 or MD5 hash of the requested user's password to the client, - prior to the client authenticating. -

-

- NEVER use the same passwords for KVMD and IPMI users. And even better not to use IPMI. - Instead, you can directly use KVMD API via curl. We gave here some examples for this: -

-
-
-
- - + + + Pi-KVM IPMI Info + + + + + + + + + + + + + +
+
  ←   [ Pi-KVM Index ] +
+

This Pi-KVM device has running kvmd-ipmi daemon and provides IPMI 2.0 interface for some basic + BMC operations like on/off/reset the server. +

+

WARNING! We strongly don't recommend you to use IPMI in untrusted networks because + this protocol is completely unsafe by design. In short, the authentication process for IPMI mandates + that the server send a salted SHA1 or MD5 hash of the requested user's password to the client, + prior to the client authenticating. +

+

NEVER use the same passwords for KVMD and IPMI users. And even better not to use IPMI. + Instead, you can directly use KVMD API via curl. Here some examples: +

+
+
+
+ + \ No newline at end of file diff --git a/web/ipmi/index.pug b/web/ipmi/index.pug new file mode 100644 index 00000000..9ac6bf29 --- /dev/null +++ b/web/ipmi/index.pug @@ -0,0 +1,20 @@ +extends ../start.pug + +append vars + - title = "Pi-KVM IPMI Info" + - main_js = "ipmi/main" + - index_link = true + +block start + p(class="text") + | This Pi-KVM device has running #[b kvmd-ipmi] daemon and provides IPMI 2.0 interface for some basic + | BMC operations like on/off/reset the server. + p(class="text") + | #[b WARNING!] We strongly don't recommend you to use IPMI in untrusted networks because + | this protocol is completely unsafe by design. In short, the authentication process for IPMI mandates + | that the server send a salted SHA1 or MD5 hash of the requested user's password to the client, + | prior to the client authenticating. + p(class="text") + | #[b NEVER] use the same passwords for KVMD and IPMI users. And even better not to use IPMI. + | Instead, you can directly use KVMD API via curl. Here some examples: + div(id="ipmi-text" class="code" style="max-height:200px") diff --git a/web/login/index.html b/web/login/index.html index 8af42adf..284d21ac 100644 --- a/web/login/index.html +++ b/web/login/index.html @@ -1,5 +1,6 @@ - - +============================================================================== +--> - - - Pi-KVM Login - - - - - - - - - - - - - - - - - - - -
-
- - - - - - - - - - - - - -
Username:
Password:
-
-
- -
    -
  • - This site is actively using JavaScript.
    - It doesn't contain ads, but is blocked by some ad filters.
    - Please turn it off to continue and reload the page. -
    • -
- - + + + Pi-KVM Login + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + +
Username: + +
Password: + +
+ +
+
+
+
    +
  • This site is actively using JavaScript.
    + It doesn't contain ads, but is blocked by some ad filters.
    + Please turn it off to continue and reload the page. +
    • +
+ + \ No newline at end of file diff --git a/web/login/index.pug b/web/login/index.pug new file mode 100644 index 00000000..0ef8af5e --- /dev/null +++ b/web/login/index.pug @@ -0,0 +1,26 @@ +extends ../base.pug + +append vars + - title = "Pi-KVM Login" + - main_js = "login/main" + - css_list = css_list.concat(["window", "modal", "login/login"]) + +block body + div(id="login-box") + div(id="login") + table + tr + td Username: + td #[input(type="text" id="user-input")] + tr + td Password: + td #[input(type="password" id="passwd-input")] + tr + td + td #[button(id="login-button") Login] + + ul(class="footer") + li(class="footer-left") + | This site is actively using JavaScript.#[br] + | It doesn't contain ads, but is blocked by some ad filters.#[br] + | Please turn it off to continue and reload the page. diff --git a/web/start.pug b/web/start.pug new file mode 100644 index 00000000..f58ccd18 --- /dev/null +++ b/web/start.pug @@ -0,0 +1,14 @@ +extends base.pug + +append vars + - css_list.push("start") + - var index_link = false + +block body + div(class="start-box") + div(class="start") + if index_link + a(style="display:inline-block; margin-top:4px; color:#5c90bc; text-decoration:none" href="/") + |   ←   [ Pi-KVM Index ] + hr + block start diff --git a/web/vnc/index.html b/web/vnc/index.html index 966f5b22..14cd290e 100644 --- a/web/vnc/index.html +++ b/web/vnc/index.html @@ -1,5 +1,6 @@ - - +============================================================================== +--> - - - Pi-KVM VNC Info - - - - - - - - - - - - - - - - - -
-
- -   ←   [ Pi-KVM Index ] - -
-

- This Pi-KVM device has running kvmd-vnc daemon and provides VNC access to the server. -

-

- 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. -

-

- Your VNC client must support Tight JPEG compression, password authentication and allow - connection without encryption. 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. -

-
-
-
- - + + + Pi-KVM VNC Info + + + + + + + + + + + + + +
+
  ←   [ Pi-KVM Index ] +
+

This Pi-KVM device has running kvmd-vnc daemon and provides VNC access to the server.

+

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. +

+

+ Your VNC client must support Tight JPEG compression, password authentication and allow + connection without encryption. 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. +

+
+
+
+ + \ No newline at end of file diff --git a/web/vnc/index.pug b/web/vnc/index.pug new file mode 100644 index 00000000..ab8be68e --- /dev/null +++ b/web/vnc/index.pug @@ -0,0 +1,20 @@ +extends ../start.pug + +append vars + - title = "Pi-KVM VNC Info" + - main_js = "vnc/main" + - index_link = true + +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. + 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. + | 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")