From bed4211f722804f936b731fbe4af617148cd5500 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Thu, 11 Aug 2011 09:57:25 -0700 Subject: [PATCH] Working login + connection list UI stub. --- .../guacamole/net/basic/BasicLogin.java | 88 ++++++++++++++++++++ src/main/webapp/WEB-INF/web.xml | 11 +++ src/main/webapp/index.xhtml | 60 +++++++++++-- src/main/webapp/styles/login.css | 58 ++++++++++++- 4 files changed, 206 insertions(+), 11 deletions(-) create mode 100644 src/main/java/net/sourceforge/guacamole/net/basic/BasicLogin.java diff --git a/src/main/java/net/sourceforge/guacamole/net/basic/BasicLogin.java b/src/main/java/net/sourceforge/guacamole/net/basic/BasicLogin.java new file mode 100644 index 0000000..1702421 --- /dev/null +++ b/src/main/java/net/sourceforge/guacamole/net/basic/BasicLogin.java @@ -0,0 +1,88 @@ +package net.sourceforge.guacamole.net.basic; + +/* + * Guacamole - Clientless Remote Desktop + * Copyright (C) 2010 Michael Jumper + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +import java.io.IOException; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import net.sourceforge.guacamole.GuacamoleException; +import net.sourceforge.guacamole.protocol.GuacamoleConfiguration; +import net.sourceforge.guacamole.properties.GuacamoleProperties; +import net.sourceforge.guacamole.net.basic.properties.BasicGuacamoleProperties; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class BasicLogin extends HttpServlet { + + private Logger logger = LoggerFactory.getLogger(BasicLogin.class); + + private AuthenticationProvider authProvider; + + @Override + public void init() throws ServletException { + + // Get auth provider instance + try { + authProvider = GuacamoleProperties.getProperty(BasicGuacamoleProperties.AUTH_PROVIDER); + } + catch (GuacamoleException e) { + logger.error("Error getting authentication provider from properties.", e); + throw new ServletException(e); + } + + } + + @Override + protected void service(HttpServletRequest request, HttpServletResponse response) + throws IOException { + + HttpSession httpSession = request.getSession(true); + + // Retrieve username and password from parms + String username = request.getParameter("username"); + String password = request.getParameter("password"); + + // Get authorized config + GuacamoleConfiguration config; + try { + config = authProvider.getAuthorizedConfiguration(username, password); + } + catch (GuacamoleException e) { + logger.error("Error retrieving authorized configuration for user {}.", username); + response.sendError(HttpServletResponse.SC_FORBIDDEN); + return; + } + + if (config == null) { + logger.warn("Failed login from {} for user \"{}\".", request.getRemoteAddr(), username); + response.sendError(HttpServletResponse.SC_FORBIDDEN); + return; + } + + logger.info("Successful login from {} for user \"{}\".", request.getRemoteAddr(), username); + + httpSession.setAttribute("GUAC_AUTH_CONFIGS", new Integer(0)); + + } + +} + diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index e7e964e..3983287 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -28,6 +28,17 @@ + + + Login servlet. + Login + net.sourceforge.guacamole.net.basic.BasicLogin + + + Login + /login + + Tunnel servlet. diff --git a/src/main/webapp/index.xhtml b/src/main/webapp/index.xhtml index dabd762..92fc1ed 100644 --- a/src/main/webapp/index.xhtml +++ b/src/main/webapp/index.xhtml @@ -29,7 +29,7 @@ -
+ - + +
+ Guacamole ${project.version} +
diff --git a/src/main/webapp/styles/login.css b/src/main/webapp/styles/login.css index 87798ae..a64b406 100644 --- a/src/main/webapp/styles/login.css +++ b/src/main/webapp/styles/login.css @@ -18,7 +18,7 @@ */ body { - background: black; + background: gray; font-family: sans-serif; padding: 0; margin: 0; @@ -114,7 +114,7 @@ div#login-dialog #login-fields img.logo { float: left; } -div#login-ui #version-dialog { +div#version-dialog { position: fixed; right: 0; bottom: 0; @@ -136,3 +136,57 @@ img#license { float: right; margin: 2px; } + +div#connection-list-ui { + background: #BCA; +} + +div#connection-list-ui table { + width: 100%; + border-collapse: collapse; +} + +div#connection-list-ui table thead { + background: #9A8; +} + +div#connection-list-ui table thead tr { + border-top: 1px solid #676; + border-bottom: 1px solid gray; +} + +div#connection-list-ui table tbody { + background: white; +} + +div#connection-list-ui table tbody tr { + border-top: 1px solid gray; + border-bottom: 1px solid gray; +} + +div#connection-list-ui table td { + padding: 0.25em; + text-align: center; +} + +div#connection-list-ui table tbody tr:nth-child(even) { background: #CCC; } +div#connection-list-ui table tbody tr:nth-child(odd) { background: #EEE; } + +div#connection-list-ui table td.description { + text-align: left; +} + +div#connection-list-ui h1 { + + margin: 0; + padding: 0.5em; + + font-size: 2em; + vertical-align: middle; + text-align: center; + +} + +div#connection-list-ui img { + vertical-align: middle; +} \ No newline at end of file -- 1.7.10.4