# HG changeset patch
# User Alex McMahon <alex.mcmahon@cs.tcd.ie>
# Date 1245760545 -3600
# Node ID bfe0d3de27649ac99bc459d951157793a4481630
# Parent  e7e70577ce6cd1cc8fc9c1d556316b26ebc14a8d
anonymous connectivity added

diff -r e7e70577ce6c -r bfe0d3de2764 .index.php.swp
Binary file .index.php.swp has changed
diff -r e7e70577ce6c -r bfe0d3de2764 details.php
--- a/details.php	Fri Jun 19 16:55:15 2009 +0100
+++ b/details.php	Tue Jun 23 13:35:45 2009 +0100
@@ -28,7 +28,7 @@
 	}
  	// read session IDs from cookie, if cookie doesn't exist, set to 1 (master)
 
-echo $_COOKIE["sid1"];
+//echo $_COOKIE["sid1"];
         $currSID1 = $_COOKIE['sid1'];
 	if ($currSID1 == "")
         {
@@ -41,7 +41,7 @@
                 $currSID2 = "06D5VlLQTbM57LL7IBMW38yHkFpb1XVa";
         }
 
-print_r($_COOKIE);
+//print_r($_COOKIE);
 	
 	$status = $_GET['alert'];
 	$view_mode = $_GET['view_mode'];
@@ -54,7 +54,7 @@
 	
 	// search server cache for received websites
 	// anonymous uid=1, sid1=06D5VlLQTbM57LL7IBMW38yHkFpb1XVa & sid2 =06D5VlLQTbM57LL7IBMW38yHkFpb1XVa
-	if (($currID != 1) && ($currSID1 != "06D5VlLQTbM57LL7IBMW38yHkFpb1XVa") && ($currSID2 != "06D5VlLQTbM57LL7IBMW38yHkFpb1XVa"))
+	if (($currID != 1) && ($currSID1 != "06D5VlLQTbM57LL7IBMW38yHkFpb1XVa"))
 	{
 		$query_cache = mysql_query("SELECT * FROM requests_tbl WHERE (uid = '$currID' OR uid = 1)");
 	} 
@@ -73,7 +73,7 @@
 //                exec($commandline, $wget_results);
 //$commandline = "squidclient -m HEAD -p 8080 -H \"Cache-Control: only-if-cached\n\" -u " . $db_fieldcache["req_ID"] . " -w " . $db_fieldcache["uid"] . " " . $db_fieldcache["req_val"] . " |grep X-Cache: |grep MISS";
 
-		$filename = "/var/www/private/HTMLrequester/staging/{$db_fieldcache["req_ID"]}/";
+		$filename = "/var/www/private/HTMLrequester/router_stage/{$db_fieldcache["req_ID"]}/";
 
 //$commandline = "squidclient -m HEAD -p 8080 -H \"Cache-Control: only-if-cached\n\" -u " . $db_fieldcache["req_ID"] . " -w " . $db_fieldcache["uid"] . " " . $db_fieldcache["req_val"] . " |grep X-Cache: |grep MISS";
 
@@ -233,7 +233,7 @@
 				} else {
 //header ('Location: http://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['PHP_SELF']) . dirname($db_fieldcache["req_ID"]));
 //strip_tags($text, '<p><a>')
-                                      print "<span class='result_output'><a href='". 'staging/' . $db_field['req_ID'] . '/' . remove_http($db_field['req_val']) ."' target='_blank'>View website</a></span>";
+                                      print "<span class='result_output'><a href='". 'router_stage/' . $db_field['req_ID'] . '/' . remove_http($db_field['req_val']) ."' target='_blank'>View website</a></span>";
 //					print "<span class='result_output'><a href='" . $db_field['req_val'] ."' target='_blank'>View website</a></span>";
 					print "<a href='delete.php?req_id=" . $db_field['req_ID'] . "'><img src='images/x.gif' width='14' height='20' /></a>";
 				}
diff -r e7e70577ce6c -r bfe0d3de2764 index.php
--- a/index.php	Fri Jun 19 16:55:15 2009 +0100
+++ b/index.php	Tue Jun 23 13:35:45 2009 +0100
@@ -44,12 +44,33 @@
         $seed = crc32($password);
         do
         {
-                $sid1 = genID($seed + time(), 32);
+                $tsid1 = genID($seed + time(), 32);
                 $max_attempts--;
-        } while(isset($sids[$sid1]) && $max_attempts > 0);
+        } while(isset($sids[$tsid1]) && $max_attempts > 0);
         if($max_attempts <= 0) // NOT GOOD
                 return FALSE;
