Added public key creation, restyled img page to match uploader, added…

… logging bc anyone can make a key now lol
Team-Tritan · Aug 20, 2023 · 1bf0618 · 1bf0618
1 parent 7f3f524
commit 1bf0618
Show file tree

Hide file tree

Showing 9 changed files with 154 additions and 35 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
 uploads
 node_modules
+keys.json
+upload-log.json
diff --git a/src/config.ts b/src/config.ts
@@ -1,13 +1,13 @@
+"use strict";
+
 interface Config {
  port: number;
  dirs: string[];
- keys: string[];
 }
 
 const config: Config = {
  port: 8080,
  dirs: ["suicidey", "pp", "kms", "fbi", "cia", "666", "777"],
- keys: ["fuckurmom"],
 };
 
 export default config;
diff --git a/src/keys.json b/src/keys.json
@@ -0,0 +1 @@
+[]
diff --git a/src/pages/img.ejs b/src/pages/img.ejs
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html lang="en">
  <head>
  <script
@@ -10,10 +11,7 @@
  integrity="sha384-Piv4xVNRyMGpqkS2by6br4gNJ7DXjqk09RmUpJ8jgGtD7zP9yug3goQfGII0yAns"
  crossorigin="anonymous"
  ></script>
- <link
- rel="stylesheet"
- href="https://cdn.upload.systems/assets/css/argon.css"
- />
+
  <meta name="twitter:card" content="summary_large_image" />
  <meta name="twitter:image" content="/api/content/raw/<%=name%>" />
  <meta name="twitter:image:src" content="/api/content/raw/<%=name%>" />
@@ -40,6 +38,44 @@
  margin-top: 10%;
  background: #04010a;
  }
+
+ body.bg-dark {
+ background-color: #04010a !important;
+ }
+
+ .row.mt-5.no-gutters {
+ margin-top: 5% !important;
+ }
+
+ .col-md-6.mx-2 {
+ width: 75vw !important;
+ margin: 0 auto !important;
+ }
+
+ .text-center.bg-dark.mb-4 {
+ background-color: #04010a !important;
+ margin-bottom: 4% !important;
+ }
+
+ .card-body {
+ padding: 1.25rem !important;
+ }
+
+ h1 {
+ font-size: 2.5rem !important;
+ }
+
+ img {
+ max-height: 75vh !important;
+ width: auto !important;
+ max-width: 100% !important;
+ border-radius: 0.25rem !important;
+ }
+ 
+ a[style="text-decoration: none; color: #5865f2"] {
+ text-decoration: none !important;
+ color: #5865f2 !important;
+ }
  </style>
  <body class="bg-dark">
  <div class="row mt-5 no-gutters">
@@ -59,14 +95,9 @@
  <img
  src="/api/content/raw/<%=name%>"
  alt="Click here to download/open the file."
- style="
- max-height: 75vh;
- width: auto;
- max-width: 100%;
- border-radius: 0.25rem;
- "
  />
  </a>
+ <br />
  <center>
  <a
  style="text-decoration: none; color: #5865f2"

diff --git a/src/pages/uploader.ejs b/src/pages/uploader.ejs
@@ -60,22 +60,26 @@
  <p id="key-button" style="font-size: 0.9em">Login →</p>
 
  <p style="margin-top: 30px; color: grey">
- If you would like to request an API key, join our
+ If you would like to request an API key,
  <a
- style="color: grey; text-decoration: none"
- href="https://tritan.gg/http"
- >Discord</a
+ style="color: grey; text-decoration: none; cursor: pointer"
+ id="request-key-link"
+ >click here</a
  >.
  </p>
  </div>
 
  <div id="dropzone" style="display: none">Drop an image here to upload.</div>
