pendulum
/
schat2-clive
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Using cookie instead of http session so we can strip Domain attribute.

This commit is contained in:
ThePendulum 2024-02-11 17:33:19 +01:00
parent 6a36df3593
commit b6cc3d716b
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/schat.js
View File

@ -17,10 +17,9 @@ const instance = process.env.NODE_APP_INSTANCE || 'main';
logger.setLevel(argv.level || 'info'); logger.setLevel(argv.level || 'info');
async function auth() { async function auth() {
const httpSession = bhttp.session();
const username = config.uniqueUsername ? `${config.user.username}-${new Date().getTime().toString().slice(-5)}` : config.user.username; const username = config.uniqueUsername ? `${config.user.username}-${new Date().getTime().toString().slice(-5)}` : config.user.username;
const res = await httpSession.post(`${config.api}/session`, { const res = await bhttp.post(`${config.api}/session`, {
...config.user, ...config.user,
username, username,
}, { }, {
@ -35,13 +34,17 @@ async function auth() {
return { return {
user: res.body, user: res.body,
httpSession, // auth may return an explicit auth cookie domain, but we connect through the VPN domain that would break the cookie, so don't use a bhttp session and strip the domain
sessionCookie: res.headers['set-cookie'][0], sessionCookie: res.headers['set-cookie'][0].replace(/Domain=.*;/, ''),
}; };
} }
async function getWsId(httpSession) { async function getWsId(sessionCookie) {
const res = await httpSession.get(`${config.api}/socket`); const res = await bhttp.get(`${config.api}/socket`, {
headers: {
cookie: sessionCookie,
},
});
if (res.statusCode !== 200) { if (res.statusCode !== 200) {
throw new Error(`Failed to retrieve WebSocket ID: ${res.body.toString()}`); throw new Error(`Failed to retrieve WebSocket ID: ${res.body.toString()}`);
@ -135,11 +138,10 @@ async function connect(bot, games) {
socket.connect = async () => { socket.connect = async () => {
try { try {
const { user, httpSession, sessionCookie } = await auth(); const { user, sessionCookie } = await auth();
const wsCreds = await getWsId(httpSession); const wsCreds = await getWsId(sessionCookie);
bot.user = user; bot.user = user;
bot.httpSession = httpSession;
logger.info(`Attempting to connect to ${config.socket}`); logger.info(`Attempting to connect to ${config.socket}`);