liz/tilde-oauth
liz/tilde-oauth
1
0
Fork 0
Code Issues 6 Pull Requests Projects Releases Wiki Activity

Split REST API usage out

Browse Source
This commit is contained in:
Elizabeth Cray 2023-10-01 23:54:32 -04:00
parent 7b90d0f927
commit 52c66eea16
2 changed files with 50 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
auth/index.php
View File

@ -3,6 +3,8 @@ $config = json_decode(file_get_contents("/var/www/usergen/secret/config.json", t
ini_set('display_errors', 1); ini_set('display_errors', 1);
ini_set('display_startup_errors', 1); ini_set('display_startup_errors', 1);
error_reporting(E_ALL); error_reporting(E_ALL);
require("/var/www/usergen/secret/oauth.php");
function flog($log_msg) { function flog($log_msg) {
$log_filename = "/var/www/html"; $log_filename = "/var/www/html";
$log_file_data = $log_filename.'/log_' . date('d-M-Y') . '.log'; $log_file_data = $log_filename.'/log_' . date('d-M-Y') . '.log';
@ -28,16 +30,6 @@ if (isset($_REQUEST["act"])){
$MastCode = $_REQUEST["code"]; $MastCode = $_REQUEST["code"];
// var_dump($_REQUEST); // var_dump($_REQUEST);
} }
if (isset($_REQUEST["token"])){
// Token passed, use for repeated OAUTH
/* TODO: Long-Term Auth
* Check if HT Token valid
* Generate Browser Token
* Encrypt Browser Token with Client Data (User Agent + IP)
* $_SERVER["HTTP_USER_AGENT"] + $_SERVER["REMOTE_ADDR"]
*/
flog("token:35 ✨ ".$_REQUEST["token"]);
}
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
<HTML lang="en"> <HTML lang="en">
@ -76,40 +68,11 @@ if (isset($_REQUEST["token"])){
</div> </div>
<?php <?php
// Query /oauth/token // Query /oauth/token
$AuthToken = ""; $Auth = oauthToken($MastCode, $config);
$UserName = "";
$ErrorDesc = "";
$UserId = "";
$request = curl_init();
curl_setopt($request, CURLOPT_POST, 1);
curl_setopt($request, CURLOPT_URL, "https://hackers.town/oauth/token");
curl_setopt($request, CURLOPT_RETURNTRANSFER, 1);
$origin = "https://tty.hackers.town";
if(file_exists("/var/www/usergen/DOMAIN_OVERRIDE")){
$origin = str_replace("\n", "", file_get_contents("/var/www/usergen/DOMAIN_OVERRIDE"));
}
$redirectUri = $origin."/auth";
$options = "grant_type=authorization_code&code=".$MastCode."&client_id=".$config->oauth->key."&client_secret=".$config->oauth->secret."&scope=read:accounts&redirect_uri=".$redirectUri;
curl_setopt($request, CURLOPT_POSTFIELDS, $options);
$response = curl_exec($request);
curl_close($request);
flog("oauth_token:91 ✨ ".$response);
$Auth = json_decode($response);
if(isset($Auth->token_type)){ if(isset($Auth->token_type)){
// Valid Auth? // Valid Auth?
$request = curl_init(); $User = verifyCredentials($Auth->access_token);
curl_setopt($request, CURLOPT_URL, "https://hackers.town/api/v1/accounts/verify_credentials"); if (gettype($User) == "object" && isset($User->id)) {
curl_setopt($request, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($request, CURLOPT_HTTPHEADER, array(
"Authorization: ".$Auth->token_type." ".$Auth->access_token
));
$response = curl_exec($request);
curl_close($request);
$User = json_decode($response);
flog("cred_verify:104 ✨ ".$response);
if (isset($User->id)){
// Congrats! // Congrats!
$AuthToken = $Auth->access_token; $AuthToken = $Auth->access_token;
$UserName = $User->display_name; $UserName = $User->display_name;
@ -119,6 +82,7 @@ if (isset($_REQUEST["token"])){
$AuthToken = "BadUser"; $AuthToken = "BadUser";
$ErrorDesc = "User Not Found"; $ErrorDesc = "User Not Found";
} }
}else{ }else{
// invalid auth // invalid auth
if(isset($_COOKIE["oa_retries"])){ if(isset($_COOKIE["oa_retries"])){

44
secret/oauth.php Normal file
View File

@ -0,0 +1,44 @@
<?php
function verifyCredentials($Auth) {
$request = curl_init();
curl_setopt($request, CURLOPT_URL, "https://hackers.town/api/v1/accounts/verify_credentials");
curl_setopt($request, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($request, CURLOPT_HTTPHEADER, array(
"Authorization: Bearer ".$Auth
));
$response = curl_exec($request);
curl_close($request);
$User = json_decode($response);
// if (isset($User->id)){
// // Congrats!
// $UserName = $User->display_name;
// $UserId = $User->id;
// }else{
// }
return (isset($User->error) ? $User->error : $User);
}
function oauthToken($AuthCode, $config){
$AuthToken = "";
$UserName = "";
$ErrorDesc = "";
$UserId = "";
$request = curl_init();
curl_setopt($request, CURLOPT_POST, 1);
curl_setopt($request, CURLOPT_URL, "https://hackers.town/oauth/token");
curl_setopt($request, CURLOPT_RETURNTRANSFER, 1);
$origin = "https://tty.hackers.town";
if(file_exists("/var/www/usergen/DOMAIN_OVERRIDE")){
$origin = str_replace("\n", "", file_get_contents("/var/www/usergen/DOMAIN_OVERRIDE"));
}
$redirectUri = $origin."/auth";
$options = "grant_type=authorization_code&code=".$AuthCode."&client_id=".$config->oauth->key."&client_secret=".$config->oauth->secret."&scope=read:accounts&redirect_uri=".$redirectUri;
curl_setopt($request, CURLOPT_POSTFIELDS, $options);
$response = curl_exec($request);
curl_close($request);
$Auth = json_decode($response);
return (isset($Auth->error) ? $Auth->error_description : $Auth);
}
?>