[Yanel-commits] rev 22364 - in public/yanel/trunk/src: core/java/org/wyona/yanel/servlet webapp/xslt

[josias at wyona.com]

Author: josias
Date: 2007-02-01 17:06:39 +0100 (Thu, 01 Feb 2007)
New Revision: 22364

Modified:
   public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java
   public/yanel/trunk/src/webapp/xslt/login-screen.xsl
Log:
added ssl on/off info to login screen. fixes bug #5129, thanks to paloma

Modified: public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java
===================================================================
--- public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java	2007-02-01 16:05:38 UTC (rev 22363)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java	2007-02-01 16:06:39 UTC (rev 22364)
@@ -112,6 +112,7 @@
             sitetree = (Sitetree) yanel.getBeanFactory().getBean("nav-sitetree");
 
             sslPort = config.getInitParameter("ssl-port");
+            
         } catch (Exception e) {
             log.error(e);
             throw new ServletException(e.getMessage(), e);
@@ -1416,8 +1417,15 @@
             
             Element realmElement = (Element) rootElement.appendChild(doc.createElement("realm"));
             realmElement.setAttribute("name", realm.getName());
-            realmElement.setAttribute("mount-point", realm.getMountPoint().toString());            
+            realmElement.setAttribute("mount-point", realm.getMountPoint().toString());  
             
+            Element sslElement = (Element) rootElement.appendChild(doc.createElement("ssl"));            
+            if(sslPort != null) {
+        	sslElement.setAttribute("status", "ON");   
+            } else {
+        	sslElement.setAttribute("status", "OFF");
+            }
+            
             response.setContentType("application/xhtml+xml; charset=UTF-8");
             response.setStatus(javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED);            
             Transformer transformer = TransformerFactory.newInstance().newTransformer(new StreamSource(xsltLoginScreen));            

Modified: public/yanel/trunk/src/webapp/xslt/login-screen.xsl
===================================================================
--- public/yanel/trunk/src/webapp/xslt/login-screen.xsl	2007-02-01 16:05:38 UTC (rev 22363)
+++ public/yanel/trunk/src/webapp/xslt/login-screen.xsl	2007-02-01 16:06:39 UTC (rev 22364)
@@ -57,6 +57,19 @@
     </li>
   </xsl:template>
 
+  <xsl:template match="ssl">
+    <li>
+      <xsl:choose>
+        <xsl:when test="contains(@status, 'ON')">
+          <p>SSL support is ON</p>
+        </xsl:when>
+        <xsl:otherwise>
+          <h4>Warning: SSL support is OFF. Your username and password will be sent as plain text.</h4>
+        </xsl:otherwise>
+      </xsl:choose>
+    </li>
+  </xsl:template>
+
   <xsl:template match="realm">
     <li> Realm info:
       <ul>