imterah/hermes
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 1 Packages Wiki Activity Actions

fix: Makes passyfire client not whine and complain.

Browse source
This commit is contained in:
greysoh 2024-05-05 12:49:36 -04:00
parent 3955b01ede
commit 59f66cbe5b
No known key found for this signature in database
GPG key ID: FE0F173B8FC01571
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
api/src/backendimpl/passyfire-reimpl/routes.ts
View file

@ -121,8 +121,6 @@ export function route(instance: PassyFireBackendProvider) {
}, },
}, },
}, async (req, res) => { }, async (req, res) => {
console.log(req.hostname);
// @ts-ignore // @ts-ignore
const body: { const body: {
token: string token: string
@ -134,28 +132,31 @@ export function route(instance: PassyFireBackendProvider) {
error: "Invalid token" error: "Invalid token"
}); });
const host = req.hostname.substring(0, req.hostname.indexOf(":")); // const host = req.hostname.substring(0, req.hostname.indexOf(":"));
const unparsedPort = req.hostname.substring(req.hostname.indexOf(":") + 1); const unparsedPort = req.hostname.substring(req.hostname.indexOf(":") + 1);
// @ts-ignore // @ts-ignore
// parseInt(...) can take a number just fine, at least in Node.JS // parseInt(...) can take a number just fine, at least in Node.JS
const port = parseInt(unparsedPort == "" ? proxiedPort : unparsedPort); const port = parseInt(unparsedPort == "" ? proxiedPort : unparsedPort);
// This protocol is so confusing. I'm sorry.
res.send({ res.send({
success: true, success: true,
data: instance.proxies.map((proxy) => ({ data: instance.proxies.map((proxy) => ({
proxyUrlSettings: { proxyUrlSettings: {
host, host: "sameAs", // Makes pfC work (this is by design apparently)
port, port,
protocol: proxy.protocol.toUpperCase() protocol: proxy.protocol.toUpperCase()
}, },
dest: `${proxy.sourceIP}:${proxy.sourcePort}`, dest: `${proxy.sourceIP}:${proxy.destPort}`,
name: `${proxy.protocol.toUpperCase()} on ::${proxy.sourcePort}`, name: `${proxy.protocol.toUpperCase()} on ::${proxy.sourcePort} -> ::${proxy.destPort}`,
passwords: [ passwords: [
proxy.userConfig[userData.username] proxy.userConfig[userData.username]
], ],
running: true
})) }))
}); });
}); });