From c68eafdc0b34d3d61465aa183452bde055e3c4d9 Mon Sep 17 00:00:00 2001
From: Daniel Cadenas <dcadenas@gmail.com>
Date: Mon, 25 Mar 2024 14:29:08 -0300
Subject: [PATCH] Use allowed_rules instead

---
 roles/relay/files/{whitelist.js => allowed_rules.js} | 8 ++++----
 roles/relay/files/strfry.conf                        | 2 +-
 roles/relay/tasks/main.yml                           | 6 +++---
 roles/relay/templates/docker-compose.yml.tpl         | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)
 rename roles/relay/files/{whitelist.js => allowed_rules.js} (76%)

diff --git a/roles/relay/files/whitelist.js b/roles/relay/files/allowed_rules.js
similarity index 76%
rename from roles/relay/files/whitelist.js
rename to roles/relay/files/allowed_rules.js
index 001a879..7f56458 100755
--- a/roles/relay/files/whitelist.js
+++ b/roles/relay/files/allowed_rules.js
@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-const WHITELIST = {
+const ALLOWED = {
   pubs: {
     add5190be4673768546c18b565da3a699241f0e06a75e2dbc03f18663d1b7b27: true, // Reportinator
   },
@@ -26,10 +26,10 @@ rl.on("line", (line) => {
 
   let res = { id: req.event.id }; // must echo the event's id
 
-  const isWhitelistedPub = WHITELIST.pubs.hasOwnProperty(req.event.pubkey);
-  const isWhitelistedEventKind = WHITELIST.eventKinds.includes(req.event.kind);
+  const isAllowedPub = ALLOWED.pubs.hasOwnProperty(req.event.pubkey);
+  const isAllowedEventKind = ALLOWED.eventKinds.includes(req.event.kind);
 
-  if (isWhitelistedPub || isWhitelistedEventKind) {
+  if (isAllowedPub || isAllowedEventKind) {
     res.action = "accept";
   } else {
     res.action = "reject";
diff --git a/roles/relay/files/strfry.conf b/roles/relay/files/strfry.conf
index 1608bb2..2074bca 100644
--- a/roles/relay/files/strfry.conf
+++ b/roles/relay/files/strfry.conf
@@ -53,7 +53,7 @@ relay {
 
     writePolicy {
         # If non-empty, path to an executable script that implements the writePolicy plugin logic
-        plugin = "./plugins/whitelist.js"
+        plugin = "./plugins/allowed_rules.js"
 
         # Number of seconds to search backwards for lookback events when starting the writePolicy plugin (0 for no lookback)
         lookbackSeconds = 0
diff --git a/roles/relay/tasks/main.yml b/roles/relay/tasks/main.yml
index 06ce821..50ca0b9 100644
--- a/roles/relay/tasks/main.yml
+++ b/roles/relay/tasks/main.yml
@@ -48,11 +48,11 @@
     mode: '0644'
 
 
-- name: Copy whitelist.js to relay dir
+- name: Copy allowed_rules.js to relay dir
   become: true
   ansible.builtin.copy:
-    src: "{{ role_path }}/files/whitelist.js"
-    dest: "{{ homedir }}/services/relay/whitelist.js"
+    src: "{{ role_path }}/files/allowed_rules.js"
+    dest: "{{ homedir }}/services/relay/allowed_rules.js"
     mode: '0755'
 
 
diff --git a/roles/relay/templates/docker-compose.yml.tpl b/roles/relay/templates/docker-compose.yml.tpl
index d30411c..6bc1ddd 100644
--- a/roles/relay/templates/docker-compose.yml.tpl
+++ b/roles/relay/templates/docker-compose.yml.tpl
@@ -34,7 +34,7 @@ services:
     volumes:
       - ./strfry.conf:/etc/strfry.conf
       - ./strfrydb:/app/strfry-db
-      - ./whitelist.js:/app/plugins/whitelist.js
+      - ./allowed_rules.js:/app/plugins/allowed_rules.js
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.strfry.rule=Host(`{{ domain }}`) && Headers(`Accept`, `application/nostr+json`) || HeadersRegexp(`Connection`, `(?i)Upgrade`) && HeadersRegexp(`Upgrade`, `websocket`)"