OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

InetAddress.java (getByName, [...]): Only perform security check when DNS lookups are required. 

2006-09-01  Gary Benson  <gbenson@redhat.com>

	* java/net/InetAddress.java (getByName, getAllByName):
	Only perform security check when DNS lookups are required.

From-SVN: r116621
This commit is contained in:
Gary Benson 2006-09-01 10:06:13 +00:00 committed by Gary Benson
parent c9e4c7b5c4
commit 7229b95cc0
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -1,3 +1,8 @@
2006-09-01 Gary Benson <gbenson@redhat.com>
* java/net/InetAddress.java (getByName, getAllByName):
Only perform security check when DNS lookups are required.
2006-08-31 Keith Seitz <keiths@redhat.com>
* include/jvmti_md.h: New file.

22
libjava/java/net/InetAddress.java
View File

@ -592,14 +592,10 @@ public class InetAddress implements Serializable
throws UnknownHostException
{
// If null or the empty string is supplied, the loopback address
// is returned. Note that this is permitted without a security check.
// is returned.
if (hostname == null || hostname.length() == 0)
return loopback;
SecurityManager s = System.getSecurityManager();
if (s != null)
s.checkConnect(hostname, -1);
// Assume that the host string is an IP address
byte[] address = aton(hostname);
if (address != null)
@ -623,6 +619,11 @@ public class InetAddress implements Serializable
throw new UnknownHostException ("Address has invalid length");
}
// Perform security check before resolving
SecurityManager s = System.getSecurityManager();
if (s != null)
s.checkConnect(hostname, -1);
// Try to resolve the host by DNS
InetAddress result = new InetAddress(null, null);
lookup (hostname, result, false);
@ -650,14 +651,10 @@ public class InetAddress implements Serializable
throws UnknownHostException
{
// If null or the empty string is supplied, the loopback address
// is returned. Note that this is permitted without a security check.
// is returned.
if (hostname == null || hostname.length() == 0)
return new InetAddress[] {loopback};
SecurityManager s = System.getSecurityManager();
if (s != null)
s.checkConnect(hostname, -1);
// Check if hostname is an IP address
byte[] address = aton (hostname);
if (address != null)
@ -667,6 +664,11 @@ public class InetAddress implements Serializable
return result;
}
// Perform security check before resolving
SecurityManager s = System.getSecurityManager();
if (s != null)
s.checkConnect(hostname, -1);
// Try to resolve the hostname by DNS
return lookup (hostname, null, true);
}