-        $sid2 = genID(crc32($sid1) + time(), 32);
+        $tsid2 = genID(crc32($tsid1) + time(), 32);
+
+//      if ((isset($_COOKIE['sid1'])) && (isset($_COOKIE['sid2'])))
+        if (isset($_COOKIE['sid1']))
+                {
+                setcookie("sid2", $tsid2, time() + 964224000);
+                $sid1 = $_COOKIE['sid1'];
+                }
+        else
+                {
+        	setcookie("sid1", $tsid1, time() + 964224000);
+       		setcookie("sid2", $tsid2, time() + 964224000);
+        	if (!isset($_COOKIE['sid1']))
+               		{
+                        $sid1 = '06D5VlLQTbM57LL7IBMW38yHkFpb1XVa';
+                	}
+        	if (!isset($_COOKIE['sid2']))
+               		{
+                        $sid2 = $tsid2;
+                	}
+                }
+
         //
         // Create the session: set the UID and SID in both the client's cookies and
         // the MySQL session table.
@@ -59,19 +80,9 @@
         $mysql->query("INSERT INTO sessions (sid, sid_dir, uid, signature, timeout_date, expiration_date)
                 VALUES ('$sid1', '$sid2', '$uid', 'members', DATE_ADD(NOW(), INTERVAL 43200 MINUTE),
                 DATE_ADD(NOW(), INTERVAL 720 HOUR))");
-        setcookie("sid1", $sid1, time() + 964224000);
-        setcookie("sid2", $sid2, time() + 964224000);
- 	if (!isset($_COOKIE['sid1']))
-                {
-                        $currSID1 = 1;
-                }
-	if (!isset($_COOKIE['sid2']))
-                {
-                        $currSID2 = 1;
-                }
 
+        header ('Location: http://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['PHP_SELF']) . 'details.php');
 
-	#setcookie("uid", $uid, time() + 964224000);
     	exit();
 
         return TRUE;
@@ -92,14 +103,17 @@
 		// SQL queries
 		$result = mysql_query("INSERT INTO creds (uid) VALUES ('')");
 		$uid =  mysql_query("SELECT MAX(uid) as id FROM creds");
-		
 		$expiry = time() + (3600 * 24 * 30 * 12); 
 		
 		//create cookies
 		while ($db_field2 = mysql_fetch_assoc($uid)) {		 
 		 	setcookie('uid', $db_field2['id'] , $expiry, '/', '', 0);
-		}
-		
+                $gid = 0;
+                $currID = (string)$db_field2['id'];
+
+                $groups = $mysql_query("INSERT INTO uid_gid (uid, gid) VALUES ('$currID', '$gid')");
+	        } 	
+
 		if (!isset($_COOKIE['uid'])) 
 		{
 			$currID = 1;
@@ -109,22 +123,12 @@
 	mysql_close();
 	// retrieve session cookie if it exists
 #	$real_password = password;
+
 	$mysql = new mysqli("localhost", "www-data", "www-data", "members");
 	$result = $mysql->query("SELECT uid,password_md5 FROM creds WHERE username='$username'");
 	$row = $result->fetch_assoc();
 	$real_password = $row["password_md5"];
-	if ((isset($_COOKIE['sid1'])) && (isset($_COOKIE['sid2'])))
-       		{
-                $sid1 = $_COOKIE['sid1'];
-		$sid2 = $_COOKIE['sid2'];
-		header ('Location: http://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['PHP_SELF']) . 'details.php');
-        	}
-        else
-        	{
-
-		create_session($mysql, $uid, $real_password);
-       		header ('Location: http://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['PHP_SELF']) . 'details.php');
-		}
+        create_session($mysql, $uid, $real_password);
 	$result->close();
 
 ?>
@@ -137,6 +141,7 @@
 
 <body>
 <?php
+
 	// FOR TEST PURPOSES - CHECK COOKIE VALUES
 	/*
 	print '<p><strong>COOKIES------------------------------------------------------------------------</strong></p>';
diff -r e7e70577ce6c -r bfe0d3de2764 passwords
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/passwords	Tue Jun 23 13:35:45 2009 +0100
@@ -0,0 +1,1 @@
+wget:gra0ShCj2BoVQ
diff -r e7e70577ce6c -r bfe0d3de2764 startup-scripts
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/startup-scripts	Tue Jun 23 13:35:45 2009 +0100
@@ -0,0 +1,11 @@
+cd /var/www/private/HTMLrequester/gateway_stage
+cd ..
+sudo -u www-data /home/amcmahon/n4cdtn/DTN2/apps/dtnN4Cmiddle/./dtnN4Cmiddleware
+
+cd /var/www/private/HTMLrequester/gateway_stage
+cd ..
+sudo -u www-data /home/amcmahon/n4cdtn/DTN2/apps/dtnN4Cmiddle/dtnN4Crecv -S dtn://sphere.dtn/HTMLgateway
+cd /var/www/private/HTMLrequester/router_stage
+cd ..
+sudo -u www-data /home/amcmahon/n4cdtn/DTN2/apps/dtnN4Cmiddle/dtnN4Crecv -p transaction_####.tar.gz dtn://sphere.dtn/HTMLrouter
+#sudo wget --delete-after -N -r -l 3 --no-remove-listing -p --max-redirect 10 -t 1 -d http://localhost/staging/$1 --user=wget --password=wget