plugins/yubikey/auth.php
author Dan Fuhry <dan@enanocms.org>
Fri, 11 Nov 2011 00:33:28 -0500
changeset 38 d109af008343
parent 37 5e946a3f405b
permissions -rw-r--r--
SECURITY: Fixed ability to log into an account with someone else's Yubikey...
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
0
9d2c4f04a0d0 First commit! Hoping everything works.
Dan
parents:
diff changeset
     1
<?php
9d2c4f04a0d0 First commit! Hoping everything works.
Dan
parents:
diff changeset
     2
3
d0fe7acaf0e8 Maybe we could actually make yubikey_enable in config not ignored!
Dan
parents: 2
diff changeset
     3
if ( getConfig('yubikey_enable', '1') != '1' )
37
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
     4
		return true;
3
d0fe7acaf0e8 Maybe we could actually make yubikey_enable in config not ignored!
Dan
parents: 2
diff changeset
     5
0
9d2c4f04a0d0 First commit! Hoping everything works.
Dan
parents:
diff changeset
     6
// hook into auth
9d2c4f04a0d0 First commit! Hoping everything works.
Dan
parents:
diff changeset
     7
$plugins->attachHook('login_process_userdata_json', 'return yubikey_auth_hook_json($userinfo, $req["level"], @$req["remember"]);');
9d2c4f04a0d0 First commit! Hoping everything works.
Dan
parents:
diff changeset
     8
// hook into special page init
9d2c4f04a0d0 First commit! Hoping everything works.
Dan
parents:
diff changeset
     9
$plugins->attachHook('session_started', 'yubikey_add_special_pages();');
32
b00055a88867 Added session key salt support
Dan
parents: 25
diff changeset
    10
// session key security
b00055a88867 Added session key salt support
Dan
parents: 25
diff changeset
    11
$plugins->attachHook('session_key_calc', 'yubikey_sk_calc($user_id, $key_pieces, $sk_mode);');
0
9d2c4f04a0d0 First commit! Hoping everything works.
Dan
parents:
diff changeset
    12
9d2c4f04a0d0 First commit! Hoping everything works.
Dan
parents:
diff changeset
    13
