detect crawlers and strippers and chop off their sessions
This commit is contained in:
		
							parent
							
								
									28d09ea769
								
							
						
					
					
						commit
						cdbb987cd6
					
				@ -23,30 +23,45 @@ importPackage(Packages.com.silverwrist.venice.ui.helpers);
 | 
				
			|||||||
rinput = bsf.lookupBean("request");
 | 
					rinput = bsf.lookupBean("request");
 | 
				
			||||||
sess = vlib.castVeniceUISession(bsf.lookupBean("session"));
 | 
					sess = vlib.castVeniceUISession(bsf.lookupBean("session"));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// Get the login cookie name and the CookieControl service.
 | 
					// Is this browser a crawler or stripper?  If so, make sure the session is destroyed at
 | 
				
			||||||
cookie_name = rinput.getConfigProperty("login.cookie");
 | 
					// the end of this request.
 | 
				
			||||||
cctl = vlib.queryCookieControl(rinput);
 | 
					binfo = vlib.queryBrowserInformation(rinput);
 | 
				
			||||||
if (cctl.isCookiePresent(cookie_name))
 | 
					if (binfo.hasCapability("crawler") || binfo.hasCapability("stripper"))
 | 
				
			||||||
{ // get the login cookie value and try to use it to log in
 | 
					{ // delete this session after 30 seconds if nothing else happens
 | 
				
			||||||
  logger.debug("cookie " + cookie_name + " found");
 | 
					  logger.debug("this session is a crawler, it will be killed");
 | 
				
			||||||
  logged_in = false;
 | 
					  sess.setMaxInactiveInterval(30);
 | 
				
			||||||
  try
 | 
					 | 
				
			||||||
  { // attempt to log the user in with the cookie
 | 
					 | 
				
			||||||
    // but don't do it if they're IP-banned
 | 
					 | 
				
			||||||
    if (rinput.engine.testIPBan(rinput.sourceAddress)==null)
 | 
					 | 
				
			||||||
      logged_in = sess.user.authenticateWithToken(cctl.getCookie(cookie_name));
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
  } // end try
 | 
					  // the session will be killed at the end of the request anyway
 | 
				
			||||||
  catch (e)
 | 
					  rinput.registerCleanup(new SessionKiller(sess));
 | 
				
			||||||
  { // login failed
 | 
					 | 
				
			||||||
    logger.error("caught " + vlib.exceptionType(e) + ": " + e.message);
 | 
					 | 
				
			||||||
    logged_in = false;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  } // end catch
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  if (!logged_in) // not logged in - delete the cookie
 | 
					 | 
				
			||||||
    cctl.deleteCookie(cookie_name);
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
} // end if
 | 
					} // end if
 | 
				
			||||||
