<?php
-if(!isset($MSG_QUEUE_KEY_ID_SERVER)) $MSG_QUEUE_KEY_ID_SERVER = "189751072";
-if(!isset($MSG_QUEUE_KEY_ID_CLIENT)) $MSG_QUEUE_KEY_ID_CLIENT = "189751073";
+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;
-define("MSG_AUTH_USER", 1);
-define("MSG_ADD_USER", 2);
-define("MSG_DELETE_USER", 2);
+define("MSG_AUTH_USER_TOKEN", 1);
+define("MSG_ADD_USER_TOKEN", 2);
+define("MSG_DELETE_USER", 3);
+define("MSG_AUTH_USER_PASSWORD", 4);
+define("MSG_SET_USER_PASSWORD", 5);
+define("MSG_SET_USER_REALNAME", 6);
+define("MSG_SET_USER_TOKEN", 7);
+define("MSG_SET_USER_TOKEN_TYPE", 8);
+define("MSG_GET_USERS", 9);
+define("MSG_GET_OTK_PNG", 10);
+define("MSG_GET_OTK_ID", 11);
+define("MSG_DELETE_USER_TOKEN", 12);
+// messy
+require_once(dirname(__FILE__)."/../../lib/ga4php.php");
+
+function generateRandomString()
+{
+ $str = "";
+ $strpos = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+
+ for($i=0; $i<128; $i++) {
+ $str .= $strpos[rand(0, strlen($strpos)-1)];
+ }
+
+ return $str;
+}
-if(file_exists("../../lib/ga4php.php")) require_once("../../lib/ga4php.php");
-if(file_exists("../lib/ga4php.php")) require_once("../lib/ga4php.php");
function getDatabase() {
$dbobject = false;
- if(file_exists("/tmp/gadata.sqlite")) {
+ if(file_exists("gaasdata.sqlite")) {
try {
- $dbobject = new PDO("sqlite:/tmp/gadata.sqlite");
+ $dbobject = new PDO("sqlite:gaasdata.sqlite");
} catch(PDOException $exep) {
error_log("execpt on db open");
}
} else {
try {
- $dbobject = new PDO("sqlite:/tmp/gadata.sqlite");
+ $dbobject = new PDO("sqlite:gaasdata.sqlite");
} catch(PDOException $exep) {
error_log("execpt on db open");
}
- $sql = 'CREATE TABLE "users" ("users_id" INTEGER PRIMARY KEY AUTOINCREMENT,"users_username" TEXT,"users_tokendata" TEXT);';
+ $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);
}
class gaasGA extends GoogleAuthenticator {
function getData($username) {
+ echo "called into getdata\n";
// get our database connection
$dbObject = getDatabase();
$result = $dbObject->query($sql);
// check the result
+ echo "next1\n";
if(!$result) return false;
// now just retreieve all the data (there should only be one, but whatever)
+ echo "next2\n";
$tokendata = false;
foreach($result as $row) {
$tokendata = $row["users_tokendata"];
}
-
+
+ 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;
}
- // now we need a function for putting the data back into our user table.
- // in this example, we wont check anything, we'll just overwrite it.
function putData($username, $data) {
// get our database connection
$dbObject = getDatabase();
- // set the sql for updating the data
- // token data is stored as a base64 encoded string, it should
- // not need to be escaped in any way prior to storing in a database
- // but feel free to call your databases "addslashes" (or whatever)
- // function on $data prior to doing the SQL.
- $sql = "delete from users where users_username='$username'";
- $dbObject->query($sql);
-
- $sql = "insert into users values (NULL, '$username', '$data')";
-
+ // we need to check if the user exists, and if so put the data, if not create the data
+ $sql = "select * from users where users_username='$username'";
+ $res = $dbObject->query($sql);
+ if($res->fetchColumn() > 0) {
+ // do 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");
+ $sql = "insert into users values (NULL, '$username', '', '', '$data', '')";
+ }
- // now execute the sql and return straight away - you should probably
- // clean up after yourselves, but im going to assume pdo does this
- // for us anyway in this exmaple
if($dbObject->query($sql)) {
return true;
} else {
return false;
}
-
- // even simpler!
+
}
function getUsers() {
}
}
-?>
\ No newline at end of file
+?>