QoL feature - select best interface on current system
When generating a default config instead of using a canned value like "eth0", hypd will isntead look at what interfaces the system has and make a best guess based on progressively narrowing filters.
This commit is contained in:
parent
6b1bfb3a01
commit
0942fb132f
@ -33,7 +33,9 @@ Running hypd requires specifying a configuration file. It's recommended you gen
|
|||||||
./hypd generate defaultconfig > hypd.conf
|
./hypd generate defaultconfig > hypd.conf
|
||||||
```
|
```
|
||||||
|
|
||||||
Make sure you take the time to review the hypd.conf file and edit it to your liking, this is the most important step.
|
Make sure you take the time to review the hypd.conf file and edit it to your liking, this is the most important step. Make sure the network interface is correct, hypd will make an educated guess based on the interfaces your system has.
|
||||||
|
|
||||||
|
If you have complex requirements, you can make the successAction/timeoutAction an external shell script. If you want to disable the timeoutAction, you can set timeoutSeconds to 0.
|
||||||
|
|
||||||
Once you have set your config file, you can finally run hypd.
|
Once you have set your config file, you can finally run hypd.
|
||||||
|
|
||||||
|
@ -57,8 +57,16 @@ func LoadConfiguration(configFilePath string) (*HypdConfiguration, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func DefaultConfig() *HypdConfiguration {
|
func DefaultConfig() *HypdConfiguration {
|
||||||
|
var ifaceString string
|
||||||
|
iface, err := getDefaultNIC()
|
||||||
|
if err == nil {
|
||||||
|
ifaceString = iface.Name
|
||||||
|
} else {
|
||||||
|
ifaceString = "enp0s3" // fallback to fixed value
|
||||||
|
}
|
||||||
|
|
||||||
return &HypdConfiguration{
|
return &HypdConfiguration{
|
||||||
NetworkInterface: "enp0s3",
|
NetworkInterface: ifaceString,
|
||||||
PreSharedKeyDirectory: "./secrets/",
|
PreSharedKeyDirectory: "./secrets/",
|
||||||
SuccessAction: "iptables -A INPUT -p tcp -s %s --dport 22 -j ACCEPT",
|
SuccessAction: "iptables -A INPUT -p tcp -s %s --dport 22 -j ACCEPT",
|
||||||
TimeoutSeconds: 1440,
|
TimeoutSeconds: 1440,
|
||||||
|
81
hypd/configuration/defaultNIC.go
Normal file
81
hypd/configuration/defaultNIC.go
Normal file
@ -0,0 +1,81 @@
|
|||||||
|
package configuration
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"net"
|
||||||
|
)
|
||||||
|
|
||||||
|
// QoL feature to try and detect the best NIC for hyp
|
||||||
|
func getDefaultNIC() (*net.Interface, error) {
|
||||||
|
ifaces, err := net.Interfaces()
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to get network interfaces on this system: %v", err)
|
||||||
|
}
|
||||||
|
if len(ifaces) < 1 {
|
||||||
|
return nil, fmt.Errorf("this system has no network interfaces: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Just pick one to start
|
||||||
|
selectedIface := ifaces[0]
|
||||||
|
filteredIfaces := make([]net.Interface, 0)
|
||||||
|
|
||||||
|
// Check for ethernet addresses
|
||||||
|
for _, iface := range ifaces {
|
||||||
|
if len(iface.HardwareAddr) == 6 {
|
||||||
|
selectedIface = iface
|
||||||
|
filteredIfaces = append(filteredIfaces, iface)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ifaces = filteredIfaces
|
||||||
|
filteredIfaces = make([]net.Interface, 0)
|
||||||
|
|
||||||
|
// Check for interfaces that are up and not loopbacks
|
||||||
|
for _, iface := range ifaces {
|
||||||
|
if iface.Flags&net.FlagUp != 0 && iface.Flags&net.FlagRunning != 0 && iface.Flags&net.FlagLoopback == 0 {
|
||||||
|
selectedIface = iface
|
||||||
|
filteredIfaces = append(filteredIfaces, iface)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ifaces = filteredIfaces
|
||||||
|
filteredIfaces = make([]net.Interface, 0)
|
||||||
|
|
||||||
|
// Check for interfaces that have IPv4 addresses assigned
|
||||||
|
for _, iface := range ifaces {
|
||||||
|
addresses, err := iface.Addrs()
|
||||||
|
if err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
for _, address := range addresses {
|
||||||
|
ip, _, err := net.ParseCIDR(address.String())
|
||||||
|
if err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if ip.To4() != nil {
|
||||||
|
selectedIface = iface
|
||||||
|
filteredIfaces = append(filteredIfaces, iface)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ifaces = filteredIfaces
|
||||||
|
filteredIfaces = nil
|
||||||
|
|
||||||
|
// Check for interfaces that have non RFC1918 addresses assigned
|
||||||
|
for _, iface := range ifaces {
|
||||||
|
addresses, err := iface.Addrs()
|
||||||
|
if err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
for _, address := range addresses {
|
||||||
|
ip, _, err := net.ParseCIDR(address.String())
|
||||||
|
if err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if !ip.IsPrivate() {
|
||||||
|
selectedIface = iface
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return &selectedIface, nil // TBD
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user