enstrayed/enstrayedapi
1
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Merge pull request #1 from Enstrayed/main

Browse Source 
merge upstream improvements into etyd-refactor
This commit was merged in pull request #1.
This commit is contained in:
Nathan Ritchie
2024-06-12 12:57:50 -07:00
committed by GitHub
parent 89f2bfecdb 7caaf7fdc2
commit aabb86d2f1
3 changed files with 55 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
routes/etyd.js
View File

@@ -10,7 +10,12 @@ app.get("/etyd*", (rreq,rres) => {
rres.sendStatus(404) rres.sendStatus(404)
} else { } else {
dbRes.json().then(dbRes => { dbRes.json().then(dbRes => {
rres.redirect(dbRes.content.url) try {
rres.redirect(dbRes.content.url) // Node will crash if the Database entry is malformed
} catch (responseError) {
rres.sendStatus(500)
console.log(`${rres.get("cf-connecting-ip")} GET ${rreq.path} returned 500: ${responseError}`)
}
}) })
} }
}).catch(fetchError => { }).catch(fetchError => {

12
routes/ip.js
View File

@@ -2,12 +2,16 @@ const { app } = require("../index.js")
app.get("/ip", (rreq,rres) => { app.get("/ip", (rreq,rres) => {
let jsonResponse = { let jsonResponse = {
"IP": rreq.get("cf-connecting-ip") || "you_did", "IP": rreq.get("cf-connecting-ip") || rreq.ip,
"Country": rreq.get("cf-ipcountry") || "not_connect", "Country": rreq.get("cf-ipcountry") || "not_cloudflare",
"CfRay": rreq.get("cf-ray") || "via_cloudflare" "CfRay": rreq.get("cf-ray") || "not_cloudflare"
} }
rres.send(jsonResponse); rres.send(jsonResponse)
})
app.get("/headers", (rreq,rres) => {
rres.send(rreq.headers)
}) })
module.exports = {app} module.exports = {app}

18
routes/mailjet.js
View File

@@ -14,6 +14,12 @@ app.post("/sendemail", (rreq,rres) => {
} else { } else {
if (dbRes["content"][rreq.get("Authorization").split("_")[0]] === rreq.get("Authorization").split("_")[1]) { if (dbRes["content"][rreq.get("Authorization").split("_")[0]] === rreq.get("Authorization").split("_")[1]) {
// 2024-05-11: Turbo bodge check to make sure request JSON is valid, probably wont work but whatever
if (rreq.body == undefined || rreq.body.recipient == undefined) {
console.log(`${rreq.get("cf-connecting-ip")} POST /sendemail returned 400 KEY:${rreq.get("Authorization").split("_")[1]}`)
rres.sendStatus(400)
} else {
let message = { let message = {
"Messages": [ "Messages": [
{ {
@@ -23,13 +29,12 @@ app.post("/sendemail", (rreq,rres) => {
}, },
"To": [ "To": [
{ {
"Email": rreq.body.recipient.emailAddr, "Email": rreq.body.recipient,
"Name": rreq.body.recipient.emailName,
} }
], ],
"Subject": rreq.body.message.subject, "Subject": rreq.body.subject || "Request did not include a subject.",
"TextPart": rreq.body.message.content, "TextPart": rreq.body.message || "Request did not include a message.",
} }
] ]
} }
@@ -43,13 +48,16 @@ app.post("/sendemail", (rreq,rres) => {
body: JSON.stringify(message) body: JSON.stringify(message)
}).then(fetchRes => { }).then(fetchRes => {
if (fetchRes.status == 200) { if (fetchRes.status == 200) {
console.log(`${rreq.get("cf-connecting-ip")} POST /sendemail returned 200 KEY:${rreq.get("Authorization")}`) console.log(`${rreq.get("cf-connecting-ip")} POST /sendemail returned 200 KEY:${rreq.get("Authorization").split("_")[1]}`)
rres.sendStatus(200) rres.sendStatus(200)
} else { } else {
console.log(`Mailjet Fetch returned result other than OK: ${fetchRes.status} ${fetchRes.statusText}`) console.log(`Mailjet Fetch returned result other than OK: ${fetchRes.status} ${fetchRes.statusText}`)
rres.sendStatus(500) rres.sendStatus(500)
} }
}) })
}
} else { } else {
console.log(`${rreq.get("cf-connecting-ip")} POST /sendemail returned 401`) // log ip of unauthorized requests console.log(`${rreq.get("cf-connecting-ip")} POST /sendemail returned 401`) // log ip of unauthorized requests