Changeset 7540

Timestamp:

Dec 3, 2018, 9:11:18 AM (4 years ago)

Author:

Nicklas Nordborg

Message:

References #2131: Add support for installing multiple authentication managers

Updated the error handling for NotLoggedIn exceptions. The existing solution didn't work well with multiple authentication manages since switching between them reloads the login form. This causes other context information to be lost.

The new solution only display an error message with a link that opens the login dialog in a popup window. Once the login has been completed the page with the error message is reloaded and hopefully the original action can be completed.

Location:

trunk

Files:

• src/clients/web/net/sf/basedb/clients/web/servlet/Download.java (modified) (1 diff)
• src/core/net/sf/basedb/core/Application.java (modified) (1 diff)
• www/common/close_popup.js (modified) (1 diff)
• www/exception/not_logged_in.jsp (modified) (3 diffs)
• www/include/scripts/exception.js (modified) (2 diffs)
• www/include/scripts/main-2.js (modified) (1 diff)
• www/login.js (modified) (10 diffs)
• www/login.jsp (modified) (2 diffs)
• www/main.jsp (modified) (6 diffs)

trunk/src/clients/web/net/sf/basedb/clients/web/servlet/Download.java

@@ -173 +173 @@
       catch (ItemNotFoundException ex)
       {
+        // Create new SessionControl and redirect to a different URL
+        // The next request will of course cause a NotLoggedInException
         sc = Application.newSessionControl(Base.WEBCLIENT_ID, request.getRemoteAddr(), null);
         ID = sc.getId();
-      }
-      if (sc == null || !sc.isLoggedIn())
+        response.sendRedirect(contextPath+servletPath+"/-"+ID+"-"+path.toString());
+        return;
+      }
+      if (!sc.isLoggedIn())
       {
         request.setAttribute("ID", ID);
-        request.setAttribute("redirect", contextPath+servletPath+"/-"+ID+"-"+path.toString());
         throw new NotLoggedInException();
       }

trunk/src/core/net/sf/basedb/core/Application.java

@@ -1023 +1023 @@
       throw new PermissionDeniedException("Invalid remoteId ("+remoteId+"; expected: "+sc.getRemoteId()+")");
     }
+    if (checkLoggedIn && !sc.isLoggedIn()) 
+    {
+      log.warn("getSessionControl: User not logged in. externalClientId: "+externalClientId+"; remoteId: "+remoteId);
+      throw new NotLoggedInException();
+    }
     if (externalClientId != null && !sc.isAllowedToUseClient(externalClientId))
     {
       log.warn("getSessionControl: Invalid externalClientId: "+externalClientId+"; expected: "+sc.getExternalClientId());
       throw new PermissionDeniedException(Permission.USE, "Client[externalId="+externalClientId+"]");
-    }
-    if (checkLoggedIn && !sc.isLoggedIn()) 
-    {
-      log.warn("getSessionControl: User not logged in. externalClientId: "+externalClientId+"; remoteId: "+remoteId);
-      throw new NotLoggedInException();
     }
     sc.updateLastAccess();

trunk/www/common/close_popup.js

@@ -66 +66 @@
     else if (refreshOpener)
     {
-      myOpener.location.reload();
+      if (myOpener.App)
+      {
+        myOpener.App.reloadWindow(true);
+      }
+      else
+      {
+        myOpener.location.reload();
+      }
     }
     App.closeWindow();

trunk/www/exception/not_logged_in.jsp

@@ -39 +39 @@
   import="net.sf.basedb.core.Application"
   import="net.sf.basedb.core.SessionControl"
-  import="net.sf.basedb.core.DbControl"
   import="net.sf.basedb.clients.web.Base"
   import="net.sf.basedb.util.Values"
