T1045: static route dhcp-interface: check for ip in response

runborg · runborg · commit 8f4b8917d23b · 2018-11-25T21:45:36.000+01:00
Checks done to verify a dhcp-lease on the interface is updated to look for a
ip-address like response from dhclient before returning an error.

This fixes the error where a newline was enough to make the checks fail..

Updated to also make sure no newline is returned after the address to make
sure commands using adresses from this script is not cut in half by the newline,
and to be in line with the syntax on all errors. (no newline at the end)
diff --git a/scripts/vyatta-dhcp-helper.pl b/scripts/vyatta-dhcp-helper.pl
@@ -22,9 +22,12 @@ sub get_dhcp_router {
     my $router = `grep new_routers= $lease | cut -d"'" -f2`;
     my @r = split(/,/, $router);
     $router = $r[0];
-    if ($router eq "") {
+    # Make sure the result looks like a IP
+    if ($router !~ /\d+\.\d+\.\d+\.\d+/) {
         return "127.0.0.1";
     }
+    # Remove trailing newlines
+    $router =~ s/\n$//;
     return $router;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,12 @@ sub get_dhcp_router {`
`22`	`22`	my $router = `grep new_routers= $lease \| cut -d"'" -f2`;
`23`	`23`	`my @r = split(/,/, $router);`
`24`	`24`	`$router = $r[0];`
`25`		`- if ($router eq "") {`
	`25`	`+ # Make sure the result looks like a IP`
	`26`	`+ if ($router !~ /\d+\.\d+\.\d+\.\d+/) {`
`26`	`27`	`return "127.0.0.1";`
`27`	`28`	`}`
	`29`	`+ # Remove trailing newlines`
	`30`	`+ $router =~ s/\n$//;`
`28`	`31`	`return $router;`
`29`	`32`	`}`
`30`	`33`