From a38bab1f99f37404dddd3f6d3c1ca6d591cd5178 Mon Sep 17 00:00:00 2001 From: not manx Date: Sun, 3 May 2020 19:03:02 +0000 Subject: [PATCH] update environment files --- BantFlags/appsettings.example.json | 30 +++--- Environment/database.sql | 147 +++++++++++------------------ Environment/nginx.conf | 36 +++++++ README.org | 65 +++++-------- 4 files changed, 127 insertions(+), 151 deletions(-) create mode 100644 Environment/nginx.conf diff --git a/BantFlags/appsettings.example.json b/BantFlags/appsettings.example.json index 9b00d01..d073bfa 100644 --- a/BantFlags/appsettings.example.json +++ b/BantFlags/appsettings.example.json @@ -1,18 +1,14 @@ { - "AllowedHosts": "*", - "dbconfig": { - "connectionstring": "Server=localhost;Port=3306;User ID=user;Password=default;Database=bantflags", - "poolsize": 2 - }, - - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" - } - }, - - "webroot": "/var/www/html", - "staging-password": "supersecretpassword" -} \ No newline at end of file + "AllowedHosts": "*", + "dbconfig": { + "connectionstring": "Server=localhost;Port=3306;User ID=user;Password=password;Database=bantflags", + "poolsize": 2, + "boards": [ + "bant", + "nap", + "srsbsn" + ] + }, + "webroot": "/var/www/html", + "staging-password": "supersecretpassword" +} diff --git a/Environment/database.sql b/Environment/database.sql index f6b9f75..8d58a29 100644 --- a/Environment/database.sql +++ b/Environment/database.sql @@ -1,143 +1,102 @@ -CREATE DATABASE IF NOT EXISTS bantflags; +DROP DATABASE IF EXISTS `bantflags`; +CREATE DATABASE `bantflags`; -USE bantflags; +USE `bantflags`; CREATE USER IF NOT EXISTS flags@localhost IDENTIFIED BY 'default'; GRANT ALL PRIVILEGES ON bantflags.* TO flags@localhost; FLUSH PRIVILEGES; +CREATE TABLE `flags` ( + `id` int(10) NOT NULL AUTO_INCREMENT, + `flag` varchar(100) NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + UNIQUE KEY `flag` (`flag`) +) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; + +CREATE TABLE `posts` ( + `id` int(10) NOT NULL AUTO_INCREMENT, + `post_nr` int(10) NOT NULL DEFAULT '0', + `board` varchar(10) NOT NULL DEFAULT 'bant', + PRIMARY KEY (`id`), + UNIQUE KEY `post_nr_board` (`post_nr`,`board`) +) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; + +CREATE TABLE `postflags` ( + `id` int(10) NOT NULL AUTO_INCREMENT, + `post_nr` int(10) NOT NULL DEFAULT '0', + `flag` int(10) NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + KEY `flag` (`flag`), + KEY `post_nr` (`post_nr`), + CONSTRAINT `flag` FOREIGN KEY (`flag`) REFERENCES `flags` (`id`) ON DELETE CASCADE, + CONSTRAINT `post_nr` FOREIGN KEY (`post_nr`) REFERENCES `posts` (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; -CREATE TABLE IF NOT EXISTS `flags` ( - `id` INT(10) NOT NULL AUTO_INCREMENT, - `flag` VARCHAR(100) NOT NULL DEFAULT '0', - PRIMARY KEY (`id`), - UNIQUE INDEX `flag` (`flag`) -) -COLLATE='utf8_general_ci' -ENGINE=InnoDB -AUTO_INCREMENT=0 -; - - -CREATE TABLE IF NOT EXISTS `posts` ( - `id` INT(10) NOT NULL AUTO_INCREMENT, - `post_nr` INT(10) NOT NULL DEFAULT '0', - `board` VARCHAR(5) NOT NULL DEFAULT 'bant', - PRIMARY KEY (`id`), - UNIQUE INDEX `post_nr` (`post_nr`) -) -COLLATE='utf8_general_ci' -ENGINE=InnoDB -AUTO_INCREMENT=0 -; - - -CREATE TABLE IF NOT EXISTS `postflags` ( - `id` INT(10) NOT NULL AUTO_INCREMENT, - `post_nr` INT(10) NOT NULL DEFAULT '0', - `flag` INT(10) NOT NULL DEFAULT '0', - PRIMARY KEY (`id`), - INDEX `flag` (`flag`), - INDEX `post_nr` (`post_nr`), - CONSTRAINT `flag` FOREIGN KEY (`flag`) REFERENCES `flags` (`id`) ON DELETE CASCADE, - CONSTRAINT `post_nr` FOREIGN KEY (`post_nr`) REFERENCES `posts` (`id`) -) -COLLATE='utf8_general_ci' -ENGINE=InnoDB -AUTO_INCREMENT=0 -; - - -DROP PROCEDURE IF EXISTS insert_post; DELIMITER $$ -CREATE DEFINER=`flags`@`localhost` PROCEDURE `insert_post`( - IN `@post_nr` INT, - IN `@board` VARCHAR(5) -) -LANGUAGE SQL -NOT DETERMINISTIC -CONTAINS SQL -SQL SECURITY DEFINER -COMMENT '' -BEGIN - INSERT IGNORE INTO `posts` (`post_nr`, `board`) VALUES (`@post_nr`, `@board`); -END + CREATE DEFINER=`flags`@`localhost` PROCEDURE `insert_post`( + IN `@post_nr` INT, + IN `@board` VARCHAR(5) + ) + LANGUAGE SQL + NOT DETERMINISTIC + CONTAINS SQL + SQL SECURITY DEFINER + BEGIN + INSERT IGNORE INTO `posts` (`post_nr`, `board`) VALUES (`@post_nr`, `@board`); + END $$ -DELIMITER ; - -DROP PROCEDURE IF EXISTS insert_post_flags; -DELIMITER $$ CREATE DEFINER=`flags`@`localhost` PROCEDURE `insert_post_flags`( - IN `@post_nr` INT, - IN `@flag` VARCHAR(100) + IN `@post_nr` INT, + IN `@flag` VARCHAR(100) ) LANGUAGE SQL NOT DETERMINISTIC CONTAINS SQL SQL SECURITY DEFINER -COMMENT '' BEGIN -insert into postflags (post_nr, flag) VALUES ( -(select id from posts where post_nr = `@post_nr`), -(select id from flags where flag = `@flag`) -); + insert into postflags (post_nr, flag) VALUES ( + (select id from posts where post_nr = `@post_nr`), + (select id from flags where flag = `@flag`) + ); END $$ -DELIMITER ; - -DROP PROCEDURE IF EXISTS rename_flag; -DELIMITER $$ CREATE DEFINER=`flags`@`localhost` PROCEDURE `rename_flag`( - IN `@old` VARCHAR(100), - IN `@new` VARCHAR(100) - + IN `@old` VARCHAR(100), + IN `@new` VARCHAR(100) ) LANGUAGE SQL NOT DETERMINISTIC CONTAINS SQL SQL SECURITY DEFINER -COMMENT '' BEGIN - UPDATE flags SET flags.flag = `@new` WHERE flags.flag = `@old`; + UPDATE flags SET flags.flag = `@new` WHERE flags.flag = `@old`; END $$ -DELIMITER ; - -DROP PROCEDURE IF EXISTS delete_flag; -DELIMITER $$ CREATE DEFINER=`flags`@`localhost` PROCEDURE `delete_flag`( - IN `@flag` VARCHAR(100) - + IN `@flag` VARCHAR(100) ) LANGUAGE SQL NOT DETERMINISTIC CONTAINS SQL SQL SECURITY DEFINER -COMMENT '' BEGIN - DELETE flags.* FROM flags WHERE flags.flag = `@flag`; + DELETE flags.* FROM flags WHERE flags.flag = `@flag`; END $$ -DELIMITER ; - -DROP PROCEDURE IF EXISTS insert_flag; -DELIMITER $$ CREATE DEFINER=`flags`@`localhost` PROCEDURE `insert_flag`( - IN `@flag` VARCHAR(100) - - + IN `@flag` VARCHAR(100) ) LANGUAGE SQL NOT DETERMINISTIC CONTAINS SQL SQL SECURITY DEFINER -COMMENT '' BEGIN - INSERT INTO `flags` (`flag`) VALUES (`@flag`); + INSERT INTO `flags` (`flag`) VALUES (`@flag`); END $$ -DELIMITER ; \ No newline at end of file +DELIMITER ; diff --git a/Environment/nginx.conf b/Environment/nginx.conf new file mode 100644 index 0000000..a5ae359 --- /dev/null +++ b/Environment/nginx.conf @@ -0,0 +1,36 @@ +events { + worker_connections 768; +} + +http { + types { + text/html html htm shtm; + text/css css; + image/gif gif; + image/jpeg jpg jpeg; + image/png png; + } + + default_type application/octet-stream; + sendfile on; + tcp_nopush on; + charset utf-8; + index index.htm index.html; + + server { + root /var/www/flags; + server_name flags.plum.moe; + listen 80; + + location / { + proxy_pass http://127.0.0.1:5000; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $http_connection; + proxy_cache_bypass $http_upgrade; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_http_version 1.1; + } + } +} diff --git a/README.org b/README.org index 9fcab85..aea6d31 100644 --- a/README.org +++ b/README.org @@ -2,21 +2,22 @@ A user script and backend enabling user created flags on [[https://boards.4chan.org/bant][/bant/]], originally based on [[https://github.com/flaghunters/Extra-Flags-for-4chan][extraflags]]. - [[https://flags.plum.moe/bantflags.user.js][Install bantflags]] +[[https://flags.plum.moe/bantflags.user.js][Install bantflags]] ** Userscript -The userscript uses of =GM_xmlhttpRequest= to get and post flags with +The userscript uses of ~GM_xmlhttpRequest~ to get and post flags with the backend . A user's flags are stored between pages using -=GM_setValue= and =GM_getValue=. +~GM_setValue~ and ~GM_getValue~. Old versions of GreaseMonkey will be able to recieve updates to the -script through the =@updateURL= and =@downloadURL= directives, though +script through the ~@updateURL~ and ~@downloadURL~ directives, though these were depricated sometime in GreaseMonkey 3.x and updates are only checked from the location the script was downloaded from so be careful where you upload links. -On self hosting, changing =back_end= to your domain /should/ be all -you need to do, but don't take this as fact. +On self hosting, changing ~back_end~ to your domain /should/ be all +you need to do, but don't take this as fact. I haven't tested the +example nginx config. The userscript has been designed specifically to target ECMAScript 2015 (ES6), making liberal use of arrow functions, and const/let @@ -43,56 +44,40 @@ declarations. Update your hecking browser. 2) Clone and build the BantFlags solution. 3) Create the database using [[https://github.com/C-xC-c/BantFlags/blob/master/Environment/database.sql][database.sql]]. - *Change the password*. -4) configure =BantFlags/appsettings.example.json= with your connection +4) configure ~BantFlags/appsettings.example.json~ with your connection string and webroot (where you'll serve the flags from *without a - trailing slash*) and rename it to =appsettings.json= - - See below for an example appsettings.json. - - ASP.NET Core applications look for a folder called =wwwroot= in + trailing slash*) and rename it to ~appsettings.json~ + - [[./BantFlags/appsettings.example.json][example appsettings.json]] + - ASP.NET Core applications look for a folder called ~wwwroot~ in the same directory as the application for static files. However - you can choose to logically seperate these by providing a vaild - directory to =webroot=. + you can choose to logically seperate these by providing a vaild + directory to ~webroot~. - That is to say, if the bantflags application is in - =/var/www/bantflags/BantFlags.dll=, the program will look for - the folder =/var/www/bantflags/wwwroot/= to host static content, - or whatever directory is provided to =wwwroot=. + ~/var/www/bantflags/BantFlags.dll~, the program will look for + the folder ~/var/www/bantflags/wwwroot/~ to host static content, + or whatever directory is provided to ~wwwroot~. 5) If you're hosting on your GNU/Linux distribution of choice, Create a - folder called =keys= in the same directory as the bantflags + folder called ~keys~ in the same directory as the bantflags executable. - - E.G. =/var/www/bantflags/keys/= + - E.G. ~/var/www/bantflags/keys/~ - This is because ASP.NET Core uses some cryptic bullshit anti forgery token when processing HTML forms, and it's unable to persistantly store the decryption keys in memory on GNU/Linux. This directory will store said keys when you or users upload flags to /upload. The path uses - =AppDomain.CurrentDomain.BaseDirectory= internally, + ~AppDomain.CurrentDomain.BaseDirectory~ internally, I.E. wherever the program is. 6) Add flags to the backend by uploading them to the flag console (/Upload). - Flags must be 16x11 pixels and under 15kb. Their names must not exceed 100 characters and cannot contain either "||" or ",". 7) Configure your webserver of choice to forward requests to kestral - [[https://github.com/C-xC-c/BantFlags/blob/master/Environment/nginx.conf][Example nginx config.]] -8) Run with =dotnet BantFlags.dll= or create a service to run it as a +8) Run with ~dotnet BantFlags.dll~ or create a service to run it as a daemon. - [[https://github.com/C-xC-c/BantFlags/blob/master/Environment/bantflags.service][Example systemd service.]] 9) ??? 10) profit. -**** Example appsettings.json -#+BEGIN_SRC javascript - { - "dbconfig": { - "connectionstring": "Server=localhost;Port=3306;User ID=user;Password=password;Database=bantflags", - "poolsize": 2, - "boards": [ - "bant", - "nap", - "srsbsn" - ] - }, - "webroot": "/var/www/html", - "staging-password": "supersecretpassword" - } -#+END_SRC *** Database Tables look like this: @@ -109,13 +94,13 @@ Tables look like this: | 1 | 1 | 1 | | 2 | 1 | 2 | | 2 | 2 | 2 | -where post_nr and flag in *postflags* are the id fields in their +where ~post_nr~ and ~flag~ in *postflags* are the id fields in their respective tables. *** API The backend exposes three endpoints for the userscript to get and post -flags. Flags themselves are hosted from the =flags/= directory. This -will be whatever value you gave to =webroot= (or -=/path/to/bantflags/wwwroot/= if no value is provided) + =flags/=. +flags. Flags themselves are hosted from the ~flags/~ directory. This +will be whatever value you gave to ~webroot~ (or +~/path/to/bantflags/wwwroot/~ if no value is provided) + ~flags/~. | route | purpse | |------------+--------------------------------------------| @@ -126,7 +111,7 @@ will be whatever value you gave to =webroot= (or ** Backwards Compatibility The API is 1:1 compatable with all previous versions of -bantflags. Further improvements are achieved by encoding a =version= +bantflags. Further improvements are achieved by encoding a ~version~ variable when poking endpoints which allows for breaking changes in the script and backend while guaranteeing data can be parsed on both ends. See [[https://github.com/C-xC-c/BantFlags/tree/master/Docs/][Docs/{endpoint}]] for changes and compatibility.