-  import="net.sf.basedb.util.extensions.ExtensionsInvoker"
-  import="net.sf.basedb.clients.web.extensions.ExtensionsControl"
-  import="net.sf.basedb.clients.web.extensions.JspContext"
-  import="net.sf.basedb.clients.web.extensions.login.LoginFormAction"
-  import="net.sf.basedb.clients.web.extensions.login.LoginFormBean"
-  import="net.sf.basedb.clients.web.extensions.login.FieldInfo"
   isErrorPage="true"
 %>
 <%@ taglib prefix="base" uri="/WEB-INF/base.tld" %>
-<%@ taglib prefix="ext" uri="/WEB-INF/extensions.tld" %>
-<%! 
-// If value is null, return "", else <prefix>+<value>+<suffix>
-String valueIfNotNull(String prefix, String value, String suffix)
-{
-  return value == null ? "" : prefix+value+suffix;
-}
-%>
 <%
 final SessionControl sc = Base.getSessionControl(pageContext, true);
@@ -64 +49 @@
 final String root = request.getContextPath()+"/";
 final String redirect = Values.getString((String)request.getAttribute("redirect"));
-final DbControl dc = sc.newDbControl();
 
 try
 {
-  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext);
-  ExtensionsInvoker<LoginFormAction> invoker = (ExtensionsInvoker<LoginFormAction>)ExtensionsControl.useExtensions(jspContext, "net.sf.basedb.clients.web.login-form");
-  LoginFormAction loginAction = null;
-  for (LoginFormAction action : invoker)
-  {
-    if (action != null)
-    {
-      loginAction = action;
-      break;
-    }
-  }
-  if (loginAction == null)
-  {
-    LoginFormBean bean  = new LoginFormBean();
-    bean.setRememberLastLogin(true);
-    bean.setLoginField(FieldInfo.DEFAULT_LOGIN);
-    bean.setPasswordField(FieldInfo.DEFAULT_PASSWORD);
-    loginAction = bean;
-  }
-  FieldInfo loginField = loginAction.getLoginField();
-  FieldInfo passwordField = loginAction.getPasswordField();
-  FieldInfo extraField = loginAction.getExtraField();
   %>
   <base:page type="default" menu="exception" title="Not logged in">
-  <base:head scripts="exception.js,/login.js" styles="login.css">
-    <ext:scripts context="<%=jspContext%>" />
-    <ext:stylesheets context="<%=jspContext%>" />
-  </base:head>
+  <base:head scripts="exception.js" />
   <base:body data-resize-if-popup="1">
   
