movie-web/simple-proxy
1
0
Fork 0
mirror of https://github.com/movie-web/simple-proxy.git synced 2025-09-13 10:23:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed AWS and NodeJS support

Browse Source
This commit is contained in:
mrjvs
2024-01-04 19:54:14 +01:00
parent 15b438be48
commit 8c503269d1
3 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -15,8 +15,8 @@
"preinstall": "npx only-allow pnpm" "preinstall": "npx only-allow pnpm"
}, },
"dependencies": { "dependencies": {
"@tsndr/cloudflare-worker-jwt": "^2.3.2",
"h3": "^1.8.1", "h3": "^1.8.1",
"jose": "^5.2.0",
"nitropack": "latest" "nitropack": "latest"
}, },
"devDependencies": { "devDependencies": {

14
pnpm-lock.yaml generated
View File

@@ -5,12 +5,12 @@ settings:
excludeLinksFromLockfile: false excludeLinksFromLockfile: false
dependencies: dependencies:
'@tsndr/cloudflare-worker-jwt':
specifier: ^2.3.2
version: 2.3.2
h3: h3:
specifier: ^1.8.1 specifier: ^1.8.1
version: 1.8.1 version: 1.8.1
jose:
specifier: ^5.2.0
version: 5.2.0
nitropack: nitropack:
specifier: latest specifier: latest
version: 2.6.3 version: 2.6.3
@@ -704,10 +704,6 @@ packages:
rollup: 3.29.1 rollup: 3.29.1
dev: false dev: false
/@tsndr/cloudflare-worker-jwt@2.3.2:
resolution: {integrity: sha512-g1jSm5olPqKh15kadnj0666YPudibHYGyFyM0URLXSeY5MzNIGkfhFedLgKHq8NCDBMzLUMX7Oz8d+jmQXqBuw==}
dev: false
/@types/estree@1.0.1: /@types/estree@1.0.1:
resolution: {integrity: sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==} resolution: {integrity: sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==}
dev: false dev: false
@@ -2537,6 +2533,10 @@ packages:
hasBin: true hasBin: true
dev: false dev: false
/jose@5.2.0:
resolution: {integrity: sha512-oW3PCnvyrcm1HMvGTzqjxxfnEs9EoFOFWi2HsEGhlFVOXxTE3K9GKWVMFoFw06yPUqwpvEWic1BmtUZBI/tIjw==}
dev: false
/js-yaml@4.1.0: /js-yaml@4.1.0:
resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==} resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
hasBin: true hasBin: true

33
src/utils/turnstile.ts
View File

@@ -1,5 +1,5 @@
import { H3Event, EventHandlerRequest } from 'h3'; import { H3Event, EventHandlerRequest } from 'h3';
import jsonwebtoken from '@tsndr/cloudflare-worker-jwt'; import { SignJWT, jwtVerify } from 'jose';
import { getIp } from '@/utils/ip'; import { getIp } from '@/utils/ip';
const turnstileSecret = process.env.TURNSTILE_SECRET ?? null; const turnstileSecret = process.env.TURNSTILE_SECRET ?? null;
@@ -15,13 +15,10 @@ export function isTurnstileEnabled() {
export async function makeToken(ip: string) { export async function makeToken(ip: string) {
if (!jwtSecret) throw new Error('Cannot make token without a secret'); if (!jwtSecret) throw new Error('Cannot make token without a secret');
return await jsonwebtoken.sign( return await new SignJWT({ ip })
{ .setProtectedHeader({ alg: 'HS256' })
ip, .setExpirationTime('10m')
exp: Math.floor(Date.now() / 1000) + 60 * 10, // 10 Minutes .sign(new TextEncoder().encode(jwtSecret));
},
jwtSecret,
);
} }
export function setTokenHeader( export function setTokenHeader(
@@ -54,13 +51,19 @@ export async function isAllowedToMakeRequest(
if (token.startsWith(jwtPrefix)) { if (token.startsWith(jwtPrefix)) {
const jwtToken = token.slice(jwtPrefix.length); const jwtToken = token.slice(jwtPrefix.length);
const isValid = await jsonwebtoken.verify(jwtToken, jwtSecret, { let jwtPayload: { ip: string } | null = null;
algorithm: 'HS256', try {
}); const jwtResult = await jwtVerify<{ ip: string }>(
if (!isValid) return false; jwtToken,
const jwtBody = jsonwebtoken.decode<{ ip: string }>(jwtToken); new TextEncoder().encode(jwtSecret),
if (!jwtBody.payload) return false; {
if (getIp(event) !== jwtBody.payload.ip) return false; algorithms: ['HS256'],
},
);
jwtPayload = jwtResult.payload;
} catch {}
if (!jwtPayload) return false;
if (getIp(event) !== jwtPayload.ip) return false;
return true; return true;
} }