From d588e0ca284630ff358d8ab029c3f82941f6c274 Mon Sep 17 00:00:00 2001 From: Daouda Lo Date: Mon, 2 Sep 2002 09:58:50 +0000 Subject: - replace tinyfirewall by drakfirewall --- perl-install/network/drakfirewall.pm | 180 +++++++++++++++++++++++++++++++++++ perl-install/network/netconnect.pm | 4 +- perl-install/network/tinyfirewall.pm | 180 ----------------------------------- 3 files changed, 182 insertions(+), 182 deletions(-) create mode 100644 perl-install/network/drakfirewall.pm delete mode 100644 perl-install/network/tinyfirewall.pm (limited to 'perl-install') diff --git a/perl-install/network/drakfirewall.pm b/perl-install/network/drakfirewall.pm new file mode 100644 index 000000000..76d5d76e0 --- /dev/null +++ b/perl-install/network/drakfirewall.pm @@ -0,0 +1,180 @@ +package network::drakfirewall; # $Id$ + +use diagnostics; +use strict; + +use network::shorewall; +use common; + +my @all_servers = +( + { + name => _("Web Server"), + pkg => 'apache apache-mod_perl boa', + ports => '80/tcp 443/tcp', + }, + { + name => _("Domain Name Server"), + pkg => 'bind', + ports => '53/tcp 53/udp', + }, + { + name => "SSH", + pkg => 'openssh-server', + ports => '22/tcp', + }, + { + name => "FTP", + pkg => 'ftp-server-krb5 wu-ftpd proftpd pure-ftpd', + ports => '20/tcp 21/tcp', + }, + { + name => _("Mail Server"), + pkg => 'sendmail postfix qmail', + ports => '25/tcp', + }, + { + name => _("POP and IMAP Server"), + pkg => 'imap courier-imap-pop', + ports => '109/tcp 110/tcp 143/tcp', + }, + { + name => "Telnet", + pkg => 'telnet-server-krb5', + ports => '23/tcp', + hide => 1, + }, + { + name => "CUPS", + pkg => 'cups', + ports => '631/tcp 631/udp', + hide => 1, + }, +); + +sub port2server { + my ($port) = @_; + foreach (@all_servers) { + return $_ if grep { $port eq $_ } split ' ', $_->{ports}; + } + undef; +} + +sub check_ports_syntax { + my ($ports) = @_; + foreach (split ' ', $ports) { + my ($nb) = m!^(\d+)/(tcp|udp)$! or return $_; + 1 <= $nb && $nb <= 65535 or return $_; + } + ''; +} + +sub to_ports { + my ($servers, $unlisted) = @_; + my $ports = join(' ', (map { $_->{ports} } @$servers), if_($unlisted, $unlisted)); + \$ports; +} + +sub from_ports { + my ($ports) = @_; + + my @l; + my @unlisted; + foreach (split ' ', $$ports) { + if (my $s = port2server($_)) { + push @l, $s; + } else { + push @unlisted, $_; + } + } + [ uniq(@l) ], join(' ', @unlisted); +} + +sub default_from_pkgs { + my ($in) = @_; + my @pkgs = $in->do_pkgs->are_installed(map { split ' ', $_->{pkg} } @all_servers); + [ grep { + my $s = $_; + grep { member($_, @pkgs) } split ' ', $s->{pkg}; + } @all_servers ]; +} + +sub get_ports { + my ($ports) = @_; + my $shorewall = network::shorewall::read() or return; + \$shorewall->{ports}; +} + +sub set_ports { + my ($disabled, $ports) = @_; + + my $shorewall = network::shorewall::read() || network::shorewall::default_interfaces() or die _("No network card"); + $shorewall->{disabled} = $disabled; + $shorewall->{ports} = $$ports; + + network::shorewall::write($shorewall); +} + +sub get_conf { + my ($in, $disabled, $ports) = @_; + + my $possible_servers = default_from_pkgs($in); + $_->{hide} = 0 foreach @$possible_servers; + + if ($ports) { + $disabled, from_ports($ports); + } elsif (my $shorewall = network::shorewall::read()) { + $shorewall->{disabled}, from_ports(\$shorewall->{ports}); + } else { + $in->ask_okcancel('', _("drakfirewall configurator + +This configures a personal firewall for this Mandrake Linux machine. +For a powerful dedicated firewall solution, please look to the +specialized MandrakeSecurity Firewall distribution."), 1) or return; + + $disabled, $possible_servers, ''; + } +} + +sub choose { + my ($in, $disabled, $servers, $unlisted) = @_; + + $_->{on} = 0 foreach @all_servers; + $_->{on} = 1 foreach @$servers; + my @l = grep { $_->{on} || !$_->{hide} } @all_servers; + + $in->ask_from_({ + messages => _("Which services would you like to allow the Internet to connect to?"), + advanced_messages => _("You can enter miscellaneous ports. +Valid examples are: 139/tcp 139/udp. +Have a look at /etc/services for information."), + callbacks => { + complete => sub { + if (my $invalid_port = check_ports_syntax($unlisted)) { + $in->ask_warn('', _("Invalid port given: %s. +The proper format is \"port/tcp\" or \"port/udp\", +where port is between 1 and 65535.", $invalid_port)); + return 1; + } + }, + }}, + [ + { text => _("Everything (no firewall)"), val => \$disabled, type => 'bool' }, + (map { { text => $_->{name}, val => \$_->{on}, type => 'bool', disabled => sub { $disabled } } } @l), + { label => _("Other ports"), val => \$unlisted, advanced => 1, disabled => sub { $disabled } } + ]) or return; + + $disabled, to_ports([ grep { $_->{on} } @l ], $unlisted); +} + +sub main { + my ($in, $disabled) = @_; + + ($disabled, my $servers, my $unlisted) = get_conf($in, $disabled) or return; + + $in->do_pkgs->ensure_is_installed('shorewall', '/sbin/shorewall', $::isInstall) or return; + + ($disabled, my $ports) = choose($in, $disabled, $servers, $unlisted) or return; + + set_ports($disabled, $ports); +} diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 7474b9b66..385893763 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -332,8 +332,8 @@ fi save_conf($netcnx, $netc, $intf); if ($::isInstall && $::o->{security} >= 3) { - require network::tinyfirewall; - network::tinyfirewall::main($in, $::o->{security} <= 3); + require network::drakfirewall; + network::drakfirewall::main($in, $::o->{security} <= 3); } #- if ($netc->{NET_DEVICE} and $netc->{NETWORKING} ne 'no' and $::isStandalone and $::expert) { diff --git a/perl-install/network/tinyfirewall.pm b/perl-install/network/tinyfirewall.pm deleted file mode 100644 index 602c0023f..000000000 --- a/perl-install/network/tinyfirewall.pm +++ /dev/null @@ -1,180 +0,0 @@ -package network::tinyfirewall; # $Id$ - -use diagnostics; -use strict; - -use network::shorewall; -use common; - -my @all_servers = -( - { - name => _("Web Server"), - pkg => 'apache apache-mod_perl boa', - ports => '80/tcp 443/tcp', - }, - { - name => _("Domain Name Server"), - pkg => 'bind', - ports => '53/tcp 53/udp', - }, - { - name => "SSH", - pkg => 'openssh-server', - ports => '22/tcp', - }, - { - name => "FTP", - pkg => 'ftp-server-krb5 wu-ftpd proftpd pure-ftpd', - ports => '20/tcp 21/tcp', - }, - { - name => _("Mail Server"), - pkg => 'sendmail postfix qmail', - ports => '25/tcp', - }, - { - name => _("POP and IMAP Server"), - pkg => 'imap courier-imap-pop', - ports => '109/tcp 110/tcp 143/tcp', - }, - { - name => "Telnet", - pkg => 'telnet-server-krb5', - ports => '23/tcp', - hide => 1, - }, - { - name => "CUPS", - pkg => 'cups', - ports => '631/tcp 631/udp', - hide => 1, - }, -); - -sub port2server { - my ($port) = @_; - foreach (@all_servers) { - return $_ if grep { $port eq $_ } split ' ', $_->{ports}; - } - undef; -} - -sub check_ports_syntax { - my ($ports) = @_; - foreach (split ' ', $ports) { - my ($nb) = m!^(\d+)/(tcp|udp)$! or return $_; - 1 <= $nb && $nb <= 65535 or return $_; - } - ''; -} - -sub to_ports { - my ($servers, $unlisted) = @_; - my $ports = join(' ', (map { $_->{ports} } @$servers), if_($unlisted, $unlisted)); - \$ports; -} - -sub from_ports { - my ($ports) = @_; - - my @l; - my @unlisted; - foreach (split ' ', $$ports) { - if (my $s = port2server($_)) { - push @l, $s; - } else { - push @unlisted, $_; - } - } - [ uniq(@l) ], join(' ', @unlisted); -} - -sub default_from_pkgs { - my ($in) = @_; - my @pkgs = $in->do_pkgs->are_installed(map { split ' ', $_->{pkg} } @all_servers); - [ grep { - my $s = $_; - grep { member($_, @pkgs) } split ' ', $s->{pkg}; - } @all_servers ]; -} - -sub get_ports { - my ($ports) = @_; - my $shorewall = network::shorewall::read() or return; - \$shorewall->{ports}; -} - -sub set_ports { - my ($disabled, $ports) = @_; - - my $shorewall = network::shorewall::read() || network::shorewall::default_interfaces() or die _("No network card"); - $shorewall->{disabled} = $disabled; - $shorewall->{ports} = $$ports; - - network::shorewall::write($shorewall); -} - -sub get_conf { - my ($in, $disabled, $ports) = @_; - - my $possible_servers = default_from_pkgs($in); - $_->{hide} = 0 foreach @$possible_servers; - - if ($ports) { - $disabled, from_ports($ports); - } elsif (my $shorewall = network::shorewall::read()) { - $shorewall->{disabled}, from_ports(\$shorewall->{ports}); - } else { - $in->ask_okcancel('', _("tinyfirewall configurator - -This configures a personal firewall for this Mandrake Linux machine. -For a powerful dedicated firewall solution, please look to the -specialized MandrakeSecurity Firewall distribution."), 1) or return; - - $disabled, $possible_servers, ''; - } -} - -sub choose { - my ($in, $disabled, $servers, $unlisted) = @_; - - $_->{on} = 0 foreach @all_servers; - $_->{on} = 1 foreach @$servers; - my @l = grep { $_->{on} || !$_->{hide} } @all_servers; - - $in->ask_from_({ - messages => _("Which services would you like to allow the Internet to connect to?"), - advanced_messages => _("You can enter miscellaneous ports. -Valid examples are: 139/tcp 139/udp. -Have a look at /etc/services for information."), - callbacks => { - complete => sub { - if (my $invalid_port = check_ports_syntax($unlisted)) { - $in->ask_warn('', _("Invalid port given: %s. -The proper format is \"port/tcp\" or \"port/udp\", -where port is between 1 and 65535.", $invalid_port)); - return 1; - } - }, - }}, - [ - { text => _("Everything (no firewall)"), val => \$disabled, type => 'bool' }, - (map { { text => $_->{name}, val => \$_->{on}, type => 'bool', disabled => sub { $disabled } } } @l), - { label => _("Other ports"), val => \$unlisted, advanced => 1, disabled => sub { $disabled } } - ]) or return; - - $disabled, to_ports([ grep { $_->{on} } @l ], $unlisted); -} - -sub main { - my ($in, $disabled) = @_; - - ($disabled, my $servers, my $unlisted) = get_conf($in, $disabled) or return; - - $in->do_pkgs->ensure_is_installed('shorewall', '/sbin/shorewall', $::isInstall) or return; - - ($disabled, my $ports) = choose($in, $disabled, $servers, $unlisted) or return; - - set_ports($disabled, $ports); -} -- cgit v1.2.1