1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
|
package lib
import (
"net"
"net/netip"
"testing"
)
func TestNewEntry(t *testing.T) {
tests := []struct {
input string
expected string
}{
{"us", "US"},
{" cn ", "CN"},
{"JP", "JP"},
{"", ""},
}
for _, tt := range tests {
e := NewEntry(tt.input)
if e.GetName() != tt.expected {
t.Errorf("NewEntry(%q).GetName() = %q, want %q", tt.input, e.GetName(), tt.expected)
}
}
}
func TestEntryHasBuilderAndSet(t *testing.T) {
e := NewEntry("test")
if e.hasIPv4Builder() {
t.Error("new entry should not have ipv4 builder")
}
if e.hasIPv6Builder() {
t.Error("new entry should not have ipv6 builder")
}
if e.hasIPv4Set() {
t.Error("new entry should not have ipv4 set")
}
if e.hasIPv6Set() {
t.Error("new entry should not have ipv6 set")
}
}
func TestEntryAddPrefixString(t *testing.T) {
tests := []struct {
name string
cidr string
wantErr bool
}{
{"ipv4 cidr", "1.0.0.0/24", false},
{"ipv6 cidr", "2001:db8::/32", false},
{"ipv4 address", "8.8.8.8", false},
{"ipv6 address", "2001:db8::1", false},
{"comment #", "# comment", true},
{"comment //", "// comment", true},
{"comment /*", "/* comment */", true},
{"empty string", "", true},
{"invalid string", "not-an-ip", true},
{"invalid cidr", "999.999.999.999/24", true},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
e := NewEntry("test")
err := e.AddPrefix(tt.cidr)
if (err != nil) != tt.wantErr {
t.Errorf("AddPrefix(%q) error = %v, wantErr %v", tt.cidr, err, tt.wantErr)
}
})
}
}
func TestEntryAddPrefixNetIP(t *testing.T) {
e := NewEntry("test")
// net.IP IPv4
ipv4 := net.ParseIP("1.2.3.4")
if err := e.AddPrefix(ipv4); err != nil {
t.Errorf("AddPrefix(net.IP IPv4) error = %v", err)
}
// net.IP IPv6
ipv6 := net.ParseIP("2001:db8::1")
if err := e.AddPrefix(ipv6); err != nil {
t.Errorf("AddPrefix(net.IP IPv6) error = %v", err)
}
// Invalid net.IP
invalidIP := net.IP{}
if err := e.AddPrefix(invalidIP); err == nil {
t.Error("AddPrefix(invalid net.IP) should return error")
}
}
func TestEntryAddPrefixNetIPNet(t *testing.T) {
e := NewEntry("test")
// IPv4 net
_, ipNet4, _ := net.ParseCIDR("10.0.0.0/8")
if err := e.AddPrefix(ipNet4); err != nil {
t.Errorf("AddPrefix(*net.IPNet IPv4) error = %v", err)
}
// IPv6 net
_, ipNet6, _ := net.ParseCIDR("2001:db8::/32")
if err := e.AddPrefix(ipNet6); err != nil {
t.Errorf("AddPrefix(*net.IPNet IPv6) error = %v", err)
}
}
func TestEntryAddPrefixNetipAddr(t *testing.T) {
e := NewEntry("test")
// netip.Addr IPv4
addr4 := netip.MustParseAddr("1.2.3.4")
if err := e.AddPrefix(addr4); err != nil {
t.Errorf("AddPrefix(netip.Addr IPv4) error = %v", err)
}
// netip.Addr IPv6
addr6 := netip.MustParseAddr("2001:db8::1")
if err := e.AddPrefix(addr6); err != nil {
t.Errorf("AddPrefix(netip.Addr IPv6) error = %v", err)
}
// *netip.Addr IPv4
a4 := netip.MustParseAddr("5.6.7.8")
if err := e.AddPrefix(&a4); err != nil {
t.Errorf("AddPrefix(*netip.Addr IPv4) error = %v", err)
}
// *netip.Addr IPv6
a6 := netip.MustParseAddr("2001:db8::2")
if err := e.AddPrefix(&a6); err != nil {
t.Errorf("AddPrefix(*netip.Addr IPv6) error = %v", err)
}
}
func TestEntryAddPrefixNetipPrefix(t *testing.T) {
e := NewEntry("test")
// netip.Prefix IPv4
p4 := netip.MustParsePrefix("10.0.0.0/8")
if err := e.AddPrefix(p4); err != nil {
t.Errorf("AddPrefix(netip.Prefix IPv4) error = %v", err)
}
// netip.Prefix IPv6
p6 := netip.MustParsePrefix("2001:db8::/32")
if err := e.AddPrefix(p6); err != nil {
t.Errorf("AddPrefix(netip.Prefix IPv6) error = %v", err)
}
// *netip.Prefix IPv4
pp4 := netip.MustParsePrefix("172.16.0.0/12")
if err := e.AddPrefix(&pp4); err != nil {
t.Errorf("AddPrefix(*netip.Prefix IPv4) error = %v", err)
}
// *netip.Prefix IPv6
pp6 := netip.MustParsePrefix("fd00::/8")
if err := e.AddPrefix(&pp6); err != nil {
t.Errorf("AddPrefix(*netip.Prefix IPv6) error = %v", err)
}
}
func TestEntryAddPrefixInvalidType(t *testing.T) {
e := NewEntry("test")
err := e.AddPrefix(12345)
if err != ErrInvalidPrefixType {
t.Errorf("AddPrefix(int) error = %v, want ErrInvalidPrefixType", err)
}
}
func TestEntryRemovePrefix(t *testing.T) {
e := NewEntry("test")
// Add first
if err := e.AddPrefix("1.0.0.0/24"); err != nil {
t.Fatal(err)
}
if err := e.AddPrefix("2001:db8::/32"); err != nil {
t.Fatal(err)
}
// Remove
if err := e.RemovePrefix("1.0.0.0/25"); err != nil {
t.Errorf("RemovePrefix error = %v", err)
}
if err := e.RemovePrefix("2001:db8::/48"); err != nil {
t.Errorf("RemovePrefix error = %v", err)
}
// Remove with comment line - returns error because processPrefix returns ErrCommentLine
// which is skipped, then remove() is called with nil prefix and empty IPType
if err := e.RemovePrefix("# comment"); err == nil {
t.Error("RemovePrefix comment line should return error")
}
// Remove invalid
if err := e.RemovePrefix("invalid"); err == nil {
t.Error("RemovePrefix(invalid) should return error")
}
}
func TestEntryRemovePrefixNoBuilder(t *testing.T) {
e := NewEntry("test")
// Remove from entry without builders should not fail
if err := e.RemovePrefix("1.0.0.0/24"); err != nil {
t.Errorf("RemovePrefix without builder error = %v", err)
}
if err := e.RemovePrefix("2001:db8::/32"); err != nil {
t.Errorf("RemovePrefix without builder error = %v", err)
}
}
func TestEntryGetIPv4Set(t *testing.T) {
e := NewEntry("test")
// No builder -> error
_, err := e.GetIPv4Set()
if err == nil {
t.Error("GetIPv4Set without builder should return error")
}
// With data
if err := e.AddPrefix("1.0.0.0/24"); err != nil {
t.Fatal(err)
}
set, err := e.GetIPv4Set()
if err != nil {
t.Errorf("GetIPv4Set error = %v", err)
}
if set == nil {
t.Error("GetIPv4Set returned nil set")
}
}
func TestEntryGetIPv6Set(t *testing.T) {
e := NewEntry("test")
// No builder -> error
_, err := e.GetIPv6Set()
if err == nil {
t.Error("GetIPv6Set without builder should return error")
}
// With data
if err := e.AddPrefix("2001:db8::/32"); err != nil {
t.Fatal(err)
}
set, err := e.GetIPv6Set()
if err != nil {
t.Errorf("GetIPv6Set error = %v", err)
}
if set == nil {
t.Error("GetIPv6Set returned nil set")
}
}
func TestEntryMarshalPrefix(t *testing.T) {
e := NewEntry("test")
if err := e.AddPrefix("1.0.0.0/24"); err != nil {
t.Fatal(err)
}
if err := e.AddPrefix("2001:db8::/32"); err != nil {
t.Fatal(err)
}
// All prefixes
prefixes, err := e.MarshalPrefix()
if err != nil {
t.Errorf("MarshalPrefix error = %v", err)
}
if len(prefixes) != 2 {
t.Errorf("expected 2 prefixes, got %d", len(prefixes))
}
// Ignore IPv4
prefixes, err = e.MarshalPrefix(IgnoreIPv4)
if err != nil {
t.Errorf("MarshalPrefix(IgnoreIPv4) error = %v", err)
}
for _, p := range prefixes {
if p.Addr().Is4() {
t.Error("should not contain IPv4 prefix when ignoring IPv4")
}
}
// Ignore IPv6
prefixes, err = e.MarshalPrefix(IgnoreIPv6)
if err != nil {
t.Errorf("MarshalPrefix(IgnoreIPv6) error = %v", err)
}
for _, p := range prefixes {
if p.Addr().Is6() && !p.Addr().Is4In6() {
t.Error("should not contain IPv6 prefix when ignoring IPv6")
}
}
// With nil option
prefixes, err = e.MarshalPrefix(nil)
if err != nil {
t.Errorf("MarshalPrefix(nil) error = %v", err)
}
if len(prefixes) != 2 {
t.Errorf("expected 2 prefixes with nil option, got %d", len(prefixes))
}
}
func TestEntryMarshalPrefixEmpty(t *testing.T) {
e := NewEntry("test")
_, err := e.MarshalPrefix()
if err == nil {
t.Error("MarshalPrefix on empty entry should return error")
}
}
func TestEntryMarshalIPRange(t *testing.T) {
e := NewEntry("test")
if err := e.AddPrefix("1.0.0.0/24"); err != nil {
t.Fatal(err)
}
if err := e.AddPrefix("2001:db8::/32"); err != nil {
t.Fatal(err)
}
// All ranges
ranges, err := e.MarshalIPRange()
if err != nil {
t.Errorf("MarshalIPRange error = %v", err)
}
if len(ranges) != 2 {
t.Errorf("expected 2 ranges, got %d", len(ranges))
}
// Ignore IPv4
ranges, err = e.MarshalIPRange(IgnoreIPv4)
if err != nil {
t.Errorf("MarshalIPRange(IgnoreIPv4) error = %v", err)
}
if len(ranges) != 1 {
t.Errorf("expected 1 range, got %d", len(ranges))
}
// Ignore IPv6
ranges, err = e.MarshalIPRange(IgnoreIPv6)
if err != nil {
t.Errorf("MarshalIPRange(IgnoreIPv6) error = %v", err)
}
if len(ranges) != 1 {
t.Errorf("expected 1 range, got %d", len(ranges))
}
// With nil option
ranges, err = e.MarshalIPRange(nil)
if err != nil {
t.Errorf("MarshalIPRange(nil) error = %v", err)
}
if len(ranges) != 2 {
t.Errorf("expected 2 ranges with nil option, got %d", len(ranges))
}
}
func TestEntryMarshalIPRangeEmpty(t *testing.T) {
e := NewEntry("test")
_, err := e.MarshalIPRange()
if err == nil {
t.Error("MarshalIPRange on empty entry should return error")
}
}
func TestEntryMarshalText(t *testing.T) {
e := NewEntry("test")
if err := e.AddPrefix("1.0.0.0/24"); err != nil {
t.Fatal(err)
}
if err := e.AddPrefix("2001:db8::/32"); err != nil {
t.Fatal(err)
}
// All text
text, err := e.MarshalText()
if err != nil {
t.Errorf("MarshalText error = %v", err)
}
if len(text) != 2 {
t.Errorf("expected 2 text entries, got %d", len(text))
}
// Ignore IPv4
text, err = e.MarshalText(IgnoreIPv4)
if err != nil {
t.Errorf("MarshalText(IgnoreIPv4) error = %v", err)
}
if len(text) != 1 {
t.Errorf("expected 1 text entry, got %d", len(text))
}
// Ignore IPv6
text, err = e.MarshalText(IgnoreIPv6)
if err != nil {
t.Errorf("MarshalText(IgnoreIPv6) error = %v", err)
}
if len(text) != 1 {
t.Errorf("expected 1 text entry, got %d", len(text))
}
// With nil option
text, err = e.MarshalText(nil)
if err != nil {
t.Errorf("MarshalText(nil) error = %v", err)
}
if len(text) != 2 {
t.Errorf("expected 2 text entries with nil option, got %d", len(text))
}
}
func TestEntryMarshalTextEmpty(t *testing.T) {
e := NewEntry("test")
_, err := e.MarshalText()
if err == nil {
t.Error("MarshalText on empty entry should return error")
}
}
func TestEntryAddInvalidIPType(t *testing.T) {
e := NewEntry("test")
prefix := netip.MustParsePrefix("1.0.0.0/24")
err := e.add(&prefix, IPType("invalid"))
if err != ErrInvalidIPType {
t.Errorf("add with invalid IPType error = %v, want ErrInvalidIPType", err)
}
}
func TestEntryRemoveInvalidIPType(t *testing.T) {
e := NewEntry("test")
prefix := netip.MustParsePrefix("1.0.0.0/24")
err := e.remove(&prefix, IPType("invalid"))
if err != ErrInvalidIPType {
t.Errorf("remove with invalid IPType error = %v, want ErrInvalidIPType", err)
}
}
func TestProcessPrefixStringCIDRWithComment(t *testing.T) {
e := NewEntry("test")
// CIDR with trailing comment
prefix, ipType, err := e.processPrefix("10.0.0.0/8 # comment")
if err != nil {
t.Errorf("processPrefix CIDR with comment error = %v", err)
}
if ipType != IPv4 {
t.Errorf("expected IPv4, got %q", ipType)
}
if prefix == nil {
t.Error("prefix should not be nil")
}
// IP with trailing comment
prefix, ipType, err = e.processPrefix("10.0.0.1 // comment")
if err != nil {
t.Errorf("processPrefix IP with comment error = %v", err)
}
if ipType != IPv4 {
t.Errorf("expected IPv4, got %q", ipType)
}
if prefix == nil {
t.Error("prefix should not be nil")
}
}
func TestProcessPrefixIPv4MappedIPv6(t *testing.T) {
e := NewEntry("test")
// netip.Addr - IPv4-mapped IPv6
mapped := netip.MustParseAddr("::ffff:1.2.3.4")
prefix, ipType, err := e.processPrefix(mapped)
if err != nil {
t.Errorf("processPrefix mapped addr error = %v", err)
}
if ipType != IPv4 {
t.Errorf("expected IPv4 for mapped address, got %q", ipType)
}
if prefix == nil {
t.Error("prefix should not be nil")
}
// *netip.Addr - IPv4-mapped IPv6
mapped2 := netip.MustParseAddr("::ffff:5.6.7.8")
prefix, ipType, err = e.processPrefix(&mapped2)
if err != nil {
t.Errorf("processPrefix *mapped addr error = %v", err)
}
if ipType != IPv4 {
t.Errorf("expected IPv4 for *mapped address, got %q", ipType)
}
if prefix == nil {
t.Error("prefix should not be nil")
}
}
func TestProcessPrefixNetipPrefixIs4In6(t *testing.T) {
e := NewEntry("test")
// netip.Prefix with IPv4-in-IPv6 address
p := netip.MustParsePrefix("::ffff:10.0.0.0/104")
prefix, ipType, err := e.processPrefix(p)
if err != nil {
t.Errorf("processPrefix 4in6 prefix error = %v", err)
}
if ipType != IPv4 {
t.Errorf("expected IPv4, got %q", ipType)
}
if prefix == nil {
t.Error("prefix should not be nil")
}
// *netip.Prefix with IPv4-in-IPv6 address
pp := netip.MustParsePrefix("::ffff:10.0.0.0/104")
prefix, ipType, err = e.processPrefix(&pp)
if err != nil {
t.Errorf("processPrefix *4in6 prefix error = %v", err)
}
if ipType != IPv4 {
t.Errorf("expected IPv4, got %q", ipType)
}
if prefix == nil {
t.Error("prefix should not be nil")
}
}
func TestProcessPrefixNetipPrefixIs4In6InvalidBits(t *testing.T) {
e := NewEntry("test")
// netip.Prefix with IPv4-in-IPv6 address and bits < 96
p := netip.MustParsePrefix("::ffff:0.0.0.0/80")
_, _, err := e.processPrefix(p)
if err != ErrInvalidPrefix {
t.Errorf("expected ErrInvalidPrefix for 4in6 with bits < 96, got %v", err)
}
// *netip.Prefix with IPv4-in-IPv6 address and bits < 96
pp := netip.MustParsePrefix("::ffff:0.0.0.0/80")
_, _, err = e.processPrefix(&pp)
if err != ErrInvalidPrefix {
t.Errorf("expected ErrInvalidPrefix for *4in6 with bits < 96, got %v", err)
}
}
func TestProcessPrefixStringCIDRIPv6(t *testing.T) {
e := NewEntry("test")
// Test normal IPv6 CIDR
prefix, ipType, err := e.processPrefix("fe80::/10")
if err != nil {
t.Errorf("processPrefix IPv6 CIDR error = %v", err)
}
if ipType != IPv6 {
t.Errorf("expected IPv6, got %q", ipType)
}
if prefix == nil {
t.Error("prefix should not be nil")
}
}
func TestProcessPrefixNetIPIPv4(t *testing.T) {
e := NewEntry("test")
// net.IP with IPv4 that is 16-byte form (IPv4-mapped IPv6)
ip := net.ParseIP("1.2.3.4")
prefix, ipType, err := e.processPrefix(ip)
if err != nil {
t.Errorf("processPrefix(net.IP v4) error = %v", err)
}
if ipType != IPv4 {
t.Errorf("expected IPv4, got %q", ipType)
}
if prefix == nil {
t.Error("prefix should not be nil")
}
}
func TestEntryBuildIPSetIdempotent(t *testing.T) {
e := NewEntry("test")
if err := e.AddPrefix("1.0.0.0/24"); err != nil {
t.Fatal(err)
}
if err := e.AddPrefix("2001:db8::/32"); err != nil {
t.Fatal(err)
}
// Build once
if err := e.buildIPSet(); err != nil {
t.Fatal(err)
}
set4 := e.ipv4Set
set6 := e.ipv6Set
// Build again - should reuse
if err := e.buildIPSet(); err != nil {
t.Fatal(err)
}
if e.ipv4Set != set4 {
t.Error("ipv4Set should be reused on second build")
}
if e.ipv6Set != set6 {
t.Error("ipv6Set should be reused on second build")
}
}
func TestEntryMarshalPrefixOnlyIPv4(t *testing.T) {
e := NewEntry("test")
if err := e.AddPrefix("1.0.0.0/24"); err != nil {
t.Fatal(err)
}
prefixes, err := e.MarshalPrefix()
if err != nil {
t.Errorf("MarshalPrefix error = %v", err)
}
if len(prefixes) != 1 {
t.Errorf("expected 1 prefix, got %d", len(prefixes))
}
// Ignore IPv4 -> should fail because only IPv4 exists
_, err = e.MarshalPrefix(IgnoreIPv4)
if err == nil {
t.Error("MarshalPrefix(IgnoreIPv4) should error when only IPv4 data exists")
}
}
func TestEntryMarshalPrefixOnlyIPv6(t *testing.T) {
e := NewEntry("test")
if err := e.AddPrefix("2001:db8::/32"); err != nil {
t.Fatal(err)
}
prefixes, err := e.MarshalPrefix()
if err != nil {
t.Errorf("MarshalPrefix error = %v", err)
}
if len(prefixes) != 1 {
t.Errorf("expected 1 prefix, got %d", len(prefixes))
}
// Ignore IPv6 -> should fail because only IPv6 exists
_, err = e.MarshalPrefix(IgnoreIPv6)
if err == nil {
t.Error("MarshalPrefix(IgnoreIPv6) should error when only IPv6 data exists")
}
}
func TestEntryMarshalIPRangeOnlyIPv4(t *testing.T) {
e := NewEntry("test")
if err := e.AddPrefix("1.0.0.0/24"); err != nil {
t.Fatal(err)
}
// Ignore IPv4 -> should fail
_, err := e.MarshalIPRange(IgnoreIPv4)
if err == nil {
t.Error("MarshalIPRange(IgnoreIPv4) should error when only IPv4 data exists")
}
}
func TestEntryMarshalTextOnlyIPv4(t *testing.T) {
e := NewEntry("test")
if err := e.AddPrefix("1.0.0.0/24"); err != nil {
t.Fatal(err)
}
// Ignore IPv4 -> should fail
_, err := e.MarshalText(IgnoreIPv4)
if err == nil {
t.Error("MarshalText(IgnoreIPv4) should error when only IPv4 data exists")
}
}
func TestProcessPrefixInvalidNetIPNet(t *testing.T) {
e := NewEntry("test")
// Create an invalid *net.IPNet
invalidIPNet := &net.IPNet{
IP: nil,
Mask: nil,
}
_, _, err := e.processPrefix(invalidIPNet)
if err == nil {
t.Error("processPrefix with invalid *net.IPNet should return error")
}
}
|