Compare commits

...

14 Commits

Author SHA1 Message Date
ae036686b8 Added code to fetch the user's location, and send it as a GET/POST variable 2023-06-12 15:29:24 -05:00
70f91c7586 Fixed bug where I accessed the database without opening a session 2023-06-12 15:28:30 -05:00
913d53b757 Added form field to allow user to georestrict the link 2023-06-12 15:28:02 -05:00
8b68547644 Added code to generate a random GLink if the user doesn't submit one 2023-06-09 20:03:30 -05:00
0f85fcf021 Made the Glink field optional 2023-06-09 20:03:01 -05:00
1d4606db27 Added code to redirect the user if the database query returns a URL 2023-06-08 21:36:33 -05:00
116bbe5218 Started working on redirect when user enters a GLink 2023-06-08 10:46:59 -05:00
1b52864952 Added server-side checks to input 2023-06-08 10:46:41 -05:00
92b70e632b Added code to print out the inserted data, and to check if the data was inserted by querying the database for the inserted data 2023-06-08 01:32:30 -05:00
c81937d6a5 Added code to insert data into Cassandra DB 2023-06-06 23:53:32 -05:00
f451850601 DO NOT USE - SWITCHED TO PHP INSTEAD - Added code to make database query 2023-06-06 13:23:27 -05:00
3bc6a56516 Added PHP file to make database queries 2023-06-06 13:22:15 -05:00
536af5f9c5 Removed event parameter from function so that it could be used with the HTML form 'onsubmit' 2023-06-06 13:21:57 -05:00
e5bdf2cc2c Switched to PHP instead of node.js, fixed bug where PHP would not be called regardless of input 2023-06-06 13:21:23 -05:00
5 changed files with 272 additions and 71 deletions

View File

@@ -7,17 +7,33 @@
<body>
<div id="root">
<h1>Link Shortener</h1>
<form id="form" action="result.js">
<form id="form" method="GET" action="result.php" onsubmit="return validate()">
<!-- <form id="form"> -->
<label for="url">URL:</label><span class="mandatory">*</span>
<input type="text" name="url" id="URL" value="example.com" required><br><br>
<input type="text" name="url" id="URL" value="https://example.com" required><br><br>
<label for="labels">GLink:</label><span class="mandatory">*</span>
<label for="GLink" id="labels" class="glink">glink.zip/</label><input type="text" name="glink" id="GLink" class="glink" value="exampleWebsite" required>
<label for="GLink" id="labels" class="glink">glink.zip/</label><input type="text" name="glink" id="GLink" class="glink" value="exampleWebsite">
<span role="alert" id="error" aria-hidden="true">Invalid URL</span>
<br><br>
<label for="restricted">Geo-restricted?: </label><input type="checkbox" name="restricted" id="restricted">
<br><br>
<label for="radius">Radius: </label>
<select name="radius" id="radius">
<option value="5">5 mi</option>
<option value="10">10 mi</option>
<option value="15">15 mi</option>
<option value="20">20 mi</option>
</select>
<br><br>
<input type="submit" id="button" value="Zip It!">
<input type="hidden" name="latitude" id="latitude">
<input type="hidden" name="longitude" id="longitude">
</form>
<hr>
<div>

180
index.js
View File

