Fix up ip filter application on some tracker paths

Author: parg

core/src/com/biglybt/core/tracker/server/impl/TRTrackerServerFactoryImpl.java

@@ -201,11 +201,11 @@
 					throw( new TRTrackerServerException( "TRTrackerServerFactory: UDP doesn't support SSL"));
 				}
 
-				server = new TRTrackerServerUDP( name, port, start_up_ready, properties );
+				server = new TRTrackerServerUDP( name, port, apply_ip_filter, start_up_ready, properties );
 
 			}else{
 
-				server = new TRTrackerServerDHT( name, start_up_ready, properties );
+				server = new TRTrackerServerDHT( name, apply_ip_filter, start_up_ready, properties );
 			}
 
 			servers.add( server );

core/src/com/biglybt/core/tracker/server/impl/TRTrackerServerImpl.java

@@ -349,7 +349,7 @@
 		return( support_experimental_extensions );
 	}
 
-	protected final IpFilter	ip_filter	= IpFilterManagerFactory.getSingleton().getIPFilter();
+	private final IpFilter	ip_filter	= IpFilterManagerFactory.getSingleton().getIPFilter();
 
 	private long		current_announce_retry_interval;
 	private long		current_scrape_retry_interval;
@@ -361,6 +361,8 @@
 	private final TRTrackerServerStatsImpl	stats = new TRTrackerServerStatsImpl( this );
 
 	private final String				name;
+	private final boolean				apply_ip_filter;
+
 	private final Map<String,Object>	properties;
 
 	private final boolean				reverse_proxy;
@@ -398,12 +400,14 @@
 	public
 	TRTrackerServerImpl(
 		String					_name,
+		boolean					_apply_ip_filter,
 		boolean					_start_up_ready,
 		Map<String,Object>		_properties )
 	{
-		name		= _name==null?DEFAULT_NAME:_name;
-		is_ready	= _start_up_ready;
-		properties	= _properties==null?new HashMap<>():_properties;
+		name			= _name==null?DEFAULT_NAME:_name;
+		apply_ip_filter	= _apply_ip_filter;
+		is_ready		= _start_up_ready;
+		properties		= _properties==null?new HashMap<>():_properties;
 
 		Boolean b_rp = (Boolean)properties.get( Tracker.PR_REVERSE_PROXY );
 
@@ -473,7 +477,7 @@
 
 		key_enabled = COConfigurationManager.getBooleanParameter("Tracker Key Enable Server");
 	}
-
+	
 	@Override
 	public void
 	setReady()
@@ -515,6 +519,20 @@
 		return( keep_alive_enabled );
 	}
 
+	protected boolean
+	isIPFiltered(
+		String		ip )
+	{
+		if ( apply_ip_filter && ip_filter.isInRange( ip, "Tracker", null )){
+			
+			return( true );
+			
+		}else{
+			
+			return( false );
+		}
+	}
+	
 	public TRTrackerServerTorrent
 	addLink(
 		String					link,

core/src/com/biglybt/core/tracker/server/impl/TRTrackerServerProcessor.java

@@ -93,6 +93,11 @@
 			throw( new TRTrackerServerException( "Tracker initialising, please wait" ));
 		}
 
+		if ( server.isIPFiltered( real_ip_address )){
+			
+			throw( new TRTrackerServerException( "Unauthorized" ));
+		}
+				
 		start = SystemTime.getHighPrecisionCounter();
 
 		boolean	ip_override = real_ip_address != original_client_ip_address;

core/src/com/biglybt/core/tracker/server/impl/dht/TRTrackerServerDHT.java

@@ -37,10 +37,11 @@
 	public
 	TRTrackerServerDHT(
 		String				name,
+		boolean				apply_ip_filter,
 		boolean				start_up_ready,
 		Map<String,Object>	properties )
 	{
-		super( name, start_up_ready, properties );
+		super( name, apply_ip_filter, start_up_ready, properties );
 	}
 
 	@Override

core/src/com/biglybt/core/tracker/server/impl/tcp/TRTrackerServerTCP.java

@@ -47,8 +47,7 @@
 	public static final int  PROCESSING_POST_MULTIPLIER	=  Math.max(0, COConfigurationManager.getIntParameter( "Tracker Max POST Time Multiplier" ));
 
 	private final boolean	ssl;
-	private int		port;
-	private final boolean	apply_ip_filter;
+	private int				port;
 
 	private boolean restrict_non_blocking_requests = TRTrackerServerImpl.restrict_non_blocking_requests;
 
@@ -65,12 +64,11 @@
 
 		throws TRTrackerServerException
 	{
-		super( _name, _start_up_ready, _properties );
+		super( _name, _apply_ip_filter, _start_up_ready, _properties );
 
 		port					= _port;
 		ssl						= _ssl;
-		apply_ip_filter			= _apply_ip_filter;
-
+		
 		thread_pool = new ThreadPool( "TrackerServer:TCP:"+port, THREAD_POOL_SIZE );
 
 		if ( PROCESSING_GET_LIMIT > 0 ){
@@ -86,12 +84,6 @@
 		thread_pool.run( processor );
 	}
 
-	protected boolean
-	isIPFilterEnabled()
-	{
-		return( apply_ip_filter );
-	}
-
 	public boolean
 	getRestrictNonBlocking()
 	{

core/src/com/biglybt/core/tracker/server/impl/tcp/blocking/TRBlockingServer.java

@@ -283,13 +283,14 @@
 
 				String	ip = socket.getInetAddress().getHostAddress();
 
-				if ( (!isIPFilterEnabled()) || (!ip_filter.isInRange( ip, "Tracker", null ))){
-
-					runProcessor( new TRBlockingServerProcessor( this, socket ));
+				if ( isIPFiltered(ip)){
 
+					socket.close();
+					
 				}else{
+										
+					runProcessor( new TRBlockingServerProcessor( this, socket ));
 
-					socket.close();
 				}
 
 			}catch( Throwable e ){

core/src/com/biglybt/core/tracker/server/impl/tcp/nonblocking/TRNonBlockingServer.java

@@ -336,8 +336,7 @@
 
         	removeAndCloseConnection( processor );
 
-        }else if ( 	isIPFilterEnabled() &&
-					ip_filter.isInRange( channel.socket().getInetAddress().getHostAddress(), "Tracker", null )){
+        }else if ( 	isIPFiltered( channel.socket().getInetAddress().getHostAddress())){
 
         	removeAndCloseConnection( processor );
 

core/src/com/biglybt/core/tracker/server/impl/udp/TRTrackerServerUDP.java

@@ -64,10 +64,11 @@
 	TRTrackerServerUDP(
 		String				_name,
 		int					_port,
+		boolean				_apply_ip_filter,
 		boolean				_start_up_ready,
 		Map<String,Object>	_properties )
 	{
-		super( _name, _start_up_ready, _properties );
+		super( _name, _apply_ip_filter, _start_up_ready, _properties );
 
 		port		= _port;
 
@@ -156,7 +157,7 @@
 
 				String	ip = packet.getAddress().getHostAddress();
 
-				if ( !ip_filter.isInRange( ip, "Tracker", null )){
+				if ( !isIPFiltered( ip )){
 
 					thread_pool.run( new TRTrackerServerProcessorUDP( this, socket, packet ));
 				}