[vscweb-commit] SF.net SVN: vscweb: [467] branches/vsc-2.2

[<hc...@us...>]

Revision: 467
          http://svn.sourceforge.net/vscweb/?rev=467&view=rev
Author:   hctv19
Date:     2007-03-27 08:15:05 -0700 (Tue, 27 Mar 2007)

Log Message:
-----------
First round of bug fixes in a while

Modified Paths:
--------------
    branches/vsc-2.2/.mysql
    branches/vsc-2.2/Main/Domain/delete_domain.php
    branches/vsc-2.2/Main/Host/Scan/include/libscan.inc
    branches/vsc-2.2/Main/Host/include/libhost.inc
    branches/vsc-2.2/Main/Host/nadd_host.php
    branches/vsc-2.2/Main/People/Privilege/grant.php
    branches/vsc-2.2/Main/People/Privilege/include/libpriv.inc
    branches/vsc-2.2/Main/People/Session/include/libsession.inc
    branches/vsc-2.2/Main/main.php
    branches/vsc-2.2/Main/ui/public.inc

Modified: branches/vsc-2.2/.mysql
===================================================================
--- branches/vsc-2.2/.mysql	2007-03-09 20:15:47 UTC (rev 466)
+++ branches/vsc-2.2/.mysql	2007-03-27 15:15:05 UTC (rev 467)
@@ -1 +1 @@
-db_name:db_user:db_pass:db_server:db_port
+vsc_2_0:vscdb:ferrousvscdb@01:192.168.32.66:3306

Modified: branches/vsc-2.2/Main/Domain/delete_domain.php
===================================================================
--- branches/vsc-2.2/Main/Domain/delete_domain.php	2007-03-09 20:15:47 UTC (rev 466)
+++ branches/vsc-2.2/Main/Domain/delete_domain.php	2007-03-27 15:15:05 UTC (rev 467)
@@ -111,15 +111,25 @@
                      FROM domain_list
                         WHERE member_domain='{$i->dom_name}'
                 ");