@@ -1,67 +1,127 @@
const submit = document.getElementById("button");
submit.addEventListener('click', validate);
function validate(e) {
e.preventDefault();
// const submit = document.getElementById("button");
// submit.addEventListener('click', validate);
const url = document.getElementById("URL");
const glink = document.getElementById("GLink");
// if (!url) {
// /* Flag */
// }
let valid = true;
const domainExp = new RegExp("http(s)*:\\/\\/[a-zA-Z0-9\\-]+(\\.[a-zA-Z0-9\\-]+)+");
const filepathExp = new RegExp("[a-zA-Z]+");
let count = 0;
let index = -1;
let domain = "";
let filepath = "";
for (let i=0; i < url.value.length; i++) {
if (url.value.charAt(i) == '/') {
count++;
mycheckbox = document.getElementById("restricted");
mycheckbox.addEventListener('change',checkboxCallback);
function checkboxCallback(event) {
if (event.currentTarget.checked) {
getLocation();
}
}
function getLocation() {
if (navigator.geolocation) {
navigator.geolocation.getCurrentPosition(showPosition);
} else {
console.log("Your browser does not support geolocation.");
}
}
function showPosition(position) {
console.log(position.coords.latitude);
console.log(position.coords.longitude);
document.getElementById("latitude").value = position.coords.latitude;
document.getElementById("longitude").value = position.coords.longitude;
}
function validate() {
//e.preventDefault();
const url = document.getElementById("URL");
let glink = document.getElementById("GLink");
const error = document.getElementById("error");
// if (!url) {
// /* Flag */
// }
let valid = true;
const domainExp = new RegExp("^http(s)*:\\/\\/[a-zA-Z0-9\\-]+(\\.[a-zA-Z0-9\\-]+)+$");
const filepathExp = new RegExp("^[a-zA-Z]+$");
const glinkExp = new RegExp("^[a-zA-Z]*$");
let glinkStr = glink.value;
let count = 0;
let index = -1;
let domain = "";
let filepath = "";
for (let i = 0; i < url.value.length; i++) {
if (url.value.charAt(i) == '/') {
count++;
}
if (count == 3) {
index = i;
break;
}
}
if (count == 3) {
index = i;
break;
}
}
if (count >= 3) {
domain = url.value.substring(0, index);
if (index == url.value.length - 1) {
filepath = url.value.charAt(index);
if (count >= 3) {
domain = url.value.substring(0, index);
if (index == url.value.length - 1) {
filepath = url.value.charAt(index);
} else {
filepath = url.value.substring(index, url.value.length - 1);
}
alert("Domain is " + domain + " filepath is " + filepath);
} else {
filepath = url.value.substring(index, url.value.length - 1);
domain = url.value;
}
alert("Domain is " + domain + " filepath is " + filepath);
} else {
domain = url.value;
}
console.log(domain);
if (domain.match(domainExp)) /** and is available? */{
const error = document.getElementById("error");
if (error.classList.contains("visible")) {
error.classList.remove("visible");
}
if (url.classList.contains("invalid")) {
url.classList.remove("invalid");
}
url.classList.add("valid");
error.setAttribute('aria-hidden', true);
error.setAttribute('aria-invalid', false);
console.log("Valid");
return valid;
} else {
console.log(domain);
/*flag*/
const error = document.getElementById("error");
error.classList.add("visible");
//error.classList.add("hidden");
if (url.classList.contains("valid")) {
url.classList.remove("valid");
if (glinkStr === "") {
var result = window.confirm("You have left the glink field blank. A random one will be generated for you.");
if (result === false) {
return false;
} else {
glinkStr = getRandomGLink();
}
}
url.classList.add("invalid");
error.setAttribute('aria-hidden', false);
error.setAttribute('aria-invalid', true);
}
}
if (domain.match(domainExp) && glinkStr.match(glinkExp))/** and is available? */{
if (error.classList.contains("visible")) {
error.classList.remove("visible");
}
if (url.classList.contains("invalid")) {
url.classList.remove("invalid");
}
url.classList.add("valid");
if (glink.classList.contains("invalid")) {
glink.classList.remove("invalid");
}
glink.classList.add("valid");
error.setAttribute('aria-hidden', true);
error.setAttribute('aria-invalid', false);
console.log("Valid with url= " +url.value+ " glink=" +glink);
return valid;
} else {
/*flag*/
error.classList.add("visible");
//error.classList.add("hidden");
if (!domain.match(domainExp)) {
if (url.classList.contains("valid")) {
url.classList.remove("valid");
}
url.classList.add("invalid");
} else {
if (url.classList.contains("invalid")) {
url.classList.remove("invalid");
}
url.classList.add("valid");
}
if (!glinkStr.match(glinkExp)) {
if (glink.classList.contains("valid")) {
glink.classList.remove("valid");
}
glink.classList.add("invalid");
} else {
if (glink.classList.contains("invalid")) {
glink.classList.remove("invalid");
}
glink.classList.add("valid");
}
error.setAttribute('aria-hidden', false);
error.setAttribute('aria-invalid', true);
return false;
}
}

36
redirect.php Normal file
View File

@@ -0,0 +1,36 @@
<?php
use Cassandra;
$uri = $_SERVER['REQUEST_URI'];
$uri = substr($uri,1);
$matches_uri = preg_match('/^[a-zA-Z]+$/',$uri);
if (($matches_uri == 0) || ($matches_uri == false)) {
header("Location: http://glink.zip/");
exit;
} else {
$cluster = Cassandra::cluster()->withPersistentSessions(true)->build();
$keyspace = 'glink';
$session = $cluster->connect($keyspace);
$statement = $session->prepare('SELECT url FROM data WHERE shortlink=? ALLOW FILTERING;');
$result = $session->execute($statement,array('arguments' => array($uri)));
if ($result->count() == 0) {
printf('The given GLink was invalid, and doesn\'t point to a specific web page.');
exit;
}
foreach($result as $row) {
if (is_null($row)) {
printf('The given GLink was invalid, and doesn\'t point to a specific web page.');
exit;
} else {
header("Location: " . $row['url']);
}
}
}
?>

View File

@@ -1,8 +0,0 @@
const cassandra = require('cassandra-driver');
const client = new cassandra.Client({
contactPoints: ['127.0.0.1:9042'],
keyspace: 'glink',
});
const query =

97
result.php Normal file
View File

@@ -0,0 +1,97 @@
<?php
function gen_base62_rand_shortlink($len) {
$rand_bytes = random_bytes(intval(($len * 2) / 3));
$rand_string = base64_encode($rand_bytes);
$rand_string = str_replace("+","",$rand_string);
$rand_string = str_replace("/","",$rand_string);
$rand_string = str_replace("=","",$rand_string);
if (mb_strlen($rand_string) < $len) {
$curlen = mb_strlen($rand_string);
$rand_string = $rand_string . gen_rand_shortlink($len - $curlen);
}
return $rand_string;
}
function gen_rand_shortlink($len) {
$to_return = '';
$possible_chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
while (mb_strlen($to_return) < $len) {
$to_return = $to_return . $possible_chars[rand(0, mb_strlen($possible_chars)-1)];
}
return $to_return;
}
ini_set('display_errors', 1);
use Casssandra;
$cluster = Cassandra::cluster()->withPersistentSessions(true)->build();
$keyspace = 'glink';
$session = $cluster->connect($keyspace);
$url = $_GET["url"];
$matches = preg_match('/^http(s)*:\\/\\/[a-zA-Z0-9\\-]+(\\.[a-zA-Z0-9\\-]+)+$/',$url);
if (($matches == 0) || ($matches == false)) {
printf("The URL entered was invalid. Please try again.");
return;
}
$shortlink = $_GET["glink"];
if ($shortlink != '') {
$matches_shortlink = preg_match('/^[a-zA-Z]+$/',$shortlink);
if (($matches_shortlink == 0) || ($matches_shortlink == false)) {
printf("The GLink entered was invalid. The GLink can only contain letters. Please try again.");
return;
}
} else {
/* generate a random shortlink */
gen_shortlink:
$rand_string = gen_rand_shortlink(6); /* the function is defined at the start of this file */
$shortlink = $rand_string;
/* Check if shortlink is already taken by querying the database */
$statement = $session->prepare('SELECT url FROM data WHERE shortlink=? ALLOW FILTERING');
$result = $session->execute($statement,array('arguments' => array($shortlink)));
if ($result->count() != 0) {
goto gen_shortlink;
}
}
//$statement = new Cassandra\SimpleStatement('SELECT name FROM data WHERE id=5');
$statement = $session->prepare('SELECT url FROM data WHERE shortlink=? ALLOW FILTERING');
$options = array('arguments' => array($shortlink));
$result = $session->execute($statement,$options);
if ($result->count() != 0) {
printf('That GLink is already taken. Please try another one.');
exit;
}
$rand_num = rand(0,99999999);
$statement = $session->prepare('INSERT INTO data (id, url, shortlink, when_created) VALUES (?,?,?,toTimestamp(now())) USING TTL 20');
$result = $session->execute($statement,array('arguments' => array($rand_num,$url,$shortlink)));
//$stringRepresentation= json_encode($result[0]);
//printf("%s\n\n\n",$stringRepresentation);
//foreach($result as $row) {
// if (is_null($row)) {
// printf('Unsuccessful');
// } else {
printf('Successful: The URL you entered was: %s and your GLink is: https://glink.zip/%s', $url,$shortlink);
// }
//}
//printf('Done');
?>