[Kimchi-devel] [PATCH 0/8 V2] Enable Kimchi authentication in console pages and spice bug fix
Paulo Ricardo Paz Vital
pvital at linux.vnet.ibm.com
Tue May 6 16:13:16 UTC 2014
--
Tested-by: Paulo Vital <pvital at linux.vnet.ibm.com>
Reviewed-by: Paulo Vital <pvital at linux.vnet.ibm.com>
On Mon, 2014-05-05 at 15:08 -0300, Aline Manera wrote:
> From: Aline Manera <alinefm at br.ibm.com>
>
> V1 -> V2:
> - Properly add the console.html to spec files
> - Use the same mechanism to accept the CA for spice console
> - Fix spice issue
>
> -------------------------------------------------------------------------------
>
> As I commented in mailing list ([v3] Enable encryption in vm VNC console connection)
> to enable Kimchi authentication in console pages those need to be provided by
> Kimchi server instead of websockify web server.
>
> I reverted the "Enable encryption in vm VNC console connection" commit, applied
> "[PATCH v2] Enable encryption in vm console connection" path send by Mark and
> make the changes needed to redirect user from websockify web server to Kimchi.
> So noVNC page continues to be rendered by Kimchi.
>
> With all that done, I was able to enable authentication to vnc_auto.html and
> spice.html
>
> Aline Manera (7):
> Revert "Enable encryption in vm VNC console connection"
> Make use of the mini Web server in the websockify
> Enable Kimchi authentication in console pages
> backend: Redirect 401 error to default page
> UI: Redirect user to console page after logging
> websockets: Disallow non-encrypted client connections
> bug fix: Properly set the listen IP to SPICE console
>
> Mark Wu (1):
> Enable encryption in vm console connection
>
> configure.ac | 9 +-
> contrib/kimchi.spec.fedora.in | 14 +-
> contrib/kimchi.spec.suse.in | 14 +-
> src/kimchi/config.py.in | 32 +-
> src/kimchi/vnc.py | 3 +-
> src/nginx.conf.in | 10 +
> tests/test_config.py.in | 32 +-
> ui/Makefile.am | 2 +-
> ui/css/Makefile.am | 2 +-
> ui/css/fonts/Makefile.am | 2 +
> ui/css/fonts/novnc/Makefile.am | 20 +
> ui/css/fonts/novnc/Orbitron700.ttf | Bin 0 -> 38580 bytes
> ui/css/fonts/novnc/Orbitron700.woff | Bin 0 -> 17472 bytes
> ui/css/novnc/Makefile.am | 20 +
> ui/css/novnc/base.css | 405 ++++++
> ui/js/Makefile.am | 2 +-
> ui/js/novnc/Makefile.am | 22 +
> ui/js/novnc/base64.js | 115 ++
> ui/js/novnc/des.js | 273 ++++
> ui/js/novnc/display.js | 770 +++++++++++
> ui/js/novnc/input.js | 1946 +++++++++++++++++++++++++++
> ui/js/novnc/jsunzip.js | 676 ++++++++++
> ui/js/novnc/main.js | 103 ++
> ui/js/novnc/rfb.js | 1866 +++++++++++++++++++++++++
> ui/js/novnc/util.js | 381 ++++++
> ui/js/novnc/web-socket-js/Makefile.am | 24 +
> ui/js/novnc/web-socket-js/README.txt | 109 ++
> ui/js/novnc/web-socket-js/WebSocketMain.swf | Bin 0 -> 177114 bytes
> ui/js/novnc/web-socket-js/swfobject.js | 4 +
> ui/js/novnc/web-socket-js/web_socket.js | 391 ++++++
> ui/js/novnc/websock.js | 422 ++++++
> ui/js/novnc/webutil.js | 216 +++
> ui/js/src/kimchi.api.js | 20 +-
> ui/js/src/kimchi.login_window.js | 19 +-
> ui/novnc/Makefile.am | 22 -
> ui/novnc/css/Makefile.am | 20 -
> ui/novnc/css/Orbitron700.ttf | Bin 38580 -> 0 bytes
> ui/novnc/css/Orbitron700.woff | Bin 17472 -> 0 bytes
> ui/novnc/css/base.css | 405 ------
> ui/novnc/js/Makefile.am | 22 -
> ui/novnc/js/base64.js | 115 --
> ui/novnc/js/des.js | 273 ----
> ui/novnc/js/display.js | 770 -----------
> ui/novnc/js/input.js | 1946 ---------------------------
> ui/novnc/js/jsunzip.js | 676 ----------
> ui/novnc/js/main.js | 103 --
> ui/novnc/js/rfb.js | 1866 -------------------------
> ui/novnc/js/util.js | 381 ------
> ui/novnc/js/web-socket-js/Makefile.am | 24 -
> ui/novnc/js/web-socket-js/README.txt | 109 --
> ui/novnc/js/web-socket-js/WebSocketMain.swf | Bin 177114 -> 0 bytes
> ui/novnc/js/web-socket-js/swfobject.js | 4 -
> ui/novnc/js/web-socket-js/web_socket.js | 391 ------
> ui/novnc/js/websock.js | 422 ------
> ui/novnc/js/webutil.js | 216 ---
> ui/novnc/vnc.html | 43 -
> ui/pages/Makefile.am | 2 +-
> ui/pages/spice.html.tmpl | 4 +-
> ui/pages/vnc_auto.html.tmpl | 44 +
> ui/pages/websockify/Makefile.am | 20 +
> ui/pages/websockify/console.html | 25 +
> 61 files changed, 7958 insertions(+), 7869 deletions(-)
> create mode 100644 ui/css/fonts/novnc/Makefile.am
> create mode 100644 ui/css/fonts/novnc/Orbitron700.ttf
> create mode 100644 ui/css/fonts/novnc/Orbitron700.woff
> create mode 100644 ui/css/novnc/Makefile.am
> create mode 100644 ui/css/novnc/base.css
> create mode 100644 ui/js/novnc/Makefile.am
> create mode 100644 ui/js/novnc/base64.js
> create mode 100644 ui/js/novnc/des.js
> create mode 100644 ui/js/novnc/display.js
> create mode 100644 ui/js/novnc/input.js
> create mode 100755 ui/js/novnc/jsunzip.js
> create mode 100644 ui/js/novnc/main.js
> create mode 100644 ui/js/novnc/rfb.js
> create mode 100644 ui/js/novnc/util.js
> create mode 100644 ui/js/novnc/web-socket-js/Makefile.am
> create mode 100644 ui/js/novnc/web-socket-js/README.txt
> create mode 100644 ui/js/novnc/web-socket-js/WebSocketMain.swf
> create mode 100644 ui/js/novnc/web-socket-js/swfobject.js
> create mode 100644 ui/js/novnc/web-socket-js/web_socket.js
> create mode 100644 ui/js/novnc/websock.js
> create mode 100644 ui/js/novnc/webutil.js
> delete mode 100644 ui/novnc/Makefile.am
> delete mode 100644 ui/novnc/css/Makefile.am
> delete mode 100644 ui/novnc/css/Orbitron700.ttf
> delete mode 100644 ui/novnc/css/Orbitron700.woff
> delete mode 100644 ui/novnc/css/base.css
> delete mode 100644 ui/novnc/js/Makefile.am
> delete mode 100644 ui/novnc/js/base64.js
> delete mode 100644 ui/novnc/js/des.js
> delete mode 100644 ui/novnc/js/display.js
> delete mode 100644 ui/novnc/js/input.js
> delete mode 100755 ui/novnc/js/jsunzip.js
> delete mode 100644 ui/novnc/js/main.js
> delete mode 100644 ui/novnc/js/rfb.js
> delete mode 100644 ui/novnc/js/util.js
> delete mode 100644 ui/novnc/js/web-socket-js/Makefile.am
> delete mode 100644 ui/novnc/js/web-socket-js/README.txt
> delete mode 100644 ui/novnc/js/web-socket-js/WebSocketMain.swf
> delete mode 100644 ui/novnc/js/web-socket-js/swfobject.js
> delete mode 100644 ui/novnc/js/web-socket-js/web_socket.js
> delete mode 100644 ui/novnc/js/websock.js
> delete mode 100644 ui/novnc/js/webutil.js
> delete mode 100644 ui/novnc/vnc.html
> create mode 100644 ui/pages/vnc_auto.html.tmpl
> create mode 100644 ui/pages/websockify/Makefile.am
> create mode 100644 ui/pages/websockify/console.html
>
More information about the Kimchi-devel
mailing list