[Netpass-devel] NetPass/www/components/Client BeginScan,1.6,1.7 Remediate,1.9,1.10 ShowResults,1.3,1.4

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

Update of /cvsroot/netpass/NetPass/www/components/Client
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6281/www/components/Client

Modified Files:
	BeginScan Remediate ShowResults 
Log Message:
QC results management, client code cleanup, admin perms cleanup

Index: ShowResults
===================================================================
RCS file: /cvsroot/netpass/NetPass/www/components/Client/ShowResults,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ShowResults	24 Apr 2005 03:42:03 -0000	1.3
+++ ShowResults	1 May 2005 05:44:11 -0000	1.4
@@ -21,6 +21,7 @@
 
 	if ($nres == 0) {
 		my $sid = $results->{'id'}->[0];
+		my $rid = $results->{'rowid'}->[0];
 		my ($shortName, $info, $description, $type);
 		$type = $results->{'type'}->[0];
 
@@ -42,7 +43,7 @@
 		}
 
 		print qq{<tr><td colspan=3 align="right"> };
-		print $q->submit(-name=>"fixed:$type:$sid", -value=>'Fixed') unless $pquar;
+		print $q->submit(-name=>"fixed:$type:$sid:$rid", -value=>'Fixed') unless $pquar;
 		print qq{</td>};
 		print qq{</tr><tr><td colspan=3>};
 
@@ -66,6 +67,7 @@
 		my $autoexpand = ($nres <= ($np->cfg->policy(-key => 'RESULTS_EXPAND', -network =>$ip)-1));
 		for(my $resultNum = 0 ; $resultNum <= $nres ; $resultNum++) {
 			my $sid = $results->{'id'}->[$resultNum];
+			my $rid = $results->{'rowid'}->[$resultNum];
 			my ($shortName, $info, $description, $type);
 			$type = $results->{'type'}->[$resultNum];
 
@@ -83,7 +85,7 @@
 				$type        = "manual";
 				$shortName   = "Database failure.";
 				$info        = "msg:dbfailure";
-				$description = "Sorry, something didn't work out quite right when I was looking at my database.";
+				$description = "Sorry, something didn't work out quite right while I was looking at my database.";
 			}
 			
 			print qq{<tr><td width="3%" align=center>};
@@ -95,7 +97,7 @@
 			}
 			print qq{</td><td>$shortName</td>};
 			print qq{<td width="1%" align="right"> };
-			print $q->submit(-name=>"fixed:$type:$sid", -value=>'Fixed') unless $pquar;
+			print $q->submit(-name=>"fixed:$type:$sid:$rid", -value=>'Fixed') unless $pquar;
 			print qq{</td>};
 			print qq{</tr><tr><td colspan=3 class="gray">};
 

Index: BeginScan
===================================================================
RCS file: /cvsroot/netpass/NetPass/www/components/Client/BeginScan,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- BeginScan	19 Apr 2005 04:01:23 -0000	1.6
+++ BeginScan	1 May 2005 05:44:11 -0000	1.7
@@ -86,9 +86,6 @@
 		goto scan_finished;
     	}
 
-    	$m->session->{'nessus'} = [];
-    	$m->session->{'nessus_defaults'} = {};
-
 	print $q->table( { -width   => "500",  # $progress_bar_width (see callback above)
 			   -border  => 0,
 			   -bgcolor => '#EFEFEF'
@@ -132,8 +129,6 @@
 		foreach my $nes ( @holes ) {
                		my $sid = $nes->ScanID;
 			$m->comp('/Audit', msg => [ "Found vulnerability: $sid" ] );
-			push(@{$m->session->{'nessus'}}, $sid);
-			$m->session->{'nessus_defaults'}->{$sid} = $nes->Description;
 			$np->db->addResult(-type => 'nessus', -mac => $mac, -id => $sid);
 		}
 	}
@@ -142,18 +137,7 @@
 
 	$nessus = undef;	
 
-	# DEBUG TESTING
-	#push(@{$m->session->{'nessus'}}, 10024);
-	#push(@{$m->session->{'nessus'}}, 11633);
-	#push(@{$m->session->{'nessus'}}, 10283);
-	#push(@{$m->session->{'nessus'}}, 10390);
-	#push(@{$m->session->{'nessus'}}, 10794);
-	# DEBUG TESTING
-
-
-    	my $number_of_holes = $#{$m->session->{'nessus'}}+1;
-
-    	if($number_of_holes > 0) {
+    	if($#holes > -1) {
 		_log("DEBUG", "$mac $ip end scan need remediation\n");
 		$m->comp('/Audit', msg => [ 'Scan Complete. Machine is not Clean. Forwarding to Remediation Step.' ] );
 		$m->session->{'phase'} = 'REMEDIATE';

Index: Remediate
===================================================================
RCS file: /cvsroot/netpass/NetPass/www/components/Client/Remediate,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Remediate	27 Apr 2005 03:54:07 -0000	1.9
+++ Remediate	1 May 2005 05:44:11 -0000	1.10
@@ -42,17 +42,12 @@
 
 print $q->br;
 
-$m->session->{'nessus'}          = [] if(!$m->session->{'nessus'});
-$m->session->{'nessus_defaults'} = {} if(!$m->session->{'nessus_defaults'});
-
 foreach my $sid (keys %ARGS) {
 	if($ARGS{$sid} eq 'Fixed') {
-		my ($type, $id) = (split(':', $sid))[1,2];
-		_log ("INFO", "$mac $ip user claims $type:$id is fixed.\n");
-		my @foo = grep(!/^$sid/, @{$m->session->{'nessus'}});
-		$m->session->{'nessus'} = \@foo;
-		my $rv = $np->db->updateResult(-mac => $mac, -type => $type, -id => $id, 
-					-status => 'user-fixed');
+		my ($type, $id, $rid) = (split(':', $sid))[1,2,3];
+		_log ("INFO", "$mac $ip user claims $type:$id:$rid is fixed.\n");
+		my $rv = $np->db->updateResult(-mac => $mac, -ip => $ip,
+					       -rowid => $rid, -status => 'user-fixed');
 		if ($rv) {
 			_log ("ERROR", "$mac $ip failed to updateResult($type:$id): $rv\n");
 		}