mirror of
https://github.com/burrow-dev/burrow-server.git
synced 2026-11-19 09:37:50 -05:00
feat(server): staff tools, player-made items, picture safety, chat, multiplayer games
Staff and moderation
- Invisible staff (!invisible, "xiv"): hidden from players, half see-through
to other staff, cannot chat while hidden. New permission staff.invisible.
- Summon and goto land on the player's exact spot ("xgt" before the move).
- Custom warnings (!warn PLAYER custom TEXT), shown in the warning popup.
- Mod notes (!note, !notes; lib/modnotes.js), on the player page and the
dashboard.
- Granular permissions: per-role overrides (setting rolePermissions) and
per-account grants and denies, applied live to staff who are playing
(refreshStaff re-sends "xsp").
- Item control (lib/itemcontrol.js): lock items out of the item finder
(!lock, !unlock, !locked), take an item from a player (!take), delete a
custom item from the game and every inventory.
- GET items/find: search any item by name or id, marked locked, for the
dashboards' quick lock.
Player-made items (lib/playeritems.js, "xcm")
- The Item Maker: make, rename, set the worn look, delete. 5 a day, 20 in all;
names go through the name filter.
- Admin switches: Item Maker on/off, new items wait for approval, and a
separate switch (on by default) that holds every player-uploaded picture
for a moderator. Review queue for items.approve (moderator and up).
- Pictures (lib/itemart.js): PNG, JPEG and GIF cleaned of metadata, BMP
converted to PNG; 512px and 300KB at most once cleaned.
- Worn as the maker chooses: a sticker (the picture) or a texture (the
item's shape painted with the picture).
Picture safety
- A picture waiting for approval is never served publicly: /itemart/ 404s it,
and it is only shown through /account|/mod|/admin/api/itemart to its maker
and to staff who review or make items.
- A picture turned away or taken off is remembered by SHA-256 and cannot be
uploaded again.
- Three strikes: three pictures turned away stops a player's uploads until a
moderator lets them again. Staff can stop or allow uploads by hand.
- Accounts under 24 hours old cannot upload pictures (AJ_ITEM_ART_MIN_HOURS);
uploads capped at 10 a day.
- Optional Google Cloud Vision SafeSearch (lib/image-moderation.js) for item
pictures and Art Studio paintings when AJ_GOOGLE_VISION_API_KEY is set;
fails closed when the scanner is unreachable.
Chat
- Emoji: Twemoji pictures served at /emoji/<codepoints>.png and cached in
data/emoji (lib/emoji.js).
- Smart spam filtering before the word filter (lib/chatspam.js): long runs of
one character, repeated words and lines, huge words and emoji floods are
tidied, and repeats within 20 seconds are dropped.
- Typing indicator: "xty" is passed on to everyone in the room who can see
the player, at most every 2 seconds.
Games (lib/minigames.js)
- Room games can be played together: a MULTIPLAYER table gives a game a
waiting list (Single Player / Multiplayer). Players in the same room are
matched, taken into the game together, and each one's moves are relayed to
the others. Gem Breaker is the first: two players, "pos", "shoot" and
"playerLost" relayed.
- Gem Breaker's start message now lists each player's id. Without it no
player counted as local, so even single player could not aim.
Other
- Players stay connected through the client's new 75-minute AFK limit
(idleTimeoutMs 80 minutes).
- Jam-a-Grams carry custom items and colours; Jammer Wall avatar photos are
validated (walls.js photoParam).
- Weak passwords refused (common words, or containing the username).
- Code-scanning fixes: every logged value goes through logText
(lib/logtext.js) against log injection, HSTS, path-only error logs, a
single file read in lib/names.js.
Tests: items (pictures, approval, strikes, re-upload refusal, the hidden
waiting picture, the dashboard search), staff (invisibility, goto and summon
spots, custom warnings, notes), buddygames (two-player Gem Breaker, the
typing relay), and updates for main's verified badge and spawn rooms.
Co-Authored-By: Claude Opus 5.5 <[email protected]>
This commit is contained in:
1 parent
da7eb9af58
commit
e05565787f
50 files changed
+2904
-277
No files matched your search
+32
-13
@@ -1,5 +1,6 @@
|
||||
"use strict";
|
||||
|
||||
const {logText} = require("./logtext.js");
|
||||
const crypto = require("crypto");
|
||||
const fs = require("fs");
|
||||
const path = require("path");
|
||||
@@ -348,7 +349,7 @@ const importLegacyFile = () => {
|
||||
}
|
||||
db.exec("COMMIT");
|
||||
fs.renameSync(file, `${file}.imported`);
|
||||
console.log(`[accounts] imported ${byKey.size} accounts from accounts.json`);
|
||||
console.log(`[accounts] imported ${logText(byKey.size)} accounts from accounts.json`);
|
||||
};
|
||||
|
||||
const load = () => {
|
||||
@@ -391,7 +392,7 @@ const load = () => {
|
||||
// runs the server is told which, to rename by hand if they see fit.
|
||||
const unusual = [...byId.values()].filter(account => names.refused(account.username)).map(account => account.username);
|
||||
if (unusual.length) {
|
||||
console.log(`[accounts] usernames that could not be chosen today: ${unusual.slice(0, 50).join(", ")}${unusual.length > 50 ? ", ..." : ""}`);
|
||||
console.log(`[accounts] usernames that could not be chosen today: ${logText(unusual.slice(0, 50).join(", "))}${logText(unusual.length > 50 ? ", ..." : "")}`);
|
||||
}
|
||||
// once: the Early Member badge for the accounts that were there before
|
||||
// it existed, the oldest hundred of them.
|
||||
@@ -414,7 +415,7 @@ const load = () => {
|
||||
for (const row of db.prepare("SELECT token, account_id, created_at FROM tokens").all()) {
|
||||
tokens.set(row.token, {id: row.account_id, createdAt: row.created_at});
|
||||
}
|
||||
console.log(`[accounts] ${byKey.size} accounts in ${path.join(config.dataDir, "game.sqlite")}`);
|
||||
console.log(`[accounts] ${logText(byKey.size)} accounts in ${logText(path.join(config.dataDir, "game.sqlite"))}`);
|
||||
};
|
||||
|
||||
// Which accounts a save looks at. turning an account into JSON to see
|
||||
@@ -638,7 +639,7 @@ const backup = async () => {
|
||||
for (const name of old) {
|
||||
fs.unlinkSync(path.join(folder, name));
|
||||
}
|
||||
console.log(`[accounts] backup written: ${file}`);
|
||||
console.log(`[accounts] backup written: ${logText(file)}`);
|
||||
};
|
||||
const startBackups = () => {
|
||||
const attempt = () => {
|
||||
@@ -671,9 +672,26 @@ const retire = key => {
|
||||
// A new password: ten characters or more, with a capital letter, a small
|
||||
// one and a digit among them. passwords chosen before this rule still sign
|
||||
// in; it is asked of the next one.
|
||||
const passwordProblem = password =>
|
||||
(typeof password !== "string" || password.length < MIN_PASSWORD_LENGTH || password.length > MAX_PASSWORD_LENGTH
|
||||
|| !/[A-Z]/.test(password) || !/[a-z]/.test(password) || !/[0-9]/.test(password) ? "invalid_password" : null);
|
||||
// the words most often under a password that meets the rules ("Password123",
|
||||
// "Sunshine2024"): with its digits and signs taken off, a password that is
|
||||
// one of these is refused, as is one with the username in it.
|
||||
const COMMON_PASSWORD_WORDS = new Set(["password", "passw", "pass", "qwerty", "qwertyuiop", "asdfgh", "asdfghjkl", "zxcvbn", "abcdef", "abcdefg",
|
||||
"abcdefgh", "abcdefghij", "welcome", "letmein", "iloveyou", "admin", "administrator", "monkey", "dragon", "football", "baseball", "soccer",
|
||||
"sunshine", "princess", "starwars", "superman", "batman", "master", "shadow", "michael", "jennifer", "charlie", "freedom", "whatever",
|
||||
"trustno", "hello", "secret", "login", "changeme", "animaljam", "animal", "jamaa", "jammer", "wildworks", "burrow", "summer", "winter",
|
||||
"spring", "autumn", "january", "minecraft", "roblox", "fortnite", "pokemon", "computer", "internet", "cookie", "chocolate", "butterfly"]);
|
||||
const passwordProblem = (password, username = "") => {
|
||||
if (typeof password !== "string" || password.length < MIN_PASSWORD_LENGTH || password.length > MAX_PASSWORD_LENGTH
|
||||
|| !/[A-Z]/.test(password) || !/[a-z]/.test(password) || !/[0-9]/.test(password)) {
|
||||
return "invalid_password";
|
||||
}
|
||||
const lower = password.toLowerCase();
|
||||
const name = String(username || "").toLowerCase().replace(/[^a-z0-9]/g, "");
|
||||
if (COMMON_PASSWORD_WORDS.has(lower.replace(/[^a-z]/g, "")) || (name.length >= 3 && lower.replace(/[^a-z0-9]/g, "").includes(name))) {
|
||||
return "weak_password";
|
||||
}
|
||||
return null;
|
||||
};
|
||||
|
||||
// creates an account. `avatar` gives the first animal's {type, name}; the
|
||||
// name may be left out, and is then the player's. there is no default
|
||||
@@ -682,7 +700,7 @@ const passwordProblem = password =>
|
||||
// "invalid_password" | "choose_animal"}.
|
||||
const register = (username, password, avatar = {}) => {
|
||||
username = typeof username === "string" ? username.trim() : username;
|
||||
const error = usernameProblem(username) || passwordProblem(password) || (defpacks.avatarDef(avatar.type) ? null : "choose_animal");
|
||||
const error = usernameProblem(username) || passwordProblem(password, username) || (defpacks.avatarDef(avatar.type) ? null : "choose_animal");
|
||||
if (error) {
|
||||
return {error};
|
||||
}
|
||||
@@ -694,7 +712,7 @@ const register = (username, password, avatar = {}) => {
|
||||
// early Member, for an account made while there are no more than a hundred.
|
||||
badges: byId.size < EARLY_MEMBERS ? [EARLY_BADGE] : [],
|
||||
});
|
||||
console.log(`[accounts] registered "${username}" (id ${account.id})`);
|
||||
console.log(`[accounts] registered "${logText(username)}" (id ${logText(account.id)})`);
|
||||
return {account};
|
||||
};
|
||||
|
||||
@@ -740,9 +758,10 @@ const authenticateAsync = async (username, password) => {
|
||||
};
|
||||
|
||||
// gives the account a new password and signs it out everywhere. returns
|
||||
// "invalid_password" when the password is not acceptable, else null.
|
||||
// "invalid_password" (the rules) or "weak_password" (a common one, or the
|
||||
// username in it) when the password is not acceptable, else null.
|
||||
const setPassword = (account, password) => {
|
||||
const problem = passwordProblem(password);
|
||||
const problem = passwordProblem(password, account.username);
|
||||
if (problem) {
|
||||
return problem;
|
||||
}
|
||||
@@ -791,7 +810,7 @@ const rename = (account, username, anyName = false) => {
|
||||
db.prepare("DELETE FROM retired_names WHERE name_key = ?").run(newKey);
|
||||
}
|
||||
db.prepare("UPDATE accounts SET username = ?, username_key = ? WHERE id = ?").run(username, newKey, account.id);
|
||||
console.log(`[accounts] renamed "${account.username}" to "${username}" (id ${account.id})`);
|
||||
console.log(`[accounts] renamed "${logText(account.username)}" to "${logText(username)}" (id ${logText(account.id)})`);
|
||||
byKey.delete(oldKey);
|
||||
account.username = username;
|
||||
byKey.set(newKey, account);
|
||||
@@ -850,7 +869,7 @@ const remove = account => {
|
||||
}
|
||||
}
|
||||
save(...named);
|
||||
console.log(`[accounts] deleted "${account.username}" (id ${account.id})`);
|
||||
console.log(`[accounts] deleted "${logText(account.username)}" (id ${logText(account.id)})`);
|
||||
};
|
||||
|
||||
// small server-wide values kept in the database (the admin panel's password).
|
||||
|
||||
Reference in new issue
Block a user