Skip to content

Enable multiple addresses to be assigned to clients in a single location #1075

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

Merged
wojcik91 merged 78 commits into from
May 14, 2025
Merged

Enable multiple addresses to be assigned to clients in a single location #1075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
46e979b
migrations for multi-address peers
j-chmielewski Apr 4, 2025
39ebd55
wip deal with most of the db issues resulting from network device add…
j-chmielewski Apr 4, 2025
7f2fcd9
Simplify WireguardNetworkDevice::wireguard_ip sql
j-chmielewski Apr 4, 2025
88ae9e3
wip deal with typing issues after multiaddress mods
j-chmielewski Apr 7, 2025
f804e2a
CommaSeparated helper trait
j-chmielewski Apr 7, 2025
03ec04b
linting
j-chmielewski Apr 7, 2025
991085f
Multi-address handling when creating new network device
j-chmielewski Apr 8, 2025
bd3d796
Cleanup
j-chmielewski Apr 8, 2025
8383a0e
update sqlx fixtures
j-chmielewski Apr 9, 2025
ffafdf7
fix tests, todos
j-chmielewski Apr 9, 2025
5a14b06
Update protos
j-chmielewski Apr 9, 2025
c947ff5
wip separate firewall rules for ipv4 and ipv6
j-chmielewski Apr 9, 2025
d5f7686
sqlx fixtures
j-chmielewski Apr 9, 2025
5709436
Fix UserDevice::from_device sql query, remove WireguardNetwork::get_i…
j-chmielewski Apr 10, 2025
34ed661
update protos
j-chmielewski Apr 10, 2025
869160a
Merge branch 'dev' into multiple-addresses
j-chmielewski Apr 10, 2025
c575d98
create_rules helper function
j-chmielewski Apr 10, 2025
938a763
cleanup
j-chmielewski Apr 10, 2025
95f6ca6
make tests compile
j-chmielewski Apr 10, 2025
a76e8a2
fix downmigration
j-chmielewski Apr 11, 2025
02d6d9d
create_rules method takes ip version as arg, fix tests
j-chmielewski Apr 14, 2025
c73552c
Only add ipv4/6 rules if network has ipv4/6 addresses
j-chmielewski Apr 14, 2025
b35387a
test_generate_firewall_rules_ipv6
j-chmielewski Apr 14, 2025
53e74f0
Firewall ipv6 and ipv4+ipv6 tests
j-chmielewski Apr 14, 2025
9263caf
test_generate_firewall_rules_ipv4_and_ipv6
j-chmielewski Apr 14, 2025
7af0ca8
fix test_network_devices test
j-chmielewski Apr 14, 2025
fd6f4cb
Imports for wg configs with multiple addresses
j-chmielewski Apr 16, 2025
2aa98d1
fix mapped devices
j-chmielewski Apr 16, 2025
00f65fa
Update validator for "map imported device" form
j-chmielewski Apr 16, 2025
ddc8cd8
Find IPs for a new network device in all networks
j-chmielewski Apr 16, 2025
06f8e72
wip
j-chmielewski Apr 16, 2025
f4c9e51
frontend displayes multiple ip recommendations
j-chmielewski Apr 17, 2025
28d19e4
wip further frontend mods related to multi-address functionality
j-chmielewski Apr 17, 2025
8ae756f
fix form validation
j-chmielewski Apr 17, 2025
b26330e
Vec of IPs in UserDeviceNetworkInfo, rename wireguard_ip -> wireguard…
j-chmielewski Apr 17, 2025
0750516
More renames and ip arrays
j-chmielewski Apr 17, 2025
6eeac01
wireguard_ips array in stats types
j-chmielewski Apr 17, 2025
423729d
WireguardDeviceStatsRow as Vec<String>
j-chmielewski Apr 18, 2025
83b3462
Merge branch 'dev' into multiple-addresses
j-chmielewski Apr 18, 2025
a6c642f
update defguard-ui
j-chmielewski Apr 18, 2025
f6e6ff8
fix new device email template
j-chmielewski Apr 18, 2025
3868faa
wip deduplicate ip check utility functions
j-chmielewski Apr 17, 2025
51b04a7
IP assignment validation
j-chmielewski Apr 18, 2025
7d4a186
fix overview types
filipslezaklab Apr 18, 2025
c23015e
multiple addresses fixes
filipslezaklab Apr 18, 2025
6997069
Fix NetworkDeviceInfo::from_device function for multiple addresses.
j-chmielewski Apr 22, 2025
2165284
Fix network device address reassignment
j-chmielewski Apr 22, 2025
f14d1cc
Fix down migration
j-chmielewski Apr 22, 2025
4866151
Rename wireguard_ip -> wireguard_ips
j-chmielewski Apr 22, 2025
46df1e5
Fix tests
j-chmielewski Apr 22, 2025
a2dc607
IP assignment tests
j-chmielewski Apr 22, 2025
96eefe8
Fix network device update handler
j-chmielewski Apr 23, 2025
a3ebef7
Improve log
j-chmielewski Apr 23, 2025
a39c7f6
Reuse can_assign_ips method in assign_next_network_ip
j-chmielewski Apr 23, 2025
50b3e44
Take device's own IP into account during readdressing
j-chmielewski Apr 23, 2025
fd01940
sqlx fixtures
j-chmielewski Apr 23, 2025
8b1514d
Fix readdressing when adding new network address
j-chmielewski Apr 23, 2025
e5e8c9e
Fix ips in mapped devices during network import
j-chmielewski Apr 24, 2025
2ca9afb
Remove unused method
j-chmielewski Apr 24, 2025
9b065fe
Cleanup
j-chmielewski Apr 28, 2025
9f6d83c
Rename helper trait CommaSeparated -> AsCsv
j-chmielewski Apr 28, 2025
8feca11
Logs, style and linter changes
j-chmielewski Apr 28, 2025
3226468
Merge branch 'dev' into multiple-addresses
j-chmielewski Apr 30, 2025
58a220f
Partition device ips
j-chmielewski Apr 30, 2025
a60ad38
fix tests
j-chmielewski Apr 30, 2025
80e54ae
Merge branch 'fix-ldap-tests' into multiple-addresses
j-chmielewski Apr 30, 2025
352f60b
Merge branch 'dev' into multiple-addresses
j-chmielewski Apr 30, 2025
b722f26
Merge branch 'dev' into multiple-addresses
wojcik91 May 6, 2025
0810cf3
update protos
wojcik91 May 6, 2025
6b26293
formatting
wojcik91 May 6, 2025
9995a6e
lint fix
wojcik91 May 6, 2025
ab6aaae
review fixes
wojcik91 May 6, 2025
4ffd4f9
formatting
wojcik91 May 6, 2025
4926633
reorder migrations
wojcik91 May 14, 2025
30d0eeb
update dependencies
wojcik91 May 14, 2025
41c3469
Merge branch 'dev' into multiple-addresses
wojcik91 May 14, 2025
1b08f86
fix deprecation warnings
wojcik91 May 14, 2025
e6c07e7
update allowed licenses
wojcik91 May 14, 2025
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
19 changes: 19 additions & 0 deletions .sqlx/query-09b6f2fc7ec101117a99f85a64314c32c219b73f3afa358f838cb833d5544842.json
View file
Open in desktop

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