-      <form action="<%=root%>login.jsp?again=1" method="post" name="login" target="Login">
-      <input type="hidden" name="ID" value="<%=ID%>">
-      <input type="hidden" name="redirect" value="<%=redirect%>">
-      <input type="hidden" name="useAutoStartPage" value="0">
-      <input type="hidden" name="deviceToken" value="">
-  
-      <table style="margin: auto; width: 700px; margin-top:5em; ">
-      <tr>
-      <td>
-        <%
-        if (loginAction.getHelp() != null)
-        {
-          %>
-          <div class="messagecontainer help" style="font-style: italic;" id="login-help">
-          <%=loginAction.getHelp() %>
-          </div>
-          <%
-        }
-        %>
-        <table style="width: 100%; margin-top: 1em; border-collapse: separate;">
-        <tr>
-          <td class="base-logo"><img src="<%=root%>images/baselogo.png" alt="BASE logo"></td>
-          <td style="width: 515px;">
-            <div id="loginform">
-            <table style="width: 100%;">
-              <tr <%=valueIfNotNull("class=\"", loginField.getClazz(), "\"")%> id="login-row">
-                <th class="bg-filled-100"><%=loginField.getPrompt() %></th>
-                <td colspan="2"><input class="text" name="login" id="login"
-                  type="<%=loginField.hasHiddenCharacters() ? "password" : "text"%>"
-                  value="" 
-                  <%=valueIfNotNull("style=\"", loginField.getStyle(), "\"") %>
-                  <%=valueIfNotNull("title=\"", loginField.getTooltip(), "\"") %>
-                  <%=valueIfNotNull("placeholder=\"", loginField.getPlaceHolder(), "\"") %>
-                  <%=loginAction.rememberLastLogin() ? "" : "autocomplete=\"off\" data-use-last-login=\"0\""%>
-                  maxlength="100" 
-                  tabindex="1">
-                </td>
-              </tr>
-              <tr <%=valueIfNotNull("class=\"", passwordField.getClazz(), "\"")%> id="password-row">
-                <th class="bg-filled-100"><%=passwordField.getPrompt() %></th>
-                <td><input class="text" name="password" id="password"
-                  type="<%=passwordField.hasHiddenCharacters() ? "password" : "text"%>"
-                  <%=valueIfNotNull("style=\"", passwordField.getStyle(), "\"") %>
-                  <%=valueIfNotNull("title=\"", passwordField.getTooltip(), "\"") %>
-                  <%=valueIfNotNull("placeholder=\"", passwordField.getPlaceHolder(), "\"") %>
-                  maxlength="80"
-                  tabindex="2">
-                </td>
-                <td <%=extraField != null?"rowspan=\"2\"" : "" %> style="vertical-align: bottom;">
-                  <base:buttongroup>
-                    <base:button id="btnLogin" image="login.png" title="Login" tabindex="4"/>
-                    <base:button id="close" title="Cancel" tabindex="5" />
-                  </base:buttongroup>
-                </td>
-              </tr>
-              <%
-              if (extraField != null)
-              {
-                %>
-                <tr <%=valueIfNotNull("class=\"", extraField.getClazz(), "\"")%> id="extra-row">
-                  <th class="bg-filled-100"><%=extraField.getPrompt() %></th>
-                  <td><input class="text" name="extraField" id="extraField"
-                    type="<%=extraField.hasHiddenCharacters() ? "password" : "text"%>"
-                    <%=valueIfNotNull("style=\"", extraField.getStyle(), "\"") %>
-                    <%=valueIfNotNull("title=\"", extraField.getTooltip(), "\"") %>
-                    <%=valueIfNotNull("placeholder=\"", extraField.getPlaceHolder(), "\"") %>
-                    maxlength="80"
-                    tabindex="3">
-                  </td>
-                </tr>
-                <%
-              }
-              %>
-              <tr>
-                <th class="bg-filled-100"></th>
-                <td colspan="2">
-                <%
-                String forgotPassword = sc.getClientDefaultSetting("server.forgotten.password");
-                String getAccount = sc.getClientDefaultSetting("server.get.account");
-                if (forgotPassword != null)
-                {
-                  %>
-                  <base:icon id="forgotPassword" image="bullet.png" 
-                    tooltip="Click here if you have forgotten your password">Forgot your password?</base:icon>
-                  <%
-                }
-                if (getAccount != null)
-                {
-                  %>
-                  <base:icon id="getAccount" image="bullet.png" 
-                    tooltip="Click here if you want to get an account on this server">Get an account!</base:icon>
-                  <%
-                }
-                %>
-                </td>
-              </tr>
-              </table>
-            </div>
-          </td>
-        </tr>
-        </table>
-  
-        <div class="messagecontainer error" id="timeout" style="display: none; margin-top: 1em;">
-          <b>Not logged in</b><br>
-          You have been automatically logged out due to inactivity or because the 
-          server has been restarted.
-          You may log in again and continue your work but unsaved changes 
-          may have been lost.
-        </div>
-  
-      </td>
-      </tr>
-      </table>
-  
-    </form>
+    <table style="margin: auto; max-width: 600px; margin-top:5em; margin-bottom: 1em;">
+    <tr>
+    <td>
+      <h1>Not logged in</h1>
+      <div class="messagecontainer error" style="margin-top: 1em; padding: 1em; font-size: 120%;">
+        You have been automatically logged out due to inactivity or because the 
+        server has been restarted.
+        You may log in again and continue your work but unsaved changes 
+        may have been lost.
+      </div>
+    </td>
+    </tr>
+    </table>
+
+    <base:buttongroup subclass="dialogbuttons">
+      <base:button id="close" title="Close"/>
+      <base:button id="gologin" image="login.png" title="Login again&hellip;" />
+    </base:buttongroup>
+        
   </base:body>
   </base:page>
