From e9bf9fd222a22565ebc13e1d903b006563f86204 Mon Sep 17 00:00:00 2001 From: Elizabeth Cray Date: Sat, 7 May 2022 08:02:58 +0000 Subject: [PATCH] Popups and Niceties --- auth/index.php | 34 +++++++++++++---- auth/setKey.php | 70 +++++++++++++++++++++++++++++++++++ favicon.ico | Bin 0 -> 1676 bytes index.html | 8 ++-- index.js | 95 +++++++++++++++++++++++++++++++++++++++++------- style.css | 4 ++ 6 files changed, 185 insertions(+), 26 deletions(-) create mode 100644 auth/setKey.php create mode 100644 favicon.ico diff --git a/auth/index.php b/auth/index.php index 2117b1a..b51e970 100644 --- a/auth/index.php +++ b/auth/index.php @@ -24,19 +24,20 @@ if (isset($_REQUEST["act"])){ - - - + + + +
@@ -52,6 +53,7 @@ if (isset($_REQUEST["act"])){ $AuthToken = ""; $UserName = ""; $ErrorDesc = ""; + $UserId = ""; $request = curl_init(); curl_setopt($request, CURLOPT_POST, 1); curl_setopt($request, CURLOPT_URL, "https://hackers.town/oauth/token"); @@ -82,6 +84,7 @@ if (isset($_REQUEST["act"])){ // Congrats! $AuthToken = $Auth->access_token; $UserName = $User->display_name; + $UserId = $User->id; }else{ // invalid auth $AuthToken = "BadUser"; @@ -89,8 +92,23 @@ if (isset($_REQUEST["act"])){ } }else{ // invalid auth - $AuthToken = "BadOauth"; - $ErrorDesc = "Invalid OAuth"; + if(isset($_COOKIE["oa_retries"])){ + $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 @@ -106,7 +124,7 @@ if (isset($_REQUEST["act"])){ try again -
+
> - + + +
diff --git a/auth/setKey.php b/auth/setKey.php new file mode 100644 index 0000000..dca7aeb --- /dev/null +++ b/auth/setKey.php @@ -0,0 +1,70 @@ + 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(); + +?> \ No newline at end of file diff --git a/favicon.ico b/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..9e9c738201ce739423ba38580563b866b20fb75f GIT binary patch literal 1676 zcmV;726Op|P)Tq_t|Gz7I1l4Bv?UFql-XIX%gD#WTJ#l zYD$_oQ-VnVO~jXGI+?ua*q4~LAL4YC^h-YUo_S_po^${A+;h+QpL3On@O2J@uX&gkKfRc+ z#%36!{?W{d(FsajrQ@yNY^~YTzsDQ`fS;4E%mS6S))ITzQjv>U)PWhn5riAGenV#s1>Y+MI1A z5h8>vfNXU?uOpZqBj(G5IB9$IMG@%E43ZsMO7z-xf-1FL~M00F+R(3^z7 zU?3;Wf$0v@P2UZ+#6;U)X!UzhL@VcFZ*sxJdF-JN2+IWM-;yZybunV{X)B_&?&jQ~7 z8mtY7G)C+lbnGvrkSNh<9x$#Emq7-}A`36xr6*6H+&;_oReI;Y2b{o5`t!H?{T`qk zD6z2M9GpIJy4j0&nG+{hxWZK}rUy^lO*nAlW*56!dC~&pPM}MF{}Si~?gRdmr1O!E zkINSGo8kD-@gtA(`04@*h!BY%L69JR{1i}t7w-cXUb(Oap9O#b{zP!`7w!5pNjg!$ zo+2Zz!KJ;I?m5P>2MZ}AK!6Y-)CoC34mpGgQx~Z71+oJRtmfNx*ogUKh*#oyF4ntL z*A#L*HM?f`Gp@E}w-q{ZGR7E2h!A}lVv)n|TRWl|| z{~6jIx~-GW-MQovCJg7~9BtAzkBh`KbmB3l|F&U7SO7eRa0p=;qBbj0)yjGy2f`wRUn1N&lAtYMKadUN1E+v2;A7x#It8nM#&`-ULqR#nL5cH%scE`Y7p;eYQB7Pw)5T1W z^x^b=GtQsiGPPywvdY`72z5#MzlumM;O9067U9^he3%c(FQfelp~ zepO28h-#O1CYhvpw0S7vj?AA@^5_Z&@Tfk!5#WY4XbsSzjk!-BTMm$`8mz(GI# z+|T{JHJfV=Q=z+?Sc)K83KRl9-HMIq^h`Bc;sIK{t@=m}H9dn2l1V1%q@&Kt*{MFQ zh$8yv%UFMDeIQyMwWS1H32f3qIu6_p?46@Q{g7B^MQ64LPw;a-$Iv$d;|t<4#1P$d zvw#Jmy0W?#Xu1VhPdu1d0z3w^&9V4KXs&49wTe~2UV4cTA*@BUO6&A`O$JV!Y#rY^ z;B)zkQXT_3RctNWCcjdeL*mrL~ z{lqNXX`0jSR7?e=AT-k0bpHJLKSqb5W`f7QvH>=;(2Ukozdha - - - - - + + +
diff --git a/index.js b/index.js index cc6e4b5..b96f9f4 100644 --- a/index.js +++ b/index.js @@ -5,8 +5,20 @@ const dbp = (msg) => { console.log(msg); }; +const SwalConfig = { + color: "#79F257", + background: "#022601", +} + 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' }) => { dbp("Resize"); (elements || [element]).forEach(el => { @@ -63,29 +75,77 @@ const disableNonDesktopElements = () => { // 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"); + // debugger; generateKeyPair("RSASSA-PKCS1-v1_5", 4096, "namehere") .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(); KeyExport.file("HackersTownTTY-"+name, keys[0]); KeyExport.file("HackersTownTTY-"+name+".pub", keys[1]); KeyExport.generateAsync({type:"blob"}) .then((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) => { 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 = () => { @@ -99,16 +159,14 @@ const beginOauth = () => { "response_type=code&client_id="+data.id+"&redirect_uri="+ "https://tty.hackers.town/auth&scope=read:accounts"; dbp(redirect); + dbp(window.location.pathname); + if(window.location.pathname.includes("auth")){ + setCookie("oa_retries", 0, 0.1); + } window.location.href = redirect; }else{ // Auth Failed - $("#resizer").html("AUTH FAILED"); - $("#resizer").css("color", "#400112"); - $("#resizer").css("background-color", "#79F257"); - $("#resizer").animate({ - color: "#79F257", - backgroundColor: "#022601" - }, 1000); + failMsg("AUTH FAILED"); } }); } @@ -126,4 +184,13 @@ $(() => { dbp("Is Mobile 👍🏻"); 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(); + } + } }); \ No newline at end of file diff --git a/style.css b/style.css index 7684c83..7e08551 100644 --- a/style.css +++ b/style.css @@ -69,4 +69,8 @@ span { .keyButton { margin: 1px; +} + +.swal2-modal { + border: 2px solid #79F257; } \ No newline at end of file