]>
Commit | Line | Data |
---|---|---|
27f4a6b1 AM |
1 | #!/usr/bin/perl |
2 | ||
3 | ||
4 | require '/var/ipfire/general-functions.pl'; | |
5 | use Socket; | |
8f0b047b | 6 | use File::Path; |
27f4a6b1 AM |
7 | my $ipgrouppath = "${General::swroot}/outgoing/groups/ipgroups/"; |
8 | my $macgrouppath = "${General::swroot}/outgoing/groups/macgroups/"; | |
9 | my $outgoingrules = "${General::swroot}/outgoing/rules"; | |
10 | my $outfwsettings = "${General::swroot}/outgoing/settings"; | |
11 | my $host = "Converted "; | |
12 | my $confighosts = "${General::swroot}/fwhosts/customhosts"; | |
13 | my $confignets = "${General::swroot}/fwhosts/customnetworks"; | |
14 | my $configgroups = "${General::swroot}/fwhosts/customgroups"; | |
15 | my $ovpnsettings = "${General::swroot}/ovpn/settings"; | |
16 | my $ovpnconfig = "${General::swroot}/ovpn/ovpnconfig"; | |
17 | my $ccdconfig = "${General::swroot}/ovpn/ccd.conf"; | |
18 | my $fwdfwconfig = "${General::swroot}/forward/config"; | |
19 | my $fwdfwsettings = "${General::swroot}/forward/settings"; | |
20 | my @ipgroups = qx(ls $ipgrouppath); | |
21 | my @macgroups = qx(ls $macgrouppath); | |
22 | my @hostarray=(); | |
23 | my %outsettings=(); | |
24 | my %hosts=(); | |
25 | my %nets=(); | |
26 | my %groups=(); | |
27 | my %settingsovpn=(); | |
28 | my %configovpn=(); | |
29 | my %ccdconf=(); | |
30 | my %fwconf=(); | |
31 | my %fwdsettings=(); | |
32 | &General::readhash($outfwsettings,\%outsettings); | |
33 | ||
27f4a6b1 AM |
34 | &process_groups; |
35 | &process_rules; | |
36 | ||
27f4a6b1 AM |
37 | sub process_groups |
38 | { | |
2833f567 | 39 | if(! -d "/var/log/converters"){ mkdir("/var/log/converters");} |
8f0b047b | 40 | if( -f "/var/log/converters/groups-convert.log"){rmtree("var/log/converters");} |
2833f567 | 41 | open (LOG, ">/var/log/converters/groups-convert.log") or die $!; |
27f4a6b1 AM |
42 | #IP Group processing |
43 | foreach my $group (@ipgroups){ | |
44 | chomp $group; | |
45 | open (DATEI, "<$ipgrouppath/$group"); | |
46 | my @zeilen = <DATEI>; | |
47 | foreach my $ip (@zeilen){ | |
48 | chomp($ip); | |
49 | $ip =~ s/\s//gi; | |
50 | my $val=&check_ip($ip); | |
51 | if($val){ | |
52 | push(@hostarray,$val.",ip"); | |
53 | } | |
54 | else{ | |
55 | print LOG "-> IP \"$ip\" from group $group not converted (invalid IP) \n"; | |
56 | } | |
57 | $val=''; | |
58 | } | |
59 | &new_hostgrp($group,'ip'); | |
60 | @hostarray=(); | |
61 | } | |
62 | $group=''; | |
63 | @zeilen=(); | |
64 | @hostarray=(); | |
65 | #MAC Group processing | |
66 | foreach my $group (@macgroups){ | |
67 | chomp $group; | |
68 | open (DATEI, "<$macgrouppath/$group"); | |
69 | my @zeilen = <DATEI>; | |
70 | foreach my $mac (@zeilen){ | |
71 | chomp($mac); | |
72 | $mac =~ s/\s//gi; | |
73 | #MAC checking | |
74 | if(&General::validmac($mac)){ | |
75 | $val=$mac; | |
76 | } | |
77 | if($val){ | |
78 | push(@hostarray,$val.",mac"); | |
79 | } | |
80 | else{ | |
81 | print LOG "-> Mac $mac from group $group not converted (invalid MAC)\n"; | |
82 | } | |
83 | $val=''; | |
84 | } | |
85 | &new_hostgrp($group,'mac'); | |
86 | @hostarray=(); | |
87 | } | |
88 | close (LOG); | |
89 | } | |
90 | sub check_ip | |
91 | { | |
92 | my $adr=shift; | |
93 | my $a; | |
94 | #ip with subnet in decimal | |
95 | if($adr =~ m/^(\d\d?\d?).(\d\d?\d?).(\d\d?\d?).(\d\d?\d?)\/(\d{1,2})$/){ | |
96 | $adr=int($1).".".int($2).".".int($3).".".int($4); | |
97 | my $b = &General::iporsubtodec($5); | |
98 | $a=$adr."/".$b; | |
99 | } | |
100 | if($adr =~ /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/){ | |
101 | $adr=int($1).".".int($2).".".int($3).".".int($4); | |
102 | if(&General::validip($adr)){ | |
103 | $a=$adr."/255.255.255.255"; | |
104 | } | |
105 | } | |
106 | if(&General::validipandmask($adr)){ | |
107 | $a=&General::iporsubtodec($adr); | |
108 | } | |
109 | return $a; | |
110 | } | |
111 | sub new_hostgrp | |
112 | { | |
113 | &General::readhasharray($confighosts,\%hosts); | |
114 | &General::readhasharray($confignets,\%nets); | |
115 | &General::readhasharray($configgroups,\%groups); | |
116 | my $grp=shift; | |
117 | my $run=shift; | |
118 | my $name; #"converted" | |
119 | my $name2; | |
120 | my $name3; #custom host/custom net | |
121 | foreach my $adr (@hostarray){ | |
122 | if($run eq 'ip'){ | |
123 | my ($ip,$type) = split(",",$adr); | |
124 | my ($ippart,$subnet) = split("/",$ip); | |
125 | my ($byte1,$byte2,$byte3,$byte4) = split(/\./,$subnet); | |
126 | if($byte4 eq '255'){ | |
127 | if(!&check_host($ip)){ | |
128 | my $key = &General::findhasharraykey(\%hosts); | |
129 | $name="host "; | |
130 | $name2=$name.$ippart; | |
131 | $name3="Custom Host"; | |
132 | $hosts{$key}[0] = $name2; | |
133 | $hosts{$key}[1] = $type; | |
134 | $hosts{$key}[2] = $ip; | |
135 | $hosts{$key}[3] = 1; | |
136 | }else{ | |
137 | print LOG "Host (IP) $ip already exists\n"; | |
138 | } | |
139 | }elsif($byte4 < '255'){ | |
140 | if(!&check_net($ippart,$subnet)){ | |
141 | my $netkey = &General::findhasharraykey(\%nets); | |
142 | $name="net "; | |
143 | $name2=$name.$ippart; | |
144 | $name3="Custom Network"; | |
145 | $nets{$netkey}[0] = $name2; | |
146 | $nets{$netkey}[1] = $ippart; | |
147 | $nets{$netkey}[2] = $subnet; | |
148 | $nets{$netkey}[3] = 1; | |
149 | }else{ | |
150 | print LOG "Network $ippart already exists\n"; | |
151 | } | |
152 | } | |
153 | if($name2){ | |
154 | my $grpkey = &General::findhasharraykey(\%groups); | |
155 | $groups{$grpkey}[0] = $grp; | |
156 | $groups{$grpkey}[1] = ''; | |
157 | $groups{$grpkey}[2] = $name2; | |
158 | $groups{$grpkey}[3] = $name3; | |
159 | $groups{$grpkey}[4] = 0; | |
160 | } | |
161 | }elsif($run eq 'mac'){ | |
162 | #MACRUN | |
163 | my ($mac,$type) = split(",",$adr); | |
164 | if(!&check_host($mac)){ | |
165 | my $key = &General::findhasharraykey(\%hosts); | |
166 | $name="host "; | |
167 | $name2=$name.$mac; | |
168 | $name3="Custom Host"; | |
169 | $hosts{$key}[0] = $name2; | |
170 | $hosts{$key}[1] = $type; | |
171 | $hosts{$key}[2] = $mac; | |
172 | $hosts{$key}[3] = 1; | |
173 | }else{ | |
174 | print LOG "Host (MAC) $mac already exists\n"; | |
175 | } | |
176 | if($name2){ | |
177 | my $grpkey = &General::findhasharraykey(\%groups); | |
178 | $groups{$grpkey}[0] = $grp; | |
179 | $groups{$grpkey}[1] = ''; | |
180 | $groups{$grpkey}[2] = $name2; | |
181 | $groups{$grpkey}[3] = $name3; | |
182 | $groups{$grpkey}[4] = 0; | |
183 | } | |
184 | } | |
99e698d0 | 185 | @hostarray=(); |
27f4a6b1 AM |
186 | } |
187 | &General::writehasharray($confighosts,\%hosts); | |
188 | &General::writehasharray($configgroups,\%groups); | |
189 | &General::writehasharray($confignets,\%nets); | |
99e698d0 | 190 | |
27f4a6b1 AM |
191 | } |
192 | sub check_host | |
193 | { | |
194 | my $ip=shift; | |
195 | foreach my $key (sort keys %hosts) | |
196 | { | |
197 | if($hosts{$key}[2] eq $ip) | |
198 | { | |
199 | return 1; | |
200 | } | |
201 | } | |
202 | return 0; | |
203 | } | |
204 | sub check_net | |
205 | { | |
206 | my $ip=shift; | |
207 | my $sub=shift; | |
208 | foreach my $key (sort keys %nets) | |
209 | { | |
210 | if($nets{$key}[1] eq $ip && $nets{$key}[2] eq $sub) | |
211 | { | |
212 | return 1; | |
213 | } | |
214 | } | |
215 | return 0; | |
216 | } | |
217 | sub check_grp | |
218 | { | |
219 | my $grp=shift; | |
220 | my $value=shift; | |
221 | foreach my $key (sort keys %groups) | |
222 | { | |
223 | if($groups{$key}[0] eq $grp && $groups{$key}[2] eq $value) | |
224 | { | |
225 | return 1; | |
226 | } | |
227 | } | |
228 | return 0; | |
229 | } | |
230 | sub process_rules | |
231 | { | |
27f4a6b1 AM |
232 | &General::readhash($fwdfwsettings,\%fwdsettings); |
233 | if($fwdsettings{'POLICY'} ne $outsettings{'POLICY'}){ | |
234 | $fwdsettings{'POLICY'}=$outsettings{'POLICY'}; | |
235 | &General::writehash($fwdfwsettings,\%fwdsettings); | |
236 | } | |
237 | #open LOG | |
2833f567 AM |
238 | if( -f "/var/log/converters/outgoingfw-convert.log"){unlink ("/var/log/converters/outgoingfw-convert.log");} |
239 | open (LOG, ">/var/log/converters/outgoingfw-convert.log") or die $!; | |
27f4a6b1 AM |
240 | |
241 | my ($type,$action,$active,$grp1,$source,$grp2,$useport,$port,$prot,$grp3,$target,$remark,$log,$time,$time_mon,$time_tue,$time_wed,$time_thu,$time_fri,$time_sat,$time_sun,$time_from,$time_to); | |
242 | if ($outsettings{'POLICY'} eq 'MODE1'){ | |
243 | $type='ALLOW'; | |
244 | $action='ACCEPT'; | |
245 | }elsif($outsettings{'POLICY'} eq 'MODE2'){ | |
246 | $type='DENY'; | |
247 | $action='DROP'; | |
248 | }else{ | |
249 | return; | |
250 | } | |
251 | open (DATEI, "<$outgoingrules"); | |
252 | my @lines = <DATEI>; | |
253 | foreach my $rule (@lines) | |
254 | { | |
255 | chomp($rule); | |
99e698d0 | 256 | $port=''; |
27f4a6b1 | 257 | print LOG "processing: $rule\n"; |
99e698d0 AM |
258 | my @configline=(); |
259 | @configline = split( /\;/, $rule ); | |
27f4a6b1 AM |
260 | my @prot=(); |
261 | if($configline[0] eq $type){ | |
262 | #some variables we can use from old config | |
263 | if($configline[1] eq 'on'){ $active='ON';}else{$active='';} | |
264 | if($configline[3] eq 'all'){ | |
265 | push(@prot,"tcp"); | |
266 | push(@prot,"udp"); | |
267 | $useport='ON'; | |
268 | $grp3='TGT_PORT'; | |
27f4a6b1 AM |
269 | }else{ |
270 | push(@prot,$configline[3]); | |
271 | $useport='ON'; | |
272 | $grp3='TGT_PORT'; | |
273 | } | |
274 | if($configline[4] ne ''){ $remark=$configline[4];}else{$remark='';} | |
275 | if($configline[9] eq 'aktiv'){ $log='ON';}else{$log='';} | |
27f4a6b1 AM |
276 | if($configline[10] eq 'on' && $configline[11] eq 'on' && $configline[12] eq 'on' && $configline[13] eq 'on' && $configline[14] eq 'on' && $configline[15] eq 'on' && $configline[16] eq 'on'){ |
277 | if($configline[17] eq '00:00' && $configline[18] eq '00:00'){ | |
278 | $time=''; | |
279 | }else{ | |
280 | $time='ON'; | |
281 | } | |
282 | }else{ | |
283 | $time='ON'; | |
284 | } | |
285 | $time_mon=$configline[10]; | |
286 | $time_tue=$configline[11]; | |
287 | $time_wed=$configline[12]; | |
288 | $time_thu=$configline[13]; | |
289 | $time_fri=$configline[14]; | |
290 | $time_sat=$configline[15]; | |
291 | $time_sun=$configline[16]; | |
292 | $time_from=$configline[17]; | |
293 | $time_to=$configline[18]; | |
294 | ############################################################ | |
295 | #sourcepart | |
296 | if ($configline[2] eq 'green') { | |
297 | $grp1='std_net_src'; | |
298 | $source='GREEN'; | |
299 | }elsif ($configline[2] eq 'orange') { | |
300 | $grp1='std_net_src'; | |
301 | $source='ORANGE'; | |
302 | }elsif ($configline[2] eq 'red') { | |
303 | print LOG "-> Rule not converted, is an outgoing rule.Please put it manually in /etc/sysconfig/firewall.local \n"; | |
304 | next; | |
305 | }elsif ($configline[2] eq 'blue') { | |
306 | $grp1='std_net_src'; | |
307 | $source='BLUE'; | |
308 | }elsif ($configline[2] eq 'ipsec') { | |
309 | print LOG "-> Rule not converted, ipsec+ interface is obsolet since IPFire 2.7 \n"; | |
310 | next; | |
311 | }elsif ($configline[2] eq 'ovpn') { | |
99e698d0 AM |
312 | &build_ovpn_grp; |
313 | $grp1='cust_grp_src'; | |
314 | $source='ovpn' | |
27f4a6b1 AM |
315 | }elsif ($configline[2] eq 'ip') { |
316 | my $z=&check_ip($configline[5]); | |
317 | if($z){ | |
318 | $grp1='src_addr'; | |
319 | $source=$z; | |
320 | }else{ | |
321 | print LOG "-> Rule not converted, missing/invalid source ip \"$configline[5]\"\n"; | |
322 | next; | |
323 | } | |
324 | }elsif ($configline[2] eq 'mac') { | |
325 | if(&General::validmac($configline[6])){ | |
326 | $grp1='src_addr'; | |
327 | $source=$configline[6]; | |
328 | }else{ | |
329 | print LOG"-> Rule not converted, invalid MAC \"$configline[6]\" \n"; | |
330 | next; | |
331 | } | |
332 | }elsif ($configline[2] eq 'all') { | |
333 | $grp1='std_net_src'; | |
334 | $source='ALL'; | |
335 | }else{ | |
336 | #&General::readhasharray($configgroups,\%groups); | |
337 | foreach my $key (sort keys %groups){ | |
338 | if($groups{$key}[0] eq $configline[2]){ | |
339 | $grp1='cust_grp_src'; | |
340 | $source=$configline[2]; | |
341 | } | |
342 | } | |
343 | if ($grp1 eq '' || $source eq ''){ | |
344 | print LOG "-> Rule not converted, no valid source recognised\n"; | |
345 | } | |
346 | } | |
347 | ############################################################ | |
348 | #destinationpart | |
349 | if($configline[7] ne ''){ | |
350 | my $address=&check_ip($configline[7]); | |
351 | if($address){ | |
352 | $grp2='tgt_addr'; | |
353 | $target=$address; | |
354 | }elsif(!$address){ | |
355 | my $getwebsiteip=&get_ip_from_domain($configline[7]); | |
356 | if ($getwebsiteip){ | |
357 | $grp2='tgt_addr'; | |
358 | $target=$getwebsiteip; | |
359 | }else{ | |
360 | print LOG "-> Rule not converted, invalid domain \"$configline[7]\"\n"; | |
361 | next; | |
362 | } | |
363 | } | |
364 | }else{ | |
365 | $grp2='std_net_tgt'; | |
366 | $target='ALL'; | |
367 | } | |
87946296 | 368 | if($configline[8] ne '' && $configline[3] ne 'gre' && $configline[3] ne 'esp'){ |
8f0b047b AM |
369 | my @values=(); |
370 | my @parts=split(",",$configline[8]); | |
371 | foreach (@parts){ | |
8f0b047b AM |
372 | if (!($_ =~ /^(\d+)\:(\d+)$/)) { |
373 | if(&General::validport($_)){ | |
374 | $useport='ON'; | |
8f0b047b AM |
375 | push (@values,$_); |
376 | $grp3='TGT_PORT'; | |
377 | }else{ | |
378 | print LOG "-> Rule not converted, invalid destination Port \"$configline[8]\"\n"; | |
379 | next; | |
380 | } | |
27f4a6b1 | 381 | }else{ |
8b3dd791 AM |
382 | my ($a1,$a2) = split(/\:/,$_); |
383 | if (&General::validport($a1) && &General::validport($a2) && $a1 < $a2){ | |
8f0b047b | 384 | $useport='ON'; |
8f0b047b AM |
385 | push (@values,"$a1:$a2"); |
386 | $grp3='TGT_PORT'; | |
8b3dd791 | 387 | }else{ |
8f0b047b AM |
388 | print LOG "-> Rule not converted, invalid destination Port \"$configline[8]\"\n"; |
389 | next; | |
8b3dd791 | 390 | } |
8f0b047b | 391 | } |
27f4a6b1 | 392 | } |
8b3dd791 AM |
393 | $port=join("|",@values); |
394 | @values=(); | |
99e698d0 | 395 | @parts=(); |
27f4a6b1 AM |
396 | } |
397 | }else{ | |
398 | print LOG "-> Rule not converted because not for Firewall mode $outsettings{'POLICY'} (we are only converting for actual mode)\n"; | |
399 | } | |
400 | &General::readhasharray($fwdfwconfig,\%fwconfig); | |
401 | my $check; | |
402 | foreach my $protocol (@prot){ | |
403 | $protocol=uc($protocol); | |
27f4a6b1 AM |
404 | print LOG "-> Converted: $action,FORWARDFW,$active,$grp1,$source,$grp2,$target,,,,,$useport,$protocol,,$grp3,$port,$remark,$log,$time,$time_mon,$time_tue,$time_wed,$time_thu,$time_fri,$time_sat,$time_sun,$time_from,$time_to\n"; |
405 | #Put rules into system.... | |
406 | ########################### | |
407 | ||
408 | #check for double rules | |
409 | foreach my $key (sort keys %fwconfig){ | |
410 | if("$action,FORWARDFW,$active,$grp1,$source,$grp2,$target,,,,,$useport,$protocol,,$grp3,$port,$remark,$log,$time,$time_mon,$time_tue,$time_wed,$time_thu,$time_fri,$time_sat,$time_sun,$time_from,$time_to" | |
411 | eq "$fwconfig{$key}[0],$fwconfig{$key}[1],$fwconfig{$key}[2],$fwconfig{$key}[3],$fwconfig{$key}[4],$fwconfig{$key}[5],$fwconfig{$key}[6],,,,,$fwconfig{$key}[11],$fwconfig{$key}[12],,$fwconfig{$key}[14],$fwconfig{$key}[15],$fwconfig{$key}[16],$fwconfig{$key}[17],$fwconfig{$key}[18],$fwconfig{$key}[19],$fwconfig{$key}[20],$fwconfig{$key}[21],$fwconfig{$key}[22],$fwconfig{$key}[23],$fwconfig{$key}[24],$fwconfig{$key}[25],$fwconfig{$key}[26],$fwconfig{$key}[27]"){ | |
412 | $check='on'; | |
413 | next; | |
414 | } | |
415 | } | |
416 | if($check ne 'on'){ | |
417 | #increase groupcounter | |
418 | my $check1; | |
419 | if($grp1 eq 'cust_grp_src'){ | |
420 | foreach my $key (sort keys %groups){ | |
421 | if($groups{$key}[0] eq $source){ | |
422 | $groups{$key}[4]++; | |
423 | $check1='on'; | |
424 | } | |
425 | } | |
426 | if($check1 eq 'on'){ | |
27f4a6b1 AM |
427 | &General::writehasharray($configgroups,\%groups); |
428 | } | |
429 | } | |
27f4a6b1 AM |
430 | my $key = &General::findhasharraykey(\%fwconfig); |
431 | $fwconfig{$key}[0] = $action; | |
432 | $fwconfig{$key}[1] = "FORWARDFW"; | |
433 | $fwconfig{$key}[2] = $active; | |
434 | $fwconfig{$key}[3] = $grp1; | |
435 | $fwconfig{$key}[4] = $source; | |
436 | $fwconfig{$key}[5] = $grp2; | |
437 | $fwconfig{$key}[6] = $target; | |
438 | $fwconfig{$key}[11] = $useport; | |
439 | $fwconfig{$key}[12] = $protocol; | |
440 | $fwconfig{$key}[14] = $grp3; | |
441 | $fwconfig{$key}[15] = $port; | |
442 | $fwconfig{$key}[16] = $remark; | |
443 | $fwconfig{$key}[17] = $log; | |
444 | $fwconfig{$key}[18] = $time; | |
445 | $fwconfig{$key}[19] = $time_mon; | |
446 | $fwconfig{$key}[20] = $time_tue; | |
447 | $fwconfig{$key}[21] = $time_wed; | |
448 | $fwconfig{$key}[22] = $time_thu; | |
449 | $fwconfig{$key}[23] = $time_fri; | |
450 | $fwconfig{$key}[24] = $time_sat; | |
451 | $fwconfig{$key}[25] = $time_sun; | |
452 | $fwconfig{$key}[26] = $time_from; | |
453 | $fwconfig{$key}[27] = $time_to; | |
454 | } | |
455 | } | |
456 | &General::writehasharray($fwdfwconfig,\%fwconfig); | |
457 | system("/usr/local/bin/forwardfwctrl"); | |
458 | @prot=(); | |
459 | } | |
460 | close(LOG); | |
461 | @lines=(); | |
462 | } | |
463 | sub get_ip_from_domain | |
464 | { | |
465 | $web=shift; | |
466 | my $resolvedip; | |
467 | my $checked; | |
468 | my ($name,$aliases,$addrtype,$length,@addrs) = gethostbyname($web); | |
469 | if(@addrs){ | |
470 | $resolvedip=inet_ntoa($addrs[0]); | |
471 | return $resolvedip; | |
472 | } | |
473 | return; | |
474 | } | |
475 | sub build_ovpn_grp | |
476 | { | |
477 | &General::readhasharray($confighosts,\%hosts); | |
478 | &General::readhasharray($confignets,\%nets); | |
479 | &General::readhasharray($configgroups,\%groups); | |
480 | &General::readhasharray($ovpnconfig,\%configovpn); | |
481 | &General::readhasharray($ccdconfig,\%ccdconf); | |
482 | &General::readhash($ovpnsettings,\%settingsovpn); | |
483 | #get ovpn nets | |
484 | my @ovpnnets=(); | |
485 | if($settingsovpn{'DOVPN_SUBNET'}){ | |
486 | my ($net,$subnet)=split("/",$settingsovpn{'DOVPN_SUBNET'}); | |
487 | push (@ovpnnets,"$net,$subnet,dynamic"); | |
488 | } | |
489 | foreach my $key (sort keys %ccdconf){ | |
490 | my ($net,$subnet)=split("/",$ccdconf{$key}[1]); | |
491 | $subnet=&General::iporsubtodec($subnet); | |
492 | push (@ovpnnets,"$net,$subnet,$ccdconf{$key}[0]"); | |
493 | } | |
494 | foreach my $key (sort keys %configovpn){ | |
495 | if ($configovpn{$key}[3] eq 'net'){ | |
496 | my ($net,$subnet)=split("/",$configovpn{$key}[27]); | |
497 | push (@ovpnnets,"$net,$subnet,$configovpn{$key}[2]"); | |
498 | } | |
499 | } | |
500 | #add ovpn nets to customnetworks/groups | |
501 | foreach my $line (@ovpnnets){ | |
502 | my ($net,$subnet,$name) = split(",",$line); | |
503 | if (!&check_net($net,$subnet)){ | |
504 | my $netkey = &General::findhasharraykey(\%nets); | |
505 | $name2=$name."(ovpn)".$net; | |
506 | $name3="Custom Network"; | |
507 | $nets{$netkey}[0] = $name2; | |
508 | $nets{$netkey}[1] = $net; | |
509 | $nets{$netkey}[2] = $subnet; | |
510 | $nets{$netkey}[3] = 1; | |
511 | }else{ | |
512 | print LOG "-> Custom Network with same IP already exist \"$net/$subnet\" (you can ignore this, if this run was manual from shell)\n"; | |
513 | } | |
514 | if($name2){ | |
515 | my $grpkey = &General::findhasharraykey(\%groups); | |
516 | $groups{$grpkey}[0] = "ovpn"; | |
517 | $groups{$grpkey}[1] = ''; | |
518 | $groups{$grpkey}[2] = $name2; | |
519 | $groups{$grpkey}[3] = "Custom Network"; | |
520 | $groups{$grpkey}[4] = 0; | |
521 | } | |
522 | $name2=''; | |
523 | } | |
524 | @ovpnnets=(); | |
525 | &General::writehasharray($confighosts,\%hosts); | |
526 | &General::writehasharray($configgroups,\%groups); | |
527 | &General::writehasharray($confignets,\%nets); | |
528 | } |