netpass-devel Mailing List for NetPass (Page 14)
Brought to you by:
jeffmurphy
You can subscribe to this list here.
2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
---|---|---|---|---|---|---|---|---|---|---|---|---|
2005 |
Jan
|
Feb
|
Mar
|
Apr
(39) |
May
(103) |
Jun
(89) |
Jul
(22) |
Aug
(100) |
Sep
(21) |
Oct
(5) |
Nov
|
Dec
(7) |
2006 |
Jan
(25) |
Feb
(8) |
Mar
(12) |
Apr
(2) |
May
|
Jun
(1) |
Jul
(4) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(4) |
2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
From: jeff m. <jef...@us...> - 2005-05-17 15:13:24
|
Update of /cvsroot/netpass/NetPass In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5083 Modified Files: MANIFEST install Log Message: Index: install =================================================================== RCS file: /cvsroot/netpass/NetPass/install,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- install 17 May 2005 02:57:36 -0000 1.21 +++ install 17 May 2005 15:13:14 -0000 1.22 @@ -361,8 +361,8 @@ "); my $npvip = ''; - my $rdir1 = ''; - my $rdir2 = ''; + my $redir1 = ''; + my $redir2 = ''; my $useha = ask("Will you be using HA? [y/N] "); if ($useha =~ /^y/i) { Index: MANIFEST =================================================================== RCS file: /cvsroot/netpass/NetPass/MANIFEST,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- MANIFEST 17 May 2005 02:57:35 -0000 1.41 +++ MANIFEST 17 May 2005 15:13:10 -0000 1.42 @@ -63,7 +63,6 @@ doc/npsnort.txt doc/netpass-install.sxw doc/snort-2.3.3-vlan.patch -doc/netpass-install.html etc/netpass-example.conf etc/oui.txt install.d/logrotate.d/apache |
From: jeff m. <jef...@us...> - 2005-05-17 15:02:47
|
Update of /cvsroot/netpass/NetPass/lib/NetPass In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2858/lib/NetPass Modified Files: DB.pm Log Message: bug in registerHost Index: DB.pm =================================================================== RCS file: /cvsroot/netpass/NetPass/lib/NetPass/DB.pm,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- DB.pm 8 May 2005 02:35:46 -0000 1.40 +++ DB.pm 17 May 2005 15:02:38 -0000 1.41 @@ -1258,7 +1258,7 @@ $mac = NetPass::padMac($mac); # ensure specific format - my $sql = qq{insert into register (macAddress, ipAddress, lastSeen, registeredOn, status, message, username, OS, switchIP, switchPort, uqlinkup) values ('$mac', '$ip', NOW(), NOW(), 'unquar', NULL, '$username', '$os', NULL, NULL, 'no')}; + my $sql = qq{insert into register (macAddress, ipAddress, lastSeen, registeredOn, status, username, OS, switchIP, switchPort, uqlinkup) values ('$mac', '$ip', NOW(), NOW(), 'unquar', '$username', '$os', NULL, NULL, 'no')}; _log("DEBUG", "$mac $ip sql=$sql\n") if $self->D; |
From: jeff m. <jef...@us...> - 2005-05-17 02:59:27
|
Update of /cvsroot/netpass/NetPass In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28720 Modified Files: install Log Message: startup bugs, garp issues Index: install =================================================================== RCS file: /cvsroot/netpass/NetPass/install,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- install 29 Apr 2005 00:31:55 -0000 1.19 +++ install 16 May 2005 16:10:41 -0000 1.20 @@ -1324,6 +1324,12 @@ ldie "failed to add 127.0.0.1 to table mysql:user" if $rv; + # redirectors + + #$rv = lsystem(qq{insert into db values "('npr1-d.cit.buffalo.edu', '%', '$u', 'Y','N','N','N','N','N','N','N','N','N','N','N')" | mysql -fu $u $p mysql}); + + #$rv = lsystem(qq{insert into user values "('npr1-d.cit.buffalo.edu', '$u', '$p','y','n','n','n','n','n','n','n','n','n','n','n','n','n','n','n','n','n','n','n','n','','','','',0,0,0)" | mysql -fu $u $p mysql}); + } sub dropDatabase { |
From: jeff m. <jef...@us...> - 2005-05-17 02:57:45
|
Update of /cvsroot/netpass/NetPass/install.d In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26972/install.d Modified Files: install-ipvs.sh Log Message: ipvsadm updated rpm Index: install-ipvs.sh =================================================================== RCS file: /cvsroot/netpass/NetPass/install.d/install-ipvs.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- install-ipvs.sh 20 Apr 2005 13:17:01 -0000 1.1 +++ install-ipvs.sh 17 May 2005 02:57:36 -0000 1.2 @@ -11,7 +11,7 @@ heartbeat-ldirectord-1.2.3-1.i386.rpm \ heartbeat-pils-1.2.3-1.i386.rpm \ heartbeat-stonith-1.2.3-1.i386.rpm \ - ipvsadm-1.21-10.i386.rpm \ + ipvsadm-1.24-5.i386.rpm \ libnet-1.1.2.1-2.i386.rpm ; do rm -f $i |
From: jeff m. <jef...@us...> - 2005-05-17 02:57:45
|
Update of /cvsroot/netpass/NetPass/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26972/doc Modified Files: netpass-install.sxw Log Message: ipvsadm updated rpm Index: netpass-install.sxw =================================================================== RCS file: /cvsroot/netpass/NetPass/doc/netpass-install.sxw,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 Binary files /tmp/cvs9ZE7do and /tmp/cvsdGGfWA differ |
From: jeff m. <jef...@us...> - 2005-05-17 02:57:45
|
Update of /cvsroot/netpass/NetPass In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26972 Modified Files: MANIFEST install Log Message: ipvsadm updated rpm Index: install =================================================================== RCS file: /cvsroot/netpass/NetPass/install,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- install 16 May 2005 16:10:41 -0000 1.20 +++ install 17 May 2005 02:57:36 -0000 1.21 @@ -88,6 +88,7 @@ my $uninstall = 0; my $help = 0; my @exclude = (); +my $R = {}; # global registry GetOptions ("s=i" => \$STAGE, "c" => \$copyOnly, @@ -359,8 +360,19 @@ "); - my $npvip = ask("If you are using HA, enter the virtual IP address for this -NetPass cluster here (otherwise just hit enter): "); + my $npvip = ''; + my $rdir1 = ''; + my $rdir2 = ''; + + my $useha = ask("Will you be using HA? [y/N] "); + if ($useha =~ /^y/i) { + $npvip = ask("Enter the virtual IP address for this NetPass cluster: "); + $redir1 = ask("Enter the DNS name (or IP address) for the primary redirector: "); + $redir2 = ask("Enter the DNS name (or IP address) for the primary redirector (hit enter if you only have one redirector): "); + $R->{'npvip'} = $npvip; + $R->{'redir1'} = $redir1; + $R->{'redir2'} = $redir2; + } my $myip = getMyIP("eth0"); @@ -1326,9 +1338,12 @@ # redirectors - #$rv = lsystem(qq{insert into db values "('npr1-d.cit.buffalo.edu', '%', '$u', 'Y','N','N','N','N','N','N','N','N','N','N','N')" | mysql -fu $u $p mysql}); - - #$rv = lsystem(qq{insert into user values "('npr1-d.cit.buffalo.edu', '$u', '$p','y','n','n','n','n','n','n','n','n','n','n','n','n','n','n','n','n','n','n','n','n','','','','',0,0,0)" | mysql -fu $u $p mysql}); + foreach my $rd ($R->{'redir1'}, $R->{'redir2'}) { + $rv = lsystem(qq{insert into db values "('$rd', '%', '$u', 'Y','N','N','N','N','N','N','N','N','N','N','N')" | mysql -fu $u $p mysql}); + ldie "failed to add $rd to mysql:db table ($rv)" if $rv; + $rv = lsystem(qq{insert into user values "('$rd', '$u', '$p','y','n','n','n','n','n','n','n','n','n','n','n','n','n','n','n','n','n','n','n','n','','','','',0,0,0)" | mysql -fu $u $p mysql}); + ldie "failed to add $rd to mysql:user table ($rv)" if $rv; + } } Index: MANIFEST =================================================================== RCS file: /cvsroot/netpass/NetPass/MANIFEST,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- MANIFEST 8 May 2005 02:35:45 -0000 1.40 +++ MANIFEST 17 May 2005 02:57:35 -0000 1.41 @@ -63,6 +63,7 @@ doc/npsnort.txt doc/netpass-install.sxw doc/snort-2.3.3-vlan.patch +doc/netpass-install.html etc/netpass-example.conf etc/oui.txt install.d/logrotate.d/apache |
From: jeff m. <jef...@us...> - 2005-05-17 01:34:03
|
Update of /cvsroot/netpass/NetPass/bin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28720/bin Modified Files: garp.pl garpctl interfacecfg.pl Log Message: startup bugs, garp issues Index: interfacecfg.pl =================================================================== RCS file: /cvsroot/netpass/NetPass/bin/interfacecfg.pl,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- interfacecfg.pl 12 Apr 2005 15:24:08 -0000 1.10 +++ interfacecfg.pl 16 May 2005 16:10:42 -0000 1.11 @@ -55,8 +55,8 @@ use Getopt::Std; use lib qw(/opt/netpass/lib); use NetPass; +use Pod::Usage; -sub Usage(); sub getIps($); sub director($); sub realserver($); @@ -77,14 +77,14 @@ getopts('U:d:r:c:h', \%opts); -Usage() if ($opts{'h'}); +pod2usage(2) if ($opts{'h'}); if (exists $opts{'r'} && ($opts{'r'} > 2 || $opts{'r'} < 1)) { - Usage(); + pod2usage(1); } if (exists $opts{'d'} && ($opts{'d'} > 2 || $opts{'d'} < 1)) { - Usage(); + pod2usage(1); } $rord = ($opts{'r'}) ? 'r' : 'd'; @@ -228,11 +228,6 @@ END } -sub Usage () { - print "Usage: $0 <[-d director] | [-r realserver]> <-c conf file>\n"; - exit 0; -} - sub ip2int ($) { my $i = shift; Index: garp.pl =================================================================== RCS file: /cvsroot/netpass/NetPass/bin/garp.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- garp.pl 24 Apr 2005 03:42:02 -0000 1.4 +++ garp.pl 16 May 2005 16:10:42 -0000 1.5 @@ -311,6 +311,7 @@ #define SIOCGIFHWADDR 0x8927 #define SIOCGIFADDR 0x8915 my $rv = ioctl SH, 0x8927, $ifr; + print "get_hwaddr: ioctl ret=".(defined($rv)?$rv:"undef")."\n" if $D; return (undef, undef) if ( !defined($rv) || ($rv ne "0 but true") ); my ($junk, $family); my @ma; Index: garpctl =================================================================== RCS file: /cvsroot/netpass/NetPass/bin/garpctl,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- garpctl 24 Apr 2005 03:42:02 -0000 1.6 +++ garpctl 16 May 2005 16:10:42 -0000 1.7 @@ -124,7 +124,7 @@ -debug => exists $opts{'D'} ? 1 : 0, -quiet => exists $opts{'q'} ? 1 : 0); -die "failed to connect to NetPass: $np" unless (ref($np) ne "NetPass"); +die "failed to connect to NetPass: $np" if (ref($np) ne "NetPass"); my $pidDir = $np->cfg->policy(-key => 'pid_dir') || "/var/run/netpass"; my $pids = getPids($pidDir); @@ -235,12 +235,22 @@ $gd = ""; } - my $shell_comm = qq{$baseDir/bin/garp.pl -i ${if}.${u} $gn $gd $vip}; + my $cstr = ''; + + if (exists $opts{'c'}) { + $cstr = "-c '".$opts{'c'}."'"; + } + + if (exists $opts{'U'}) { + $cstr .= " -U '".$opts{'U'}."'"; + } + + my $shell_comm = qq{$baseDir/bin/garp.pl $cstr -i ${if}.${u} $gn $gd $vip}; print "\t\tshell_comm = $shell_comm\n" if exists $opts{'D'}; $rv = system $shell_comm || $rv; - $shell_comm = qq{$baseDir/bin/garp.pl -i ${if}.${q} $gn $gd $vip}; + $shell_comm = qq{$baseDir/bin/garp.pl $cstr -i ${if}.${q} $gn $gd $vip}; print "\t\tshell_comm = $shell_comm\n" if exists $opts{'D'}; $rv = system $shell_comm || $rv; |
From: jeff m. <jef...@us...> - 2005-05-16 22:14:28
|
Update of /cvsroot/netpass/NetPass/install.d/init.d In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28720/install.d/init.d Modified Files: netpass Log Message: startup bugs, garp issues Index: netpass =================================================================== RCS file: /cvsroot/netpass/NetPass/install.d/init.d/netpass,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- netpass 28 Apr 2005 07:21:00 -0000 1.3 +++ netpass 16 May 2005 16:10:43 -0000 1.4 @@ -43,7 +43,7 @@ start() { # /cookies is where Apache::Session will stash # the cookie files. 'reiserfs' is recommended. - [ -d /cookies ] && { + [ ! -d /cookies ] && { echo "/cookies filesystem is not mounted" exit 255 } |
From: jeff m. <jef...@us...> - 2005-05-08 02:35:57
|
Update of /cvsroot/netpass/NetPass/lib/NetPass In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1361/lib/NetPass Modified Files: Config.pm DB.pm Log Message: more work on network cfg UI, removed some unused code Index: Config.pm =================================================================== RCS file: /cvsroot/netpass/NetPass/lib/NetPass/Config.pm,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- Config.pm 6 May 2005 03:09:32 -0000 1.37 +++ Config.pm 8 May 2005 02:35:46 -0000 1.38 @@ -65,22 +65,6 @@ my $errstr; -sub xxAUTOLOAD { - no strict; - return if($AUTOLOAD =~ /::DESTROY$/); - if ($AUTOLOAD=~/(\w+)$/) { - my $field = $1; - *{$field} = sub { - my $self = shift; - @_ ? $self->{"_$field"} = shift - : $self->{"_$field"}; - }; - &$field(@_); - } else { - Carp::confess("Cannot figure out field name from '$AUTOLOAD'"); - } -} - sub debug { my $self = shift; my $val = shift; @@ -1829,61 +1813,6 @@ return $etl; } -=head2 B<$np->cfg->nessusBaseDir()> - - -=cut - -sub nessusBaseDir { - my $self = shift; - $self->reloadIfChanged(); - return $self->{'cfg'}->obj('nessus')->value('BASE_DIR'); -} - -=head2 B<$np->cfg->nessusUsername()> - - -=cut - -sub nessusUsername { - my $self = shift; - $self->reloadIfChanged(); - return $self->{'cfg'}->obj('nessus')->value('username'); -} - -=head2 B<$np->cfg->nessusPassword()> - - -=cut - -sub nessusPassword { - my $self = shift; - $self->reloadIfChanged(); - return $self->{'cfg'}->obj('nessus')->value('password'); -} - -=head2 B<$np->cfg->nessusHost()> - - -=cut - -sub nessusHost { - my $self = shift; - $self->reloadIfChanged(); - return $self->{'cfg'}->obj('nessus')->value('host'); -} - -=head2 B<$np->cfg->nessusPort()> - - -=cut - -sub nessusPort { - my $self = shift; - $self->reloadIfChanged(); - return $self->{'cfg'}->obj('nessus')->value('port'); -} - =head2 B<$np->cfg->nessus(-key => key, -val => val)> Given a <nessus> config variable, return the value. If -val is given, Index: DB.pm =================================================================== RCS file: /cvsroot/netpass/NetPass/lib/NetPass/DB.pm,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- DB.pm 4 May 2005 20:22:17 -0000 1.39 +++ DB.pm 8 May 2005 02:35:46 -0000 1.40 @@ -20,11 +20,6 @@ $self->{'dbh'}->disconnect if defined $self->{'dbh'}; } -sub disconnect { - my $self = shift; - $self->{'dbh'}->disconnect if defined $self->{'dbh'}; -} - sub D { my $self = shift; |
From: jeff m. <jef...@us...> - 2005-05-08 02:35:57
|
Update of /cvsroot/netpass/NetPass In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1361 Modified Files: MANIFEST Log Message: more work on network cfg UI, removed some unused code Index: MANIFEST =================================================================== RCS file: /cvsroot/netpass/NetPass/MANIFEST,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- MANIFEST 6 May 2005 03:09:31 -0000 1.39 +++ MANIFEST 8 May 2005 02:35:45 -0000 1.40 @@ -182,6 +182,7 @@ www/htdocs/Admin/urlfilter.mhtml www/htdocs/Admin/network.mhtml www/htdocs/Admin/clienthistory.mhtml +www/htdocs/Admin/switch.mhtml www/htdocs/Admin/help.mhtml www/htdocs/Admin/chpwd.mhtml www/htdocs/Admin/auth.mhtml |
From: jeff m. <jef...@us...> - 2005-05-08 02:35:57
|
Update of /cvsroot/netpass/NetPass/www/htdocs/Admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1361/www/htdocs/Admin Modified Files: network.mhtml Added Files: switch.mhtml Log Message: more work on network cfg UI, removed some unused code --- NEW FILE: switch.mhtml --- <%doc> </%doc> <%args> $switch => ''; </%args> switch: <%$switch%> Index: network.mhtml =================================================================== RCS file: /cvsroot/netpass/NetPass/www/htdocs/Admin/network.mhtml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- network.mhtml 6 May 2005 20:13:35 -0000 1.4 +++ network.mhtml 8 May 2005 02:35:46 -0000 1.5 @@ -35,6 +35,8 @@ $garpToggle => ''; $garpDelay => 5; $garpNumber => 3; + $switches => []; + $BSW => ''; </%args> <%perl> my ($isRoot, $junk) = $m->comp('/Admin/MemberOf', 'acl' => [ 'Admin' ], 'group' => 'default'); @@ -66,6 +68,8 @@ $comment = $np->cfg->getNetComment($network); $ng = $np->cfg->getNetgroup(-network => $network); $ng ||= ''; + $switches = $np->cfg->getSwitches($network); + $BSW = $np->cfg->getBSW($network); } if ($network && $np->cfg->ha($network)) { $primaryRedirector = $np->cfg->primary_redirector($network); @@ -146,8 +150,8 @@ <tr class='haOptions' id='haOptions2'><td class='left'>Secondary Redirector:</td> <td colspan=2><input size=32 maxlength=255 name='primaryRedirector' value="<%$secondaryRedirector%>"></td></tr> <tr class='haOptions' id='haOptions3'><td class='left'>Servers:<BR> -<button id='delHaNPServer' onclick='return network_onclick_delHaNPServer();'>Delete</button><BR> -<input id='addHaNPServer' onfocus='return network_onfocus_addHaNPServer();' onblur='return network_onblur_addHaNPServer();' value="Add Server..." +<button id='delHaNPServer' onclick='network_onclick_delHaNPServer(); return false;' type='button'>Delete</button><BR> +<input id='addHaNPServer' onfocus='network_onfocus_addHaNPServer(this);' onblur='return network_onblur_addHaNPServer(this);' value="Add Server..." size=12 maxlength=255></td> <td colspan=2><%$q->scrolling_list(-id => 'haNPServers', -name => 'haNPServers', -size => 4, -values => $haNPServers , -multiple => 'true')%></td></tr> <tr class='haOptions' id='haOptions4'><td class='left'>Virtual IP:</td><td colspan=2><input id='virtualIP' name='virtualIP' size=16 maxlength=32 @@ -158,6 +162,21 @@ <tr class='garpOptions' id='garpOptions1'><td class='left'>Delay:</td><td colspan=2><input size=4 maxlength=8 name='garpDelay' value="<%$garpDelay%>"> seconds </td></tr> <tr class='garpOptions' id='garpOptions2'><td class='left'>Number:</td><td colspan=2><input size=4 maxlength=8 name='garpNumber' value="<%$garpNumber%>"></td></tr> +<tr><td class='left'>Switches:<BR> +<button id='delSwitch' onclick='network_onclick_delSwitch(); return false;' + type='button'>Delete</button><BR> +<button id='cfgSwitch' onclick='network_onclick_cfgSwitch(); return false;' + type='button'>Configure</button><BR> +<input id='addSwitch' onfocus='network_onfocus_addSwitch(this);' + onblur='return network_onblur_addSwitch(this);' value="Add Switch..." + size=12 maxlength=255> +</td> +<td colspan=2> +BSW: <input name='BSW' id='BSW' value='<%$BSW%>' size=16 maxlength=32><BR> +<%$q->scrolling_list(-id => 'switches', -name => 'switches', -size => 4, + -values => $switches , -multiple => 'true')%></td></tr> +</td> +</tr> <tr><td colspan=3> <PRE><B>TODO: - switches (list + add new + link to switch config) @@ -179,6 +198,7 @@ <script src="/resources/js/common.js" type="text/javascript"></script> <script src="/resources/js/network.js" type="text/javascript"></script> <script language="JavaScript"> +var network_ourHostname = '<%hostname%>'; % if ($network && $np->cfg->ha($network)) { network_show_haOptions(); % } else { |
From: jeff m. <jef...@us...> - 2005-05-08 02:35:57
|
Update of /cvsroot/netpass/NetPass/bin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1361/bin Modified Files: import_nessus_scans.pl Log Message: more work on network cfg UI, removed some unused code Index: import_nessus_scans.pl =================================================================== RCS file: /cvsroot/netpass/NetPass/bin/import_nessus_scans.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- import_nessus_scans.pl 12 Apr 2005 14:18:11 -0000 1.4 +++ import_nessus_scans.pl 8 May 2005 02:35:45 -0000 1.5 @@ -61,7 +61,7 @@ print "Loading Netpass object ..\n" if $D; -my $np = new NetPass(-config => exists $opts{'c'} ? $opts{'c'} : undef, +my $np = new NetPass(-cstr => exists $opts{'c'} ? $opts{'c'} : undef, -dbuser => $dbuser, -dbpass => $dbpass); @@ -70,7 +70,7 @@ my $dbh = $np->db->{dbh}; print "Retrieving nessus configuration ..\n" if $D; -my $bd = $np->cfg->nessusBaseDir(); +my $bd = $np->cfg->nessus(-key => 'base_dir'); die "nessus base_dir undefined in netpass configuration" if (!defined($bd) || ($bd eq "")); @@ -79,10 +79,10 @@ die "cant find $bd/bin/nessus"; } -my $host = $np->cfg->nessusHost(); -my $user = $np->cfg->nessusUsername(); -my $pass = $np->cfg->nessusPassword(); -my $port = $np->cfg->nessusPort(); +my $host = $np->cfg->nessus(-key => 'host'); +my $user = $np->cfg->nessus(-key => 'username'); +my $pass = $np->cfg->nessus(-key => 'password'); +my $port = $np->cfg->nessus(-key => 'port'); my $ncmd = "$bd/bin/nessus -q -p $host $port $user $pass "; |
From: jeff m. <jef...@us...> - 2005-05-08 02:35:57
|
Update of /cvsroot/netpass/NetPass/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1361/lib Modified Files: NetPass.pm Log Message: more work on network cfg UI, removed some unused code Index: NetPass.pm =================================================================== RCS file: /cvsroot/netpass/NetPass/lib/NetPass.pm,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- NetPass.pm 24 Apr 2005 03:42:02 -0000 1.17 +++ NetPass.pm 8 May 2005 02:35:45 -0000 1.18 @@ -41,22 +41,6 @@ $self->{'db'}->DESTROY() if defined($self->{'db'}); } -sub xx_AUTOLOAD { - no strict; - return if($AUTOLOAD =~ /::DESTROY$/); - if ($AUTOLOAD=~/(\w+)$/) { - my $field = $1; - *{$field} = sub { - my $self = shift; - @_ ? $self->{"_$field"} = shift - : $self->{"_$field"}; - }; - &$field(@_); - } else { - Carp::confess("Cannot figure out field name from '$AUTOLOAD'"); - } -} - =head2 new NetPass(-config =E<gt> file, -notReally =E<gt> [0|1], -quiet =E<gt> [0|1], -debug =E<gt> [0|1]) =over |
From: jeff m. <jef...@us...> - 2005-05-08 02:35:57
|
Update of /cvsroot/netpass/NetPass/www/htdocs/OSSTemplate/js In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1361/www/htdocs/OSSTemplate/js Modified Files: network.js Log Message: more work on network cfg UI, removed some unused code Index: network.js =================================================================== RCS file: /cvsroot/netpass/NetPass/www/htdocs/OSSTemplate/js/network.js,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- network.js 6 May 2005 20:13:35 -0000 1.2 +++ network.js 8 May 2005 02:35:47 -0000 1.3 @@ -110,4 +110,105 @@ } document.forms[0].submit(); + +} + +function network_onblur_addHaNPServer(o) { + var RN = "network_onblur_addServer"; + dbg(1, RN); + var servs = document.getElementById('haNPServers'); + if (servs && o && o.value != "") { + var exists = false; + for(var i = 0 ; i < servs.options.length ; i++) { + if (servs.options[i].value == o.value) exists = true; + } + if (!exists) { + var no = new Option(o.value, o.value, false, false); + servs.options[servs.options.length] = no; + unHighLightList("haNPServers"); + servs.options[servs.options.length-1].selected = true; + sortList("haNPServers"); + } else { + dbg (1, RN + ": server already exists: " + o.value); + } + } + if (o) o.value = "Add Server..."; + return false; +} + +function network_onfocus_addHaNPServer(o) { + var RN = "network_onblur_addHaNPServer"; + dbg(1, RN); + if (o && o.value == "Add Server...") o.value = ''; +} + +function network_onclick_delHaNPServer() { + var RN = "network_delHaNPServer"; + dbg (1, RN); + + var servs = document.getElementById('haNPServers'); + if (servs) { + for(var i = servs.options.length-1 ; i >= 0 ; i--) { + if (servs.options[i].selected) + if (servs.options[i].value != network_ourHostname) { + dbg(1, RN + ": del " + servs.options[i].value); + servs.options[i] = undefined; + } + } + } + return false; +} + +function network_onclick_cfgSwitch() { + var switches = document.getElementById('switches'); + if (switches) { + for(var i = 0 ; i < switches.options.length ; i++) { + if (switches.options[i].selected) { + document.location.href = 'switch.mhtml?switch=' + + switches.options[i].value; + } + } + } + return false; +} + +function network_onclick_delSwitch() { + var switches = document.getElementById('switches'); + if (switches) { + for(var i = switches.options.length-1 ; i >= 0 ; i--) { + if (switches.options[i].selected) + switches.options[i] = undefined; + } + } + return false; +} + + +function network_onblur_addSwitch(o) { + var RN = "network_onblur_addSwitch"; + dbg(1, RN); + var servs = document.getElementById('switches'); + if (servs && o && o.value != "") { + var exists = false; + for(var i = 0 ; i < servs.options.length ; i++) { + if (servs.options[i].value == o.value) exists = true; + } + if (!exists) { + var no = new Option(o.value, o.value, false, false); + servs.options[servs.options.length] = no; + unHighLightList("switches"); + servs.options[servs.options.length-1].selected = true; + sortList("switches"); + } else { + dbg (1, RN + ": switch already exists: " + o.value); + } + } + if (o) o.value = "Add Switch..."; + return false; +} + +function network_onfocus_addSwitch(o) { + var RN = "network_onblur_addSwitch"; + dbg(1, RN); + if (o && o.value == "Add Switch...") o.value = ''; } |
From: jeff m. <jef...@us...> - 2005-05-08 02:35:57
|
Update of /cvsroot/netpass/NetPass/www/components/Client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1361/www/components/Client Modified Files: BeginScan Log Message: more work on network cfg UI, removed some unused code Index: BeginScan =================================================================== RCS file: /cvsroot/netpass/NetPass/www/components/Client/BeginScan,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- BeginScan 1 May 2005 05:44:11 -0000 1.7 +++ BeginScan 8 May 2005 02:35:46 -0000 1.8 @@ -62,10 +62,10 @@ }; - my $nessus = new NetPass::Nessus(host => $np->cfg->nessusHost, - port => $np->cfg->nessusPort, - user => $np->cfg->nessusUsername, - password => $np->cfg->nessusPassword, + my $nessus = new NetPass::Nessus(host => $np->cfg->nessus(-key => 'host'), + port => $np->cfg->nessus(-key => 'port'), + user => $np->cfg->nessus(-key => 'username'), + password => $np->cfg->nessus(-key => 'password'), ssl => 1, timeout => 20, debug => 0, callback => $progressBar, callbackparms => { pitot => $plugin_total } |
From: Matt <mt...@us...> - 2005-05-07 04:31:26
|
Update of /cvsroot/netpass/NetPass/lib/NetPass In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1443 Modified Files: API.pm Log Message: Index: API.pm =================================================================== RCS file: /cvsroot/netpass/NetPass/lib/NetPass/API.pm,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- API.pm 1 May 2005 14:02:35 -0000 1.15 +++ API.pm 7 May 2005 04:31:16 -0000 1.16 @@ -5,7 +5,7 @@ my $VERSION = '0.01'; -use lib qw("/opt/netpass/lib); +use lib qw(/opt/netpass/lib); use NetPass::LOG qw(_log _cont); use NetPass::Config; use Digest::MD5 qw(md5_hex); |
From: Matt <mt...@us...> - 2005-05-07 04:27:49
|
Update of /cvsroot/netpass/NetPass/bin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv834 Modified Files: import_snort_rules.pl Log Message: Index: import_snort_rules.pl =================================================================== RCS file: /cvsroot/netpass/NetPass/bin/import_snort_rules.pl,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- import_snort_rules.pl 1 May 2005 13:03:57 -0000 1.9 +++ import_snort_rules.pl 7 May 2005 04:27:41 -0000 1.10 @@ -118,7 +118,9 @@ ); if ($rv ne 1) { - warn "failed to add $sid $rv"; + printf("failed to add %s\n", $rv); + } else { + printf("successfully added %d\n", $sid); } } |
From: jeff m. <jef...@us...> - 2005-05-06 20:14:15
|
Update of /cvsroot/netpass/NetPass/www/htdocs/OSSTemplate/js In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20192/www/htdocs/OSSTemplate/js Modified Files: debug.js Log Message: disable JS debug Index: debug.js =================================================================== RCS file: /cvsroot/netpass/NetPass/www/htdocs/OSSTemplate/js/debug.js,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- debug.js 6 May 2005 03:09:34 -0000 1.6 +++ debug.js 6 May 2005 20:14:06 -0000 1.7 @@ -1,4 +1,4 @@ -var DBGLEVEL = 1; +var DBGLEVEL = 0; var dbgwin; var browserType_IE = 0; |
From: jeff m. <jef...@us...> - 2005-05-06 20:13:50
|
Update of /cvsroot/netpass/NetPass/www/htdocs/OSSTemplate/css In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19989/www/htdocs/OSSTemplate/css Modified Files: site.css Log Message: network editor UI Index: site.css =================================================================== RCS file: /cvsroot/netpass/NetPass/www/htdocs/OSSTemplate/css/site.css,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- site.css 6 May 2005 03:09:33 -0000 1.7 +++ site.css 6 May 2005 20:13:35 -0000 1.8 @@ -176,3 +176,31 @@ TABLE#passwdChangeDialog TD.right { text-align: left; } + +TABLE#networkConfig { + border-collapse: collapse; +} + +TABLE#networkConfig TD.left { + text-align: right; +} + +TABLE#networkConfig TR.haOptions { + background: #EFEFEF; +} + +TABLE#networkConfig TR.garpOptions { + background: #EFEFEF; +} + +TABLE#networkConfig TD.selector { + text-align: center; + border-bottom: solid 1px black; + border-top: solid 1px black; + width: 33%; +} + +TABLE#networkConfig TR.selector { + border-bottom: 2px solid black; + border-top: 2px solid black; +} |
From: jeff m. <jef...@us...> - 2005-05-06 20:13:50
|
Update of /cvsroot/netpass/NetPass/www/htdocs/Admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19989/www/htdocs/Admin Modified Files: logout.mhtml network.mhtml Log Message: network editor UI Index: logout.mhtml =================================================================== RCS file: /cvsroot/netpass/NetPass/www/htdocs/Admin/logout.mhtml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- logout.mhtml 6 May 2005 03:09:33 -0000 1.4 +++ logout.mhtml 6 May 2005 20:13:34 -0000 1.5 @@ -14,7 +14,7 @@ <%perl> if (exists $m->session->{'logged_in'}) { _log("INFO", $m->session->{'username'}." is logging out of Admin tool\n"); - $m->audit(-severity => 'NOTICE', -ip => $ENV{'REMOTE_ADDR'}, + $np->db->audit(-severity => 'NOTICE', -ip => $ENV{'REMOTE_ADDR'}, -user => $m->session->{'username'}, -msg => [ "$username logged out of Admin tool" ]); $m->session->{'logged_in'} = 0; Index: network.mhtml =================================================================== RCS file: /cvsroot/netpass/NetPass/www/htdocs/Admin/network.mhtml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- network.mhtml 6 May 2005 03:09:33 -0000 1.3 +++ network.mhtml 6 May 2005 20:13:35 -0000 1.4 @@ -21,11 +21,22 @@ RO none </%doc> <%args> - $submitButton => ''; - $network => ''; + $submitButton => ''; + $network => ''; + $comment => ''; + $interface => ''; + $qvid => ''; + $uqvid => ''; + $haToggle => ''; + $primaryRedirector => ''; + $secondaryRedirector => ''; + $haNPServers => []; + $virtualIP => ''; + $garpToggle => ''; + $garpDelay => 5; + $garpNumber => 3; </%args> <%perl> - my ($isRoot, $junk) = $m->comp('/Admin/MemberOf', 'acl' => [ 'Admin' ], 'group' => 'default'); if (!$isRoot) { print qq{<p class='error'>Sorry, you don't have access to this form.}; @@ -35,13 +46,44 @@ my $ip = $ENV{'REMOTE_ADDR'}; my $whoami = $m->session->{'username'}; +use Sys::Hostname; + +my $ng; + +$haNPServers = [ hostname, "xyz", "abc" ] if (ref ($haNPServers) ne "ARRAY" || $#{$haNPServers} == -1); +$garpDelay ||= 5; +$garpNumber ||= 3; + +if ($network && $np->cfg->garp($network)) { + $garpDelay = $np->cfg->garp($network, 'delay'); + $garpNumber = $np->cfg->garp($network, 'number'); +} + +if ($network) { + $qvid = $np->cfg->quarantineVlan($network); + $uqvid = $np->cfg->nonquarantineVlan($network); + $interface = $np->cfg->getInterface($network); + $comment = $np->cfg->getNetComment($network); + $ng = $np->cfg->getNetgroup(-network => $network); + $ng ||= ''; +} +if ($network && $np->cfg->ha($network)) { + $primaryRedirector = $np->cfg->primary_redirector($network); + $secondaryRedirector = $np->cfg->secondary_redirector($network); + $haNPServers = $np->cfg->ha_servers($network); + if (!defined($haNPServers)) { + $haNPServers = [ hostname ]; + } + $virtualIP = $np->cfg->virtualIP($network); +} + # fetch all known networks and netgroups my $allNetworks = $np->cfg->getNetworks(); my $allNetgroups = (); foreach my $nw (@$allNetworks) { - my $ng = $np->cfg->getNetgroup(-network => $nw); - push @$allNetgroups, $ng if ($ng ne "") && (!grep(/^$ng$/, @$allNetgroups)); + my $_ng = $np->cfg->getNetgroup(-network => $nw); + push @$allNetgroups, $_ng if ($_ng ne "") && (!grep(/^$_ng$/, @$allNetgroups)); } $m->comp('/Admin/LockConfig', 'enableWhenLocked' => [ 'addNetwork', 'submitButton' ], 'init' => 0); my $WH = "--Select a Network--"; @@ -75,37 +117,54 @@ <form method="post"> -<table border=0> -<tr> - <td> - <%$q->popup_menu(-id => 'network', -name => 'network', -values => [ $WH, sort @$allNetworks ], -onchange => 'network_onchange_network();')%> +<table border=0 width=1000 id='networkConfig'> +<tr class='selector'> + <td class='selector'> + <%$q->popup_menu(-id => 'network', -name => 'network', -values => [ $WH, sort @$allNetworks ], + -default => $network, -onchange => 'network_onchange_network();')%> </td> - <td> + <td class='selector'> <input id='addNetwork' name='addNetwork' size=20 value='Add Network...' disabled onblur='network_onblur_addNetwork(this);' onfocus='network_onfocus_addNetwork(this);'> </td> - <td> + <td class='selector'> <input type='submit' name='submitButton' id='submitButton' value='Commit Changes' disabled> </td> </tr> % if ($network) { -<tr><td colspan=3><PRE> - - comment - - ha enabled/disabled + settings - - primary-redirector - - secondary-redirector - - servers - - virtualip - - garp enabled/disabled + settings - - delay - - number - - netgroup membership (uneditable list + link) - - interface - - nonquar/quar vlan id - - switches (list + add new + link to switch config)</PRE> +<tr><td class='left'>Comment:</td><td colspan=2><input size=32 maxlength=80 name='comment' value="<%$comment%>"></td></tr> +<tr><td class='left'>Interface:</td><td colspan=2><input size=8 maxlength=16 name='interface' value="<%$interface%>"> (sans "/dev/")</td></tr> +<tr><td class='left'>Quarantine VLANID:</td><td colspan=2><input size=6 maxlength=6 name='qvid' value="<%$qvid%>"></td></tr> +<tr><td class='left'>Unquarantine VLANID:</td><td colspan=2><input size=6 maxlength=6 name='uqvid' value="<%$uqvid%>"></td></tr> +<tr><td class='left'>Netgroup:</td><td colspan=2><a href="netgroups.mhtml?netgroups=<%$ng%>"><%$ng%></a></td></tr> + + +<tr><td class='left'>HA:</td><td colspan=2> <%$q->popup_menu(-id => 'haToggle', -name => 'haToggle', -values => [ 'Disabled', 'Enabled' ], + -onchange => 'network_onchange_haToggle(this);', -default => $np->cfg->ha($network) ? "Enabled" : "Disabled")%></td></tr> +<tr class='haOptions' id='haOptions1'><td class='left'>Primary Redirector:</td> + <td colspan=2><input size=32 maxlength=255 name='primaryRedirector' value="<%$primaryRedirector%>"></td></tr> +<tr class='haOptions' id='haOptions2'><td class='left'>Secondary Redirector:</td> + <td colspan=2><input size=32 maxlength=255 name='primaryRedirector' value="<%$secondaryRedirector%>"></td></tr> +<tr class='haOptions' id='haOptions3'><td class='left'>Servers:<BR> +<button id='delHaNPServer' onclick='return network_onclick_delHaNPServer();'>Delete</button><BR> +<input id='addHaNPServer' onfocus='return network_onfocus_addHaNPServer();' onblur='return network_onblur_addHaNPServer();' value="Add Server..." + size=12 maxlength=255></td> +<td colspan=2><%$q->scrolling_list(-id => 'haNPServers', -name => 'haNPServers', -size => 4, -values => $haNPServers , -multiple => 'true')%></td></tr> +<tr class='haOptions' id='haOptions4'><td class='left'>Virtual IP:</td><td colspan=2><input id='virtualIP' name='virtualIP' size=16 maxlength=32 + value="<%$virtualIP%>"></td></tr> + +<tr><td class='left'>GARP:</td><td colspan=2> <%$q->popup_menu(-id => 'garpToggle', -name => 'garpToggle', -values => [ 'Disabled', 'Enabled' ], + -onchange => 'network_onchange_garpToggle(this);', -default => $np->cfg->garp($network) ? "Enabled" : "Disabled")%></td></tr> +<tr class='garpOptions' id='garpOptions1'><td class='left'>Delay:</td><td colspan=2><input size=4 maxlength=8 name='garpDelay' value="<%$garpDelay%>"> seconds </td></tr> +<tr class='garpOptions' id='garpOptions2'><td class='left'>Number:</td><td colspan=2><input size=4 maxlength=8 name='garpNumber' value="<%$garpNumber%>"></td></tr> + +<tr><td colspan=3> +<PRE><B>TODO: + - switches (list + add new + link to switch config) + - when click netgroup .. highlight networks list</B> +</PRE> </td></tr> <tr><td colspan=3> -% my $ng = $np->cfg->getNetgroup(-network => $network); % my $ngtxt = $ng ? qq{<BR>(Part of the "<a href='netgroups.mhtml?netgroups=$ng'>$ng</a>" netgroup)} : ""; % $m->comp('/Admin/TableEditPolicy', %ARGS, 'tableName' => 'Network General Settings for '.$network.$ngtxt, % 'showDefault' => 1, 'formatFor' => 'network', @@ -119,9 +178,21 @@ <script src="/resources/js/common.js" type="text/javascript"></script> <script src="/resources/js/network.js" type="text/javascript"></script> - +<script language="JavaScript"> +% if ($network && $np->cfg->ha($network)) { + network_show_haOptions(); +% } else { + network_hide_haOptions(); +% } +% if ($network && $np->cfg->garp($network)) { + network_show_garpOptions(); +% } else { + network_hide_garpOptions(); +% } +</script> <%perl> + my $lstat = $np->db->isConfigLocked(); if (ref($lstat) eq "HASH") { |
From: jeff m. <jef...@us...> - 2005-05-06 20:13:50
|
Update of /cvsroot/netpass/NetPass/www/components/Admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19989/www/components/Admin Modified Files: Login TableEditPolicy Log Message: network editor UI Index: TableEditPolicy =================================================================== RCS file: /cvsroot/netpass/NetPass/www/components/Admin/TableEditPolicy,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- TableEditPolicy 6 May 2005 03:09:33 -0000 1.4 +++ TableEditPolicy 6 May 2005 20:13:34 -0000 1.5 @@ -37,8 +37,8 @@ </TD> % if ($showDefault) { <td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'MULTI_MAC', -network => $network, -location => $formatFor)?"":"checked"%> name="override:MULTI_MAC"></td> -<td class='left'><%$np->cfg->policy(-key => 'MULTI_MAC')%></td><td class='right'> -(<%join(',', @{$np->cfg->policyLocation(-key => 'MULTI_MAC', -network => $network)})%>)</td> +<td class='right'><%$np->cfg->policy(-key => 'MULTI_MAC')%></td> +<td class='left'>(<%join(',', @{$np->cfg->policyLocation(-key => 'MULTI_MAC', -network => $network)})%>)</td> % } </TR> <TR> @@ -52,8 +52,8 @@ </TD> % if ($showDefault) { <td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'STRIKES', -network => $network, -location => $formatFor)?"":"checked"%> name="override:STRIKES"></td> -<td class='left'><%$np->cfg->policy(-key => 'STRIKES')%></td><td class='right'> -(<%join(',', @{$np->cfg->policyLocation(-key => 'STRIKES', -network => $network)})%>)</td> +<td class='right'><%$np->cfg->policy(-key => 'STRIKES')%></td> +<td class='left'>(<%join(',', @{$np->cfg->policyLocation(-key => 'STRIKES', -network => $network)})%>)</td> % } </TR> <TR> @@ -68,8 +68,8 @@ </TD> % if ($showDefault) { <td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'NO_STRIKES_FOR_MANUAL', -network => $network, -location => $formatFor)?"":"checked"%> name="override:NO_STRIKES_FOR_MANUAL"></td> -<td class='left'><%$np->cfg->policy(-key => 'NO_STRIKES_FOR_MANUAL') ? "yes" : "no"%></td><td class='right'> -(<%join(',', @{$np->cfg->policyLocation(-key => 'NO_STRIKES_FOR_MANUAL', -network => $network)})%>)</td> +<td class='right'><%$np->cfg->policy(-key => 'NO_STRIKES_FOR_MANUAL') ? "yes" : "no"%></td> +<td class='left'>(<%join(',', @{$np->cfg->policyLocation(-key => 'NO_STRIKES_FOR_MANUAL', -network => $network)})%>)</td> % } </TR> <TR> @@ -84,8 +84,8 @@ </TD> % if ($showDefault) { <td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'NO_STRIKES_FOR_SNORT', -network => $network, -location => $formatFor)?"":"checked"%> name="override:NO_STRIKES_FOR_SNORT"></td> -<td class='left'><%$np->cfg->policy(-key => 'NO_STRIKES_FOR_SNORT') ? "yes" : "no"%></td><td class='right'> -(<%join(',', @{$np->cfg->policyLocation(-key => 'NO_STRIKES_FOR_SNORT', -network => $network)})%>)</td> +<td class='right'><%$np->cfg->policy(-key => 'NO_STRIKES_FOR_SNORT') ? "yes" : "no"%></td> +<td class='left'>(<%join(',', @{$np->cfg->policyLocation(-key => 'NO_STRIKES_FOR_SNORT', -network => $network)})%>)</td> % } </TR> <TR> @@ -100,8 +100,8 @@ </TD> % if ($showDefault) { <td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'NO_STRIKES_FOR_NESSUS', -network => $network, -location => $formatFor)?"":"checked"%> name="override:NO_STRIKES_FOR_NESSUS"></td> -<td class='left'><%$np->cfg->policy(-key => 'NO_STRIKES_FOR_NESSUS') ? "yes" : "no"%></td><td class='right'> -(<%join(',', @{$np->cfg->policyLocation(-key => 'NO_STRIKES_FOR_NESSUS', -network => $network)})%>)</td> +<td class='right'><%$np->cfg->policy(-key => 'NO_STRIKES_FOR_NESSUS') ? "yes" : "no"%></td> +<td class='left'>(<%join(',', @{$np->cfg->policyLocation(-key => 'NO_STRIKES_FOR_NESSUS', -network => $network)})%>)</td> % } </TR> <TR> @@ -115,8 +115,8 @@ </TD> % if ($showDefault) { <td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'RESULTS_DISPLAY', -network => $network, -location => $formatFor)?"":"checked"%> name="override:RESULTS_DISPLAY"></td> -<td class='left'><%$np->cfg->policy(-key => 'RESULTS_DISPLAY')%></td><td class='right'> -(<%join(',', @{$np->cfg->policyLocation(-key => 'RESULTS_DISPLAY', -network => $network)})%>)</td> +<td class='right'><%$np->cfg->policy(-key => 'RESULTS_DISPLAY')%></td> +<td class='left'>(<%join(',', @{$np->cfg->policyLocation(-key => 'RESULTS_DISPLAY', -network => $network)})%>)</td> % } </TR> <TR> @@ -130,8 +130,8 @@ </TD> % if ($showDefault) { <td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'RESULTS_EXPAND', -network => $network, -location => $formatFor)?"":"checked"%> name="override:RESULTS_EXPAND"></td> -<td class='left'><%$np->cfg->policy(-key => 'RESULTS_EXPAND')%></td><td class='right'> -(<%join(',', @{$np->cfg->policyLocation(-key => 'RESULTS_EXPAND', -network => $network)})%>)</td> +<td class='right'><%$np->cfg->policy(-key => 'RESULTS_EXPAND')%></td> +<td class='left'>(<%join(',', @{$np->cfg->policyLocation(-key => 'RESULTS_EXPAND', -network => $network)})%>)</td> % } </TR> <TR> @@ -145,8 +145,8 @@ </TD> % if ($showDefault) { <td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'AUTO_REDIRECT', -network => $network, -location => $formatFor)?"":"checked"%> name="override:AUTO_REDIRECT"></td> -<td class='left'><%$np->cfg->policy(-key => 'AUTO_REDIRECT')?"Yes":"No"%></td><td class='right'> -(<%join(',', @{$np->cfg->policyLocation(-key => 'AUTO_REDIRECT', -network => $network)})%>)</td> +<td class='right'><%$np->cfg->policy(-key => 'AUTO_REDIRECT')?"Yes":"No"%></td> +<td class='left'>(<%join(',', @{$np->cfg->policyLocation(-key => 'AUTO_REDIRECT', -network => $network)})%>)</td> % } </TR> <TR> @@ -160,8 +160,8 @@ </TD> % if ($showDefault) { <td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'COOKIE_DETECT', -network => $network, -location => $formatFor)?"":"checked"%> name="override:COOKIE_DETECT"></td> -<td class='left'><%$np->cfg->policy(-key => 'COOKIE_DETECT')?"Yes":"No"%></td><td class='right'> -(<%join(',', @{$np->cfg->policyLocation(-key => 'COOKIE_DETECT', -network => $network)})%>)</td> +<td class='right'><%$np->cfg->policy(-key => 'COOKIE_DETECT')?"Yes":"No"%></td> +<td class='left'>(<%join(',', @{$np->cfg->policyLocation(-key => 'COOKIE_DETECT', -network => $network)})%>)</td> % } </TR> <TR> @@ -175,8 +175,8 @@ </TD> % if ($showDefault) { <td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'COOKIE_NAME', -network => $network, -location => $formatFor)?"":"checked"%> name="override:COOKIE_NAME"></td> -<td class='left'><%$np->cfg->policy(-key => 'COOKIE_NAME')%></td><td class='right'> -(<%join(',', @{$np->cfg->policyLocation(-key => 'COOKIE_NAME', -network => $network)})%>)</td> +<td class='right'><%$np->cfg->policy(-key => 'COOKIE_NAME')%></td> +<td class='left'>(<%join(',', @{$np->cfg->policyLocation(-key => 'COOKIE_NAME', -network => $network)})%>)</td> % } </TR> <TR> @@ -190,8 +190,8 @@ </TD> % if ($showDefault) { <td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'REDIR_URL_DEFAULT', -network => $network, -location => $formatFor)?"":"checked"%> name="override:REDIR_URL_DEFAULT"></td> -<td class='left'><%$np->cfg->policy(-key => 'REDIR_URL_DEFAULT')%></td><td class='right'> -(<%join(',', @{$np->cfg->policyLocation(-key => 'REDIR_URL_DEFAULT', -network => $network)})%>)</td> +<td class='right'><%$np->cfg->policy(-key => 'REDIR_URL_DEFAULT')%></td> +<td class='left'>(<%join(',', @{$np->cfg->policyLocation(-key => 'REDIR_URL_DEFAULT', -network => $network)})%>)</td> % } </TR> <TR> @@ -205,7 +205,7 @@ </TD> % if ($showDefault) { <td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'SURVEY_ENABLED', -network => $network, -location => $formatFor)?"":"checked"%> name="override:SURVEY_ENABLED"></td> -<td class='left'><%$np->cfg->policy(-key => 'SURVEY_ENABLED')?"Yes":"No"%></td><td class='right'> +<td class='right'><%$np->cfg->policy(-key => 'SURVEY_ENABLED')?"Yes":"No"%></td><td class='left'> (<%join(',', @{$np->cfg->policyLocation(-key => 'SURVEY_ENABLED', -network => $network)})%>)</td> % } </TR> @@ -220,7 +220,7 @@ </TD> % if ($showDefault) { <td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'SURVEY_EMAIL', -network => $network, -location => $formatFor)?"":"checked"%> name="override:SURVEY_EMAIL"></td> -<td class='left'><%$np->cfg->policy(-key => 'SURVEY_EMAIL')%></td><td class='right'> +<td class='right'><%$np->cfg->policy(-key => 'SURVEY_EMAIL')%></td><td class='left'> (<%join(',', @{$np->cfg->policyLocation(-key => 'SURVEY_EMAIL', -network => $network)})%>)</td> % } </TR> @@ -237,7 +237,7 @@ </TD> % if ($showDefault) { <td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'PID_DIR', -network => $network, -location => $formatFor)?"":"checked"%> name="override:PID_DIR"></td> -<td class='left'><%$np->cfg->policy(-key => 'PID_DIR')%></td><td class='right'> +<td class='right'><%$np->cfg->policy(-key => 'PID_DIR')%></td><td class='left'> (<%join(',', @{$np->cfg->policyLocation(-key => 'PID_DIR', -network => $network)})%>)</td> % } </TR> @@ -255,7 +255,7 @@ </TD> % if ($showDefault) { <td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'BASE_DIR', -network => $network, -location => $formatFor)?"":"checked"%> name="override:BASE_DIR"></td> -<td class='left'><%$np->cfg->policy(-key => 'BASE_DIR')%></td><td class='right'> +<td class='right'><%$np->cfg->policy(-key => 'BASE_DIR')%></td><td class='left'> (<%join(',', @{$np->cfg->policyLocation(-key => 'BASE_DIR', -network => $network)})%>)</td> % } </TR> @@ -272,7 +272,7 @@ </TD> % if ($showDefault) { <td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'PORT_SEARCH_ALGO', -network => $network, -location => $formatFor)?"":"checked"%> name="override:PORT_SEARCH_ALGO"></td> -<td class='left'><%$np->cfg->policy(-key => 'PORT_SEARCH_ALGO')%></td><td class='right'> +<td class='right'><%$np->cfg->policy(-key => 'PORT_SEARCH_ALGO')%></td><td class='left'> (<%join(',', @{$np->cfg->policyLocation(-key => 'PORT_SEARCH_ALGO', -network => $network)})%>)</td> % } </TR> @@ -287,7 +287,7 @@ </TD> % if ($showDefault) { <td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'PORT_CACHE', -network => $network, -location => $formatFor)?"":"checked"%> name="override:PORT_CACHE"></td> -<td class='left'><%$np->cfg->policy(-key => 'PORT_CACHE')?"on":"off"%></td><td class='right'> +<td class='right'><%$np->cfg->policy(-key => 'PORT_CACHE')?"on":"off"%></td><td class='left'> (<%join(',', @{$np->cfg->policyLocation(-key => 'PORT_CACHE', -network => $network)})%>)</td> % } </TR> @@ -307,7 +307,7 @@ <td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'UNQUAR_ON_LINKUP', -network => $network, -location => $formatFor)?"":"checked"%> name="override:UNQUAR_ON_LINKUP"></td> % my $uqlu = $np->cfg->policy(-key => 'UNQUAR_ON_LINKUP'); % $uqlu = ($uqlu =~ /itdepends/i)?$uqlu : ($uqlu ? "on" : "off"); -<td class='left'><%$uqlu%></td><td class='right'> +<td class='right'><%$uqlu%></td><td class='left'> (<%join(',', @{$np->cfg->policyLocation(-key => 'UNQUAR_ON_LINKUP', -network => $network)})%>)</td> % } </TR> @@ -322,7 +322,7 @@ </TD> % if ($showDefault) { <td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'resetport', -network => $network, -location => $formatFor)?"":"checked"%> name="override:resetport"></td> -<td class='left'><%$np->cfg->policy(-key => 'resetport')?"on":"off"%></td><td class='right'> +<td class='right'><%$np->cfg->policy(-key => 'resetport')?"on":"off"%></td><td class='left'> (<%join(',', @{$np->cfg->policyLocation(-key => 'resetport', -network => $network)})%>)</td> % } </TR> @@ -337,7 +337,7 @@ </TD> % if ($showDefault) { <td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'macscan', -network => $network, -location => $formatFor)?"":"checked"%> name="override:macscan"></td> -<td class='left'><%$np->cfg->policy(-key => 'macscan')?"on":"off"%></td><td class='right'> +<td class='right'><%$np->cfg->policy(-key => 'macscan')?"on":"off"%></td><td class='left'> (<%join(',', @{$np->cfg->policyLocation(-key => 'macscan', -network => $network)})%>)</td> % } </TR> @@ -352,7 +352,7 @@ </TD> % if ($showDefault) { <td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'nessus', -network => $network, -location => $formatFor)?"":"checked"%> name="override:nessus"></td> -<td class='left'><%$np->cfg->policy(-key => 'nessus')?"on":"off"%></td><td class='right'> +<td class='right'><%$np->cfg->policy(-key => 'nessus')?"on":"off"%></td><td class='left'> (<%join(',', @{$np->cfg->policyLocation(-key => 'nessus', -network => $network)})%>)</td> % } </TR> @@ -367,7 +367,7 @@ </TD> % if ($showDefault) { <td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'LDAP_USER_QUERY', -network => $network, -location => $formatFor)?"":"checked"%> name="override:LDAP_USER_QUERY"></td> -<td class='left'><%$np->cfg->policy(-key => 'LDAP_USER_QUERY')%></td><td class='right'> +<td class='right'><%$np->cfg->policy(-key => 'LDAP_USER_QUERY')%></td><td class='left'> (<%join(',', @{$np->cfg->policyLocation(-key => 'LDAP_USER_QUERY', -network => $network)})%>)</td> % } </TR> @@ -382,7 +382,7 @@ </TD> % if ($showDefault) { <td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'LDAP_POPUP_WIDTH', -network => $network, -location => $formatFor)?"":"checked"%> name="override:LDAP_POPUP_WIDTH"></td> -<td class='left'><%$np->cfg->policy(-key => 'LDAP_POPUP_WIDTH')%></td><td class='right'> +<td class='right'><%$np->cfg->policy(-key => 'LDAP_POPUP_WIDTH')%></td><td class='left'> (<%join(',', @{$np->cfg->policyLocation(-key => 'LDAP_POPUP_WIDTH', -network => $network)})%>)</td> % } </TR> @@ -397,7 +397,7 @@ </TD> % if ($showDefault) { <td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'LDAP_POPUP_HEIGHT', -network => $network, -location => $formatFor)?"":"checked"%> name="override:LDAP_POPUP_HEIGHT"></td> -<td class='left'><%$np->cfg->policy(-key => 'LDAP_POPUP_HEIGHT')%></td><td class='right'> +<td class='right'><%$np->cfg->policy(-key => 'LDAP_POPUP_HEIGHT')%></td><td class='left'> (<%join(',', @{$np->cfg->policyLocation(-key => 'LDAP_POPUP_HEIGHT', -network => $network)})%>)</td> % } </TR> @@ -412,7 +412,7 @@ </TD> % if ($showDefault) { <td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'USERNAME_PROMPT', -network => $network, -location => $formatFor)?"":"checked"%> name="override:USERNAME_PROMPT"></td> -<td class='left'><%$np->cfg->policy(-key => 'USERNAME_PROMPT')%></td><td class='right'> +<td class='right'><%$np->cfg->policy(-key => 'USERNAME_PROMPT')%></td><td class='left'> (<%join(',', @{$np->cfg->policyLocation(-key => 'USERNAME_PROMPT', -network => $network)})%>)</td> % } </TR> @@ -427,7 +427,7 @@ </TD> % if ($showDefault) { <td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'PASSWORD_PROMPT', -network => $network, -location => $formatFor)?"":"checked"%> name="override:PASSWORD_PROMPT"></td> -<td class='left'><%$np->cfg->policy(-key => 'PASSWORD_PROMPT')%></td><td class='right'> +<td class='right'><%$np->cfg->policy(-key => 'PASSWORD_PROMPT')%></td><td class='left'> (<%join(',', @{$np->cfg->policyLocation(-key => 'PASSWORD_PROMPT', -network => $network)})%>)</td> % } </TR> @@ -442,7 +442,7 @@ </TD> % if ($showDefault) { <td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'COMPANY_NAME', -network => $network, -location => $formatFor)?"":"checked"%> name="override:COMPANY_NAME"></td> -<td class='left'><%$np->cfg->policy(-key => 'COMPANY_NAME')%></td><td class='right'> +<td class='right'><%$np->cfg->policy(-key => 'COMPANY_NAME')%></td><td class='left'> (<%join(',', @{$np->cfg->policyLocation(-key => 'COMPANY_NAME', -network => $network)})%>)</td> % } </TR> @@ -457,7 +457,7 @@ </TD> % if ($showDefault) { <td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'COMPANY_SHORT_NAME', -network => $network, -location => $formatFor)?"":"checked"%> name="override:COMPANY_SHORT_NAME"></td> -<td class='left'><%$np->cfg->policy(-key => 'COMPANY_SHORT_NAME')%></td><td class='right'> +<td class='right'><%$np->cfg->policy(-key => 'COMPANY_SHORT_NAME')%></td><td class='left'> (<%join(',', @{$np->cfg->policyLocation(-key => 'COMPANY_SHORT_NAME', -network => $network)})%>)</td> % } </TR> @@ -472,7 +472,7 @@ </TD> % if ($showDefault) { <td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'COMPANY_UNIT_NAME', -network => $network, -location => $formatFor)?"":"checked"%> name="override:COMPANY_UNIT_NAME"></td> -<td class='left'><%$np->cfg->policy(-key => 'COMPANY_UNIT_NAME')%></td><td class='right'> +<td class='right'><%$np->cfg->policy(-key => 'COMPANY_UNIT_NAME')%></td><td class='left'> (<%join(',', @{$np->cfg->policyLocation(-key => 'COMPANY_UNIT_NAME', -network => $network)})%>)</td> % } </TR> @@ -487,7 +487,7 @@ </TD> % if ($showDefault) { <td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'EXAMPLE_IPADDR', -network => $network, -location => $formatFor)?"":"checked"%> name="override:EXAMPLE_IPADDR"></td> -<td class='left'><%$np->cfg->policy(-key => 'EXAMPLE_IPADDR')%></td><td class='right'> +<td class='right'><%$np->cfg->policy(-key => 'EXAMPLE_IPADDR')%></td><td class='left'> (<%join(',', @{$np->cfg->policyLocation(-key => 'EXAMPLE_IPADDR', -network => $network)})%>)</td> % } </TR> Index: Login =================================================================== RCS file: /cvsroot/netpass/NetPass/www/components/Admin/Login,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- Login 6 May 2005 03:09:33 -0000 1.11 +++ Login 6 May 2005 20:13:34 -0000 1.12 @@ -34,7 +34,7 @@ if (defined($aok) && ($aok == 1)) { _log("INFO", $username." is logging in to Admin tool\n"); - $m->audit(-severity => 'NOTICE', -ip => $ENV{'REMOTE_ADDR'}, + $np->db->audit(-severity => 'NOTICE', -ip => $ENV{'REMOTE_ADDR'}, -user => $username, -msg => [ "$username logged in to Admin tool" ]); $m->session->{'logged_in'} = 1; # FIX/Client/Login $m->session->{'username'} = $username; |
From: jeff m. <jef...@us...> - 2005-05-06 20:13:50
|
Update of /cvsroot/netpass/NetPass/www/htdocs/OSSTemplate/js In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19989/www/htdocs/OSSTemplate/js Modified Files: OSSTemplate.js network.js Log Message: network editor UI Index: OSSTemplate.js =================================================================== RCS file: /cvsroot/netpass/NetPass/www/htdocs/OSSTemplate/js/OSSTemplate.js,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- OSSTemplate.js 1 May 2005 05:44:12 -0000 1.4 +++ OSSTemplate.js 6 May 2005 20:13:35 -0000 1.5 @@ -49,6 +49,8 @@ x = new getObj(obj); } + dbg(1, "showhide " + obj + " " + x + " d:" + x.style.display ); + if (x.style.display == "none"){ x.style.display = ""; } else { Index: network.js =================================================================== RCS file: /cvsroot/netpass/NetPass/www/htdocs/OSSTemplate/js/network.js,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- network.js 6 May 2005 15:33:47 -0000 1.1 +++ network.js 6 May 2005 20:13:35 -0000 1.2 @@ -1,3 +1,71 @@ +function network_show_haOptions() { + var i = 1; + var done = false; + while (!done) { + var fn = 'haOptions'+ i++; + var o = document.getElementById(fn); + if (o) + o.style.display = ""; + else + done = true; + } +} + +function network_hide_haOptions() { + var i = 1; + var done = false; + while (!done) { + var fn = 'haOptions' + i++; + var o = document.getElementById(fn); + if (o) + o.style.display = "none"; + else + done = true; + } +} + +function network_onchange_haToggle(o) { + if (o && o.value) { + if (o.value == "Enabled") network_show_haOptions(); + if (o.value == "Disabled") network_hide_haOptions(); + } +} + + +function network_show_garpOptions() { + var i = 1; + var done = false; + while (!done) { + var fn = 'garpOptions'+ i++; + var o = document.getElementById(fn); + if (o) + o.style.display = ""; + else + done = true; + } +} + +function network_hide_garpOptions() { + var i = 1; + var done = false; + while (!done) { + var fn = 'garpOptions' + i++; + var o = document.getElementById(fn); + if (o) + o.style.display = "none"; + else + done = true; + } +} + +function network_onchange_garpToggle(o) { + if (o && o.value) { + if (o.value == "Enabled") network_show_garpOptions(); + if (o.value == "Disabled") network_hide_garpOptions(); + } +} + + function network_onblur_addNetwork(o) { var RN = "network_onblur_addNetwork"; |
From: jeff m. <jef...@us...> - 2005-05-06 15:33:57
|
Update of /cvsroot/netpass/NetPass/www/htdocs/OSSTemplate/js In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12856 Added Files: network.js Log Message: network.js --- NEW FILE: network.js --- function network_onblur_addNetwork(o) { var RN = "network_onblur_addNetwork"; dbg(1, RN); var nw = document.getElementById('network'); if (nw && o.value != "") { if ( o.value.match(/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\/\d+$/) ) { var exists = false; for(var i = 1 ; i < nw.options.length ; i++) { if (nw.options[i].value == o.value) exists = true; } if (!exists) { var no = new Option(o.value, o.value, false, false); nw.options[nw.options.length] = no; unHighLightList("network"); nw.options[nw.options.length-1].selected = true; sortList("network"); } else { dbg (1, RN + ": network already exists: " + o.value); } } else { dbg (1, RN + ": " + o.value + " not in CIDR notation."); } } o.value = "Add Network..."; } function network_onfocus_addNetwork(o) { var RN = "network_onblur_addNetwork"; dbg(1, RN); if (o && o.value == "Add Network...") o.value = ''; } function network_onchange_network() { var RN = "network_onchange_network"; dbg (1, RN); var o = document.getElementById("network"); if (!o) return; if(o.options[0].selected == true) { //IE o.options[0].selected == false; return; } document.forms[0].submit(); } |
From: jeff m. <jef...@us...> - 2005-05-06 03:10:27
|
Update of /cvsroot/netpass/NetPass/www/components/Admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3466/www/components/Admin Modified Files: LockConfig Login TableEditPolicy Log Message: netgroup/network editor UI Index: TableEditPolicy =================================================================== RCS file: /cvsroot/netpass/NetPass/www/components/Admin/TableEditPolicy,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- TableEditPolicy 4 May 2005 20:22:17 -0000 1.3 +++ TableEditPolicy 6 May 2005 03:09:33 -0000 1.4 @@ -1,17 +1,30 @@ <%doc> </%doc> <%args> - $tableName => 'General'; - $network => ''; - $suppressKeys => {}; + $tableName => 'General'; + $network => ''; + $suppressKeys => {}; + $showDefault => 0; + $formatFor => 'group'; </%args> +<%perl> +my $colspan = 2; +$colspan +=3 if ($showDefault); +my $C = qq{style='text-align:center;'}; +</%perl> + <TABLE WIDTH=800 ID="policyConfig" class="expandable" CELLSPACING=2 CELLPADDING=2> <THEAD> -<TR><TH onclick="showHideObj2(getElementById('policyConfig').tBodies[0]);" COLSPAN=4><%$tableName%></TH></TR> +<TR><TH onclick="showHideObj2(getElementById('policyConfig').tBodies[0]);" COLSPAN=<%$colspan%>><%$tableName%></TH></TR> </THEAD> <TBODY> -<tr><th>Option</th><th>Value</th><th>Use Default</th><th><a href="gencfg.mhtml">Default (Global) Value</a></th></tr> +<tr><th>Option</th><th>Value</th> +% if ($showDefault) { +<th>Override Default</th> +<th colspan=2>Default Value</th> +% } +</tr> <TR> <TD CLASS='left'>MULTI_MAC</TD> <TD CLASS='right' > @@ -22,8 +35,11 @@ -default => $np->cfg->policy(-key => 'MULTI_MAC', -network => $network), )%> </TD> -<td class='left'><input type='checkbox' <%$np->cfg->policyLocation(-key => 'MULTI_MAC', -network => $network, -location => 'group')?"":"checked"%> name="usedefault:MULTI_MAC"></td> -<td class='left'><%$np->cfg->policy(-key => 'MULTI_MAC')%></td> +% if ($showDefault) { +<td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'MULTI_MAC', -network => $network, -location => $formatFor)?"":"checked"%> name="override:MULTI_MAC"></td> +<td class='left'><%$np->cfg->policy(-key => 'MULTI_MAC')%></td><td class='right'> +(<%join(',', @{$np->cfg->policyLocation(-key => 'MULTI_MAC', -network => $network)})%>)</td> +% } </TR> <TR> <TD CLASS='left'>Strikes</TD> @@ -34,8 +50,59 @@ -size => 3, )%> </TD> -<td class='left'><input type='checkbox' <%$np->cfg->policyLocation(-key => 'STRIKES', -network => $network, -location => 'group')?"":"checked"%> name="usedefault:STRIKES"></td> -<td class='left'><%$np->cfg->policy(-key => 'STRIKES')%></td> +% if ($showDefault) { +<td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'STRIKES', -network => $network, -location => $formatFor)?"":"checked"%> name="override:STRIKES"></td> +<td class='left'><%$np->cfg->policy(-key => 'STRIKES')%></td><td class='right'> +(<%join(',', @{$np->cfg->policyLocation(-key => 'STRIKES', -network => $network)})%>)</td> +% } +</TR> +<TR> +<TD CLASS='left'>Disable Strikes For Manual Quarantine</TD> +<TD CLASS='right'> +<%$q->radio_group ( + -name => 'policy:NO_STRIKES_FOR_MANUAL', + -values => [ 'Yes', 'No' ], + -default => $np->cfg->policy(-key => 'NO_STRIKES_FOR_MANUAL', -network => $network) ? "Yes" : "No", + -size => 3, + )%> +</TD> +% if ($showDefault) { +<td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'NO_STRIKES_FOR_MANUAL', -network => $network, -location => $formatFor)?"":"checked"%> name="override:NO_STRIKES_FOR_MANUAL"></td> +<td class='left'><%$np->cfg->policy(-key => 'NO_STRIKES_FOR_MANUAL') ? "yes" : "no"%></td><td class='right'> +(<%join(',', @{$np->cfg->policyLocation(-key => 'NO_STRIKES_FOR_MANUAL', -network => $network)})%>)</td> +% } +</TR> +<TR> +<TD CLASS='left'>Disable Strikes For Snort Quarantine</TD> +<TD CLASS='right'> +<%$q->radio_group ( + -name => 'policy:NO_STRIKES_FOR_SNORT', + -values => [ 'Yes', 'No' ], + -default => $np->cfg->policy(-key => 'NO_STRIKES_FOR_SNORT', -network => $network) ? "Yes" : "No", + -size => 3, + )%> +</TD> +% if ($showDefault) { +<td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'NO_STRIKES_FOR_SNORT', -network => $network, -location => $formatFor)?"":"checked"%> name="override:NO_STRIKES_FOR_SNORT"></td> +<td class='left'><%$np->cfg->policy(-key => 'NO_STRIKES_FOR_SNORT') ? "yes" : "no"%></td><td class='right'> +(<%join(',', @{$np->cfg->policyLocation(-key => 'NO_STRIKES_FOR_SNORT', -network => $network)})%>)</td> +% } +</TR> +<TR> +<TD CLASS='left'>Disable Strikes For Nessus Quarantine</TD> +<TD CLASS='right'> +<%$q->radio_group ( + -name => 'policy:NO_STRIKES_FOR_NESSUS', + -values => [ 'Yes', 'No' ], + -default => $np->cfg->policy(-key => 'NO_STRIKES_FOR_NESSUS', -network => $network) ? "Yes" : "No", + -size => 3, + )%> +</TD> +% if ($showDefault) { +<td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'NO_STRIKES_FOR_NESSUS', -network => $network, -location => $formatFor)?"":"checked"%> name="override:NO_STRIKES_FOR_NESSUS"></td> +<td class='left'><%$np->cfg->policy(-key => 'NO_STRIKES_FOR_NESSUS') ? "yes" : "no"%></td><td class='right'> +(<%join(',', @{$np->cfg->policyLocation(-key => 'NO_STRIKES_FOR_NESSUS', -network => $network)})%>)</td> +% } </TR> <TR> <TD CLASS='left'>RESULTS_DISPLAY</TD> @@ -46,8 +113,11 @@ -default => $np->cfg->policy(-key => 'RESULTS_DISPLAY', -network => $network), )%> </TD> -<td class='left'><input type='checkbox' <%$np->cfg->policyLocation(-key => 'RESULTS_DISPLAY', -network => $network, -location => 'group')?"":"checked"%> name="usedefault:RESULTS_DISPLAY"></td> -<td class='left'><%$np->cfg->policy(-key => 'RESULTS_DISPLAY')%></td> +% if ($showDefault) { +<td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'RESULTS_DISPLAY', -network => $network, -location => $formatFor)?"":"checked"%> name="override:RESULTS_DISPLAY"></td> +<td class='left'><%$np->cfg->policy(-key => 'RESULTS_DISPLAY')%></td><td class='right'> +(<%join(',', @{$np->cfg->policyLocation(-key => 'RESULTS_DISPLAY', -network => $network)})%>)</td> +% } </TR> <TR> <TD CLASS='left'>RESULTS_EXPAND</TD> @@ -58,8 +128,11 @@ -size => 3, )%> </TD> -<td class='left'><input type='checkbox' <%$np->cfg->policyLocation(-key => 'RESULTS_EXPAND', -network => $network, -location => 'group')?"":"checked"%> name="usedefault:RESULTS_EXPAND"></td> -<td class='left'><%$np->cfg->policy(-key => 'RESULTS_EXPAND')%></td> +% if ($showDefault) { +<td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'RESULTS_EXPAND', -network => $network, -location => $formatFor)?"":"checked"%> name="override:RESULTS_EXPAND"></td> +<td class='left'><%$np->cfg->policy(-key => 'RESULTS_EXPAND')%></td><td class='right'> +(<%join(',', @{$np->cfg->policyLocation(-key => 'RESULTS_EXPAND', -network => $network)})%>)</td> +% } </TR> <TR> <TD CLASS='left'>AUTO_REDIRECT</TD> @@ -70,8 +143,11 @@ -default => ($np->cfg->policy(-key => 'AUTO_REDIRECT', -network => $network)) ? 'Yes' : 'No' )%> </TD> -<td class='left'><input type='checkbox' <%$np->cfg->policyLocation(-key => 'AUTO_REDIRECT', -network => $network, -location => 'group')?"":"checked"%> name="usedefault:AUTO_REDIRECT"></td> -<td class='left'><%$np->cfg->policy(-key => 'AUTO_REDIRECT')?"Yes":"No"%></td> +% if ($showDefault) { +<td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'AUTO_REDIRECT', -network => $network, -location => $formatFor)?"":"checked"%> name="override:AUTO_REDIRECT"></td> +<td class='left'><%$np->cfg->policy(-key => 'AUTO_REDIRECT')?"Yes":"No"%></td><td class='right'> +(<%join(',', @{$np->cfg->policyLocation(-key => 'AUTO_REDIRECT', -network => $network)})%>)</td> +% } </TR> <TR> <TD CLASS='left'>COOKIE_DETECT</TD> @@ -82,8 +158,11 @@ -default => ($np->cfg->policy(-key => 'COOKIE_DETECT', -network => $network)) ? 'Yes' : 'No' )%> </TD> -<td class='left'><input type='checkbox' <%$np->cfg->policyLocation(-key => 'COOKIE_DETECT', -network => $network, -location => 'group')?"":"checked"%> name="usedefault:COOKIE_DETECT"></td> -<td class='left'><%$np->cfg->policy(-key => 'COOKIE_DETECT')?"Yes":"No"%></td> +% if ($showDefault) { +<td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'COOKIE_DETECT', -network => $network, -location => $formatFor)?"":"checked"%> name="override:COOKIE_DETECT"></td> +<td class='left'><%$np->cfg->policy(-key => 'COOKIE_DETECT')?"Yes":"No"%></td><td class='right'> +(<%join(',', @{$np->cfg->policyLocation(-key => 'COOKIE_DETECT', -network => $network)})%>)</td> +% } </TR> <TR> <TD CLASS='left'>COOKIE_NAME</TD> @@ -94,8 +173,11 @@ -size => 25, )%> </TD> -<td class='left'><input type='checkbox' <%$np->cfg->policyLocation(-key => 'COOKIE_NAME', -network => $network, -location => 'group')?"":"checked"%> name="usedefault:COOKIE_NAME"></td> -<td class='left'><%$np->cfg->policy(-key => 'COOKIE_NAME')%></td> +% if ($showDefault) { +<td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'COOKIE_NAME', -network => $network, -location => $formatFor)?"":"checked"%> name="override:COOKIE_NAME"></td> +<td class='left'><%$np->cfg->policy(-key => 'COOKIE_NAME')%></td><td class='right'> +(<%join(',', @{$np->cfg->policyLocation(-key => 'COOKIE_NAME', -network => $network)})%>)</td> +% } </TR> <TR> <TD CLASS='left'>REDIR_URL_DEFAULT</TD> @@ -106,8 +188,11 @@ -size => 25, )%> </TD> -<td class='left'><input type='checkbox' <%$np->cfg->policyLocation(-key => 'REDIR_URL_DEFAULT', -network => $network, -location => 'group')?"":"checked"%> name="usedefault:REDIR_URL_DEFAULT"></td> -<td class='left'><%$np->cfg->policy(-key => 'REDIR_URL_DEFAULT')%></td> +% if ($showDefault) { +<td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'REDIR_URL_DEFAULT', -network => $network, -location => $formatFor)?"":"checked"%> name="override:REDIR_URL_DEFAULT"></td> +<td class='left'><%$np->cfg->policy(-key => 'REDIR_URL_DEFAULT')%></td><td class='right'> +(<%join(',', @{$np->cfg->policyLocation(-key => 'REDIR_URL_DEFAULT', -network => $network)})%>)</td> +% } </TR> <TR> <TD CLASS='left'>SURVEY_ENABLED</TD> @@ -118,8 +203,11 @@ -default => ($np->cfg->policy(-key => 'SURVEY_ENABLED', -network => $network)) ? 'Yes' : 'No' )%> </TD> -<td class='left'><input type='checkbox' <%$np->cfg->policyLocation(-key => 'SURVEY_ENABLED', -network => $network, -location => 'group')?"":"checked"%> name="usedefault:SURVEY_ENABLED"></td> -<td class='left'><%$np->cfg->policy(-key => 'SURVEY_ENABLED')?"Yes":"No"%></td> +% if ($showDefault) { +<td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'SURVEY_ENABLED', -network => $network, -location => $formatFor)?"":"checked"%> name="override:SURVEY_ENABLED"></td> +<td class='left'><%$np->cfg->policy(-key => 'SURVEY_ENABLED')?"Yes":"No"%></td><td class='right'> +(<%join(',', @{$np->cfg->policyLocation(-key => 'SURVEY_ENABLED', -network => $network)})%>)</td> +% } </TR> <TR> <TD CLASS='left'>SURVEY_EMAIL</TD> @@ -130,8 +218,11 @@ -size => 25, )%> </TD> -<td class='left'><input type='checkbox' <%$np->cfg->policyLocation(-key => 'SURVEY_EMAIL', -network => $network, -location => 'group')?"":"checked"%> name="usedefault:SURVEY_EMAIL"></td> -<td class='left'><%$np->cfg->policy(-key => 'SURVEY_EMAIL')%></td> +% if ($showDefault) { +<td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'SURVEY_EMAIL', -network => $network, -location => $formatFor)?"":"checked"%> name="override:SURVEY_EMAIL"></td> +<td class='left'><%$np->cfg->policy(-key => 'SURVEY_EMAIL')%></td><td class='right'> +(<%join(',', @{$np->cfg->policyLocation(-key => 'SURVEY_EMAIL', -network => $network)})%>)</td> +% } </TR> % if (!exists $suppressKeys->{'PID_DIR'}) { @@ -144,8 +235,11 @@ -size => 25, )%> </TD> -<td class='left'><input type='checkbox' <%$np->cfg->policyLocation(-key => 'PID_DIR', -network => $network, -location => 'group')?"":"checked"%> name="usedefault:PID_DIR"></td> -<td class='left'><%$np->cfg->policy(-key => 'PID_DIR')%></td> +% if ($showDefault) { +<td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'PID_DIR', -network => $network, -location => $formatFor)?"":"checked"%> name="override:PID_DIR"></td> +<td class='left'><%$np->cfg->policy(-key => 'PID_DIR')%></td><td class='right'> +(<%join(',', @{$np->cfg->policyLocation(-key => 'PID_DIR', -network => $network)})%>)</td> +% } </TR> %} @@ -159,8 +253,11 @@ -size => 25, )%> </TD> -<td class='left'><input type='checkbox' <%$np->cfg->policyLocation(-key => 'BASE_DIR', -network => $network, -location => 'group')?"":"checked"%> name="usedefault:BASE_DIR"></td> -<td class='left'><%$np->cfg->policy(-key => 'BASE_DIR')%></td> +% if ($showDefault) { +<td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'BASE_DIR', -network => $network, -location => $formatFor)?"":"checked"%> name="override:BASE_DIR"></td> +<td class='left'><%$np->cfg->policy(-key => 'BASE_DIR')%></td><td class='right'> +(<%join(',', @{$np->cfg->policyLocation(-key => 'BASE_DIR', -network => $network)})%>)</td> +% } </TR> %} @@ -173,8 +270,11 @@ -default => $np->cfg->policy(-key => 'PORT_SEARCH_ALGO', -network => $network), )%> </TD> -<td class='left'><input type='checkbox' <%$np->cfg->policyLocation(-key => 'PORT_SEARCH_ALGO', -network => $network, -location => 'group')?"":"checked"%> name="usedefault:PORT_SEARCH_ALGO"></td> -<td class='left'><%$np->cfg->policy(-key => 'PORT_SEARCH_ALGO')%></td> +% if ($showDefault) { +<td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'PORT_SEARCH_ALGO', -network => $network, -location => $formatFor)?"":"checked"%> name="override:PORT_SEARCH_ALGO"></td> +<td class='left'><%$np->cfg->policy(-key => 'PORT_SEARCH_ALGO')%></td><td class='right'> +(<%join(',', @{$np->cfg->policyLocation(-key => 'PORT_SEARCH_ALGO', -network => $network)})%>)</td> +% } </TR> <TR> <TD CLASS='left'>PORT_CACHE</TD> @@ -185,8 +285,11 @@ -default => ($np->cfg->policy(-key => 'PORT_CACHE', -network => $network)) ? 'ON' : 'OFF', )%> </TD> -<td class='left'><input type='checkbox' <%$np->cfg->policyLocation(-key => 'PORT_CACHE', -network => $network, -location => 'group')?"":"checked"%> name="usedefault:PORT_CACHE"></td> -<td class='left'><%$np->cfg->policy(-key => 'PORT_CACHE')?"on":"off"%></td> +% if ($showDefault) { +<td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'PORT_CACHE', -network => $network, -location => $formatFor)?"":"checked"%> name="override:PORT_CACHE"></td> +<td class='left'><%$np->cfg->policy(-key => 'PORT_CACHE')?"on":"off"%></td><td class='right'> +(<%join(',', @{$np->cfg->policyLocation(-key => 'PORT_CACHE', -network => $network)})%>)</td> +% } </TR> <TR> <TD CLASS='left'>UNQUAR_ON_LINKUP</TD> @@ -200,10 +303,13 @@ 'ON' : 'OFF', )%> </TD> -<td class='left'><input type='checkbox' <%$np->cfg->policyLocation(-key => 'UNQUAR_ON_LINKUP', -network => $network, -location => 'group')?"":"checked"%> name="usedefault:UNQUAR_ON_LINKUP"></td> +% if ($showDefault) { +<td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'UNQUAR_ON_LINKUP', -network => $network, -location => $formatFor)?"":"checked"%> name="override:UNQUAR_ON_LINKUP"></td> % my $uqlu = $np->cfg->policy(-key => 'UNQUAR_ON_LINKUP'); % $uqlu = ($uqlu =~ /itdepends/i)?$uqlu : ($uqlu ? "on" : "off"); -<td class='left'><%$uqlu%></td> +<td class='left'><%$uqlu%></td><td class='right'> +(<%join(',', @{$np->cfg->policyLocation(-key => 'UNQUAR_ON_LINKUP', -network => $network)})%>)</td> +% } </TR> <TR> <TD CLASS='left'>Enable ResetPort?</TD> @@ -214,8 +320,11 @@ -default => ($np->cfg->policy(-key => 'resetport', -network => $network)) ? 'on': 'off', )%> </TD> -<td class='left'><input type='checkbox' <%$np->cfg->policyLocation(-key => 'resetport', -network => $network, -location => 'group')?"":"checked"%> name="usedefault:resetport"></td> -<td class='left'><%$np->cfg->policy(-key => 'resetport')?"on":"off"%></td> +% if ($showDefault) { +<td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'resetport', -network => $network, -location => $formatFor)?"":"checked"%> name="override:resetport"></td> +<td class='left'><%$np->cfg->policy(-key => 'resetport')?"on":"off"%></td><td class='right'> +(<%join(',', @{$np->cfg->policyLocation(-key => 'resetport', -network => $network)})%>)</td> +% } </TR> <TR> <TD CLASS='left'>Enable MacScan?</TD> @@ -226,8 +335,11 @@ -default => ($np->cfg->policy(-key => 'macscan', -network => $network)) ? 'on': 'off', )%> </TD> -<td class='left'><input type='checkbox' <%$np->cfg->policyLocation(-key => 'macscan', -network => $network, -location => 'group')?"":"checked"%> name="usedefault:macscan"></td> -<td class='left'><%$np->cfg->policy(-key => 'macscan')?"on":"off"%></td> +% if ($showDefault) { +<td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'macscan', -network => $network, -location => $formatFor)?"":"checked"%> name="override:macscan"></td> +<td class='left'><%$np->cfg->policy(-key => 'macscan')?"on":"off"%></td><td class='right'> +(<%join(',', @{$np->cfg->policyLocation(-key => 'macscan', -network => $network)})%>)</td> +% } </TR> <TR> <TD CLASS='left'>Require Nessus to register?</TD> @@ -238,8 +350,11 @@ -default => ($np->cfg->policy(-key => 'nessus', -network => $network)) ? 'on': 'off', )%> </TD> -<td class='left'><input type='checkbox' <%$np->cfg->policyLocation(-key => 'nessus', -network => $network, -location => 'group')?"":"checked"%> name="usedefault:nessus"></td> -<td class='left'><%$np->cfg->policy(-key => 'nessus')?"on":"off"%></td> +% if ($showDefault) { +<td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'nessus', -network => $network, -location => $formatFor)?"":"checked"%> name="override:nessus"></td> +<td class='left'><%$np->cfg->policy(-key => 'nessus')?"on":"off"%></td><td class='right'> +(<%join(',', @{$np->cfg->policyLocation(-key => 'nessus', -network => $network)})%>)</td> +% } </TR> <TR> <TD CLASS='left'>LDAP Query URL</TD> @@ -250,8 +365,11 @@ -size => 25, )%> </TD> -<td class='left'><input type='checkbox' <%$np->cfg->policyLocation(-key => 'LDAP_USER_QUERY', -network => $network, -location => 'group')?"":"checked"%> name="usedefault:LDAP_USER_QUERY"></td> -<td class='left'><%$np->cfg->policy(-key => 'LDAP_USER_QUERY')%></td> +% if ($showDefault) { +<td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'LDAP_USER_QUERY', -network => $network, -location => $formatFor)?"":"checked"%> name="override:LDAP_USER_QUERY"></td> +<td class='left'><%$np->cfg->policy(-key => 'LDAP_USER_QUERY')%></td><td class='right'> +(<%join(',', @{$np->cfg->policyLocation(-key => 'LDAP_USER_QUERY', -network => $network)})%>)</td> +% } </TR> <TR> <TD CLASS='left'>LDAP Popup Width</TD> @@ -262,8 +380,11 @@ -size => 5, )%> </TD> -<td class='left'><input type='checkbox' <%$np->cfg->policyLocation(-key => 'LDAP_POPUP_WIDTH', -network => $network, -location => 'group')?"":"checked"%> name="usedefault:LDAP_POPUP_WIDTH"></td> -<td class='left'><%$np->cfg->policy(-key => 'LDAP_POPUP_WIDTH')%></td> +% if ($showDefault) { +<td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'LDAP_POPUP_WIDTH', -network => $network, -location => $formatFor)?"":"checked"%> name="override:LDAP_POPUP_WIDTH"></td> +<td class='left'><%$np->cfg->policy(-key => 'LDAP_POPUP_WIDTH')%></td><td class='right'> +(<%join(',', @{$np->cfg->policyLocation(-key => 'LDAP_POPUP_WIDTH', -network => $network)})%>)</td> +% } </TR> <TR> <TD CLASS='left'>LDAP Popup Height</TD> @@ -274,8 +395,11 @@ -size => 5, )%> </TD> -<td class='left'><input type='checkbox' <%$np->cfg->policyLocation(-key => 'LDAP_POPUP_HEIGHT', -network => $network, -location => 'group')?"":"checked"%> name="usedefault:LDAP_POPUP_HEIGHT"></td> -<td class='left'><%$np->cfg->policy(-key => 'LDAP_POPUP_HEIGHT')%></td> +% if ($showDefault) { +<td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'LDAP_POPUP_HEIGHT', -network => $network, -location => $formatFor)?"":"checked"%> name="override:LDAP_POPUP_HEIGHT"></td> +<td class='left'><%$np->cfg->policy(-key => 'LDAP_POPUP_HEIGHT')%></td><td class='right'> +(<%join(',', @{$np->cfg->policyLocation(-key => 'LDAP_POPUP_HEIGHT', -network => $network)})%>)</td> +% } </TR> <TR> <TD CLASS='left'>Username Prompt</TD> @@ -286,8 +410,11 @@ -size => 25, )%> </TD> -<td class='left'><input type='checkbox' <%$np->cfg->policyLocation(-key => 'USERNAME_PROMPT', -network => $network, -location => 'group')?"":"checked"%> name="usedefault:USERNAME_PROMPT"></td> -<td class='left'><%$np->cfg->policy(-key => 'USERNAME_PROMPT')%></td> +% if ($showDefault) { +<td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'USERNAME_PROMPT', -network => $network, -location => $formatFor)?"":"checked"%> name="override:USERNAME_PROMPT"></td> +<td class='left'><%$np->cfg->policy(-key => 'USERNAME_PROMPT')%></td><td class='right'> +(<%join(',', @{$np->cfg->policyLocation(-key => 'USERNAME_PROMPT', -network => $network)})%>)</td> +% } </TR> <TR> <TD CLASS='left'>Password Prompt</TD> @@ -298,8 +425,11 @@ -size => 25, )%> </TD> -<td class='left'><input type='checkbox' <%$np->cfg->policyLocation(-key => 'PASSWORD_PROMPT', -network => $network, -location => 'group')?"":"checked"%> name="usedefault:PASSWORD_PROMPT"></td> -<td class='left'><%$np->cfg->policy(-key => 'PASSWORD_PROMPT')%></td> +% if ($showDefault) { +<td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'PASSWORD_PROMPT', -network => $network, -location => $formatFor)?"":"checked"%> name="override:PASSWORD_PROMPT"></td> +<td class='left'><%$np->cfg->policy(-key => 'PASSWORD_PROMPT')%></td><td class='right'> +(<%join(',', @{$np->cfg->policyLocation(-key => 'PASSWORD_PROMPT', -network => $network)})%>)</td> +% } </TR> <TR> <TD CLASS='left'>Company Name</TD> @@ -310,8 +440,11 @@ -size => 25, )%> </TD> -<td class='left'><input type='checkbox' <%$np->cfg->policyLocation(-key => 'COMPANY_NAME', -network => $network, -location => 'group')?"":"checked"%> name="usedefault:COMPANY_NAME"></td> -<td class='left'><%$np->cfg->policy(-key => 'COMPANY_NAME')%></td> +% if ($showDefault) { +<td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'COMPANY_NAME', -network => $network, -location => $formatFor)?"":"checked"%> name="override:COMPANY_NAME"></td> +<td class='left'><%$np->cfg->policy(-key => 'COMPANY_NAME')%></td><td class='right'> +(<%join(',', @{$np->cfg->policyLocation(-key => 'COMPANY_NAME', -network => $network)})%>)</td> +% } </TR> <TR> <TD CLASS='left'>Company Abbreviation</TD> @@ -322,8 +455,11 @@ -size => 25, )%> </TD> -<td class='left'><input type='checkbox' <%$np->cfg->policyLocation(-key => 'COMPANY_SHORT_NAME', -network => $network, -location => 'group')?"":"checked"%> name="usedefault:COMPANY_SHORT_NAME"></td> -<td class='left'><%$np->cfg->policy(-key => 'COMPANY_SHORT_NAME')%></td> +% if ($showDefault) { +<td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'COMPANY_SHORT_NAME', -network => $network, -location => $formatFor)?"":"checked"%> name="override:COMPANY_SHORT_NAME"></td> +<td class='left'><%$np->cfg->policy(-key => 'COMPANY_SHORT_NAME')%></td><td class='right'> +(<%join(',', @{$np->cfg->policyLocation(-key => 'COMPANY_SHORT_NAME', -network => $network)})%>)</td> +% } </TR> <TR> <TD CLASS='left'>Organization Name</TD> @@ -334,8 +470,11 @@ -size => 25, )%> </TD> -<td class='left'><input type='checkbox' <%$np->cfg->policyLocation(-key => 'COMPANY_UNIT_NAME', -network => $network, -location => 'group')?"":"checked"%> name="usedefault:COMPANY_UNIT_NAME"></td> -<td class='left'><%$np->cfg->policy(-key => 'COMPANY_UNIT_NAME')%></td> +% if ($showDefault) { +<td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'COMPANY_UNIT_NAME', -network => $network, -location => $formatFor)?"":"checked"%> name="override:COMPANY_UNIT_NAME"></td> +<td class='left'><%$np->cfg->policy(-key => 'COMPANY_UNIT_NAME')%></td><td class='right'> +(<%join(',', @{$np->cfg->policyLocation(-key => 'COMPANY_UNIT_NAME', -network => $network)})%>)</td> +% } </TR> <TR> <TD CLASS='left'>Example IP Address</TD> @@ -346,8 +485,11 @@ -size => 16, )%> </TD> -<td class='left'><input type='checkbox' <%$np->cfg->policyLocation(-key => 'EXAMPLE_IPADDR', -network => $network, -location => 'group')?"":"checked"%> name="usedefault:EXAMPLE_IPADDR"></td> -<td class='left'><%$np->cfg->policy(-key => 'EXAMPLE_IPADDR')%></td> +% if ($showDefault) { +<td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'EXAMPLE_IPADDR', -network => $network, -location => $formatFor)?"":"checked"%> name="override:EXAMPLE_IPADDR"></td> +<td class='left'><%$np->cfg->policy(-key => 'EXAMPLE_IPADDR')%></td><td class='right'> +(<%join(',', @{$np->cfg->policyLocation(-key => 'EXAMPLE_IPADDR', -network => $network)})%>)</td> +% } </TR> </TBODY></TABLE> Index: Login =================================================================== RCS file: /cvsroot/netpass/NetPass/www/components/Admin/Login,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- Login 4 May 2005 03:09:45 -0000 1.10 +++ Login 6 May 2005 03:09:33 -0000 1.11 @@ -18,9 +18,14 @@ </%args> <%perl> +#use Data::Dumper; print "<PRE>", Dumper($m->session), "</PRE>"; + return 1 if (exists $m->session->{'logged_in'} && ($m->session->{'logged_in'} == 1)); + delete $m->session->{'username'}; + delete $m->session->{'my_groups'}; + my $ip = $ENV{'REMOTE_ADDR'}; if (defined($username) && ($username ne "")) { @@ -28,6 +33,9 @@ $password); if (defined($aok) && ($aok == 1)) { + _log("INFO", $username." is logging in to Admin tool\n"); + $m->audit(-severity => 'NOTICE', -ip => $ENV{'REMOTE_ADDR'}, + -user => $username, -msg => [ "$username logged in to Admin tool" ]); $m->session->{'logged_in'} = 1; # FIX/Client/Login $m->session->{'username'} = $username; $m->session->{'my_groups'} = $np->db->getUserGroups($username); Index: LockConfig =================================================================== RCS file: /cvsroot/netpass/NetPass/www/components/Admin/LockConfig,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- LockConfig 4 May 2005 03:09:45 -0000 1.8 +++ LockConfig 6 May 2005 03:09:33 -0000 1.9 @@ -2,6 +2,7 @@ </%doc> <%args> $enableWhenLocked => ''; + $init => 1; </%args> <script language="JavaScript"> @@ -39,6 +40,8 @@ class='lockButton'>Thinking ...</div> <%perl> +return unless $init; + my $lstat = $np->db->isConfigLocked(); if (ref($lstat) eq "HASH") { |
From: jeff m. <jef...@us...> - 2005-05-06 03:10:17
|
Update of /cvsroot/netpass/NetPass/www/htdocs/Admin/cmd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3466/www/htdocs/Admin/cmd Modified Files: lockcfg.mhtml Log Message: netgroup/network editor UI Index: lockcfg.mhtml =================================================================== RCS file: /cvsroot/netpass/NetPass/www/htdocs/Admin/cmd/lockcfg.mhtml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- lockcfg.mhtml 3 May 2005 16:13:30 -0000 1.1 +++ lockcfg.mhtml 6 May 2005 03:09:33 -0000 1.2 @@ -5,12 +5,17 @@ $force => 0; </%args> <%perl> - my ($isRoot, $junk) = $m->comp('/Admin/MemberOf', 'acl' => [ 'Admin' ], 'group' => 'default'); +my $username = $m->session->{'username'} if exists $m->session->{'username'}; +$username ||= "unknown"; if (! $isRoot ) { if ($lock) { + $np->db->audit(-severity => 'NOTICE', -ip => $ENV{'REMOTE_ADDR'}, + -user => $username, -msg => [ "$username failed to lock cfg (permission denied)" ]); print "NOK lock permission denied\n"; } else { + $np->db->audit(-severity => 'NOTICE', -ip => $ENV{'REMOTE_ADDR'}, + -user => $username, -msg => [ "$username failed to unlock cfg (permission denied)" ]); print "NOK unlock permission denied\n"; } return; @@ -32,6 +37,9 @@ -user => $m->session->{'username'}); if ($rv) { # fail + $np->db->audit(-severity => 'NOTICE', -ip => $ENV{'REMOTE_ADDR'}, + -user => $username, + -msg => [ "$username failed to force unlock cfg ($rv)" ]); print "NOK lock unlockfailed $rv\n"; } else { $rv = $np->db->lockConfig(-rev => $lstat->{'rev'}, @@ -39,23 +47,38 @@ if ($rv) { # fail print "NOK lock force err=$rv\n"; + $np->db->audit(-severity => 'NOTICE', -ip => $ENV{'REMOTE_ADDR'}, + -user => $username, + -msg => [ "$username failed to force lock cfg ($rv)" ]); } else { # success print "OK lock\n"; + $np->db->audit(-severity => 'NOTICE', -ip => $ENV{'REMOTE_ADDR'}, + -user => $username, + -msg => [ "$username forced lock cfg" ]); } } } else { # we're not willing to break the lock print "NOK lock lockedby=".$lstat->{'user'}."\n"; + $np->db->audit(-severity => 'NOTICE', -ip => $ENV{'REMOTE_ADDR'}, + -user => $username, + -msg => [ "$username failed lock cfg (lockedby=".$lstat->{'user'}.")" ]); } } else { # config is already locked by us print "OK lock alreadylocked\n"; + $np->db->audit(-severity => 'NOTICE', -ip => $ENV{'REMOTE_ADDR'}, + -user => $username, + -msg => [ "$username already has lock cfg" ]); } } elsif ($lstat) { # an error occurred print "NOK lock isConfigLockedErr $lstat\n"; + $np->db->audit(-severity => 'NOTICE', -ip => $ENV{'REMOTE_ADDR'}, + -user => $username, + -msg => [ "$username failed lock cfg $lstat" ]); } else { # config is not locked, lock it @@ -65,9 +88,15 @@ if ($rv) { # fail print "NOK lock err=$rv\n"; + $np->db->audit(-severity => 'NOTICE', -ip => $ENV{'REMOTE_ADDR'}, + -user => $username, + -msg => [ "$username failed lock cfg $lstat" ]); } else { # success print "OK lock\n"; + $np->db->audit(-severity => 'NOTICE', -ip => $ENV{'REMOTE_ADDR'}, + -user => $username, + -msg => [ "$username locked cfg" ]); } } } else { @@ -84,12 +113,21 @@ if ($rv) { # error print "NOK unlock $rv\n"; + $np->db->audit(-severity => 'NOTICE', -ip => $ENV{'REMOTE_ADDR'}, + -user => $username, + -msg => [ "$username failed force unlock cfg $rv" ]); } else { print "OK unlock\n"; + $np->db->audit(-severity => 'NOTICE', -ip => $ENV{'REMOTE_ADDR'}, + -user => $username, + -msg => [ "$username force unlocked cfg" ]); } } else { # we're not willing to break the lock print "NOK unlock lockedby=".$lstat->{'user'}."\n"; + $np->db->audit(-severity => 'NOTICE', -ip => $ENV{'REMOTE_ADDR'}, + -user => $username, + -msg => [ "$username failed unlocked cfg (locked by=".$lstat->{'user'}.")" ]); } } else { # config is locked by us: unlock it @@ -98,18 +136,30 @@ if ($rv) { # fail print "NOK unlock $rv\n"; + $np->db->audit(-severity => 'NOTICE', -ip => $ENV{'REMOTE_ADDR'}, + -user => $username, + -msg => [ "$username failed unlocked cfg $rv" ]); } else { print "OK unlock\n"; + $np->db->audit(-severity => 'NOTICE', -ip => $ENV{'REMOTE_ADDR'}, + -user => $username, + -msg => [ "$username unlocked cfg" ]); } } } elsif ($lstat) { # an error occurred print "NOK unlock $lstat\n"; + $np->db->audit(-severity => 'NOTICE', -ip => $ENV{'REMOTE_ADDR'}, + -user => $username, + -msg => [ "$username failed unlocked cfg $lstat" ]); } else { # config is not locked: NOP print "OK unlock\n"; + $np->db->audit(-severity => 'NOTICE', -ip => $ENV{'REMOTE_ADDR'}, + -user => $username, + -msg => [ "$username unlocked cfg (wasn't locked)" ]); } } </%perl> |