From 03a00881dabd9f18a2cc714f76057fc5fc2a4463 Mon Sep 17 00:00:00 2001 From: paulr Date: Fri, 24 Dec 2010 03:42:58 +1100 Subject: [PATCH] im so happy the tcp comms just worked ok --- authserver/authd/authd.php | 49 +++++++++++++++++++++---------------------- authserver/lib/lib.php | 12 +++++----- 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/authserver/authd/authd.php b/authserver/authd/authd.php index eb21dfe..aa78a73 100644 --- a/authserver/authd/authd.php +++ b/authserver/authd/authd.php @@ -19,7 +19,7 @@ if($pid == -1) { } else if($pid) { // i am the parent, i shall leave - echo "i am a parent, i leave\n"; + //echo "i am a parent, i leave\n"; exit(0); } else { // here is where i need to swithc to TCP network protocol stuff @@ -36,7 +36,6 @@ if($pid == -1) { $res = socket_create(AF_INET, SOCK_STREAM, SOL_TCP); socket_bind($res, "127.0.0.1", $TCP_PORT_NUMBER); socket_listen($res); - echo "am now listneing\n"; while(true) { $data_socket = socket_accept($res); @@ -68,10 +67,10 @@ if($pid == -1) { $msg_type = $component["type"]; $msg = $component["data"]; - echo "I now have a message of $msg_type\n"; - echo "with data:\n"; - print_r($msg); - echo "eof\n"; + //echo "I now have a message of $msg_type\n"; + //echo "with data:\n"; + //print_r($msg); + //echo "eof\n"; // the switch should now set a $data_returned value that gets bundled up and sent back to the client // HERES WHERE THE SWITCH GOES // ****** @@ -102,7 +101,7 @@ if($pid == -1) { $data_returned = true; break; case MSG_ADD_RADIUS_CLIENT: - echo "in addradclient\n"; + //echo "in addradclient\n"; $client = $msg["clientname"]; $clientsecret = $msg["clientsecret"]; $clientip = $msg["clientip"]; @@ -111,7 +110,7 @@ if($pid == -1) { // check for existing clients with same name $sql = "select * from radclients where rad_name='$client'"; - echo "doing select, $sql\n"; + //echo "doing select, $sql\n"; $res = $dbo->query($sql); if($res->fetchColumn() > 0) { $data_returned = "name"; @@ -120,7 +119,7 @@ if($pid == -1) { // check for existing clients with same ip $sql = "select * from radclients where rad_ip='$clientip'"; $res = $dbo->query($sql); - echo "doing select, $sql\n"; + //echo "doing select, $sql\n"; if($res->fetchColumn() > 0) { $data_returned = "ip"; @@ -155,7 +154,7 @@ if($pid == -1) { $data_returned = true; break; case MSG_AUTH_USER_TOKEN: - echo "Call to auth user token\n"; + //echo "Call to auth user token\n"; // minimal checking, we leav it up to authenticateUser to do the real // checking if(!isset($msg["username"])) $msg["username"] = ""; @@ -237,7 +236,7 @@ if($pid == -1) { } break; case MSG_ADD_USER_TOKEN: - echo "Call to add user token\n"; + //echo "Call to add user token\n"; if(!isset($msg["username"])) { $data_returned = false; } else { @@ -255,7 +254,7 @@ if($pid == -1) { $myga->setUser($username, $tokentype, "", $hexkey); $url = $myga->createUrl($username); - echo "Url was: $url\n"; + //echo "Url was: $url\n"; if(!file_exists("$BASE_DIR/authserver/authd/otks")) mkdir("$BASE_DIR/authserver/authd/otks"); $otk = generateRandomString(); system("qrencode -o $BASE_DIR/authserver/authd/otks/$otk.png '$url'"); @@ -268,7 +267,7 @@ if($pid == -1) { } break; case MSG_DELETE_USER: - echo "Call to del user\n"; + //echo "Call to del user\n"; if(!isset($msg["username"])) { $data_returned = false; } else { @@ -296,7 +295,7 @@ if($pid == -1) { break; case MSG_AUTH_USER_PASSWORD: // TODO - echo "Call to auth user pass\n"; + //echo "Call to auth user pass\n"; if(!isset($msg["username"])) { $data_returned = false; break; @@ -318,7 +317,7 @@ if($pid == -1) { // TODO now do auth $ourpass = hash('sha512', $password); - echo "ourpass: $ourpass\nourhash: $pass\n"; + //echo "ourpass: $ourpass\nourhash: $pass\n"; if($ourpass == $pass) { $data_returned = true; @@ -329,29 +328,29 @@ if($pid == -1) { break; case MSG_SET_USER_PASSWORD: - echo "how on earth is that happening Call to set user pass, wtf?\n"; + //echo "how on earth is that happening Call to set user pass, wtf?\n"; // TODO - print_r($msg); + //print_r($msg); if(!isset($msg["username"])) { $data_returned = false; - echo "in break 1\n"; + //echo "in break 1\n"; break; } if(!isset($msg["password"])) { $data_returned = false; - echo "in break 1\n"; + //echo "in break 1\n"; break; } $username = $msg["username"]; $password = $msg["password"]; - echo "would set pass for $username, to $password\n"; + //echo "would set pass for $username, to $password\n"; if($password == "") $pass = ""; else $pass = hash('sha512', $password); $dbo = getDatabase(); - echo "in set user pass for $username, $pass\n"; + //echo "in set user pass for $username, $pass\n"; $sql = "update users set users_password='$pass' where users_username='$username'"; $dbo->query($sql); @@ -363,7 +362,7 @@ if($pid == -1) { // TODO now set pass break; case MSG_SET_USER_REALNAME: - echo "Call to set user realname\n"; + //echo "Call to set user realname\n"; // TODO if(!isset($msg["username"])) { $data_returned = false; @@ -387,7 +386,7 @@ if($pid == -1) { break; case MSG_SET_USER_TOKEN: // TODO - echo "Call to set user token\n"; + //echo "Call to set user token\n"; if(!isset($msg["username"])) { $data_returned = false; break; @@ -407,7 +406,7 @@ if($pid == -1) { break; case MSG_SET_USER_TOKEN_TYPE: // TODO - echo "Call to set user token type\n"; + //echo "Call to set user token type\n"; if(!isset($msg["username"])) { $data_returned = false; break; @@ -441,7 +440,7 @@ if($pid == -1) { } else { $users[$i]["haspass"] = false; } - echo "user: ".$users[$i]["username"]." has tdata: \"".$row["users_tokendata"]."\"\n"; + //echo "user: ".$users[$i]["username"]." has tdata: \"".$row["users_tokendata"]."\"\n"; if($row["users_tokendata"]!="") { $users[$i]["hastoken"] = true; } else { diff --git a/authserver/lib/lib.php b/authserver/lib/lib.php index d0856b0..76af285 100644 --- a/authserver/lib/lib.php +++ b/authserver/lib/lib.php @@ -98,7 +98,7 @@ function closeDatabase($db) { class gaasGA extends GoogleAuthenticator { function getData($username) { - echo "called into getdata\n"; + //echo "called into getdata\n"; // get our database connection $dbObject = getDatabase(); @@ -110,17 +110,17 @@ class gaasGA extends GoogleAuthenticator { $result = $dbObject->query($sql); // check the result - echo "next1\n"; + //echo "next1\n"; if(!$result) return false; // now just retreieve all the data (there should only be one, but whatever) - echo "next2\n"; + //echo "next2\n"; $tokendata = false; foreach($result as $row) { $tokendata = $row["users_tokendata"]; } - echo "next3, $username, $tokendata\n"; + //echo "next3, $username, $tokendata\n"; // now we have our data, we just return it. If we got no data // we'll just return false by default return $tokendata; @@ -138,11 +138,11 @@ class gaasGA extends GoogleAuthenticator { $res = $dbObject->query($sql); if($res->fetchColumn() > 0) { // do update - error_log("doing userdata update"); + //error_log("doing userdata update"); $sql = "update users set users_tokendata='$data' where users_username='$username'"; } else { // do insert - error_log("doing user data create"); + //error_log("doing user data create"); $sql = "insert into users values (NULL, '$username', '', '', '$data', '')"; } -- 1.7.0.4