benkyd/note-service-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

for frick sake

Browse Source
This commit is contained in:
Ben
2018-09-14 19:07:47 +01:00
parent 3455bbc14b
commit 7e5f13e114
5 changed files with 49 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
logs.log
View File

@@ -3278,3 +3278,42 @@
[2018-9-8 15:40:54] [SQLITE] Executing (default): SELECT `id`, `token`, `passhash`, `createdAt`, `updatedAt` FROM `auth` AS `auth` WHERE `auth`.`token` = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlcnJvciI6ZmFsc2UsImNvZGUiOjIwMCwidHlwZSI6InN1Y2Nlc3MiLCJtZXNzYWdlIjoiU3VjY2VzcyIsImlhdCI6MTUzNjQxNzYwMH0.4orSGRhO3Ytug0hJsbfRMDme5xUs2l8lT8svCYcnQAw' LIMIT 1; [2018-9-8 15:40:54] [SQLITE] Executing (default): SELECT `id`, `token`, `passhash`, `createdAt`, `updatedAt` FROM `auth` AS `auth` WHERE `auth`.`token` = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlcnJvciI6ZmFsc2UsImNvZGUiOjIwMCwidHlwZSI6InN1Y2Nlc3MiLCJtZXNzYWdlIjoiU3VjY2VzcyIsImlhdCI6MTUzNjQxNzYwMH0.4orSGRhO3Ytug0hJsbfRMDme5xUs2l8lT8svCYcnQAw' LIMIT 1;
[2018-9-8 15:40:54] [SQLITE] Executing (default): SELECT `id`, `username`, `password`, `email`, `ip`, `lastupdated`, `verified`, `authcode`, `timeauthed`, `createdAt`, `updatedAt` FROM `user` AS `user` WHERE `user`.`id` = 1536417600066; [2018-9-8 15:40:54] [SQLITE] Executing (default): SELECT `id`, `username`, `password`, `email`, `ip`, `lastupdated`, `verified`, `authcode`, `timeauthed`, `createdAt`, `updatedAt` FROM `user` AS `user` WHERE `user`.`id` = 1536417600066;
[2018-9-8 15:40:54] [DEBUG] [D:/Programming/Projects/NoteService/note-service-server/src/controllers/noteController.js:9] {"id":1536417600066,"username":"plane000","password":"$2b$10$pGQNawrnCc6M7Zg9LOFywu7KUaL0gD9JZGGz4z5GB6XX8YwK15RuC","email":"plsaysplane@gmail.com","ip":"::1","lastupdated":"1536417600236","verified":false,"authcode":"1234","timeauthed":"-1","createdAt":"2018-09-08T14:40:00.236Z","updatedAt":"2018-09-08T14:40:00.236Z"} [2018-9-8 15:40:54] [DEBUG] [D:/Programming/Projects/NoteService/note-service-server/src/controllers/noteController.js:9] {"id":1536417600066,"username":"plane000","password":"$2b$10$pGQNawrnCc6M7Zg9LOFywu7KUaL0gD9JZGGz4z5GB6XX8YwK15RuC","email":"plsaysplane@gmail.com","ip":"::1","lastupdated":"1536417600236","verified":false,"authcode":"1234","timeauthed":"-1","createdAt":"2018-09-08T14:40:00.236Z","updatedAt":"2018-09-08T14:40:00.236Z"}
[SYSTEM STARTING UP]
[9/14/2018, 1:22:59 PM] [INFO] Loading config
[9/14/2018, 1:22:59 PM] [INFO] LOADED: src/config/configs/server.json
[9/14/2018, 1:22:59 PM] [INFO] LOADED: src/config/configs/database.json
[9/14/2018, 1:22:59 PM] [INFO] Config loaded
[9/14/2018, 1:22:59 PM] [INFO] Connecting to SQLite Database
[9/14/2018, 1:23:01 PM] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `user` (`id` BIGINT UNIQUE PRIMARY KEY, `username` TEXT, `password` TEXT, `email` TEXT, `ip` TEXT, `lastupdated` TEXT, `verified` TINYINT(1), `authcode` TEXT, `timeauthed` TEXT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL);
[9/14/2018, 1:23:01 PM] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`user`)
[9/14/2018, 1:23:01 PM] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_user_1`)
[9/14/2018, 1:23:01 PM] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `auth` (`id` BIGINT UNIQUE PRIMARY KEY, `token` TEXT, `passhash` TEXT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL);
[9/14/2018, 1:23:01 PM] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`auth`)
[9/14/2018, 1:23:01 PM] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_auth_1`)
[9/14/2018, 1:23:01 PM] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `permanote` (`uid` BIGINT UNIQUE PRIMARY KEY, `endpoint` TEXT, `text` TEXT, `creatorid` BIGINT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL);
[9/14/2018, 1:23:01 PM] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`permanote`)
[9/14/2018, 1:23:01 PM] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_permanote_1`)
[9/14/2018, 1:23:01 PM] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `group` (`id` BIGINT UNIQUE PRIMARY KEY, `creatorid` BIGINT, `order` INTEGER, `lastupdated` TEXT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL);
[9/14/2018, 1:23:01 PM] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`group`)
[9/14/2018, 1:23:01 PM] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_group_1`)
[9/14/2018, 1:23:01 PM] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `note` (`id` BIGINT UNIQUE PRIMARY KEY, `content` TEXT, `parentgroup` BIGINT, `creatorid` BIGINT, `order` INTEGER, `catergory` TEXT, `endpoint` TEXT UNIQUE, `lastupdated` TEXT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL);
[9/14/2018, 1:23:01 PM] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`note`)
[9/14/2018, 1:23:01 PM] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_note_1`)
[9/14/2018, 1:23:01 PM] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_note_2`)
[9/14/2018, 1:23:01 PM] [INFO] Connected to SQLite Database
[9/14/2018, 1:23:01 PM] [INFO] Server created
[9/14/2018, 1:23:02 PM] [INFO] HTTP service is listening at port 8080
[9/14/2018, 1:23:02 PM] [INFO] Setting up API HTTP endpoints
[9/14/2018, 1:23:02 PM] [INFO] HTTP endpoints settup
[9/14/2018, 1:23:02 PM] [INFO] Initialized ratelimiting middleware
[9/14/2018, 1:23:02 PM] [READY]
[9/14/2018, 1:24:36 PM] [HTTP-MIDDLEWARE] POST request to /auth/note
[9/14/2018, 1:24:36 PM] [DEBUG] New rate limiting bucket
[9/14/2018, 1:24:36 PM] [SQLITE] Executing (default): SELECT `id`, `token`, `passhash`, `createdAt`, `updatedAt` FROM `auth` AS `auth` WHERE `auth`.`token` = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlcnJvciI6ZmFsc2UsImNvZGUiOjIwMCwidHlwZSI6InN1Y2Nlc3MiLCJtZXNzYWdlIjoiU3VjY2VzcyIsImlhdCI6MTUzNjE1ODMwNX0.3PBpiRRSw6_is-4hvLUR9qjvtHSEG2UGMsjC4piB26k' LIMIT 1;
[9/14/2018, 1:25:23 PM] [HTTP-MIDDLEWARE] POST request to /login
[9/14/2018, 1:25:23 PM] [SQLITE] Executing (default): SELECT `id`, `username`, `password`, `email`, `ip`, `lastupdated`, `verified`, `authcode`, `timeauthed`, `createdAt`, `updatedAt` FROM `user` AS `user` WHERE `user`.`username` = 'plane000' LIMIT 1;
[9/14/2018, 1:25:23 PM] [SQLITE] Executing (default): SELECT `id`, `token`, `passhash`, `createdAt`, `updatedAt` FROM `auth` AS `auth` WHERE `auth`.`id` = 1536417600066;
[9/14/2018, 1:25:43 PM] [HTTP-MIDDLEWARE] POST request to /auth/note
[9/14/2018, 1:25:43 PM] [SQLITE] Executing (default): SELECT `id`, `token`, `passhash`, `createdAt`, `updatedAt` FROM `auth` AS `auth` WHERE `auth`.`token` = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlcnJvciI6ZmFsc2UsImNvZGUiOjIwMCwidHlwZSI6InN1Y2Nlc3MiLCJtZXNzYWdlIjoiU3VjY2VzcyIsImlhdCI6MTUzNjQxNzYwMH0.4orSGRhO3Ytug0hJsbfRMDme5xUs2l8lT8svCYcnQAw' LIMIT 1;
[9/14/2018, 1:25:43 PM] [SQLITE] Executing (default): SELECT `id`, `username`, `password`, `email`, `ip`, `lastupdated`, `verified`, `authcode`, `timeauthed`, `createdAt`, `updatedAt` FROM `user` AS `user` WHERE `user`.`id` = 1536417600066;
[9/14/2018, 1:25:43 PM] [DEBUG] User 1536417600066 authenticated.

