netpass-devel

[jeff m. <jef...@us...>]

Update of /cvsroot/netpass/NetPass/www/htdocs/Admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19022/www/htdocs/Admin

Modified Files:
	auth.mhtml autohandler gencfg.mhtml greset.mhtml index.mhtml 
	switch.mhtml 
Log Message:
some bug fixes, resetport.pl re-write, appstarter completion, install/initd tweaks

Index: switch.mhtml
===================================================================
RCS file: /cvsroot/netpass/NetPass/www/htdocs/Admin/switch.mhtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- switch.mhtml	3 Jun 2005 16:59:55 -0000	1.4
+++ switch.mhtml	3 Aug 2005 02:44:39 -0000	1.5
@@ -45,6 +45,10 @@
 	}
 }
 
+if ($switch && ($switch ne $WH) && !$submitButton) {
+	($rocomm, $rwcomm) = $np->cfg->getCommunities($switch);
+}
+
 if ($#err > -1) {
 	print "<P class='error'>The following errors occurred:</P> ";
 	print "<OL><LI class='error'>", join("<LI class='error'>", @err), "</OL>";

Index: autohandler
===================================================================
RCS file: /cvsroot/netpass/NetPass/www/htdocs/Admin/autohandler,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- autohandler	19 Jul 2005 14:45:52 -0000	1.16
+++ autohandler	3 Aug 2005 02:44:39 -0000	1.17
@@ -66,7 +66,7 @@
 %$m->comp("/Admin/DisplaySideLinks");
 </DIV>
 <P><P>
-<BR><H6><I><%join('.', (split(/\./, hostname))[0,1])%></I></H6>
+<BR><I style='color:white;border: solid 1px white; padding: 2px; text-align:center;'><%join('.', (split(/\./, hostname))[0,1])%></I>
 
 <%perl>
 	}

Index: auth.mhtml
===================================================================
RCS file: /cvsroot/netpass/NetPass/www/htdocs/Admin/auth.mhtml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- auth.mhtml	23 Jun 2005 20:21:09 -0000	1.6
+++ auth.mhtml	3 Aug 2005 02:44:39 -0000	1.7
@@ -42,6 +42,11 @@
 $m->comp('/Admin/LockConfig', 'enableWhenLocked' => [ 'submitButton' ], 'init' => 0);
 my $lstat = $np->db->isConfigLocked();
 