@@ -218 +81 @@
 }
 finally
-{
-  if (dc != null) dc.close();
-}
+{}
 %>

trunk/www/include/scripts/exception.js

@@ -42 +42 @@
     Buttons.addClickHandler('showMoreDetails', exception.showMoreDetails);
     Buttons.addClickHandler('continuePluginWizard', exception.continuePluginWizard);
+    Buttons.addClickHandler('gologin', exception.goLogin);
   }
   
@@ -106 +107 @@
   }
   
+  exception.goLogin = function()
+  {
+    var url = App.getRoot()+'main.jsp?ID='+App.getSessionId();
+    url += '&again=1'
+    Dialogs.openPopup(url, 'Login', 750, 450);
+  }
+  
   exception.showMoreDetails = function(event)
   {

trunk/www/include/scripts/main-2.js

@@ -170 +170 @@
     Reload the current window.
   */
-  app.reloadWindow = function()
-  {
+  app.reloadWindow = function(wait)
+  {
+    if (wait) 
+    {
+      setTimeout(App.reloadWindow, 250);
+      return;
+    }
     window.location.reload();
   }

trunk/www/login.js

@@ -26 +26 @@
 var Login = function()
 {
-  var pLoginForm = 'login';
   var pUseLastLogin = 1;
   
@@ -45 +44 @@
       }
     }
-    
-    Doc.show('the-login-form');
     
     // Information links
@@ -74 +71 @@
     }
     
+    Doc.show('the-login-form', 'table');
     login.initForm();
     
@@ -81 +79 @@
       setTimeout(login.reloadFootnote, 500);
     }
-    
-    if (window.Exception) Exception.fixWindow();
   }
   
@@ -93 +89 @@
   login.switchLoginForm = function(loginForm)
   {
+    var frm = document.forms['login'];
     var url = location.pathname+'?ID='+App.getSessionId();
     url += '&loginForm='+encodeURIComponent(loginForm);
+    if (frm.again) url += '&again='+encodeURIComponent(frm.again.value);
     location.replace(url);
   }
@@ -110 +108 @@
   login.initForm = function()
   {
-    var frm = document.forms[pLoginForm];
+    var frm = document.forms['login'];
     if (!frm.login) return;
     pUseLastLogin = Data.int(frm.login, 'use-last-login', 1);
@@ -119 +117 @@
       {
         frm.login.value = lastLogin;
-        Doc.show('timeout');
       }
     }
