Skip to content
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

Add peer network posture check #1606

Merged
merged 15 commits into from
Feb 22, 2024
Merged

Add peer network posture check #1606

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9c5c521
wip: Add PrivateNetworkCheck checks interface implementation
bcmmbaga Feb 20, 2024
2b08225
Merge branch 'main' into private-network-posture-check
bcmmbaga Feb 20, 2024
8b2d2e7
use generic CheckAction constant
bcmmbaga Feb 21, 2024
d7db3e6
Add private network check to posture checks
bcmmbaga Feb 21, 2024
7f5ef83
Fix copy function target in posture checks
bcmmbaga Feb 21, 2024
c1fa50f
Merge branch 'main' into private-network-posture-check
bcmmbaga Feb 21, 2024
be1158f
Add network check functionality to posture package
bcmmbaga Feb 21, 2024
7236c60
regenerate the openapi specs
bcmmbaga Feb 21, 2024
e7fb4a3
Update Posture Check actions in test file
bcmmbaga Feb 21, 2024
bff121d
Remove unused function
bcmmbaga Feb 21, 2024
7d59132
Refactor network address handling in PrivateNetworkCheck
bcmmbaga Feb 22, 2024
2ba3f38
Refactor Prefixes to Ranges in private network checks
bcmmbaga Feb 22, 2024
d44c80a
Implement private network checks in posture checks handler tests
bcmmbaga Feb 22, 2024
01c08cd
Add test for check copy
bcmmbaga Feb 22, 2024
a8fc803
Add gorm serializer for network range
bcmmbaga Feb 22, 2024
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
20 changes: 20 additions & 0 deletions management/server/http/api/openapi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -862,6 +862,8 @@ components:
$ref: '#/components/schemas/OSVersionCheck'
geo_location_check:
$ref: '#/components/schemas/GeoLocationCheck'
private_network_check:
$ref: '#/components/schemas/PrivateNetworkCheck'
NBVersionCheck:
description: Posture check for the version of NetBird
type: object
Expand Down Expand Up @@ -932,6 +934,24 @@ components:
required:
- locations
- action
PrivateNetworkCheck:
description: Posture check for allow or deny private network
type: object
properties:
prefixes:
bcmmbaga marked this conversation as resolved.
Show resolved Hide resolved
description: List of private network prefixes
bcmmbaga marked this conversation as resolved.
Show resolved Hide resolved
type: array
items:
type: string
example: "192.168.1.0/24"
bcmmbaga marked this conversation as resolved.
Show resolved Hide resolved
action:
description: Action to take upon policy match
type: string
enum: [ "allow", "deny" ]
example: "allow"
required:
- prefixes
- action
Location:
description: Describe geographical location information
type: object
Expand Down
80 changes: 54 additions & 26 deletions management/server/http/api/types.gen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 16 additions & 16 deletions management/server/http/peers_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@
return groupsInfo
}

func connectionIPoString(ip net.IP) *string {

Check failure on line 234 in management/server/http/peers_handler.go

View workflow job for this annotation

GitHub Actions / lint (macos-latest) 

func `connectionIPoString` is unused (unused)

Check failure on line 234 in management/server/http/peers_handler.go

View workflow job for this annotation

GitHub Actions / lint (windows-latest) 

func `connectionIPoString` is unused (unused)

Check failure on line 234 in management/server/http/peers_handler.go

View workflow job for this annotation

GitHub Actions / lint (ubuntu-latest) 

func `connectionIPoString` is unused (unused)
publicIP := ""
if ip != nil {
publicIP = ip.String()
Expand All @@ -244,31 +244,31 @@
if osVersion == "" {
osVersion = peer.Meta.Core
}
geonameID := int(peer.Location.GeoNameID)

return &api.Peer{
Id: peer.ID,
Name: peer.Name,
Ip: peer.IP.String(),
ConnectionIp: connectionIPoString(peer.Location.ConnectionIP),
ConnectionIp: peer.Location.ConnectionIP.String(),
Connected: peer.Status.Connected,
LastSeen: peer.Status.LastSeen,
Os: fmt.Sprintf("%s %s", peer.Meta.OS, osVersion),
KernelVersion: &peer.Meta.KernelVersion,
GeonameId: &geonameID,
KernelVersion: peer.Meta.KernelVersion,
GeonameId: int(peer.Location.GeoNameID),
Version: peer.Meta.WtVersion,
Groups: groupsInfo,
SshEnabled: peer.SSHEnabled,
Hostname: peer.Meta.Hostname,
UserId: &peer.UserID,
UiVersion: &peer.Meta.UIVersion,
UserId: peer.UserID,
UiVersion: peer.Meta.UIVersion,
DnsLabel: fqdn(peer, dnsDomain),
LoginExpirationEnabled: peer.LoginExpirationEnabled,
LastLogin: peer.LastLogin,
LoginExpired: peer.Status.LoginExpired,
AccessiblePeers: accessiblePeer,
ApprovalRequired: &peer.Status.RequiresApproval,
CountryCode: &peer.Location.CountryCode,
CityName: &peer.Location.CityName,
CountryCode: peer.Location.CountryCode,
CityName: peer.Location.CityName,
}
}

Expand All @@ -277,31 +277,31 @@
if osVersion == "" {
osVersion = peer.Meta.Core
}
geonameID := int(peer.Location.GeoNameID)

return &api.PeerBatch{
Id: peer.ID,
Name: peer.Name,
Ip: peer.IP.String(),
ConnectionIp: connectionIPoString(peer.Location.ConnectionIP),
ConnectionIp: peer.Location.ConnectionIP.String(),
Connected: peer.Status.Connected,
LastSeen: peer.Status.LastSeen,
Os: fmt.Sprintf("%s %s", peer.Meta.OS, osVersion),
KernelVersion: &peer.Meta.KernelVersion,
GeonameId: &geonameID,
KernelVersion: peer.Meta.KernelVersion,
GeonameId: int(peer.Location.GeoNameID),
Version: peer.Meta.WtVersion,
Groups: groupsInfo,
SshEnabled: peer.SSHEnabled,
Hostname: peer.Meta.Hostname,
UserId: &peer.UserID,
UiVersion: &peer.Meta.UIVersion,
UserId: peer.UserID,
UiVersion: peer.Meta.UIVersion,
DnsLabel: fqdn(peer, dnsDomain),
LoginExpirationEnabled: peer.LoginExpirationEnabled,
LastLogin: peer.LastLogin,
LoginExpired: peer.Status.LoginExpired,
AccessiblePeersCount: accessiblePeersCount,
ApprovalRequired: &peer.Status.RequiresApproval,
CountryCode: &peer.Location.CountryCode,
CityName: &peer.Location.CityName,
CountryCode: peer.Location.CountryCode,
CityName: peer.Location.CityName,
}
}

Expand Down
Loading
Loading