+Radius and LDAP servers are shared. If you select Radius for both Client and Admin
+authentication, you will see two "Radius Server" configuration areas, but they
+both refer to the same information. So if you add a Radius server to one, it will 
+appear in both.
+
 if ($submitButton eq "Commit Changes") {
 	_log("DEBUG", "$whoami is changing system auth settings\n");
 

Index: index.mhtml
===================================================================
RCS file: /cvsroot/netpass/NetPass/www/htdocs/Admin/index.mhtml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- index.mhtml	14 Jun 2005 21:12:07 -0000	1.11
+++ index.mhtml	3 Aug 2005 02:44:39 -0000	1.12
@@ -33,10 +33,12 @@
 use SOAP::Lite;
 
 print $q->h2("System Status");
-print $q->start_form(-method=>"POST", -action => "index.mhtml");
+print $q->start_form(-method => "POST", -action => "index.mhtml");
 
 snortStats($rw, \%ARGS);
 
+$m->comp('/Admin/DialogBulkMovePort', 'isRoot' => $rw, %ARGS);
+
 sub snortStats {
 	my $rw       = shift;
 	my $args     = shift;

Index: greset.mhtml
===================================================================
RCS file: /cvsroot/netpass/NetPass/www/htdocs/Admin/greset.mhtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- greset.mhtml	27 Apr 2005 03:54:07 -0000	1.3
+++ greset.mhtml	3 Aug 2005 02:44:39 -0000	1.4
@@ -47,11 +47,14 @@
 }
 
 if ($ARGS{'quarantineall'}) {
-	$np->db->reqAppAction('quarall', 'start', '');
-        $np->db->audit(  -user    => $m->session->{'username'},
-                        -severity => "ALERT",
-                        -msg      => [ "Activated Quarantine All Global Reset" ]);
-
+	if ($np->db->clearRegister()) {
+		$np->db->reqAppAction('quarall', 'start', '');
+	        $np->db->audit(  -user    => $m->session->{'username'},
+	                        -severity => "ALERT",
+	                        -msg      => [ "Activated Quarantine All Global Reset" ]);
+	} else {
+		print "<p class='error'>Failed to clear register table. Unquarantine all aborted.</P>";
+	}
 } elsif ($ARGS{'unquarantineall'}) {
 	$np->db->reqAppAction('unquarall', 'start', '');
         $np->db->audit(  -user     => $m->session->{'username'},
@@ -60,11 +63,27 @@
 }
 
 print $q->start_form(-name => 'form', -method => "POST");
-print "<h2>Global Reset</h2>";
-print "<FONT CLASS='error'>WARNING:</FONT>The following will cause a system wide reset.<BR>Make sure a global reset is exactly what you want to do.<P>"; 
-print "<TABLE CLASS='gray' CELLSPACING=2 CELLPADDING=2 BORDER=0 HEIGHT=200>";
-print "<TR><TH HEIGHT=25 WIDTH=200 COLSPAN=2>Global Reset</TH></TR><TR>";
-print "<TD ALIGN='center'>";
+</%perl>
+<h2>Global Reset</h2>
+
+<FONT CLASS='error'>WARNING:</FONT>The following will cause <B>all managed ports</B> to be reset to the state you choose.<BR>
+Make sure a global reset is exactly what you want to do. <P>
+
+If you choose to <B>quarantine</B> all ports then <B>all registration data will be deleted</B> thereby forcing
+all users to go back through the registration process.<P>
+
+Once you've initiated the global reset, go to the 
+<a href="/Admin/index.mhtml">NetPass Admin Home</a> page to check its progress.<P>
+
+Also note that the status area on the Home page only shows the status of the <I>local</I> NetPass server. If you
+are running in a Clustered (HA) Configuration, then the Global Reset process might be running on another server
+and the home page <I>will not</I> show that it is running. Take note of the server you are attached to when
+you start the global reset (the server name is in the lower left corner of this screen).
+
+<TABLE CLASS='gray' CELLSPACING=2 CELLPADDING=2 BORDER=0 HEIGHT=200>
+<TR><TH HEIGHT=25 WIDTH=200 COLSPAN=2>Global Reset</TH></TR><TR>
+<TD ALIGN='center'>
+<%perl>
 print $q->button (
 			-name	=> 'quarall',	
 			-value	=> 'Quarantine All',

Index: gencfg.mhtml
===================================================================
RCS file: /cvsroot/netpass/NetPass/www/htdocs/Admin/gencfg.mhtml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- gencfg.mhtml	14 Jun 2005 16:38:26 -0000	1.19
+++ gencfg.mhtml	3 Aug 2005 02:44:39 -0000	1.20
@@ -88,9 +88,10 @@
                 }
         }
 
-        $np->db->reqAppAction('netpass', 'restart', '') if ($restartnetpass);
-        $np->db->reqAppAction('httpd',   'restart', '') if ($restarthttpd);
-	$np->db->reqAppAction('nessusd', 'restart', '') if ($restartnessus);
+	# the config is auto-reloaded. we dont need to do this anymore
+        #$np->db->reqAppAction('netpass', 'restart', '') if ($restartnetpass);
+        #$np->db->reqAppAction('httpd',   'restart', '') if ($restarthttpd);
+	#$np->db->reqAppAction('nessusd', 'restart', '') if ($restartnessus);
 
         $np->cfg->save(-user => $m->session->{'username'});
 }