19 changes: 0 additions & 19 deletions .sqlx/query-12d13e1b78576a8751ae2c219f865ee71d125c20933c6659b747cf5ccdc1d9a1.json
View file
Open in desktop

This file was deleted.

19 changes: 19 additions & 0 deletions .sqlx/query-20efd0ac76bd8a6ca51dd31ff89125ce288466a847cf58b3e9be7659e7360933.json
View file
Open in desktop

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

8 changes: 4 additions & 4 deletions ...0923a54812064de0b9331b2c71134e6ce29e.json → ...32c9ebb2231dd6da663cdeaaf29b93afc8ac.json
View file
Open in desktop

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

8 changes: 4 additions & 4 deletions ...0a852264d7465295de0223e00cf1f69c98c1.json → ...7d8596d6499193933c58fa1d7ba0a8f445bd.json
View file
Open in desktop

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

8 changes: 4 additions & 4 deletions ...b31030fe878f3001447d2c245b9502dff427.json → ...3a3ac6c360be2c949e5567afb8383ec92475.json
View file
Open in desktop

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

35 changes: 35 additions & 0 deletions .sqlx/query-751bb201b4bbf3477c87f81a2fd77089d0a6773cebb138f77700cc052d1229aa.json
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions ...3908aec2ddb747ad6e77e347365b4e61a8b0.json → ...5e337d121ee56509b42b6e4f57e2575c9bce.json
View file
Open in desktop

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

8 changes: 4 additions & 4 deletions ...f366eb24bf7b907011a01313b77bed572176.json → ...cafa2c1e5161eef7c5f35a7705be21235087.json
View file
Open in desktop

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

23 changes: 23 additions & 0 deletions .sqlx/query-9338acd23dbb4f6b14d15482d86eb14fbfe962f46ebf0b0e00cfad7c2955f598.json
View file
Open in desktop

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

8 changes: 4 additions & 4 deletions ...2ccf6cdcebe76c12cde524b162552b002d89.json → ...9d6b74b3288be8d31dfcd32394685ba54e0f.json
View file
Open in desktop

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

8 changes: 4 additions & 4 deletions ...a0225ffe0171886e9e4c7b70346f1c37d42a.json → ...a6bd455ce7059baf539d7b678996c2c92c8c.json
View file
Open in desktop

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

23 changes: 0 additions & 23 deletions .sqlx/query-bbc08ad580dbb33fdafa20cdefda974dde20c858da0eb2773e59ed79697e49df.json
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions .sqlx/query-c9ccdf7be24dfe8c69f0f71242e4b37c022ebca568e9af80d65730f450664313.json
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions .sqlx/query-da7a1669b1ba89003f6c507b5b2b09f39004776d14c0b37fc9d7ac636b2b58ec.json
View file
Open in desktop

This file was deleted.

23 changes: 23 additions & 0 deletions .sqlx/query-dca1b36b0c60d9dd643e0f8b86b35c93e831d73c532d038fda7c831123600ce3.json
View file
Open in desktop

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

Loading