small change to add hardware tokens to database.

[ga4php.git] / authserver / lib / lib.php

diff --git a/authserver/lib/lib.php b/authserver/lib/lib.php
index c3ac220..6ae1d81 100644 (file)
--- a/authserver/lib/lib.php
+++ b/authserver/lib/lib.php
@@ -1,8 +1,7 @@
 <?php
 
-if(!isset($MSG_QUEUE_KEY_ID_SERVER)) $MSG_QUEUE_KEY_ID_SERVER = "189751072"; // i would use ftok, but its crap
-if(!isset($MSG_QUEUE_KEY_ID_CLIENT)) $MSG_QUEUE_KEY_ID_CLIENT = "189751073"; // ftok is not ok!
-global $MSG_QUEUE_KEY_ID_SERVER, $MSG_QUEUE_KEY_ID_CLIENT;
+if(!isset($TCP_PORT_NUMBER)) $TCP_PORT_NUMBER = 21446;
+global $TCP_PORT_NUMBER;
 
 define("MSG_AUTH_USER_TOKEN", 1);
 define("MSG_ADD_USER_TOKEN", 2);
@@ -17,8 +16,13 @@ define("MSG_GET_OTK_PNG", 10);
 define("MSG_GET_OTK_ID", 11);
 define("MSG_DELETE_USER_TOKEN", 12);
 define("MSG_SYNC_TOKEN", 13);
+define("MSG_GET_TOKEN_TYPE", 14);
+define("MSG_GET_RADIUS_CLIENTS", 15);
+define("MSG_REMOVE_RADIUS_CLIENT", 16);
+define("MSG_ADD_RADIUS_CLIENT", 17);
 
 // BASE_DIR = 
+// messy
 $BASE_DIR = realpath(dirname(__FILE__)."/../../");
 global $BASE_DIR;
 
@@ -37,8 +41,34 @@ function generateRandomString()
        return $str;
 }
 
+function updateRadius()
+{
+       // this is hardcoded for now.
+       //$clientfile = "/etc/freeradius/clients.conf";
+       $clientfile = "/tmp/clients.conf";
+       $reloadinit = "/etc/init.d/freeradius restart";
+       
+       $db = getDatabase();
+       
+       echo "in updateradius\n";
+       $hand = fopen($clientfile, "w");
+       $sql = "select * from radclients";
+       $res = $db->query($sql);
+       foreach($res as $row) {
+               $cname = $row["rad_name"];
+               $cip = $row["rad_ip"];
+               $csec = $row["rad_secret"];
+               $lines = "client $cname {\nipaddr = $cip\nsecret = $csec\nrequire_message_authenticator = no\n}\n\n";
+               fwrite($hand, $lines);
+       }
+       fclose($hand);
+       // not yet
+       //system($reloadinit);
+}
+
 
-function getDatabase() {
+function getDatabase()
+{
        $dbobject = false;
        global $BASE_DIR;
        if(file_exists("$BASE_DIR/authserver/authd/gaasdata.sqlite")) {
@@ -55,6 +85,10 @@ function getDatabase() {
                }
                $sql = 'CREATE TABLE "users" ("users_id" INTEGER PRIMARY KEY AUTOINCREMENT,"users_username" TEXT, "users_realname" TEXT, "users_password" TEXT, "users_tokendata" TEXT, "users_otk" TEXT);';
                $dbobject->query($sql);
+               $sql = 'CREATE TABLE "radclients" ("rad_id" INTEGER PRIMARY KEY AUTOINCREMENT,"rad_name" TEXT, "rad_ip" TEXT, "rad_secret" TEXT, "rad_desc" TEXT);';
+               $dbobject->query($sql);
+               $sql = 'CREATE TABLE "hardwaretokens" ("tok_id" INTEGER PRIMARY KEY AUTOINCREMENT,"tok_name" TEXT, "tok_key" TEXT, "tok_type" TEXT);';
+               $dbobject->query($sql);
        }
        
        return $dbobject;
@@ -66,7 +100,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();
@@ -78,17 +112,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;
@@ -106,11 +140,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', '')";
                }