rooty/yubikey-val
1
0
Fork 0
mirror of https://github.com/Yubico/yubikey-val.git synced 2025-01-20 10:52:15 +01:00
Code Issues Projects Releases Wiki Activity

add sn

Browse Source
This commit is contained in:
Paul Chen 2008-12-02 19:23:44 +00:00
parent 9a9a41072e
commit 71273a67c5
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
addKey.php
View File

@ -14,24 +14,24 @@ if ($nonce == '') {
$client = getHttpVal('id', 0); $client = getHttpVal('id', 0);
if ($client <= 0) { if ($client <= 0) {
reply(S_MISSING_PARAMETER, '', $client, $nonce, 'id'); reply(S_MISSING_PARAMETER, '', $client, $nonce, '', 'id');
exit; exit;
} }
$ci = getClientInfo($client); $ci = getClientInfo($client);
$h = getHttpVal('h', ''); $h = getHttpVal('h', '');
if ($h == '') { if ($h == '') {
reply(S_MISSING_PARAMETER, '', $client, $nonce, 'h'); reply(S_MISSING_PARAMETER, '', $client, $nonce, '', 'h');
exit; exit;
} }
$op = getHttpVal('operation', ''); $op = getHttpVal('operation', '');
if ($op == '') { if ($op == '') {
reply(S_MISSING_PARAMETER, '', $client, $nonce, 'operation'); reply(S_MISSING_PARAMETER, '', $client, $nonce, '', 'operation');
exit; exit;
} else if ($op != 'add_key') { } else if ($op != 'add_key') {
reply(S_OPERATION_NOT_ALLOWED, $ci['secret'], $client, $nonce, $op); reply(S_OPERATION_NOT_ALLOWED, $ci['secret'], $client, $nonce, '', $op);
exit; exit;
} }
@ -40,7 +40,7 @@ if (! isset($ci['id'])) {
$client = 1; $client = 1;
if (($ci = getClientInfo($client)) == null) { if (($ci = getClientInfo($client)) == null) {
debug('Root client not found, service not installed properly!'); debug('Root client not found, service not installed properly!');
reply(S_BACKEND_ERROR, '', $client, $nonce, 'root client'); reply(S_BACKEND_ERROR, '', $client, $nonce, '', 'root client missing');
exit; exit;
} }
reply(S_BAD_CLIENT, $ci['secret'], $client, $nonce); reply(S_BAD_CLIENT, $ci['secret'], $client, $nonce);
@ -48,7 +48,7 @@ if (! isset($ci['id'])) {
} }
if ($ci['perm_id'] != 1 && $ci['perm_id'] != 2) { if ($ci['perm_id'] != 1 && $ci['perm_id'] != 2) {
reply(S_OPERATION_NOT_ALLOWED, $ci['secret'], $client, $nonce, $ci['perm_id']); reply(S_OPERATION_NOT_ALLOWED, $ci['secret'], $client, $nonce, '', $ci['perm_id']);
exit; exit;
} }
@ -72,17 +72,19 @@ if ($reqHash != $h) {
$tokenId = base64_encode(genRandRaw(6)); $tokenId = base64_encode(genRandRaw(6));
$secret = base64_encode(genRandRaw(16)); $secret = base64_encode(genRandRaw(16));
$keyid = addNewKey($tokenId, 1, $secret, '', $client); $a = addNewKey($tokenId, 1, $secret, '', $client);
$keyid = $a['keyid'];
$sn = $a['sn'];
if ($keyid > 0) { if ($keyid > 0) {
debug('Key '.$keyid.' added'); debug('Key '.$keyid.' added');
reply(S_OK, $ci['secret'], $client, $nonce); reply(S_OK, $ci['secret'], $client, $nonce, $sn);
} else { } else {
reply(S_BACKEND_ERROR, $ci['secret'], $client, $nonce); reply(S_BACKEND_ERROR, $ci['secret'], $client, $nonce);
exit; exit;
} }
function reply($status, $apiKey, $client_id, $nonce, $info='') { function reply($status, $apiKey, $client_id, $nonce, $sn='', $info='') {
global $tokenId, $secret; global $tokenId, $secret;
if ($status == null) { if ($status == null) {
@ -93,16 +95,20 @@ function reply($status, $apiKey, $client_id, $nonce, $info='') {
echo 'nonce='.($a['nonce'] = $nonce).PHP_EOL; echo 'nonce='.($a['nonce'] = $nonce).PHP_EOL;
echo 'status='.($a['status'] = $status).PHP_EOL; echo 'status='.($a['status'] = $status).PHP_EOL;
if ($info != '') { if ($info != '') {
echo 'info='.($a['info'] = $info).PHP_EOL; echo 'info='.($a['info'] = $info).PHP_EOL;
} }
if ($sn != '') {
echo 'sn='.$sn.PHP_EOL;
}
if ($tokenId != '') { if ($tokenId != '') {
echo 'token_id='.($a['token_id'] = $tokenId).PHP_EOL; echo 'token_id='.($a['token_id'] = $tokenId).PHP_EOL;
echo 'user_id='.($a['user_id'] = $tokenId).PHP_EOL;//TODO echo 'user_id='.($a['user_id'] = $tokenId).PHP_EOL;//TODO
} }
if ($secret != '') {
echo 'shared_secret='.($a['shared_secret'] = $secret).PHP_EOL;
}
echo 't='.($a['t']=getUTCTimeStamp()).PHP_EOL; echo 't='.($a['t']=getUTCTimeStamp()).PHP_EOL;
$h = sign($a, $apiKey); $h = sign($a, $apiKey);
echo 'h='.$h.PHP_EOL; echo 'h='.$h.PHP_EOL;