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

Popups and Niceties

Browse Source
This commit is contained in:
Elizabeth Cray 2022-05-07 08:02:58 +00:00
parent 60f182b99d
commit e9bf9fd222
6 changed files with 185 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
auth/index.php
View File

@ -24,19 +24,20 @@ if (isset($_REQUEST["act"])){
<meta charset="utf-8"> <meta charset="utf-8">
<base href="/auth"/> <base href="/auth"/>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<!-- Stylesheets -->
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
<link href="/style.css" rel="stylesheet"/>
<!-- Javascript --> <!-- Javascript -->
<script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script> <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
<script src="https://code.jquery.com/color/jquery.color.plus-names-2.1.2.min.js"></script> <script src="https://code.jquery.com/color/jquery.color.plus-names-2.1.2.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script> <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/jszip@3.9.1/dist/jszip.min.js" integrity="sha256-aSPPIlJfSHQ5T7wunbPcp7tM0rlq5dHoUGeN8O5odMg=" crossorigin="anonymous"></script> <script src="https://cdn.jsdelivr.net/npm/jszip@3.9.1/dist/jszip.min.js" integrity="sha256-aSPPIlJfSHQ5T7wunbPcp7tM0rlq5dHoUGeN8O5odMg=" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11.4.10/dist/sweetalert2.all.min.js" integrity="sha256-YX0M+vWkN+Xjq3t0RBoP6rENNiYm4CN2k33WefMkn+E=" crossorigin="anonymous"></script>
<script src="/base64url.js"></script> <script src="/base64url.js"></script>
<script src="/ssh-util.js"></script> <script src="/ssh-util.js"></script>
<script src="/keygen.js"></script> <script src="/keygen.js"></script>
<script src="/fittext.js"></script> <script src="/fittext.js"></script>
<script src="/index.js"></script> <script src="/index.js"></script>
<!-- Stylesheets -->
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
<link href="/style.css" rel="stylesheet"/>
</Head> </Head>
<Body> <Body>
<div class="row"> <div class="row">
@ -52,6 +53,7 @@ if (isset($_REQUEST["act"])){
$AuthToken = ""; $AuthToken = "";
$UserName = ""; $UserName = "";
$ErrorDesc = ""; $ErrorDesc = "";
$UserId = "";
$request = curl_init(); $request = curl_init();
curl_setopt($request, CURLOPT_POST, 1); curl_setopt($request, CURLOPT_POST, 1);
curl_setopt($request, CURLOPT_URL, "https://hackers.town/oauth/token"); curl_setopt($request, CURLOPT_URL, "https://hackers.town/oauth/token");
@ -82,6 +84,7 @@ if (isset($_REQUEST["act"])){
// Congrats! // Congrats!
$AuthToken = $Auth->access_token; $AuthToken = $Auth->access_token;
$UserName = $User->display_name; $UserName = $User->display_name;
$UserId = $User->id;
}else{ }else{
// invalid auth // invalid auth
$AuthToken = "BadUser"; $AuthToken = "BadUser";
@ -89,8 +92,23 @@ if (isset($_REQUEST["act"])){
} }
}else{ }else{
// invalid auth // invalid auth
$AuthToken = "BadOauth"; if(isset($_COOKIE["oa_retries"])){
$ErrorDesc = "Invalid OAuth"; $retries = $_COOKIE["oa_retries"];
if($retries >= 3){
$AuthToken = "BadUser";
$ErrorDesc = "Invalid OAuth";
setcookie("oa_retries", 0, time()+3600);
}else{
$retries++;
setcookie("oa_retries", $retries, time()+3600);
$AuthToken = "BadOauthRetry";
$ErrorDesc = "Invalid OAuth Retry";
}
}else{
$AuthToken = "BadOauth";
$ErrorDesc = "Invalid OAuth Retry";
setcookie("oa_retries", 1, time()+3600);
}
} }
// revoke token after usage // revoke token after usage
@ -106,7 +124,7 @@ if (isset($_REQUEST["act"])){
<span> <span>
try again try again
</span> </span>
<div class="message"> <div id="ErrorResult" class="message">
<?php echo $ErrorDesc; ?> <?php echo $ErrorDesc; ?>
</div> </div>
</div><div class="row button"<?php if(strpos($AuthToken, "Bad") === false){ </div><div class="row button"<?php if(strpos($AuthToken, "Bad") === false){
@ -135,8 +153,10 @@ if (isset($_REQUEST["act"])){
<div class="row button" <?php if(strpos($AuthToken, "Bad") !== false){ <div class="row button" <?php if(strpos($AuthToken, "Bad") !== false){
echo "hidden"; echo "hidden";
}?>> }?>>
<button class="col keyButton" onclick="generateSSH('<?php echo $UserName; ?>')">Generate</button> <button class="col keyButton" onclick="generateSSH('<?php echo $UserName; ?>', '<?php echo $UserId; ?>', '<?php echo $AuthToken; ?>')">Generate</button>
<button class="col keyButton" onclick="uploadSSH()">Upload</button> <button class="col keyButton" onclick="uploadSSH()">Upload</button>
<button class="col keyButton" onclick="testSwal()">Test Popup</button>
<input id="keyfile" type="file" style="display: none;"/>
</div> </div>
<div class="row copyright"> <div class="row copyright">
<!-- TODO: Make this file PHP and make the canary dependent on /etc/ttyserver/canary --> <!-- TODO: Make this file PHP and make the canary dependent on /etc/ttyserver/canary -->

70
auth/setKey.php Normal file
View File

@ -0,0 +1,70 @@
<?php
// Create an account and apply SSH key
$config = json_decode(file_get_contents("/var/www/usergen/config.json", true));
function checkParameters($parameterArray){
$error = false;
foreach($parameterArray as $parameter){
if(!isset($_POST[$parameter])){
$error = true;
}
}
return $error;
}
function apiResult($result){
header('Content-type: application/json');
echo json_encode($result);
exit();
}
function success(){
apiResult(array("status" => true));
}
function error($error){
apiResult(array("status" => false, "error" => $error));
}
function validateUsername($username){
return (preg_match("/^([a-zA-Z0-9_.]+)$/", $username) == 1);
}
if (checkParameters(array("pubkey", "userId", "authToken"))){
error("Missing parameters");
}
$userToken = $_POST["authToken"];
$userId = $_POST["userId"];
$pubkey = $_POST["pubkey"];
$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 ".$userToken
));
$response = curl_exec($request);
curl_close($request);
$User = json_decode($response);
// Check User
if($User->id != $userId){
error("User Mismatch");
}
if(!validateUsername($User->username)){
error("Invalid Username");
}
// Create temporary pubkey holding file
$TempFileName = "/tmp/mkuser/".uniqid("ssh-", true).".pub";
if(!file_put_contents($TempFileName, $pubkey."\n")){
error("Key Addition Failed: Temp");
}
// Run User Generation Tool
// TODO: Replace with custom Rust PHP Extension
$UserGenCode = shell_exec("/etc/ttyserver/bin/mkuser.tmp \"".$User->username."\" \"".$TempFileName."\" 2>&1; echo $?");
if($UserGenCode != "0"){
error("Key Addition Failed: MK-".$UserGenCode);
}
success();
?>

BIN
favicon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

8
index.html
View File

@ -4,17 +4,15 @@
<meta charset="utf-8"> <meta charset="utf-8">
<base href="/"/> <base href="/"/>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<!-- Stylesheets -->
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
<link href="/style.css" rel="stylesheet"/>
<!-- Javascript --> <!-- Javascript -->
<script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script> <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
<script src="https://code.jquery.com/color/jquery.color.plus-names-2.1.2.min.js"></script> <script src="https://code.jquery.com/color/jquery.color.plus-names-2.1.2.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script> <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script>
<script src="/fittext.js"></script> <script src="/fittext.js"></script>
<script src="https://livejs.com/live.js"></script>
<script src="/index.js"></script> <script src="/index.js"></script>
<!-- Stylesheets -->
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
<link href="/style.css" rel="stylesheet"/>
</Head> </Head>
<Body> <Body>
<div class="row"> <div class="row">

95
index.js
View File

@ -5,8 +5,20 @@ const dbp = (msg) => {
console.log(msg); console.log(msg);
}; };
const SwalConfig = {
color: "#79F257",
background: "#022601",
}
const isOverflown = ({ clientHeight, scrollHeight }) => scrollHeight > clientHeight const isOverflown = ({ clientHeight, scrollHeight }) => scrollHeight > clientHeight
const setCookie = (cname, cvalue, exdays) => {
const d = new Date();
d.setTime(d.getTime() + (exdays*24*60*60*1000));
let expires = "expires="+ d.toUTCString();
document.cookie = cname + "=" + cvalue + ";" + expires + ";path=/auth";
}
const resizeText = ({ element, elements, minSize = 10, maxSize = 512, step = 1, unit = 'px' }) => { const resizeText = ({ element, elements, minSize = 10, maxSize = 512, step = 1, unit = 'px' }) => {
dbp("Resize"); dbp("Resize");
(elements || [element]).forEach(el => { (elements || [element]).forEach(el => {
@ -63,29 +75,77 @@ const disableNonDesktopElements = () => {
// document.getElementById("bttn").style.height = "15vw"; // document.getElementById("bttn").style.height = "15vw";
} }
const generateSSH = async (name) => { const failMsg = (msg) => {
$("#resizer").html(msg);
$("#resizer").css("color", "#400112");
$("#resizer").css("background-color", "#79F257");
$("#resizer").animate({
color: "#79F257",
backgroundColor: "#022601"
}, 1000);
}
const generateSSH = async (name, id, token) => {
dbp("Generate Key"); dbp("Generate Key");
// debugger;
generateKeyPair("RSASSA-PKCS1-v1_5", 4096, "namehere") generateKeyPair("RSASSA-PKCS1-v1_5", 4096, "namehere")
.then((keys) => { .then((keys) => {
console.dir(keys);
// saveFile("ssh_key.pem", "text/plain", keys[0]);
// saveFile("ssh_key.pub", "text/plain", keys[1]);
var KeyExport = new JSZip(); var KeyExport = new JSZip();
KeyExport.file("HackersTownTTY-"+name, keys[0]); KeyExport.file("HackersTownTTY-"+name, keys[0]);
KeyExport.file("HackersTownTTY-"+name+".pub", keys[1]); KeyExport.file("HackersTownTTY-"+name+".pub", keys[1]);
KeyExport.generateAsync({type:"blob"}) KeyExport.generateAsync({type:"blob"})
.then((content) => { .then((content) => {
saveFile("HackersTownTTY-"+name+".zip", "application/zip", content); saveFile("HackersTownTTY-"+name+".zip", "application/zip", content);
// saveAs(content, "HackersTownTTY-"+name+".zip"); });
}); var payload = {
pubkey: keys[1],
userId: id,
authToken: token
};
$.post("https://tty.hackers.town/auth/setKey.php", payload, (response) => {
console.log(response);
// debugger;
if(response.status){
Swal.fire({
...SwalConfig,
title: "Success!",
});
}else{
Swal.fire({
...SwalConfig,
title: "Failed!",
text: response.error
});
}
}).fail(() => {
console.log("Failed");
});
}).catch((err) => { }).catch((err) => {
console.log(err); console.log(err);
}); });
} }
const uploadSSH = () => { const testSwal = () => {
Swal.fire({
...SwalConfig,
title: "Success!",
});
}
const uploadSSH = () => {
//request local file
// $("#keyfiie").trigger("click");
var kf = document.getElementById("keyfile");
kf.onchange = function(e) {
// File selected
}
kf.click();
dbp("Nextttt");
//upload file
} }
const beginOauth = () => { const beginOauth = () => {
@ -99,16 +159,14 @@ const beginOauth = () => {
"response_type=code&client_id="+data.id+"&redirect_uri="+ "response_type=code&client_id="+data.id+"&redirect_uri="+
"https://tty.hackers.town/auth&scope=read:accounts"; "https://tty.hackers.town/auth&scope=read:accounts";
dbp(redirect); dbp(redirect);
dbp(window.location.pathname);
if(window.location.pathname.includes("auth")){
setCookie("oa_retries", 0, 0.1);
}
window.location.href = redirect; window.location.href = redirect;
}else{ }else{
// Auth Failed // Auth Failed
$("#resizer").html("AUTH FAILED"); failMsg("AUTH FAILED");
$("#resizer").css("color", "#400112");
$("#resizer").css("background-color", "#79F257");
$("#resizer").animate({
color: "#79F257",
backgroundColor: "#022601"
}, 1000);
} }
}); });
} }
@ -126,4 +184,13 @@ $(() => {
dbp("Is Mobile 👍🏻"); dbp("Is Mobile 👍🏻");
disableNonDesktopElements(); disableNonDesktopElements();
} }
// Auto Retry
if(window.location.pathname.includes("auth")){
var ErrorMsg = document.getElementById("ErrorResult");
dbp(typeof ErrorMsg);
if(typeof ErrorMsg !== 'undefined' && ErrorMsg.innerText.includes("Retry")){
dbp("attempt retry");
beginOauth();
}
}
}); });

4
style.css
View File

@ -69,4 +69,8 @@ span {
.keyButton { .keyButton {
margin: 1px; margin: 1px;
}
.swal2-modal {
border: 2px solid #79F257;
} }