function yubikey_auth_hook_json(&$userdata, $level, $remember)
9d2c4f04a0d0 First commit! Hoping everything works.
Dan
parents:
diff changeset
    14
{
37
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    15
	global $db, $session, $paths, $template, $plugins; // Common objects
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    16
	global $lang;
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    17
	
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    18
	$do_validate_otp = false;
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    19
	$do_validate_user = false;
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    20
	$do_validate_pass = false;
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    21
	
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    22
	$user_flag = ( $level >= USER_LEVEL_CHPREF ) ? YK_SEC_ELEV_USERNAME : YK_SEC_NORMAL_USERNAME;
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    23
	$pass_flag = ( $level >= USER_LEVEL_CHPREF ) ? YK_SEC_ELEV_PASSWORD : YK_SEC_NORMAL_PASSWORD;
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    24
	
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    25
	$auth_log_prefix = ( $level >= USER_LEVEL_CHPREF ) ? 'admin_' : '';
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    26
	
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    27
	// Sort of a hack: if the password looks like an OTP and the OTP field is empty, use the password as the OTP
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    28
	if ( empty($userdata['yubikey_otp']) && preg_match('/^[cbdefghijklnrtuv]{44}$/', $userdata['password'] ) )
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    29
	{
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    30
		$userdata['yubikey_otp'] = $userdata['password'];
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    31
	}
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    32
	
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    33
	// Lockouts removed from here - they're done during preprocessing now.
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    34
	
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    35
	if ( !empty($userdata['username']) )
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    36
	{
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    37
		// get flags
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    38
		$q = $db->sql_query('SELECT user_id, user_yubikey_flags FROM ' . table_prefix . "users WHERE " . ENANO_SQLFUNC_LOWERCASE . "(username) = '" . $db->escape(strtolower($userdata['username'])) . "';");
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    39
		if ( !$q )
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    40
			$db->die_json();
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    41
		
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    42
		if ( $db->numrows() < 1 )
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    43
		{
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    44
			// Username not found - let the main login function handle it
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    45
			$db->free_result();
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    46
			return null;
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    47
		}
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    48
		list($user_id, $flags) = $db->fetchrow_num();
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    49
		$flags = intval($flags);
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    50
		// At the point the username is validated.
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    51
		$do_validate_user = false;
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    52
		$do_validate_pass = $flags & $pass_flag;
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    53
		if ( empty($userdata['yubikey_otp']) )
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    54
		{
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    55
			// no OTP was provided
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    56
			// make sure the user has allowed logging in with no OTP
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    57
			if ( !($flags & YK_SEC_ALLOW_NO_OTP) )
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    58
			{
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    59
				// We also might have no Yubikeys enrolled.
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    60
				$q = $db->sql_query('SELECT 1 FROM ' . table_prefix . "yubikey WHERE user_id = $user_id;");
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    61
				if ( !$q )
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    62
					$db->die_json();
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    63
				
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    64
				if ( $db->numrows() > 0 )
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    65
				{
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    66
					// Yep at least one key is enrolled.
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    67
					// I don't think these should be logged because they'll usually just be innocent mistakes.
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    68
					$db->free_result();
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    69
					return array(
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    70
							'mode' => 'error',
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    71
							'error' => 'yubiauth_err_must_have_otp'
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    72
						);
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    73
				}
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    74
				// Nope, no keys enrolled, user hasn't enabled Yubikey support
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    75
				$db->free_result();
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    76
			}
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    77
			// we're ok, use normal password auth
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    78
			return null;
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    79
		}
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    80
		else
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    81
		{
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    82
			// user did enter an OTP; make sure it's associated with the username
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    83
			$yubi_uid = $db->escape(substr($userdata['yubikey_otp'], 0, 12));
38
d109af008343 SECURITY: Fixed ability to log into an account with someone else's Yubikey...
Dan Fuhry <dan@enanocms.org>
parents: 37
diff changeset
    84
			$q = $db->sql_query('SELECT user_id FROM ' . table_prefix . 'yubikey WHERE yubi_uid = \'' . $yubi_uid . '\';');
37
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    85
			if ( !$q )
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    86
				$db->die_json();
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    87
			if ( $db->numrows() < 1 )
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    88
			{
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    89
				$db->free_result();
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    90
				return array(
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    91
						'mode' => 'error',
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    92
						'error' => 'yubiauth_err_key_not_authorized'
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    93
					);
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
    94
			}
38
d109af008343 SECURITY: Fixed ability to log into an account with someone else's Yubikey...
Dan Fuhry <dan@enanocms.org>
parents: 37
diff changeset
    95
			list($yubi_pair_uid) = $db->fetchrow_num();
d109af008343 SECURITY: Fixed ability to log into an account with someone else's Yubikey...
Dan Fuhry <dan@enanocms.org>
parents: 37
diff changeset
    96
			if ( $yubi_pair_uid !== $user_id )
d109af008343 SECURITY: Fixed ability to log into an account with someone else's Yubikey...
Dan Fuhry <dan@enanocms.org>
parents: 37
diff changeset
    97
			{
d109af008343 SECURITY: Fixed ability to log into an account with someone else's Yubikey...
Dan Fuhry <dan@enanocms.org>
parents: 37
diff changeset
    98
				return array(
d109af008343 SECURITY: Fixed ability to log into an account with someone else's Yubikey...
Dan Fuhry <dan@enanocms.org>
parents: 37
diff changeset
    99
						'mode' => 'error',
d109af008343 SECURITY: Fixed ability to log into an account with someone else's Yubikey...
Dan Fuhry <dan@enanocms.org>
parents: 37
diff changeset
   100
						'error' => 'yubiauth_err_uid_mismatch'
d109af008343 SECURITY: Fixed ability to log into an account with someone else's Yubikey...
Dan Fuhry <dan@enanocms.org>
parents: 37
diff changeset
   101
					);
d109af008343 SECURITY: Fixed ability to log into an account with someone else's Yubikey...
Dan Fuhry <dan@enanocms.org>
parents: 37
diff changeset
   102
			}
37
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   103
			$db->free_result();
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   104
			$do_validate_otp = true;
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   105
		}
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   106
	}
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   107
	else if ( !empty($userdata['yubikey_otp']) )
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   108
	{
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   109
		// we have an OTP, but no username to work with
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   110
		$yubi_uid = substr($userdata['yubikey_otp'], 0, 12);
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   111
		if ( !preg_match('/^[cbdefghijklnrtuv]{12}$/', $yubi_uid ) )
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   112
		{
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   113
			return array(
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   114
					'mode' => 'error',
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   115
					'error' => 'yubiauth_err_invalid_otp'
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   116
				);
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   117
		}
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   118
		$q = $db->sql_query('SELECT u.user_id, u.username, u.user_yubikey_flags FROM ' . table_prefix . "users AS u\n"
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   119
											. "  LEFT JOIN " . table_prefix . "yubikey AS y\n"
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   120
											. "    ON ( y.user_id = u.user_id )\n"
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   121
											. "  WHERE y.yubi_uid = '$yubi_uid'\n"
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   122
											. "  GROUP BY u.user_yubikey_flags;");
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   123
		if ( !$q )
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   124
			$db->_die();
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   125
		
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   126
		if ( $db->numrows() < 1 )
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   127
		{
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   128
			if ( !$do_validate_pass )
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   129
				$session->sql('INSERT INTO ' . table_prefix . "logs(log_type,action,time_id,date_string,author,edit_summary,page_text) VALUES\n"
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   130
 									. '  (\'security\', \'' . $auth_log_prefix . 'auth_bad\', '.time().', \'DEPRECATED\', \'(Yubikey)\', '
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   131
											. '\''.$db->escape($_SERVER['REMOTE_ADDR']).'\', ' . intval($level) . ')');
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   132
			
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   133
			return array(
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   134
					'mode' => 'error',
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   135
					'error' => 'yubiauth_err_key_not_authorized'
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   136
				);
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   137
		}
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   138
		
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   139
		list($user_id, $username, $flags) = $db->fetchrow_num();
38
d109af008343 SECURITY: Fixed ability to log into an account with someone else's Yubikey...
Dan Fuhry <dan@enanocms.org>
parents: 37
diff changeset
   140
		
d109af008343 SECURITY: Fixed ability to log into an account with someone else's Yubikey...
Dan Fuhry <dan@enanocms.org>
parents: 37
diff changeset
   141
		if ( $level > USER_LEVEL_MEMBER )
d109af008343 SECURITY: Fixed ability to log into an account with someone else's Yubikey...
Dan Fuhry <dan@enanocms.org>
parents: 37
diff changeset
   142
		{
d109af008343 SECURITY: Fixed ability to log into an account with someone else's Yubikey...
Dan Fuhry <dan@enanocms.org>
parents: 37
diff changeset
   143
			$session->start();
d109af008343 SECURITY: Fixed ability to log into an account with someone else's Yubikey...
Dan Fuhry <dan@enanocms.org>
parents: 37
diff changeset
   144
			if ( $session->user_logged_in && ($session->user_id !== $user_id) )
d109af008343 SECURITY: Fixed ability to log into an account with someone else's Yubikey...
Dan Fuhry <dan@enanocms.org>
parents: 37
diff changeset
   145
			{
d109af008343 SECURITY: Fixed ability to log into an account with someone else's Yubikey...
Dan Fuhry <dan@enanocms.org>
parents: 37
diff changeset
   146
				return array(
d109af008343 SECURITY: Fixed ability to log into an account with someone else's Yubikey...
Dan Fuhry <dan@enanocms.org>
parents: 37
diff changeset
   147
						'mode' => 'error',
d109af008343 SECURITY: Fixed ability to log into an account with someone else's Yubikey...
Dan Fuhry <dan@enanocms.org>
parents: 37
diff changeset
   148
						'error' => 'yubiauth_err_uid_mismatch'
d109af008343 SECURITY: Fixed ability to log into an account with someone else's Yubikey...
Dan Fuhry <dan@enanocms.org>
parents: 37
diff changeset
   149
					);
d109af008343 SECURITY: Fixed ability to log into an account with someone else's Yubikey...
Dan Fuhry <dan@enanocms.org>
parents: 37
diff changeset
   150
			}
d109af008343 SECURITY: Fixed ability to log into an account with someone else's Yubikey...
Dan Fuhry <dan@enanocms.org>
parents: 37
diff changeset
   151
		}
d109af008343 SECURITY: Fixed ability to log into an account with someone else's Yubikey...
Dan Fuhry <dan@enanocms.org>
parents: 37
diff changeset
   152
		
37
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   153
		$do_validate_otp = true;
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   154
		$do_validate_user = $flags & $user_flag;
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   155
		$do_validate_pass = $flags & $pass_flag;
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   156
		// to complete security logs later
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   157
		$userdata['username'] = $username;
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   158
	}
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   159
	else
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   160
	{
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   161
		// Nothing - no username or OTP. This request can't be used; throw it out.
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   162
		return array(
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   163
				'mode' => 'error',
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   164
				'error' => 'yubiauth_err_nothing_provided'
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   165
			);
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   166
	}
38
d109af008343 SECURITY: Fixed ability to log into an account with someone else's Yubikey...
Dan Fuhry <dan@enanocms.org>
parents: 37
diff changeset
   167
	
37
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   168
	if ( $do_validate_otp )
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   169
	{
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   170
		// We need to validate the OTP.
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   171
		$otp_check = yubikey_validate_otp($userdata['yubikey_otp']);
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   172
		if ( !$otp_check['success'] )
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   173
		{
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   174
			if ( !$do_validate_pass )
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   175
				$session->sql('INSERT INTO ' . table_prefix . "logs(log_type,action,time_id,date_string,author,edit_summary,page_text) VALUES\n"
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   176
 									. '  (\'security\', \'' . $auth_log_prefix . 'auth_bad\', '.time().', \'DEPRECATED\', \'(Yubikey)\', '
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   177
											. '\''.$db->escape($_SERVER['REMOTE_ADDR']).'\', ' . intval($level) . ')');
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   178
			
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   179
			if ( $otp_check['error'] === 'http_failed' )
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   180
			{
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   181
				return array(
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   182
						'mode' => 'error',
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   183
						'error' => 'yubiauth_err_' . $otp_check['error'],
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   184
						'http_error' => $otp_check['http_error']
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   185
					);
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   186
			}
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   187
			return array(
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   188
					'mode' => 'error',
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   189
					'error' => 'yubiauth_err_' . $otp_check['error']
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   190
				);
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   191
		}
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   192
	}
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   193
	if ( $do_validate_user )
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   194
	{
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   195
		if ( empty($username) )
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   196
		{
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   197
			return array(
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   198
					'mode' => 'error',
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   199
					'error' => 'yubiauth_err_must_have_username'
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   200
				);
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   201
		}
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   202
		if ( strtolower($username) !== strtolower($userdata['username']) )
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   203
		{
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   204
			// Username incorrect
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   205
			if ( !$do_validate_pass )
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   206
				$session->sql('INSERT INTO ' . table_prefix . "logs(log_type,action,time_id,date_string,author,edit_summary,page_text) VALUES\n"
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   207
 									. '  (\'security\', \'' . $auth_log_prefix . 'auth_bad\', '.time().', \'DEPRECATED\', \'(Yubikey)\', '
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   208
											. '\''.$db->escape($_SERVER['REMOTE_ADDR']).'\', ' . intval($level) . ')');
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   209
			return array(
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   210
					'mode' => 'error',
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   211
					'error' => 'invalid_credentials'
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   212
				);
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   213
		}
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   214
	}
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   215
	// Do we need to have the password validated?
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   216
	if ( $do_validate_pass )
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   217
	{
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   218
		if ( empty($userdata['password']) )
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   219
		{
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   220
			return array(
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   221
					'mode' => 'error',
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   222
					'error' => 'yubiauth_err_must_have_password'
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   223
				);
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   224
		}
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   225
		// Yes; return and let the login API continue
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   226
		return null;
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   227
	}
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   228
	else
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   229
	{
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   230
		// No password required; validated, issue session key
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   231
		$session->sql('INSERT INTO ' . table_prefix . "logs(log_type,action,time_id,date_string,author,edit_summary,page_text) VALUES\n"
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   232
 									. '  (\'security\', \'' . $auth_log_prefix . 'auth_good\', '.time().', \'DEPRECATED\', \'' . $db->escape($userdata['username']) . '\', '
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   233
											. '\''.$db->escape($_SERVER['REMOTE_ADDR']).'\', ' . intval($level) . ')');
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   234
				
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   235
		$q = $db->sql_query('SELECT password FROM ' . table_prefix . "users WHERE user_id = $user_id;");
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   236
		if ( !$q )
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   237
			$db->_die();
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   238
		
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   239
		list($password) = $db->fetchrow_num();
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   240
		$db->free_result();
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   241
		
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   242
		$session->register_session($user_id, $userdata['username'], $password, intval($level), $remember);
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   243
		return true;
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   244
	}
0
9d2c4f04a0d0 First commit! Hoping everything works.
Dan
parents:
diff changeset
   245
}
9d2c4f04a0d0 First commit! Hoping everything works.
Dan
parents:
diff changeset
   246
