Login | Register
My pages Projects Community openCollabNet

Discussions > cvs > cvs commit: joist/java/org/joist/security Login.java PermissionSelection.java SecureServlet.java UnsecureServlet.java

Project highlights: Architectural Overview

joist
Discussion topic

Hide all messages in topic

All messages in topic

cvs commit: joist/java/org/joist/security Login.java PermissionSelection.java SecureServlet.java UnsecureServlet.java

Author commitlogger at hocus dot collab dot net
Full name commitlogger at hocus dot collab dot net
Date 2000-01-30 11:50:12 PST
Message root 00/01/30 11:50:12

  Modified: java/org/joist/account UserSelection.java
               java/org/joist/database UserManager.java
               java/org/joist/mail MailListMaintenance.java
                        MailListSubscribe.java
               java/org/joist/security Login.java PermissionSelection.java
                        SecureServlet.java UnsecureServlet.java
  Log:
  commented out references to old tables; moved $proj up to UnsecureServlet; made BRANDNAME explicitly set
  
  Revision Changes Path
  1.3 +3 -3 joist/java/org/joist​/account/UserSelecti​on.java
  
  Index: UserSelection.java
  ====================​====================​====================​=======
  RCS file: /cvs/joist/java/org/​joist/account/UserSe​lection.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- UserSelection.java 2000/01/30 13:00:34 1.2
  +++ UserSelection.java 2000/01/30 19:50:11 1.3
  @@ -21,7 +21,7 @@
     * for additional processing, such as displaying details of the user.
     *
     * @author Daniel M. Pellegrini <A HREF="mailto:pilgrim​@dataweb-systems.com​">pilgrim@dataweb​-systems.com</A​>
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
     *
     * Copyright (c) 1999 dataweb systems, inc.
    * Copyright (c) 1999, 2000 Collab.Net, Inc.
  @@ -82,7 +82,7 @@
   
           if (haveUserID)
           {
  - setAsCancel(context);
  + //JER: setAsCancel(context);
           throw new RedirectException("U​serMaintenance");
           }
           else
  @@ -96,7 +96,7 @@
       if (action.equals("New"))
       {
           if (debug) log.debug("UserSelection: New redirect");
  - setAsCancel(context);
  + //JER: setAsCancel(context);
           throw new RedirectException("U​serMaintenance");
       }
   
  
  
  
  1.3 +11 -11 joist/java/org/joist​/database/UserManage​r.java
  
  Index: UserManager.java
  ====================​====================​====================​=======
  RCS file: /cvs/joist/java/org/​joist/database/UserM​anager.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- UserManager.java 2000/01/30 13:00:35 1.2
  +++ UserManager.java 2000/01/30 19:50:12 1.3
  @@ -15,7 +15,7 @@
     * Manages users, including adding, retrieving, updating, and deleting.
     *
     * @author David C. Pellegrini <A HREF="mailto:davidp@​dataweb-systems.com"​>davidp@dataweb-s​ystems.com</A>​
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
     *
     * Copyright (c) 1999 dataweb systems, inc.
    * Copyright (c) 1999, 2000 Collab.Net, Inc.
  @@ -240,15 +240,15 @@
           Statement stmt = connection.createStatement();
           try
           {
  - StringBuffer encPass = new StringBuffer("select PASSWORD(");
  - encPass.append(Quote​dString.from(newPass​word));
  - encPass.append(") from Dual");
  - ResultSet rset = stmt.executeQuery(en​cPass.toString());
  -
  - if (rset.next())
  - {
  - encryptedPassword = rset.getString(1);
  - }
  + //JER: StringBuffer encPass = new StringBuffer("select PASSWORD(");
  + //JER: encPass.append(Quote​dString.from(newPass​word));
  + //JER: encPass.append(") from Dual");
  + //JER: ResultSet rset = stmt.executeQuery(en​cPass.toString());
  +
  + //JER: if (rset.next())
  + //JER: {
  + //JER: encryptedPassword = rset.getString(1);
  + //JER: }
           }
           finally
           {
  @@ -376,7 +376,7 @@
   
           stmt.executeUpdate("delete from UserRole where userID=" + userID);
   
  - stmt.executeUpdate("delete from Developer where userID=" + userID);
  + //JER: stmt.executeUpdate("delete from Developer where userID=" + userID);
   
           // Should we bother to cascade the delete to other tables that have
           // userID as a foreign key? Not doing so will leave orphan links,
  
  
  
  1.3 +2 -2 joist/java/org/joist​/mail/MailListMainte​nance.java
  
  Index: MailListMaintenance.java
  ====================​====================​====================​=======
  RCS file: /cvs/joist/java/org/​joist/mail/MailListM​aintenance.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MailListMaintenance.java 2000/01/30 13:00:35 1.2
  +++ MailListMaintenance.java 2000/01/30 19:50:12 1.3
  @@ -18,7 +18,7 @@
     *
     * @author David C. Pellegrini <A HREF="mailto:davidp@​dataweb-systems.com"​>davidp@dataweb-s​ystems.com</A>​
    
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
     *
     * Copyright (c) 1999 dataweb systems, inc.
    * Copyright (c) 1999, 2000 Collab.Net, Inc.
  @@ -100,7 +100,7 @@
           {
           phase = "Viewing archive for";
           checkForViewPermissi​on(userPerms);
  - setAsCancel(context);
  + //JER: setAsCancel(context);
           context.put("listName", listName);
           redirectTo(mailListA​rchiveServlet());
           }
  
  
  
  1.3 +2 -2 joist/java/org/joist​/mail/MailListSubscr​ibe.java
  
  Index: MailListSubscribe.java
  ====================​====================​====================​=======
  RCS file: /cvs/joist/java/org/​joist/mail/MailListS​ubscribe.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MailListSubscribe.java 2000/01/30 13:00:35 1.2
  +++ MailListSubscribe.java 2000/01/30 19:50:12 1.3
  @@ -20,7 +20,7 @@
     *
     * @author David C. Pellegrini <A HREF="mailto:davidp@​dataweb-systems.com"​>davidp@dataweb-s​ystems.com</A>​
    
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
     *
     * Copyright (c) 1999 dataweb systems, inc.
    * Copyright (c) 1999, 2000 Collab.Net, Inc.
  @@ -95,7 +95,7 @@
           {
           phase = "Viewing archive for";
           checkForViewPermissi​on(userPerms);
  - setAsCancel(context);
  + //JER: setAsCancel(context);
           context.put("listName", listName);
           redirectTo(mailListA​rchiveServlet());
           }
  
  
  
  1.3 +2 -2 joist/java/org/joist​/security/Login.java​
  
  Index: Login.java
  ====================​====================​====================​=======
  RCS file: /cvs/joist/java/org/​joist/security/Login​.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Login.java 2000/01/30 13:00:37 1.2
  +++ Login.java 2000/01/30 19:50:12 1.3
  @@ -32,7 +32,7 @@
     *
     * @author Daniel M. Pellegrini <A HREF="mailto:pilgrim​@dataweb-systems.com​">pilgrim@dataweb​-systems.com</A​>
     * @author David C. Pellegrini <A HREF="mailto:davidp@​dataweb-systems.com"​>davidp@dataweb-s​ystems.com</A>​
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
     *
     * Copyright (c) 1999 dataweb systems, inc.
    * Copyright (c) 1999, 2000 Collab.Net, Inc.
  @@ -113,7 +113,7 @@
           sMgr.getPermissions(connection, context);
   
           // Redirect to the target page or the Start Page for this User
  - redirectToDetour(context);
  + //JER: redirectToDetour(context);
           }
   
           if (!validAction) redirectToUnauthorized();
  
  
  
  1.3 +2 -2 joist/java/org/joist​/security/Permission​Selection.java
  
  Index: PermissionSelection.java
  ====================​====================​====================​=======
  RCS file: /cvs/joist/java/org/​joist/security/Permi​ssionSelection.java,​v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PermissionSelection.java 2000/01/30 13:00:37 1.2
  +++ PermissionSelection.java 2000/01/30 19:50:12 1.3
  @@ -16,7 +16,7 @@
     * for additional processing, such as displaying details of the permission.
     *
     * @author David C. Pellegrini <A HREF="mailto:davidp@​dataweb-systems.com"​>davidp@dataweb-s​ystems.com</A>​
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
     *
     * Copyright (c) 1999 dataweb systems, inc.
    * Copyright (c) 1999, 2000 Collab.Net, Inc.
  @@ -73,7 +73,7 @@
       {
           if (havePermID)
           {
  - setAsCancel(context);
  + //JER: setAsCancel(context);
           throw new RedirectException("R​olePermissionMainten​ance");
           }
           else
  
  
  
  1.3 +2 -2 joist/java/org/joist​/security/SecureServ​let.java
  
  Index: SecureServlet.java
  ====================​====================​====================​=======
  RCS file: /cvs/joist/java/org/​joist/security/Secur​eServlet.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SecureServlet.java 2000/01/30 13:00:37 1.2
  +++ SecureServlet.java 2000/01/30 19:50:12 1.3
  @@ -18,7 +18,7 @@
    * Adds session tracking and user authentication to WebMacro servlets.
    *
    * @author David C. Pellegrini <A HREF="mailto:davidp@​dataweb-systems.com"​>davidp@dataweb-s​ystems.com</A>​
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    *
    * Copyright (c) 1999 dataweb systems, inc.
    * Copyright (c) 1999, 2000 Collab.Net, Inc.
  @@ -59,7 +59,7 @@
           if (!(isLoggedIn.booleanValue()))
           {
           if (debug) log.debug("NOT logged in");
  - setAsDetour(context);
  + //JER: setAsDetour(context);
           context.put("action", "none");
           redirectTo(myPropert​ies.getProperty("log​inServletName"));
           }
  
  
  
  1.3 +13 -2 joist/java/org/joist​/security/UnsecureSe​rvlet.java
  
  Index: UnsecureServlet.java
  ====================​====================​====================​=======
  RCS file: /cvs/joist/java/org/​joist/security/Unsec​ureServlet.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- UnsecureServlet.java 2000/01/30 13:00:37 1.2
  +++ UnsecureServlet.java 2000/01/30 19:50:12 1.3
  @@ -23,7 +23,7 @@
    * loading to WebMacro servlets.
    *
    * @author David C. Pellegrini <A HREF="mailto:davidp@​dataweb-systems.com"​>davidp@dataweb-s​ystems.com</A>​
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    *
    * Copyright (c) 1999 dataweb systems, inc.
    * Copyright (c) 1999, 2000 Collab.Net, Inc.
  @@ -247,8 +247,19 @@
       // environment, bypass the standard template and get the raw
       // application servlet specific template.
       context.put("servletTemplate", myProperties.getProp​erty("servletTemplat​e"));
  - context.put("httpAndServer", URL.httpAndServer(context));
   
  + context.put("myProperties", myProperties);
  + context.put("BRANDNAME", myProperties.getProp​erty("BRANDNAME"));
  +
  + String httpAndServer = URL.httpAndServer(co​ntext).toString();
  + context.put("httpAndServer", httpAndServer);
  +
  +
  + int dot = httpAndServer.indexOf('.', 7);
  + String proj = httpAndServer.substring(7, dot);
  + context.put("proj", proj);
  +
  +
       if (inProductionEnvironment)
       {
           templateName = myProperties.getProp​erty("servletTemplat​e");
Messages per page: