Skip to content

Commit

Permalink
Trojan bug fix.
Browse files Browse the repository at this point in the history
  • Loading branch information
@bia-pain-bache
bia-pain-bache committed Oct 10, 2024
1 parent 93646dd commit 9f4c22b
Showing 1 changed file with 13 additions and 29 deletions.
42 changes: 13 additions & 29 deletions src/worker.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,8 @@ const defaultHttpPorts = ['80', '8080', '2052', '2082', '2086', '2095', '8880'];
const defaultHttpsPorts = ['443', '8443', '2053', '2083', '2087', '2096'];
let proxyIP = proxyIPs[Math.floor(Math.random() * proxyIPs.length)];
let dohURL = 'https://cloudflare-dns.com/dns-query';
let hashPassword = sha256.sha224(trojanPassword);;
let panelVersion = '2.6.7';

if (!isValidUUID(userID)) throw new Error(`Invalid UUID: ${userID}`);
if (!isValidSHA224(hashPassword)) throw new Error(`Invalid Hash password: ${hashPassword}`);
let hashPassword;
let panelVersion = '2.6.8';

export default {
/**
Expand All @@ -27,12 +24,14 @@ export default {
* @param {import("@cloudflare/workers-types").ExecutionContext} ctx
* @returns {Promise<Response>}
*/
async fetch(request, env, ctx) {
async fetch(request, env) {
try {
userID = env.UUID || userID;
proxyIP = env.PROXYIP || proxyIP;
dohURL = env.DNS_RESOLVER_URL || dohURL;
trojanPassword = env.TROJAN_PASS || trojanPassword;
hashPassword = sha256.sha224(trojanPassword);
if (!isValidUUID(userID)) throw new Error(`Invalid UUID: ${userID}`);
const upgradeHeader = request.headers.get('Upgrade');
const url = new URL(request.url);

Expand All @@ -58,13 +57,12 @@ export default {
});

case '/update-warp':

const Auth = await Authenticate(request, env);
if (!Auth) return new Response('Unauthorized', { status: 401 });

if (request.method === 'POST') {
try {
const {error: warpPlusError, configs } = await fetchWgConfig(env, settings);
const { error: warpPlusError } = await fetchWgConfig(env, settings);
if (warpPlusError) {
return new Response(warpPlusError, { status: 400 });
} else {
Expand All @@ -80,7 +78,6 @@ export default {
}

case `/sub/${userID}`:

if (client === 'sfa') {
const BestPingSFA = await getSingBoxCustomConfig(env, settings, host, client, false);
return new Response(JSON.stringify(BestPingSFA, null, 4), {
Expand Down Expand Up @@ -128,7 +125,6 @@ export default {
});

case `/fragsub/${userID}`:

let fragConfigs = client === 'hiddify'
? await getSingBoxCustomConfig(env, settings, host, client, true)
: await getXrayCustomConfigs(env, settings, host, true);
Expand All @@ -143,7 +139,6 @@ export default {
});

case `/warpsub/${userID}`:

if (client === 'clash') {
const clashWarpConfig = await getClashWarpConfig(settings, warpConfigs);
return new Response(JSON.stringify(clashWarpConfig, null, 4), {
Expand Down Expand Up @@ -179,7 +174,6 @@ export default {
});

case '/panel':

const pwd = await env.bpb.get('pwd');
const isAuth = await Authenticate(request, env);

Expand All @@ -196,7 +190,6 @@ export default {

if (pwd && !isAuth) return Response.redirect(`${url.origin}/login`, 302);
const homePage = await renderHomePage(settings, warpConfigs, host, pwd);

return new Response(homePage, {
status: 200,
headers: {
Expand All @@ -211,7 +204,6 @@ export default {
});

case '/login':

if (typeof env.bpb !== 'object') {
const errorPage = renderErrorPage('KV Dataset is not properly set!', null, true);
return new Response(errorPage, { status: 200, headers: {'Content-Type': 'text/html'}});
Expand All @@ -232,8 +224,7 @@ export default {

if (password === savedPass) {
const jwtToken = generateJWTToken(password, secretKey);
const cookieHeader = `jwtToken=${jwtToken}; HttpOnly; Secure; Max-Age=${7 * 24 * 60 * 60}; Path=/; SameSite=Strict`;

const cookieHeader = `jwtToken=${jwtToken}; HttpOnly; Secure; Max-Age=${7 * 24 * 60 * 60}; Path=/; SameSite=Strict`;
return new Response('Success', {
status: 200,
headers: {
Expand All @@ -247,7 +238,6 @@ export default {
}

const loginPage = await renderLoginPage();

return new Response(loginPage, {
status: 200,
headers: {
Expand All @@ -261,8 +251,7 @@ export default {
}
});

case '/logout':

case '/logout':
return new Response('Success', {
status: 200,
headers: {
Expand All @@ -272,14 +261,12 @@ export default {
});

case '/panel/password':

const oldPwd = await env.bpb.get('pwd');
let passAuth = await Authenticate(request, env);
if (oldPwd && !passAuth) return new Response('Unauthorized!', { status: 401 });
const newPwd = await request.text();
if (newPwd === oldPwd) return new Response('Please enter a new Password!', { status: 400 });
await env.bpb.put('pwd', newPwd);

return new Response('Success', {
status: 200,
headers: {
Expand All @@ -296,7 +283,9 @@ export default {
return await fetch(request);
}
} else {
return url.pathname.startsWith('/tr') ? await trojanOverWSHandler(request) : await vlessOverWSHandler(request);
return url.pathname.startsWith('/tr')
? await trojanOverWSHandler(request)
: await vlessOverWSHandler(request);
}
} catch (err) {
const errorPage = renderErrorPage('Something went wrong!', err, false);
Expand Down Expand Up @@ -984,11 +973,6 @@ function isValidUUID(uuid) {
return uuidRegex.test(uuid);
}

function isValidSHA224(hash) {
const sha224Regex = /^[0-9a-f]{56}$/i;
return sha224Regex.test(hash);
}

const WS_READY_STATE_OPEN = 1;
const WS_READY_STATE_CLOSING = 2;
/**
Expand Down Expand Up @@ -3364,7 +3348,7 @@ async function buildXrayDNS (proxySettings, isWorkerLess, isChain, isWarp) {
};
bypassLAN && localDNSServer.domains.push("geosite:private") && localDNSServer.expectIPs.push("geoip:private");
bypassIran && localDNSServer.domains.push("geosite:category-ir") && localDNSServer.expectIPs.push("geoip:ir");
bypassChina && localDNSServer.domains.push("geosite:cn") && localDNSServer.expectIPs.push("geoip:cn");
bypassChina && localDNSServer.domains.push("geosite:cn", "geosite:geolocation-cn") && localDNSServer.expectIPs.push("geoip:cn");
dnsObject.servers.push(localDNSServer);
isFakeDNS && dnsObject.servers.unshift({
address: "fakedns",
Expand Down Expand Up @@ -3421,7 +3405,7 @@ function buildXrayRoutingRules (proxySettings, isChain, isBalancer, isWorkerLess
if (!isWorkerLess) {
bypassLAN && domainRule.domain.push("geosite:private") && ipRule.ip.push("geoip:private");
bypassIran && domainRule.domain.push("geosite:category-ir") && ipRule.ip.push("geoip:ir");
bypassChina && domainRule.domain.push("geosite:cn") && ipRule.ip.push("geoip:cn");
bypassChina && domainRule.domain.push("geosite:cn", "geosite:geolocation-cn") && ipRule.ip.push("geoip:cn");
rules.push(domainRule, ipRule);
}
}
Expand Down

0 comments on commit 9f4c22b

Please sign in to comment.