From 53ecff4f605c52555bf5ec045a02c91c7d478889 Mon Sep 17 00:00:00 2001 From: jeb228 Date: Fri, 3 Sep 2010 16:17:01 +0000 Subject: [PATCH] Cosmetic changes: reformat, organize imports, add generic type arguments. --- .../mannlib/vedit/beans/LoginFormBean.java | 361 ++++++++++-------- 1 file changed, 194 insertions(+), 167 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vedit/beans/LoginFormBean.java b/webapp/src/edu/cornell/mannlib/vedit/beans/LoginFormBean.java index 38fadd74a..146c524b9 100644 --- a/webapp/src/edu/cornell/mannlib/vedit/beans/LoginFormBean.java +++ b/webapp/src/edu/cornell/mannlib/vedit/beans/LoginFormBean.java @@ -2,214 +2,241 @@ package edu.cornell.mannlib.vedit.beans; -import javax.servlet.*; -import javax.servlet.http.*; -import java.util.*; +import java.util.Hashtable; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; /** - * + * * @author jc55 - * + * */ public class LoginFormBean { - public static final int ANYBODY=0; - public int getAnybody(){ return ANYBODY; } - public static final int NON_EDITOR = 1; - public int getNonEditor(){ return NON_EDITOR; } - public static final int EDITOR =4; - public int getEditor(){return EDITOR;} - public static final int CURATOR=5; - public int getCurator(){return CURATOR;} - public static final int DBA =50; - public int getDba(){return DBA;} + public static final int ANYBODY = 0; - public boolean getBla(){ return true; } + public int getAnybody() { + return ANYBODY; + } - private String userURI; - private String sessionId; - private String loginBrowser; - private String loginRemoteAddr; - private String loginName; - private String loginPassword; - private String loginStatus; - private int loginUserId; - private String loginRole; - private String duplicatePassword; - private String emailAddress; - private Hashtable errors; + public static final int NON_EDITOR = 1; - public boolean validateLoginForm() { - boolean allOk=true; + public int getNonEditor() { + return NON_EDITOR; + } - if ( loginName.equals("")) { - errors.put( "loginName","Please enter your Vivo user name" ); - loginName = ""; - allOk = false; - } + public static final int EDITOR = 4; - if ( loginPassword.equals("")) { - errors.put( "loginPassword","Please enter your Vivo password" ); - loginPassword=""; - allOk=false; - } + public int getEditor() { + return EDITOR; + } - return allOk; - } + public static final int CURATOR = 5; - public LoginFormBean() { - sessionId = ""; - loginBrowser = ""; - loginRemoteAddr = ""; - loginName = ""; - loginPassword = ""; - loginStatus = "none"; - loginUserId = 0; - loginRole = "1"; - duplicatePassword = ""; - emailAddress = ""; + public int getCurator() { + return CURATOR; + } - errors = new Hashtable(); - } + public static final int DBA = 50; - public String toString(){ - String name = "-not-logged-in-"; - if( getLoginName() != null && !"".equals(getLoginName()) ) - name = getLoginName(); + public int getDba() { + return DBA; + } - return this.getClass().getName() - +" loginName: " + name - +" loginStatus: "+ getLoginStatus() - +" loginRole: "+ getLoginRole(); - } - /** - Tests a HttpSession to see if logged in and authenticated. - @returns loginRole if seems to be authenticated, -1 otherwise - */ - public int testSessionLevel( HttpServletRequest request ){ - //TODO: security code added by bdc34, should be checked by jc55 - HttpSession currentSession = request.getSession(); - int returnRole = -1; - if ( getLoginStatus().equals("authenticated") && - currentSession.getId().equals( getSessionId() ) && - request.getRemoteAddr().equals( getLoginRemoteAddr() ) ) { - try{ - returnRole = Integer.parseInt( getLoginRole() ); - }catch(Throwable thr){ } - } - return returnRole; - } + public boolean getBla() { + return true; + } - public static boolean loggedIn(HttpServletRequest request, int minLevel) { - if( request == null ) return false; - HttpSession sess = request.getSession(false); - if( sess == null ) return false; - Object obj = sess.getAttribute("loginHandler"); - if( obj == null || ! (obj instanceof LoginFormBean)) - return false; + private String userURI; + private String sessionId; + private String loginBrowser; + private String loginRemoteAddr; + private String loginName; + private String loginPassword; + private String loginStatus; + private int loginUserId; + private String loginRole; + private String duplicatePassword; + private String emailAddress; + private Hashtable errors; - LoginFormBean lfb = (LoginFormBean)obj; - return ( "authenticated".equals(lfb.loginStatus ) && - Integer.parseInt(lfb.loginRole ) >= minLevel) ; - } + public boolean validateLoginForm() { + boolean allOk = true; - /********************** GET METHODS *********************/ + if (loginName.equals("")) { + errors.put("loginName", "Please enter your Vivo user name"); + loginName = ""; + allOk = false; + } - public String getUserURI() { - return userURI; - } + if (loginPassword.equals("")) { + errors.put("loginPassword", "Please enter your Vivo password"); + loginPassword = ""; + allOk = false; + } - public String getSessionId() { - return sessionId; - } + return allOk; + } - public String getLoginBrowser() { - return loginBrowser; - } + public LoginFormBean() { + sessionId = ""; + loginBrowser = ""; + loginRemoteAddr = ""; + loginName = ""; + loginPassword = ""; + loginStatus = "none"; + loginUserId = 0; + loginRole = "1"; + duplicatePassword = ""; + emailAddress = ""; - public String getLoginRemoteAddr() { - return loginRemoteAddr; - } - public String getLoginName() { - return loginName; - } + errors = new Hashtable(); + } - public String getLoginPassword() { - return loginPassword; - } + public String toString() { + String name = "-not-logged-in-"; + if (getLoginName() != null && !"".equals(getLoginName())) + name = getLoginName(); - public String getLoginStatus() { - return loginStatus; - } + return this.getClass().getName() + " loginName: " + name + + " loginStatus: " + getLoginStatus() + " loginRole: " + + getLoginRole(); + } - public int getLoginUserId() { - return loginUserId; - } + /** + * Tests a HttpSession to see if logged in and authenticated. + * + * @returns loginRole if seems to be authenticated, -1 otherwise + */ + public int testSessionLevel(HttpServletRequest request) { + // TODO: security code added by bdc34, should be checked by jc55 + HttpSession currentSession = request.getSession(); + int returnRole = -1; + if (getLoginStatus().equals("authenticated") + && currentSession.getId().equals(getSessionId()) + && request.getRemoteAddr().equals(getLoginRemoteAddr())) { + try { + returnRole = Integer.parseInt(getLoginRole()); + } catch (Throwable thr) { + } + } + return returnRole; + } - public String getLoginRole() { - return loginRole; - } + public static boolean loggedIn(HttpServletRequest request, int minLevel) { + if (request == null) + return false; + HttpSession sess = request.getSession(false); + if (sess == null) + return false; + Object obj = sess.getAttribute("loginHandler"); + if (obj == null || !(obj instanceof LoginFormBean)) + return false; - public String getDuplicatePassword() { - return duplicatePassword; - } + LoginFormBean lfb = (LoginFormBean) obj; + return ("authenticated".equals(lfb.loginStatus) && Integer + .parseInt(lfb.loginRole) >= minLevel); + } - public String getEmailAddress() { - return emailAddress; - } + /********************** GET METHODS *********************/ - public String getErrorMsg( String s ) { - String errorMsg =(String) errors.get( s.trim() ); - return ( errorMsg == null ) ? "" : errorMsg; - } + public String getUserURI() { + return userURI; + } - /********************** SET METHODS *********************/ + public String getSessionId() { + return sessionId; + } - public void setUserURI( String uri ) { - this.userURI = uri; - } + public String getLoginBrowser() { + return loginBrowser; + } - public void setSessionId( String id ) { - sessionId = id; - } + public String getLoginRemoteAddr() { + return loginRemoteAddr; + } - public void setLoginBrowser( String b ) { - loginBrowser = b; - } + public String getLoginName() { + return loginName; + } - public void setLoginRemoteAddr( String ra ) { - loginRemoteAddr = ra; - } + public String getLoginPassword() { + return loginPassword; + } - public void setLoginName( String ln ) { - loginName = ln; - } + public String getLoginStatus() { + return loginStatus; + } - public void setLoginPassword( String lp ) { - loginPassword = lp; - } + public int getLoginUserId() { + return loginUserId; + } - public void setLoginStatus( String ls ) { - loginStatus = ls; - } + public String getLoginRole() { + return loginRole; + } - public void setLoginUserId(int int_val) { - loginUserId=int_val; - } + public String getDuplicatePassword() { + return duplicatePassword; + } - public void setLoginRole( String lr ) { - loginRole = lr; - } + public String getEmailAddress() { + return emailAddress; + } - public void setDuplicatePassword( String dp ) { - duplicatePassword = dp; - } + public String getErrorMsg(String s) { + String errorMsg = (String) errors.get(s.trim()); + return (errorMsg == null) ? "" : errorMsg; + } - public void setEmailAddress( String ea ) { - emailAddress = ea; - } + /********************** SET METHODS *********************/ - public void setErrorMsg( String key, String msg ) { - errors.put( key,msg ); - } + public void setUserURI(String uri) { + this.userURI = uri; + } + + public void setSessionId(String id) { + sessionId = id; + } + + public void setLoginBrowser(String b) { + loginBrowser = b; + } + + public void setLoginRemoteAddr(String ra) { + loginRemoteAddr = ra; + } + + public void setLoginName(String ln) { + loginName = ln; + } + + public void setLoginPassword(String lp) { + loginPassword = lp; + } + + public void setLoginStatus(String ls) { + loginStatus = ls; + } + + public void setLoginUserId(int int_val) { + loginUserId = int_val; + } + + public void setLoginRole(String lr) { + loginRole = lr; + } + + public void setDuplicatePassword(String dp) { + duplicatePassword = dp; + } + + public void setEmailAddress(String ea) { + emailAddress = ea; + } + + public void setErrorMsg(String key, String msg) { + errors.put(key, msg); + } }