Skip to content

Add new properties to inetutils: useOnlySiteLocalInterfaces and preferredNetworks #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tjuchniewicz wants to merge 4 commits into from
Closed

Add new properties to inetutils: useOnlySiteLocalInterfaces and preferredNetworks #120

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9d6a113
Add new properties to inetutils: useOnlySiteLocalInterfaces and prefe…
tjuchniewicz Jul 8, 2016
918b687
Fix code formatting.
tjuchniewicz Jul 8, 2016
1b7807a
Fix invalid condition for preferredNetworks
tjuchniewicz Aug 17, 2016
33ca17b
Fix InetUtilsTests for prefferedNetworks
tjuchniewicz Aug 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix code formatting.
  • Loading branch information
@tjuchniewicz
tjuchniewicz committed Jul 8, 2016
commit 918b687c17742b10531d2f33506e6e231498be55
33 changes: 16 additions & 17 deletions spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/InetUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,23 +129,22 @@ else if (result != null) {
}

boolean ignoreAddress(InetAddress address) {

if (this.properties.isUseOnlySiteLocalInterfaces() && !address.isSiteLocalAddress()) {
log.trace("Ignoring address: " + address.getHostAddress());
return true;
}

for (String regex : this.properties.getPreferredNetworks()) {
if (address.getHostAddress().matches(regex) || address.getHostAddress().startsWith(regex)) {
log.trace("Ignoring address: " + address.getHostAddress());
return true;
}
}

return false;
}

boolean ignoreInterface(String interfaceName) {

if (this.properties.isUseOnlySiteLocalInterfaces() && !address.isSiteLocalAddress()) {
log.trace("Ignoring address: " + address.getHostAddress());
return true;
}

for (String regex : this.properties.getPreferredNetworks()) {
Copy link
Member

@spencergibb spencergibb Aug 17, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a bit confused here. Why is prefferedNetworks being ignored?

Copy link
Contributor Author

@tjuchniewicz tjuchniewicz Aug 17, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Look like a bug.

if (address.getHostAddress().matches(regex) || address.getHostAddress().startsWith(regex))

must be replaced by:

if (!address.getHostAddress().matches(regex) && !address.getHostAddress().startsWith(regex))

Now I use only useOnlySiteLocalInterfaces on production. prefferedNetworks is planned to be used in next months.

Copy link
Contributor Author

@tjuchniewicz tjuchniewicz Aug 17, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

if (address.getHostAddress().matches(regex) || address.getHostAddress().startsWith(regex)) {
log.trace("Ignoring address: " + address.getHostAddress());
return true;
}
}
return false;
}

boolean ignoreInterface(String interfaceName) {
for (String regex : this.properties.getIgnoredInterfaces()) {
if (interfaceName.matches(regex)) {
log.trace("Ignoring interface: " + interfaceName);
Expand Down
4 changes: 2 additions & 2 deletions ...oud-commons/src/main/java/org/springframework/cloud/commons/util/InetUtilsProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public class InetUtilsProperties {
private boolean useOnlySiteLocalInterfaces = false;

/**
* List of Java regex expressions for network addresses that will be ignored.
*/
* List of Java regex expressions for network addresses that will be ignored.
*/
private List<String> preferredNetworks = new ArrayList<>();
}
48 changes: 24 additions & 24 deletions ...ng-cloud-commons/src/test/java/org/springframework/cloud/commons/util/InetUtilsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,35 +87,35 @@ public void testDefaultIgnoreInterface() {
}

@Test
public void testSiteLocalAddresses() throws Exception {
InetUtilsProperties properties = new InetUtilsProperties();
properties.setUseOnlySiteLocalInterfaces(true);
try (InetUtils utils = new InetUtils(properties)) {
assertFalse(utils.ignoreAddress(InetAddress.getByName("192.168.0.1")));
assertTrue(utils.ignoreAddress(InetAddress.getByName("5.5.8.1")));
}
public void testSiteLocalAddresses() throws Exception {
InetUtilsProperties properties = new InetUtilsProperties();
properties.setUseOnlySiteLocalInterfaces(true);

try (InetUtils utils = new InetUtils(properties)) {
assertFalse(utils.ignoreAddress(InetAddress.getByName("192.168.0.1")));
assertTrue(utils.ignoreAddress(InetAddress.getByName("5.5.8.1")));
}
}

@Test
public void testPrefferedNetworksRegex() throws Exception {
InetUtilsProperties properties = new InetUtilsProperties();
properties.setPreferredNetworks(Arrays.asList("192.168.*"));
try (InetUtils utils = new InetUtils(properties)) {
assertTrue(utils.ignoreAddress(InetAddress.getByName("192.168.0.1")));
assertFalse(utils.ignoreAddress(InetAddress.getByName("5.5.8.1")));
}
}
public void testPrefferedNetworksRegex() throws Exception {
InetUtilsProperties properties = new InetUtilsProperties();
properties.setPreferredNetworks(Arrays.asList("192.168.*"));

try (InetUtils utils = new InetUtils(properties)) {
assertTrue(utils.ignoreAddress(InetAddress.getByName("192.168.0.1")));
assertFalse(utils.ignoreAddress(InetAddress.getByName("5.5.8.1")));
}
}

@Test
public void testPrefferedNetworksSimple() throws Exception {
InetUtilsProperties properties = new InetUtilsProperties();
properties.setPreferredNetworks(Arrays.asList("192"));
try (InetUtils utils = new InetUtils(properties)) {
assertTrue(utils.ignoreAddress(InetAddress.getByName("192.168.0.1")));
assertFalse(utils.ignoreAddress(InetAddress.getByName("5.5.8.1")));
}
InetUtilsProperties properties = new InetUtilsProperties();
properties.setPreferredNetworks(Arrays.asList("192"));
try (InetUtils utils = new InetUtils(properties)) {
assertTrue(utils.ignoreAddress(InetAddress.getByName("192.168.0.1")));
assertFalse(utils.ignoreAddress(InetAddress.getByName("5.5.8.1")));
}
}
}