@@ -206 +203 @@
   login.setFocus = function()
   {
-    var frm = document.forms[pLoginForm];
+    var frm = document.forms['login'];
     var fieldToFocus = null;
     if (!frm.login.value)
@@ -229 +226 @@
   login.enableLogin = function()
   {
-    var frm = document.forms[pLoginForm];
+    var frm = document.forms['login'];
     frm.login.disabled = false;
     frm.password.disabled = false;
@@ -243 +240 @@
   login.doLogin = function(event)
   {
-    var frm = document.forms[pLoginForm];
+    var frm = document.forms['login'];
     // Check if login has been disabled
     if (frm.login && frm.login.disabled) return;

trunk/www/login.jsp

@@ -53 +53 @@
   String ID = sc.getId();
   String cmd = request.getParameter("cmd");
-  String again = request.getParameter("again");
+  boolean again = Values.getBoolean(request.getParameter("again"));
   boolean useAutoStartPage = false;
   String root = request.getContextPath()+"/";
@@ -210 +210 @@
   }
 
-  if ("1".equals(again))
+  if (again)
   {
     if (errorMessage != null)
     {
-      throw new WebException("popup", errorTitle, errorMessage);
+      response.sendRedirect(root+"main.jsp?ID="+ID+"&again=1&login="+HTML.urlEncode(login)+"&loginForm="+HTML.encodeTags(loginForm)+"&error="+HTML.urlEncode(errorMessage));
     }
     else

trunk/www/main.jsp

@@ -69 +69 @@
 final String login = Values.getString(request.getParameter("login"), "");
 final String error = Values.getString(request.getParameter("error"), null);
+final boolean again = Values.getBoolean(request.getParameter("again"));
 final String requestedLoginForm = Values.getString(request.getParameter("loginForm"), null);
 final String root = request.getContextPath()+"/";
@@ -82 +83 @@
   String broadcastMessage = (String)application.getAttribute("broadcast.message");
   boolean denyLogin = Boolean.TRUE.equals(application.getAttribute("broadcast.deny-login"));
+  
   ItemResultIterator<News> news = null;
   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext);
@@ -120 +122 @@
   %>
   <base:page type="default">
-  <base:head styles="login.css" scripts="exception.js,~login.js">
+  <base:head styles="login.css" scripts="~login.js">
     <ext:scripts context="<%=jspContext%>" />
     <ext:stylesheets context="<%=jspContext%>" />
@@ -127 +129 @@
     <form name="login" action="login.jsp" method="post">
     <input type="hidden" name="ID" value="<%=ID%>">
+    <input type="hidden" name="again" value="<%=again?1:0%>">
     <input type="hidden" name="useAutoStartPage" value="1">
     <input type="hidden" name="deviceToken" value="">
     
-    <table style="margin: auto; width: 700px; display: none;" id="the-login-form">
+    <table style="margin: auto; max-width: 700px; display: none;" id="the-login-form">
     <tr>
     <td>
@@ -205 +208 @@
                 tabindex="2">
               </td>
-              <td <%=extraField != null?"rowspan=\"2\"" : "" %> style="vertical-align: bottom;"><base:button 
-                id="btnLogin"
-                subclass="<%=denyLogin ? "disabled" : ""%>"
-                image="login.png" title="Login" 
-                tooltip="<%=HTML.encodeTags(broadcastTitle)%>" tabindex="4" /></td>
+              <td <%=extraField != null?"rowspan=\"2\"" : "" %> style="vertical-align: bottom;">
+                  <base:buttongroup>
+                    <base:button 
+                      id="btnLogin"
+                      subclass="<%=denyLogin ? "disabled" : ""%>"
+                      image="login.png" title="Login" 
+                      tooltip="<%=HTML.encodeTags(broadcastTitle)%>" tabindex="4" 
+                    />
+                    <base:button 
+                      id="close" title="Cancel" tabindex="5"
+                      visible="<%=again %>"
+                    />
+                  </base:buttongroup>
+              </td>
             </tr>
             <%
@@ -271 +283 @@
         <%
       }
+      if (!again)
+      {
+        String aboutServer = sc.getClientDefaultSetting("server.about");
+        if (aboutServer != null)
+        {
+          %>
+          <h3 style="margin-top: 1em;">About this server</h3>
+          <p>
+            <%=aboutServer%>
+          </p>
+          <base:icon id="aboutServer" image="bullet.png">More about this server</base:icon>
+          <%
+        }
+        %>
+        <h3 style="margin-top: 1em;">News and announcements 
+        <%
+        if (RssNewsFeed.isEnabled()) 
+        {
+          %>
+          <a href="info/news.rss" 
+            title="Subscribe to news from this BASE server"
+            ><base:icon image="rss.png" style="float: right;" /></a>
+          <%
+        }
+        %>
+        </h3>
+        <div id="news" class="news">
+        <%
+        if (broadcastTitle != null)
+        {
+          %>
+          <div class="item note sticky">
+            <div class="headline">
+              <span class="date"><%=dateFormatter.format(new Date())%></span>
+              <%=HTML.encodeTags(broadcastTitle)%><%=denyLogin ? " (login disabled)" : "" %>
+            </div>
+            <div class="text"><%=HTML.niceFormat(broadcastMessage)%></div>
+          </div>
+          <% 
+        }
+        
+        ItemQuery<News> query = News.getQuery();
+        query.order(Orders.desc(Hql.property("sticky")));
+        query.order(Orders.desc(Hql.property("newsDate")));
+        query.order(Orders.desc(Hql.property("id")));
+        query.setCacheResult(true);
+        query.setReturnTotalCount(true);
+        news = query.iterate(dc);
+        int numListed = 0;
+        while (news.hasNext())
+        {
+          News n = news.next();
+          if (numListed >= 10 && !n.isSticky()) break;
+          %>
+          <div class="item <%=n.isSticky() ? "note sticky" : ""%>">
+            <div class="headline">
+              <span class="date"><%=dateFormatter.format(n.getNewsDate())%></span>
+              <%=HTML.encodeTags(n.getName())%>
+            </div>
+            <div class="text"><%=HTML.niceFormat(n.getDescription())%></div>
+          </div>
+          <%
+          numListed++;
+        }
+        if (numListed < news.getTotalCount())
+        {
+          %>
+          <base:icon image="bullet.png" /><a href="info/news.jsp" 
+            title="Show older news..."><%=news.getTotalCount()-numListed%> more</a>
+          <%
+        }
+        %>
+        </div>
+        <%
+      }
       %>
-      <%
-      String aboutServer = sc.getClientDefaultSetting("server.about");
-      if (aboutServer != null)
-      {
-        %>
-        <h3 style="margin-top: 1em;">About this server</h3>
-        <p>
-          <%=aboutServer%>
-        </p>
-        <base:icon id="aboutServer" image="bullet.png">More about this server</base:icon>
-        <%
-      }
-      %>
-      
-      <h3 style="margin-top: 1em;">News and announcements 
-      <%
-      if (RssNewsFeed.isEnabled()) 
-      {
-        %>
-        <a href="info/news.rss" 
-          title="Subscribe to news from this BASE server"
-          ><base:icon image="rss.png" style="float: right;" /></a>
-        <%
-      }
-      %>
-      </h3>
-      <div id="news" class="news">
-      <%
-      if (broadcastTitle != null)
-      {
-        %>
-        <div class="item note sticky">
-          <div class="headline">
-            <span class="date"><%=dateFormatter.format(new Date())%></span>
-            <%=HTML.encodeTags(broadcastTitle)%><%=denyLogin ? " (login disabled)" : "" %>
-          </div>
-          <div class="text"><%=HTML.niceFormat(broadcastMessage)%></div>
-        </div>
-        <% 
-      }
-      
-      ItemQuery<News> query = News.getQuery();
-      query.order(Orders.desc(Hql.property("sticky")));
-      query.order(Orders.desc(Hql.property("newsDate")));
-      query.order(Orders.desc(Hql.property("id")));
-      query.setCacheResult(true);
-      query.setReturnTotalCount(true);
-      news = query.iterate(dc);
-      int numListed = 0;
-      while (news.hasNext())
-      {
-        News n = news.next();
-        if (numListed >= 10 && !n.isSticky()) break;
-        %>
-        <div class="item <%=n.isSticky() ? "note sticky" : ""%>">
-          <div class="headline">
-            <span class="date"><%=dateFormatter.format(n.getNewsDate())%></span>
-            <%=HTML.encodeTags(n.getName())%>
-          </div>
-          <div class="text"><%=HTML.niceFormat(n.getDescription())%></div>
-        </div>
-        <%
-        numListed++;
-      }
-      if (numListed < news.getTotalCount())
-      {
-        %>
-        <base:icon image="bullet.png" /><a href="info/news.jsp" 
-          title="Show older news..."><%=news.getTotalCount()-numListed%> more</a>
-        <%
-      }
-      %>
-      </div>
     </td>
     </tr>