4
package.json
View File

@@ -8,15 +8,13 @@
"bcryptjs": "^2.4.3", "bcryptjs": "^2.4.3",
"body-parser": "^1.18.3", "body-parser": "^1.18.3",
"colors": "^1.3.1", "colors": "^1.3.1",
"error-stack-parser": "^2.0.2",
"express": "^4.16.3", "express": "^4.16.3",
"js-sha256": "^0.9.0", "js-sha256": "^0.9.0",
"json-stringify-safe": "^5.0.1", "json-stringify-safe": "^5.0.1",
"jsonwebtoken": "^8.3.0", "jsonwebtoken": "^8.3.0",
"regenerator-runtime": "^0.12.1", "regenerator-runtime": "^0.12.1",
"sequelize": "^4.38.0", "sequelize": "^4.38.0",
"sqlite3": "^4.0.2", "sqlite3": "^4.0.2"
"stacktrace-js": "^2.0.0"
}, },
"devDependencies": { "devDependencies": {
"babel-preset-env": "^1.7.0", "babel-preset-env": "^1.7.0",

2
src/controllers/middleware/auth.js
View File

@@ -22,7 +22,7 @@ export class AuthMiddleWare extends MiddleWare {
} }
req.user = user; req.user = user;
Logger.debug(`User ${user.id} authenticated`);
next(); next();
} }
} }