-		DB_GetResult("DELETE 
-							FROM domain_network_map
-							WHERE domain='{$i->dom_name}'
-					 ");
+	DB_GetResult("DELETE 
+		FROM domain_network_map
+			WHERE domain='{$i->dom_name}'
+		 ");
       DB_GetResult("
                   DELETE
                      FROM domain
                      WHERE name='{$i->dom_name}'
                 ");
+      DB_GetResult("
+                  DELETE
+                     FROM privilege
+                     WHERE domain_name='{$i->dom_name}'
+                ");
+      DB_GetResult("
+                  DELETE
+                     FROM privilege_request
+                     WHERE domain_name='{$i->dom_name}'
+                ");
                      
       foreach ($table as $t) {
          if ($t == 'domain' || $t == 'incident' || $t == 'domain_list' || $t = 'Host') {

Modified: branches/vsc-2.2/Main/Host/Scan/include/libscan.inc
===================================================================
--- branches/vsc-2.2/Main/Host/Scan/include/libscan.inc	2007-03-09 20:15:47 UTC (rev 466)
+++ branches/vsc-2.2/Main/Host/Scan/include/libscan.inc	2007-03-27 15:15:05 UTC (rev 467)
@@ -569,10 +569,16 @@
 }
 
 function SCAN_GetRecurScans($scan_id, $mark_child_scan=NULL) {
+   $scan_parent_id = $scan_id;
+   if (!SCAN_IsParent($scan_id))
+   {
+   	$scan_parent_id = SCAN_GetParent($scan_id);
+   }
+   
    $sql = "SELECT S.*, IF(R.status IS NULL, 'REQ',R.status) AS status ".
           "FROM scan_recur_calendar S ".
           "LEFT JOIN nessus_scan_request R ON R.scan_id=S.scan_id ".
-          "WHERE parent_scan_id='$scan_id' ORDER BY scheduled_for ASC";
+          "WHERE parent_scan_id='".$scan_parent_id."' ORDER BY scheduled_for ASC";
    
    $res = DB_GetResult($sql);
    $ret = array();

Modified: branches/vsc-2.2/Main/Host/include/libhost.inc
===================================================================
--- branches/vsc-2.2/Main/Host/include/libhost.inc	2007-03-09 20:15:47 UTC (rev 466)
+++ branches/vsc-2.2/Main/Host/include/libhost.inc	2007-03-27 15:15:05 UTC (rev 467)
@@ -227,8 +227,22 @@
    }
    return false;
 }
+function HOST_AddHostByAddrWithDNS($ipaddy,$dns, $family, $domain) {
+   if (!HOST_GetHostByAddr($ipaddy)) {
+      $sql = "INSERT INTO Host (address,dns_name, family_id)
+               VALUES('$ipaddy', '$dns', '$family')";
+      $res = DB_GetResult($sql);
+      $hostid = DB_LastInsertID("Host", "hostid", $res);
+      $sql = "INSERT INTO family_host_map (hostid, family_id, domain)
+               VALUES('$hostid','$family','$domain')";
+      DB_GetResult($sql);
 
+      return $hostid;
+   }
+   return false;
+}
 
+
 class Host_Range {
 
    var $start_addr;

Modified: branches/vsc-2.2/Main/Host/nadd_host.php
===================================================================
--- branches/vsc-2.2/Main/Host/nadd_host.php	2007-03-09 20:15:47 UTC (rev 466)
+++ branches/vsc-2.2/Main/Host/nadd_host.php	2007-03-27 15:15:05 UTC (rev 467)
@@ -61,8 +61,10 @@
 	if ($i->submitter != "" && $i->hosts != "" && Family_IsFamily($i->family)) {
 		$hosts = explode("\n", $i->hosts);
 		foreach ($hosts as $addr) {
-      $ipv4 = Net_ParseIP($addr);
-      if (!Net_IsNet($ipv4)) Error($_error, ERR_FATAL);
+		$addressArray = explode("/", $addr);
+		$ipv4 = Net_ParseIP($addressArray[0]);
+      		$dns = $addressArray[1];
+      if (!Net_IsNet($ipv4)) Error($_error.$ipv4."Added", ERR_FATAL);
 			$hr = new Net_Range($ipv4);
          /*print "<pre>";
          print_r($hr);
@@ -70,8 +72,16 @@
 			while ($addr2 = $hr->get_next()) {
 				if (!Net_ValidDomainIP($addr2, $_USER['domain'])) {
 					$_proc[] = "$addr2 is not an allowed IP address for this domain.";
-				} else {
-               $res = HOST_AddHostByAddr($addr2, $i->family, $_USER['domain']);
+				} 
+				else {
+               if(is_null($dns))
+	       {
+	       $res = HOST_AddHostByAddr($addr2, $i->family, $_USER['domain']);
+	       }
+	       else
+	       {
+	       $res = HOST_AddHostByAddrWithDNS($addr2,$dns, $i->family, $_USER['domain']);
+	       }
                if (!$res) {
                   /* host is already added */
                   $hid = HOST_GetHostByAddr($addr2);

Modified: branches/vsc-2.2/Main/People/Privilege/grant.php
===================================================================
--- branches/vsc-2.2/Main/People/Privilege/grant.php	2007-03-09 20:15:47 UTC (rev 466)
+++ branches/vsc-2.2/Main/People/Privilege/grant.php	2007-03-27 15:15:05 UTC (rev 467)
@@ -82,8 +82,9 @@
 if ($i->action == "Submit") {
    foreach ($i->grant as $key=>$value) {
       list($r_domain, $r_user) = explode(".", $key);
-      if (!in_array($r_domain, DOMAIN_MakeList($_USER['domain'],$_USER['dominate']))) {
-         Error("Domain $r_domain does not exist!", ERR_FATAL);
+      $domain_array = DOMAIN_MakeList($_USER['domain'],$_USER['dominate']);
+      if (!in_array($r_domain, $domain_array)) {
+         Error("Domain $r_domain does not exist!".$domain_array[1], ERR_FATAL);
       }
       $reason = $i->reason[$key];
       if ($value == "grant") {

Modified: branches/vsc-2.2/Main/People/Privilege/include/libpriv.inc
===================================================================
--- branches/vsc-2.2/Main/People/Privilege/include/libpriv.inc	2007-03-09 20:15:47 UTC (rev 466)
+++ branches/vsc-2.2/Main/People/Privilege/include/libpriv.inc	2007-03-27 15:15:05 UTC (rev 467)
@@ -56,8 +56,9 @@
 
 function Priv_GetRequestsByDomain($domain_list, $orderby="domain_name") {
    $dlist = implode("','", $domain_list);
-   $sql = "SELECT userid,level,domain_name,when_requested FROM privilege_request
-            WHERE domain_name IN ('$dlist') ORDER BY $orderby";
+   //$sql = "SELECT userid,level,domain_name,when_requested FROM privilege_request
+   //         WHERE domain_name IN ('$dlist') ORDER BY $orderby";
+   $sql = "SELECT userid,level,domain_name,when_requested FROM privilege_request";
    $res = DB_GetResult($sql);
    $r_arr = array();
    while ($arr = DB_FetchArray($res)) {

Modified: branches/vsc-2.2/Main/People/Session/include/libsession.inc
===================================================================
--- branches/vsc-2.2/Main/People/Session/include/libsession.inc	2007-03-09 20:15:47 UTC (rev 466)
+++ branches/vsc-2.2/Main/People/Session/include/libsession.inc	2007-03-27 15:15:05 UTC (rev 467)
@@ -96,7 +96,7 @@
    //close expired sessions (older than session_timeout)
    DB_GetResult("UPDATE session_log SET ended=UNIX_TIMESTAMP()
                   WHERE userid='{$_USER['userid']}'
-                  AND (UNIX_TIMESTAMP() - lastchange) > ".$_CONFIG['session_timeout']);
+                  AND (UNIX_TIMESTAMP() - lastchange) > ".$_CONFIG['session_timeout']."  AND ENDED IS NULL");
    
 	// Look for an active session with this username + sid
 	$array = DB_GetArray("

Modified: branches/vsc-2.2/Main/main.php
===================================================================
--- branches/vsc-2.2/Main/main.php	2007-03-09 20:15:47 UTC (rev 466)
+++ branches/vsc-2.2/Main/main.php	2007-03-27 15:15:05 UTC (rev 467)
@@ -54,7 +54,7 @@
 
 
 UI_Header("VSC - Main Page");
-echo "<img src='$IMAGE_PATH/image/title_vsc.gif' alt='Vulnerability Scanning Cluster'><br><br>";
+echo "<img src='$IMAGE_PATH/image/title_vsc.gif' alt='Vulnerability asdfScanning Cluster'><br><br>";
 UI_Style("Current News", STY_BOLD|STY_SIZE, array("SIZE" =>STY_FONT_HUGE));
 echo "<br>";
 	
@@ -65,5 +65,7 @@
    $smarty->assign('na', $na);
    $smarty->display('News_Item.tpl');
 }
+echo "<b>This is the correct instance of vsc dev</b>";
 UI_Footer();
 ?>	
+

Modified: branches/vsc-2.2/Main/ui/public.inc
===================================================================
--- branches/vsc-2.2/Main/ui/public.inc	2007-03-09 20:15:47 UTC (rev 466)
+++ branches/vsc-2.2/Main/ui/public.inc	2007-03-27 15:15:05 UTC (rev 467)
@@ -207,7 +207,7 @@
                   &nbsp;
                </td>
                <td align='center' valign='top' width='20%'>
-                  <form action='<?=$_SERVER['PHP_SELF']?>' method='Post'>
+                  <form action='<?=$_SERVER['PHP_SELF']?>?target=myscans' method='Post'>
                   <?
                      if ($_CONFIG['ADV_MENU']) {
                         echo "<input type='submit' name='adv_menu' value='Hide'>";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.