9d2c4f04a0d0 First commit! Hoping everything works.
Dan
parents:
diff changeset
   247
function yubikey_add_special_pages()
9d2c4f04a0d0 First commit! Hoping everything works.
Dan
parents:
diff changeset
   248
{
37
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   249
	global $db, $session, $paths, $template, $plugins; // Common objects
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   250
	global $lang;
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   251
	
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   252
	if ( getConfig('yubikey_enable', '1') != '1' )
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   253
		return true;
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   254
	
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   255
	$paths->add_page(array(
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   256
			'name' => $lang->get('yubiauth_specialpage_yubikey'),
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   257
			'urlname' => 'Yubikey',
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   258
			'namespace' => 'Special',
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   259
			'visible' => 0, 'protected' => 0, 'comments_on' => 0, 'special' => 0
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   260
		));
0
9d2c4f04a0d0 First commit! Hoping everything works.
Dan
parents:
diff changeset
   261
}
9d2c4f04a0d0 First commit! Hoping everything works.
Dan
parents:
diff changeset
   262
32
b00055a88867 Added session key salt support
Dan
parents: 25
diff changeset
   263
function yubikey_sk_calc($user_id, &$key_pieces, &$sk_mode)
b00055a88867 Added session key salt support
Dan
parents: 25
diff changeset
   264
{
37
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   265
	global $db, $session, $paths, $template, $plugins; // Common objects
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   266
	// hash the user's yubikeys
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   267
	$q = $db->sql_query('SELECT yubi_uid FROM ' . table_prefix . "yubikey WHERE user_id = $user_id;");
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   268
	if ( !$q )
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   269
		$db->_die();
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   270
	
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   271
	while ( $row = $db->fetchrow() )
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   272
	{
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   273
		$key_pieces[] = $row['yubi_uid'];
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   274
	}
32
b00055a88867 Added session key salt support
Dan
parents: 25
diff changeset
   275
}
b00055a88867 Added session key salt support
Dan
parents: 25
diff changeset
   276
