aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Soltys <[email protected]>2023-01-03 00:24:03 -0800
committerAdam Soltys <[email protected]>2023-01-03 00:24:03 -0800
commit572bf373a9771dfa11ccaf027a45c0c1611a26a8 (patch)
tree667c3fc8ae175d5a3ac90a948a649108a2e2f3e8
parent1037c37a310cf127828c81e90fe4b8f3579556f8 (diff)
downloadcoinos-server-572bf373a9771dfa11ccaf027a45c0c1611a26a8.tar.gz
coinos-server-572bf373a9771dfa11ccaf027a45c0c1611a26a8.zip
whitelist registration fields
-rw-r--r--lib/nostr.js5
-rw-r--r--routes/bitcoin/send.js1
-rw-r--r--routes/users.js28
3 files changed, 22 insertions, 12 deletions
diff --git a/lib/nostr.js b/lib/nostr.js
index 3894819d..285fdde2 100644
--- a/lib/nostr.js
+++ b/lib/nostr.js
@@ -4,10 +4,7 @@ import { broadcast } from "$lib/sockets";
import store from "$lib/store";
import redis from "$lib/redis";
-const relays = [
- "wss://relay.damus.io",
- "wss://nostr.coinos.io"
-];
+const relays = ["wss://relay.damus.io", "wss://nostr.coinos.io"];
export const pool = RelayPool(relays);
diff --git a/routes/bitcoin/send.js b/routes/bitcoin/send.js
index c52592ae..3e030413 100644
--- a/routes/bitcoin/send.js
+++ b/routes/bitcoin/send.js
@@ -187,7 +187,6 @@ export default async (req, res) => {
if (e.message === "low") e.message = "Insufficient funds in account"
err("error sending bitcoin", e.message);
- console.log(e);
return res.code(500).send(e.message);
}
};
diff --git a/routes/users.js b/routes/users.js
index 19ddc7b3..ff188fad 100644
--- a/routes/users.js
+++ b/routes/users.js
@@ -103,7 +103,18 @@ app.get("/users/:username", async (req, res) => {
app.post("/register", async (req, res) => {
try {
const ip = req.headers["x-forwarded-for"] || req.connection.remoteAddress;
- const user = await register(req.body.user, ip, false);
+ let { cipher, pubkey, password, username, salt } = req.body.user;
+
+ let user = {
+ cipher,
+ pubkey,
+ password,
+ username,
+ salt
+ };
+
+ user = await register(user, ip, false);
+ info("registered new user", username);
res.send(pick(user, ...whitelist));
} catch (e) {
res.code(500).send(e.message);
@@ -683,7 +694,9 @@ app.get("/:pubkey/followers", async (req, res) => {
try {
let { pubkey } = req.params;
- let pubkeys = await got(`https://coinos.io/nostr/followers?pubkey=${pubkey}`).json();
+ let pubkeys = await got(
+ `https://coinos.io/nostr/followers?pubkey=${pubkey}`
+ ).json();
let followers = [];
@@ -699,11 +712,12 @@ app.get("/:pubkey/followers", async (req, res) => {
user = JSON.parse(await redis.get(`user:${pubkey}`));
}
- if (!user) user = {
- username: pubkey.substr(0, 6),
- pubkey,
- anon: true
- };
+ if (!user)
+ user = {
+ username: pubkey.substr(0, 6),
+ pubkey,
+ anon: true
+ };
followers.push(user);
}