8
src/controllers/noteController.js
View File

@@ -16,9 +16,15 @@ export class NoteController extends ControllerHandler {
let user = req.user || undefined; let user = req.user || undefined;
if (!creatorid) errors.addError(403, 'Forbidden'); if (!creatorid || !user) errors.addError(403, 'Forbidden');
if (errors.count() > 0) {
errors.endpoint();
next();
return;
}
// what the hecking heck is this code supoased to do you hecking idiot
next(); next();
} }

3
src/models/logger.js
View File

@@ -1,5 +1,4 @@
const colours = require('colors/safe'); const colours = require('colors/safe');
const StackTrace = require('stacktrace-js');
const fs = require('fs'); const fs = require('fs');
let LogLevel = 1; let LogLevel = 1;
@@ -48,7 +47,7 @@ export class Logger {
static debug(message) { static debug(message) {
if (LogLevel > 1) return; if (LogLevel > 1) return;
let d = new Date(); let d = new Date();
fs.appendFileSync(logPath, `[${d.toLocaleString()}] [DEBUG] [${StackTrace.getSync()[1].fileName + ':' + StackTrace.getSync()[1].lineNumber}] ${message} \n`); fs.appendFileSync(logPath, `[${d.toLocaleString()}] [DEBUG] ${message} \n`);
console.log('[' + d.toLocaleString() + '] [' console.log('[' + d.toLocaleString() + '] ['
+ colours.cyan('DEBUG') + '] ' + message); + colours.cyan('DEBUG') + '] ' + message);
} }