else
 | 
					else
 | 
				
			||||||
  logger.debug("cookie " + cookie_name + " not found");
 | 
					{ // Get the login cookie name and the CookieControl service.
 | 
				
			||||||
 | 
					  cookie_name = rinput.getConfigProperty("login.cookie");
 | 
				
			||||||
 | 
					  cctl = vlib.queryCookieControl(rinput);
 | 
				
			||||||
 | 
					  if (cctl.isCookiePresent(cookie_name))
 | 
				
			||||||
 | 
					  { // get the login cookie value and try to use it to log in
 | 
				
			||||||
 | 
					    logger.debug("cookie " + cookie_name + " found");
 | 
				
			||||||
 | 
					    logged_in = false;
 | 
				
			||||||
 | 
					    try
 | 
				
			||||||
 | 
					    { // attempt to log the user in with the cookie
 | 
				
			||||||
 | 
					      // but don't do it if they're IP-banned
 | 
				
			||||||
 | 
					      if (rinput.engine.testIPBan(rinput.sourceAddress)==null)
 | 
				
			||||||
 | 
					        logged_in = sess.user.authenticateWithToken(cctl.getCookie(cookie_name));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    } // end try
 | 
				
			||||||
 | 
					    catch (e)
 | 
				
			||||||
 | 
					    { // login failed
 | 
				
			||||||
 | 
					      logger.error("caught " + vlib.exceptionType(e) + ": " + e.message);
 | 
				
			||||||
 | 
					      logged_in = false;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    } // end catch
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (!logged_in) // not logged in - delete the cookie
 | 
				
			||||||
 | 
					      cctl.deleteCookie(cookie_name);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  } // end if
 | 
				
			||||||
 | 
					  else
 | 
				
			||||||
 | 
					    logger.debug("cookie " + cookie_name + " not found");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					} // end else (this is a REAL browser, not a crawler or stripper)
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										53
									
								
								src/com/silverwrist/venice/ui/helpers/SessionKiller.java
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										53
									
								
								src/com/silverwrist/venice/ui/helpers/SessionKiller.java
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,53 @@
 | 
				
			|||||||
 | 
					/*
 | 
				
			||||||
 | 
					 * The contents of this file are subject to the Mozilla Public License Version 1.1
 | 
				
			||||||
 | 
					 * (the "License"); you may not use this file except in compliance with the License.
 | 
				
			||||||
 | 
					 * You may obtain a copy of the License at <http://www.mozilla.org/MPL/>.
 | 
				
			||||||
 | 
					 * 
 | 
				
			||||||
 | 
					 * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT
 | 
				
			||||||
 | 
					 * WARRANTY OF ANY KIND, either express or implied. See the License for the specific
 | 
				
			||||||
 | 
					 * language governing rights and limitations under the License.
 | 
				
			||||||
 | 
					 * 
 | 
				
			||||||
 | 
					 * The Original Code is the Venice Web Communities System.
 | 
				
			||||||
 | 
					 * 
 | 
				
			||||||
 | 
					 * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
 | 
				
			||||||
 | 
					 * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
 | 
				
			||||||
 | 
					 * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
 | 
				
			||||||
 | 
					 * 
 | 
				
			||||||
 | 
					 * Contributor(s): 
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					package com.silverwrist.venice.ui.helpers;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import com.silverwrist.venice.ui.*;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					public class SessionKiller implements AutoCleanup
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					  /*--------------------------------------------------------------------------------
 | 
				
			||||||
 | 
					   * Attributes
 | 
				
			||||||
 | 
					   *--------------------------------------------------------------------------------
 | 
				
			||||||
 | 
					   */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  private final VeniceUISession m_sess;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  /*--------------------------------------------------------------------------------
 | 
				
			||||||
 | 
					   * Constructor
 | 
				
			||||||
 | 
					   *--------------------------------------------------------------------------------
 | 
				
			||||||
 | 
					   */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  public SessionKiller(VeniceUISession sess)
 | 
				
			||||||
 | 
					  {
 | 
				
			||||||
 | 
					    m_sess = sess;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  } // end constructor
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  /*--------------------------------------------------------------------------------
 | 
				
			||||||
 | 
					   * Implementations from interface AutoCleanup
 | 
				
			||||||
 | 
					   *--------------------------------------------------------------------------------
 | 
				
			||||||
 | 
					   */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  public void cleanup()
 | 
				
			||||||
 | 
					  {
 | 
				
			||||||
 | 
					    m_sess.invalidate();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  } // end cleanup
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					} // end class SessionKiller
 | 
				
			||||||
@ -24,9 +24,7 @@ import org.w3c.dom.*;
 | 
				
			|||||||
import com.silverwrist.util.StringUtil;
 | 
					import com.silverwrist.util.StringUtil;
 | 
				
			||||||
import com.silverwrist.venice.core.*;
 | 
					import com.silverwrist.venice.core.*;
 | 
				
			||||||
import com.silverwrist.venice.ui.VeniceUISession;
 | 
					import com.silverwrist.venice.ui.VeniceUISession;
 | 
				
			||||||
import com.silverwrist.venice.ui.helpers.CookieControl;
 | 
					import com.silverwrist.venice.ui.helpers.*;
 | 
				
			||||||
import com.silverwrist.venice.ui.helpers.HTMLRendering;
 | 
					 | 
				
			||||||
import com.silverwrist.venice.ui.helpers.SessionControl;
 | 
					 | 
				
			||||||
import com.silverwrist.venice.util.*;
 | 
					import com.silverwrist.venice.util.*;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
public class ScriptLibrary
 | 
					public class ScriptLibrary
 | 
				
			||||||
@ -220,6 +218,12 @@ public class ScriptLibrary
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  } // end join
 | 
					  } // end join
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  public final BrowserInformation queryBrowserInformation(ServiceProvider sp)
 | 
				
			||||||
 | 
					  {
 | 
				
			||||||
 | 
					    return (BrowserInformation)(sp.queryService(BrowserInformation.class));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  } // end queryBrowserInformation
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  public final CookieControl queryCookieControl(ServiceProvider sp)
 | 
					  public final CookieControl queryCookieControl(ServiceProvider sp)
 | 
				
			||||||
  {
 | 
					  {
 | 
				
			||||||
    return (CookieControl)(sp.queryService(CookieControl.class));
 | 
					    return (CookieControl)(sp.queryService(CookieControl.class));
 | 
				
			||||||
 | 
				
			|||||||
@ -110,6 +110,11 @@ class BrowserDatabase
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    } // end finally
 | 
					    } // end finally
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (m_broken)
 | 
				
			||||||
 | 
					      logger.info("BrowserDatabase: load broken");
 | 
				
			||||||
 | 
					    else
 | 
				
			||||||
 | 
					      logger.info("BrowserDatabase: loaded " + m_browser_list.size() + " entries");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  } // end constructor
 | 
					  } // end constructor
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  /*--------------------------------------------------------------------------------
 | 
					  /*--------------------------------------------------------------------------------
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user