xsteadfastx/dsnet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add validationof hostname + IP

Browse Source
This commit is contained in:
Callan Bryant 2020-03-02 19:26:08 +00:00
parent af7484c84b
commit 11ed6be6d1
No known key found for this signature in database
GPG Key ID: C31FA9DF3ACBFFAA
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
add.go
View File

@ -21,10 +21,10 @@ func Add(hostname string, owner string, description string) { //, publicKey stri
PublicKey: publicKey, PublicKey: publicKey,
PresharedKey: presharedKey, PresharedKey: presharedKey,
// TODO Endpoint: // TODO Endpoint:
AllowedIPs: []JSONIPNet{ AllowedIPs: []JSONIPNet{
JSONIPNet { JSONIPNet{
IPNet: net.IPNet{ IPNet: net.IPNet{
IP: IP, IP: IP,
Mask: conf.Network.IPNet.Mask, Mask: conf.Network.IPNet.Mask,
}, },
}, },

16
types.go
View File

@ -78,7 +78,20 @@ func (conf *DsnetConfig) MustSave() {
} }
func (conf *DsnetConfig) MustAddPeer(peer PeerConfig) { func (conf *DsnetConfig) MustAddPeer(peer PeerConfig) {
// TODO validate PeerConfig!!! // TODO validate all PeerConfig (keys etc)
for _, p := range conf.Peers {
if peer.Hostname == p.Hostname {
ExitFail("%s is not an unique hostname", peer.Hostname)
}
}
for _, peerIPNet := range peer.AllowedIPs {
if conf.IPAllocated(peerIPNet.IPNet.IP) {
ExitFail("%s is not unique", peerIPNet)
}
}
conf.Peers = append(conf.Peers, peer) conf.Peers = append(conf.Peers, peer)
} }
@ -95,6 +108,7 @@ func (conf DsnetConfig) IPAllocated(IP net.IP) bool {
} }
// choose a free IP for a new Peer // choose a free IP for a new Peer
// TODO MustChooseIP? -- failure means we give up anyway
func (conf DsnetConfig) ChooseIP() (net.IP, error) { func (conf DsnetConfig) ChooseIP() (net.IP, error) {
network := conf.Network.IPNet network := conf.Network.IPNet
ones, bits := network.Mask.Size() ones, bits := network.Mask.Size()