+
  <div id="link"></div>
 
  <script>
  $(document).ready(function () {
  const dropzone = $("#dropzone");
- let apiKey = localStorage.getItem("apiKey") || "";
+ const login = $("#login");
+
+ let apiKey = localStorage.getItem("uploader_apiKey") || "";
+
  const domains = [
  "https://im.sleepdeprived.wtf",
  "https://ur.sleepdeprived.wtf",
@@ -87,21 +91,34 @@
  "https://because.horny.rip",
  ];
 
+ function setApiKey(key) {
+ apiKey = key;
+ localStorage.setItem("uploader_apiKey", apiKey);
+ $("#key-input").val(apiKey);
+ }
+
  $("#key-input").val(apiKey);
 
  $("#key-button").click(function () {
- apiKey = $("#key-input").val();
-
- if (!apiKey) {
+ const inputKey = $("#key-input").val();
+ if (!inputKey) {
  alert("Please enter an API key.");
  return;
  }
-
- localStorage.setItem("apiKey", apiKey);
- $("#login").hide();
+ setApiKey(inputKey);
+ login.hide();
  dropzone.show();
  });
 
+ $("#request-key-link").click(function () {
+ $.post("/api/create", function (data) {
+ setApiKey(data.key);
+ alert(
+ `Your API key is ${data.key}. It has been copied to your clipboard.`
+ );
+ });
+ });
+
  dropzone.on({
  dragover: function () {
  dropzone.css("background-color", "#eee");
@@ -133,11 +150,10 @@
  success: function (data) {
  const domain =
  domains[Math.floor(Math.random() * domains.length)];
+
  const link = domain + data.url;
 
- $("#link")
- .html(`<a href="${link}">${link}</a>`)
- .addClass("link");
+ $("#link").append(`<a href="${link}">${link}</a><br>`);
  },
 
  error: function (xhr, status, error) {
@@ -166,9 +182,7 @@
  domains[Math.floor(Math.random() * domains.length)];
  const link = `${domain}/${data.url}`;
 
- $("#link")
- .html(`<a href="${link}">${link}</a>`)
- .addClass("link");
+ $("#link").append(`<a href="${link}">${link}</a><br>`);
  },
 
  error: function (xhr, status, error) {

diff --git a/src/routes/api/create.ts b/src/routes/api/create.ts
@@ -0,0 +1,48 @@
+import { Router, Request, Response } from "express";
+import fs from "fs";
+
+const router = Router();
+
+router.post("/", (req: Request, res: Response) => {
+ try {
+ const ip = req.headers["x-forwarded-for"] || req.socket.remoteAddress;
+ const keys = JSON.parse(fs.readFileSync("keys.json", "utf8"));
+
+ const newKey = {
+ key: generateRandomKey(10),
+ created_at: new Date().toISOString(),
+ ip: ip,
+ };
+
+ keys.push(newKey);
+
+ fs.writeFileSync("keys.json", JSON.stringify(keys, null, 2));
+
+ res.send({
+ status: 200,
+ message: "Key created successfully.",
+ key: newKey.key,
+ });
+ } catch (err) {
+ console.error(`Failed to create key: ${err}`);
+ res.status(500).send({
+ status: 500,
+ message: "Failed to create key.",
+ error: err,
+ });
+ }
+});
+
+function generateRandomKey(length: number): string {
+ const chars =
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+ let result = "";
+
+ for (let i = 0; i < length; i++) {
+ result += chars.charAt(Math.floor(Math.random() * chars.length));
+ }
+
+ return result;
+}
+
+export default router;
diff --git a/src/routes/api/upload.ts b/src/routes/api/upload.ts
@@ -1,8 +1,7 @@
-"use strict";
-
-import { Router, type Request, type Response } from "express";
+import { Router, Request, Response } from "express";
 import path from "path";
 import config from "../../config";
+import fs from "fs";
 
 interface UploadedFile {
  name: string;
@@ -28,10 +27,12 @@ router.post("/", (req: Request, res: Response) => {
  key: string;
  };
 
- if (!config.keys.includes(key)) {
+ const keys = JSON.parse(fs.readFileSync("keys.json", "utf8"));
+
+ if (!keys.some((k: { key: string }) => k.key === key)) {
  return res.status(403).send({
  status: 403,
- message: "Invalid token, get fucked dumbass.",
+ message: "Invalid key retard.",
  });
  }
 
@@ -48,6 +49,7 @@ router.post("/", (req: Request, res: Response) => {
  const ext = path.extname(singleSharex.name);
  const name = generateRandomName(10);
  const dir = config.dirs[Math.floor(Math.random() * config.dirs.length)];
+ const ip = req.headers["x-forwarded-for"] || req.socket.remoteAddress;
 
  singleSharex.mv(`./uploads/${name}${ext}`, (err: Error | null) => {
  if (err) {
@@ -58,7 +60,25 @@ router.post("/", (req: Request, res: Response) => {
  });
  }
 
- console.log(`${key} just uploaded ${name + ext}`);
+ console.log(`${key} just uploaded ${name + ext} from ${ip}.`);
+
+ const logEntry = {
+ ip: ip,
+ key: key,
+ fileName: name + ext,
+ timestamp: new Date().toISOString(),
+ };
+
+ const existingLogs = JSON.parse(
+ fs.readFileSync("upload-log.json", "utf8")
+ );
+
+ existingLogs.push(logEntry);
+
+ fs.writeFileSync(
+ "upload-log.json",
+ JSON.stringify(existingLogs, null, 2)
+ );
 
  res.send({
  status: 200,

diff --git a/src/routes/router.ts b/src/routes/router.ts
@@ -8,6 +8,7 @@ import express, {
 } from "express";
 import imageRouter from "./index";
 import uploadRouter from "./api/upload";
+import createKey from "./api/create";
 
 const router: Router = express.Router();
 
@@ -18,6 +19,7 @@ router.use("*", (req: Request, res: Response, next: NextFunction) => {
 
 router.use("/", imageRouter);
 router.use("/api/upload", uploadRouter);
+router.use("/api/create", createKey);
 
 router.use("*", (req: Request, res: Response, error: any) => {
  return res.status(error ? 500 : 404).json({

diff --git a/src/upload-log.json b/src/upload-log.json
@@ -0,0 +1 @@
+[]