Merge pull request #27 from Klemek/dev

GitBlog v1.2.8
nvm
2019-09-19 20:38:38 +02:00 · 2019-09-19 20:37:40 +02:00 · 2019-09-19 20:30:35 +02:00 · 2019-09-19 20:28:20 +02:00 · 2019-09-19 20:13:36 +02:00 · 2019-09-19 20:12:49 +02:00
8 changed files with 1301 additions and 5102 deletions
@@ -1,5 +1,7 @@
 [![Build Status](https://img.shields.io/travis/Klemek/GitBlog.md.svg?branch=master)](https://travis-ci.org/Klemek/GitBlog.md)
 [![Coverage Status](https://img.shields.io/coveralls/github/Klemek/GitBlog.md.svg?branch=master)](https://coveralls.io/github/Klemek/GitBlog.md?branch=master)
+[![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/Klemek/GitBlog.md.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/Klemek/GitBlog.md/context:javascript)
+[![Total alerts](https://img.shields.io/lgtm/alerts/g/Klemek/GitBlog.md.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/Klemek/GitBlog.md/alerts/)

 # GitBlog.md

@@ -260,6 +262,8 @@ Any URL like `/year/month/day/anything/` will redirect to this article (and link
  the directory where will be located the git repo with templates and articles
 * `view_engine` (default: ejs)  
  the Express view engine used to render pages from templates
+* `rate_limit` (default: 100)  
+  number of requests allowed in a time-frame of 15 minutes
 * `access_log` (default: access.log)  
  log file where to save access requests (empty to disable)
 * `error_log` (default: error.log)  
@@ -0,0 +1,7 @@
+path_classifiers:
+  test:
+    - test
+  docs:
+    - uml
+  library:
+    - src/lib
@@ -1,14 +1,14 @@
 {
  "name": "gitblog.md",
-  "version": "1.2.7",
+  "version": "1.2.8",
  "description": "A static blog using Markdown pulled from your git repository.",
  "main": "src/server.js",
  "dependencies": {
    "@iarna/toml": "^2.2.3",
    "body-parser": "^1.19.0",
-    "crypto": "^1.0.1",
    "ejs": "^2.6.2",
    "express": "^4.17.1",
+    "express-rate-limit": "^5.0.0",
    "fa-diagrams": "^1.0.3",
    "mathjax-node": "^2.1.1",
    "ncp": "^2.0.0",
@@ -18,8 +18,6 @@
    "showdown": "^1.9.0"
  },
  "devDependencies": {
-    "babel-cli": "^6.26.0",
-    "babel-preset-env": "^1.7.0",
    "coveralls": "^3.0.4",
    "jest": "^24.8.0",
    "superagent": "^5.1.0",
@@ -3,6 +3,7 @@ const app = express();
 const fs = require('fs');
 const path = require('path');
 const pjson = require('../package.json');
+const rateLimit = require('express-rate-limit');

 app.enable('trust proxy');

@@ -122,6 +123,13 @@ module.exports = (config) => {
    next();
  });

+  //rate limit for safer server
+  const limiter = rateLimit({
+    windowMs: 15 * 60 * 1000, // 15 minutes
+    max: config['rate_limit']
+  });
+  app.use(limiter);
+
  //log request at result end
  app.use((req, res, next) => {
    if (config['access_log']) {
@@ -3,6 +3,7 @@
  "host": "",
  "data_dir": "data",
  "view_engine": "ejs",
+  "rate_limit": 100,
  "access_log": "access.log",
  "error_log": "error.log",
  "modules": {
@@ -10,6 +10,7 @@ node nodejs {
 }

 package data {
+    [template.ejs]
    package "2019/06/18" {
        component index [
            index.md
@@ -22,6 +23,7 @@ package data {
 web -down-> TCP : 1. /2019/06/18/title
 express -down-> index : 2. fetch
 index -up-> showdown : 3. markdown
+template.ejs -up-> express : 4
 showdown -left-> express : 4. html
 express -up-> web : 5. html
Author	SHA1	Message	Date
Klemek	32f9ea74f1	Merge pull request #27 from Klemek/dev GitBlog v1.2.8	2019-09-19 20:38:38 +02:00
Klemek	9d1fb69fee	nvm	2019-09-19 20:37:40 +02:00
Klemek	24a02d862f	fml2	2019-09-19 20:30:35 +02:00
Klemek	cfe9965d03	fml	2019-09-19 20:28:20 +02:00
Klemek	d260b9d2f8	Merge pull request #26 from Klemek/dev GitBlog v1.2.8	2019-09-19 20:13:36 +02:00
Klemek	9ec55b3c01	dependencies fix ffs	2019-09-19 20:12:49 +02:00
Klemek	c693d96339	Merge pull request #25 from Klemek/dev GitBlog v1.2.8	2019-09-19 20:09:57 +02:00
Klemek	8bb6b6db66	Merge branch 'master' into dev	2019-09-19 20:07:59 +02:00
Klemek	849cdf2a19	dependencies fix FINALLY	2019-09-19 20:05:10 +02:00
Klemek	d0d3f94049	wtf2	2019-09-19 20:02:23 +02:00
Klemek	613e663c13	wtf	2019-09-19 20:01:32 +02:00
Klemek	bd10871da9	Merge branch 'dev'	2019-09-19 19:52:55 +02:00
Klemek	671a4314d7	Merge branch 'master' into dev	2019-09-19 19:51:04 +02:00
Klemek	1cee7094f3	Delete package-lock.json	2019-09-19 19:47:33 +02:00
Klemek	2284d46bb5	Merge remote-tracking branch 'origin/dev' into dev	2019-09-19 19:46:19 +02:00
Klemek	7245876b07	dependencies fix	2019-09-19 19:46:09 +02:00
Klemek	7a35aec7ad	Merge pull request #23 from Klemek/dependabot/npm_and_yarn/mixin-deep-1.3.2 Bump mixin-deep from 1.3.1 to 1.3.2	2019-09-19 19:27:34 +02:00
dependabot[bot]	870701b6c6	Bump mixin-deep from 1.3.1 to 1.3.2 Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2. - [Release notes](https://github.com/jonschlinkert/mixin-deep/releases) - [Commits](https://github.com/jonschlinkert/mixin-deep/compare/1.3.1...1.3.2) Signed-off-by: dependabot[bot] <support@github.com>	2019-09-19 17:23:38 +00:00
Klemek	3be86dec58	Merge pull request #22 from Klemek/dev GitBlog.md v1.2.8	2019-09-19 19:22:16 +02:00
Klemek	48d9535007	Merge branch 'master' into dev	2019-09-19 19:16:59 +02:00
Klemek	ae2eb52cf8	[skip CI]updated README.md	2019-09-19 19:16:31 +02:00
Klemek	7e9e1e19fa	changed version number	2019-09-19 19:14:16 +02:00
Klemek	c9ef93088b	express rate limit	2019-09-19 19:13:41 +02:00
Klemek	99e4bb5c4d	[skip CI] lgtm config	2019-09-19 19:03:49 +02:00
Klemek	dd5af2b865	[skip CI] update README.md	2019-09-19 09:26:17 +02:00
Klemek	90c343c752	Merge remote-tracking branch 'origin/master'	2019-06-19 18:41:23 +02:00
Klemek	ff7542af70	updated uml	2019-06-18 20:14:37 +02:00