0
9d2c4f04a0d0 First commit! Hoping everything works.
Dan
parents:
diff changeset
   277
function page_Special_Yubikey()
9d2c4f04a0d0 First commit! Hoping everything works.
Dan
parents:
diff changeset
   278
{
37
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   279
	global $db, $session, $paths, $template, $plugins; // Common objects
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   280
	
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   281
	header('Content-type: text/javascript');
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   282
	/*
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   283
	if ( isset($_GET['validate_otp']) )
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   284
	{
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   285
		echo enano_json_encode(yubikey_validate_otp($_GET['validate_otp']));
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   286
		return true;
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   287
	}
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   288
	*/
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   289
	if ( isset($_GET['get_flags']) || isset($_POST['get_flags']) )
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   290
	{
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   291
		$yubi_uid = substr($_REQUEST['get_flags'], 0, 12);
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   292
		if ( !preg_match('/^[cbdefghijklnrtuv]{12}$/', $yubi_uid) )
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   293
		{
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   294
			return print enano_json_encode(array(
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   295
					'mode' => 'error',
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   296
					'error' => 'invalid_otp'
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   297
				));
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   298
		}
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   299
		$q = $db->sql_query('SELECT u.user_yubikey_flags FROM ' . table_prefix . "users AS u\n"
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   300
											. "  LEFT JOIN " . table_prefix . "yubikey AS y\n"
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   301
											. "    ON ( y.user_id = u.user_id )\n"
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   302
											. "  WHERE y.yubi_uid = '$yubi_uid'\n"
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   303
											. "  GROUP BY u.user_yubikey_flags;");
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   304
		if ( !$q )
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   305
			$db->_die();
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   306
		
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   307
		if ( $db->numrows() < 1 )
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   308
		{
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   309
			return print enano_json_encode(array(
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   310
					'mode' => 'error',
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   311
					'error' => 'key_not_authorized'
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   312
				));
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   313
		}
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   314
		
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   315
		list($flags) = $db->fetchrow_num();
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   316
		
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   317
		echo enano_json_encode(array(
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   318
				// We strip YK_SEC_ALLOW_NO_OTP here for security reasons.
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   319
				'flags' => intval($flags & ~YK_SEC_ALLOW_NO_OTP)
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   320
			));
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   321
		
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   322
		return true;
5e946a3f405b Converted to tabs
Dan Fuhry <dan@enanocms.org>
parents: 34
diff changeset
   323
	}
0
9d2c4f04a0d0 First commit! Hoping everything works.
Dan
parents:
diff changeset
   324
}
9d2c4f04a0d0 First commit! Hoping everything works.
Dan
parents:
diff changeset
   325