Skip to content

Commit

Permalink
Increased security
Browse files Browse the repository at this point in the history
  • Loading branch information
@gdsc0301
gdsc0301 committed Sep 13, 2023
1 parent f55fbf3 commit 093a631
Show file tree
Hide file tree
Showing 4 changed files with 90 additions and 75 deletions.
2 changes: 1 addition & 1 deletion index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="viewport" content="width=device-width, height=device-height initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0" />

<title>BMPG</title>
</head>
Expand Down
25 changes: 16 additions & 9 deletions index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,15 @@ export const PORT = parseInt(process.env.PORT || '8080');
export const BasicHeaders = {
"Content-Type": "application/json",
"Vary": "Origin",
"Access-Control-Allow-Methods": ["POST", "GET"],
"Access-Control-Allow-Methods": "POST, GET",
"Access-Control-Max-Age": "86400",
"Access-Control-Allow-Credentials": "true"
};

const rooms: {[ID: string]: Room} = {};
const players: {[username: string]: Player} = {};

const assign_room_for = (playerUsername: string): Room | false => {
const assign_room_for = (playerUsername: string): Room => {
if(Object.keys(rooms).length === 0) { // If ther's no room, create a new one;
const new_room = new Room(createHash('sha256').update(Date.now().toString()).digest('hex'));
players[playerUsername].setRoomID(new_room.ID);
Expand Down Expand Up @@ -61,7 +62,7 @@ const get_headers = (origin: string) => {
}else {
return {
...BasicHeaders,
...{"Access-Control-Allow-Origin": origin}
"Access-Control-Allow-Origin": origin
};
}
}
Expand All @@ -77,27 +78,33 @@ app.use((req, res, next) => {

app.use(express.text());

app.options('*', (req, res) => {
res.set(get_headers(req.headers.origin!));
res.end();
});

app.get('/', (req, res) => {
res.set(get_headers(req.headers.origin || ''));
res.set(get_headers(req.headers.origin!));
res.end('This is the BMGP server');
});

app.get('/login', (req, res) => {
const origin = req.headers.origin!;
const player_email = req.query['player_email']+'';
players[player_email] = new Player(player_email);

const new_player_room = assign_room_for(player_email);

const body = new Response(new_player_room);
res.set(get_headers(req.headers.origin || ''));
res.set(get_headers(origin));
res.status(OK).json(body);

console.log('New player: ', players[player_email], new_player_room);
console.log('New player: ', origin, players[player_email].username, new_player_room.ID);
return;
});

app.get('/room', (req, res) => {
const origin = req.headers.origin || '';
const origin = req.headers.origin!;
const player_email = req.query['player_email'] + '';

const response = new Response();
Expand All @@ -120,7 +127,7 @@ app.get('/room', (req, res) => {
});

app.post('/player_update', (req, res) => {
const origin = req.headers.origin || '';
const origin = req.headers.origin!;
const player_email = req.query['player_email']+'';

if(!players[player_email]) {
Expand Down Expand Up @@ -152,7 +159,7 @@ app.post('/player_update', (req, res) => {
});

app.get('/logout', (req, res) => {
const origin = req.headers.origin || '';
const origin = req.headers.origin!;
const player_email = req.query['player_email']+'';

if(!players[player_email]) {
Expand Down
125 changes: 63 additions & 62 deletions src/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,18 +53,6 @@ class App {

this.camera = new FreeCamera('mainCamera', new Vector3(0, 0, -20), this.scene);

window.addEventListener("keydown", (e) => {
if (e.key === 'F1') {
if (Inspector.IsVisible) {
Inspector.Hide();
} else {
Inspector.Show(this.scene,{});
}
}
});

window.addEventListener('resize', () => this.engine.resize());

this.localPlayer = new Player('LocalPlayer', this.scene, true);
this.localPlayer.setPosition(Vector3.Zero());

Expand All @@ -82,66 +70,79 @@ class App {
server.ipAddress = e.target!['elements'][0].value;
this.username = e.target!['elements'][1].value;

if (server.URL && this.username) {
fetch(`${server.URL}/login?player_email=${encodeURIComponent(this.username)}`).then(res => {
res.json().then(body => {
if (body?.status === 200) {
Object.keys(e.target!['elements']).forEach(elm => {
e.target!['elements'][elm].setAttribute('disabled', '');
});

this.canvas.focus({ preventScroll: true });
this.emailErrorField.classList.remove('active');

this.currentRoom = Object.assign((new Room(body.data.ID, 1000, 1000, this.scene)), structuredClone(body.data));

this.localPlayer.mesh.dispose();
this.localPlayer = Object.assign(new Player(this.username, this.scene, true), structuredClone(this.currentRoom.players[this.username]));
this.parseRoomPlayers(body.data as Room);

document.addEventListener('keydown', e => {
if (e.key === 'Escape') { // On press esc, stop game
Object.keys(this.loginForm.elements).forEach(elm => {
this.loginForm.elements[elm].removeAttribute('disabled', '');
});

this.welcomeMessage.innerHTML = 'Insert the IP address and username to start';
this.engine.stopRenderLoop();
return;
}
}
);
this.initGame(e);
});


window.addEventListener("keydown", (e) => {
if (e.key === 'F1') {
Inspector.IsVisible ? Inspector.Hide() : Inspector.Show(this.scene,{});
}
});

window.addEventListener('beforeunload', () => {
fetch(this.getReqURL('logout'));
window.addEventListener('resize', () => this.engine.resize());
this.engine.runRenderLoop(()=> this.update());
}

initGame(e) {
if (server.URL && this.username) {
fetch(`${server.URL}/login?player_email=${encodeURIComponent(this.username)}`).then(res => {
res.json().then(body => {
if (body?.status === 200) {
Object.keys(e.target!['elements']).forEach(elm => {
e.target!['elements'][elm].setAttribute('disabled', '');
});

this.canvas.focus({ preventScroll: true });
this.emailErrorField.classList.remove('active');

this.currentRoom = Object.assign((new Room(body.data.ID, 1000, 1000, this.scene)), structuredClone(body.data));

this.localPlayer.mesh.dispose();
this.localPlayer = Object.assign(new Player(this.username, this.scene, true), structuredClone(this.currentRoom.players[this.username]));
this.parseRoomPlayers(body.data as Room);

document.addEventListener('keydown', e => {
if (e.key === 'Escape') { // On press esc, stop game
Object.keys(this.loginForm.elements).forEach(elm => {
this.loginForm.elements[elm].removeAttribute('disabled', '');
});

this.welcomeMessage.innerHTML = 'Insert the IP address and username to start';
this.engine.stopRenderLoop();
return;
});
}
}
);

this.welcomeMessage.innerHTML = 'Welcome, ' + this.username;
this.loggedIn = true;
} else {
this.emailErrorField.innerHTML = 'Login failed, try again later';
this.emailErrorField.classList.add('active');
window.addEventListener('beforeunload', () => {
fetch(this.getReqURL('logout'));

this.engine.stopRenderLoop();

console.error(body);
}
})
});
} else {
this.emailErrorField.innerHTML = 'Invalid IP address or Username';
this.emailErrorField.classList.add('active');
}
});

this.engine.runRenderLoop(()=> this.update());
return;
});

this.welcomeMessage.innerHTML = 'Welcome, ' + this.username;
this.loggedIn = true;
} else {
this.emailErrorField.innerHTML = 'Login failed, try again later';
this.emailErrorField.classList.add('active');

this.engine.stopRenderLoop();

console.error(body);
}
})
});
} else {
this.emailErrorField.innerHTML = 'Invalid IP address or Username';
this.emailErrorField.classList.add('active');
}
}


getReqURL(path: string) {
return `${server.URL}/${path}?player_email=${this.localPlayer.username}&room_id=${this.localPlayer.currentRoomID}`;
return `${server.URL}/${path}?player_email=${this.localPlayer.username}`;
}

getRoomData() {
Expand Down
13 changes: 10 additions & 3 deletions src/style.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,23 @@ body {
#loginForm {
position: absolute;

left: calc(50% - 320px);
left: 0;
bottom: 2%;

width: 640px;
width: 100%;

display: grid;
grid-template-columns: 3fr 2fr 1fr;
grid-template-columns: 1fr;
grid-auto-flow: row;
gap: 8px;
padding: 32px 0;

@media (min-width: 680px) {
left: calc(50% - 320px);
width: 640px;
grid-template-columns: 3fr 2fr 1fr;
}

z-index: 2;

.welcomeMessage {
Expand Down

0 comments on commit 093a631

Please sign in to comment.