ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-02-20 17:52:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use regex to finely detect docker and rce interfaces and address style fixes

Browse Source
This commit is contained in:
Praneeth Bodduluri 2015-09-16 21:03:40 +05:30 committed by Pablo Carranza Vélez
parent f86f5881d9
commit feb4d74d28
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gosuper/gosuper/api.go
View File

@ -7,6 +7,7 @@ import (
"net"
"net/http"
"os"
"regexp"
"strconv"
"strings"
"time"
@ -14,6 +15,10 @@ import (
"resin-supervisor/gosuper/systemd"
)
// Compile the expression once, usually at init time.
// Use raw strings to avoid having to quote the backslashes.
var dockerMatch = regexp.MustCompile(`(docker[0-9])|(rce[0-9])`)
type ApiResponse struct {
Status string
Error string
@ -116,19 +121,19 @@ func ShutdownHandler(writer http.ResponseWriter, request *http.Request) {
}
// This function returns all active IPs of the interfaces that arent docker/rce and loopback
func ipAddress() ([]string, error) {
ipAddr := []string{}
func ipAddress() (ipAddresses []string, err error) {
ifaces, err := net.Interfaces()
if err != nil {
return ipAddr, err
return ipAddresses, err
}
for _, iface := range ifaces {
if (iface.Flags&net.FlagUp == 0) || (iface.Flags&net.FlagLoopback != 0) || strings.Contains(iface.Name, "docker") || strings.Contains(iface.Name, "rce") {
if (iface.Flags&net.FlagUp == 0) || (iface.Flags&net.FlagLoopback != 0) || dockerMatch.MatchString(iface.Name) {
continue // Interface down or Interface is loopback or Interface is a docker IP
}
addrs, err := iface.Addrs()
if err != nil {
return ipAddr, err
return ipAddresses, err
}
for _, addr := range addrs {
var ip net.IP
@ -137,25 +142,23 @@ func ipAddress() ([]string, error) {
ip = v.IP
case *net.IPAddr:
ip = v.IP
default:
continue
}
if ip == nil {
continue
} else {
ip = ip.To4()
if ip == nil {
continue // This isnt an IPv4 Addresss
} else {
ipAddr = append(ipAddr, ip.String())
}
}
if ip = ip.To4(); ip == nil {
continue // This isnt an IPv4 Addresss
}
ipAddresses = append(ipAddresses, ip.String())
}
}
return ipAddr, nil
return
}
//IPAddressHandler is used to reply back with an array of the IPaddress used by the system.
func IPAddressHandler(writer http.ResponseWriter, request *http.Request) {
// log.Println("Fetching IP Address'") - Not logging this as this is called every 30 seconds.
sendResponse := responseSender(writer)
sendError := func(err string) {
sendResponse("Error", err, http.StatusInternalServerError)