Merge pull request #205 from sematext/token_blacklist_status_code_con…

…figurable Make HTTP status for blacklisted tokens configurable
sematext · Feb 28, 2020 · 2642074 · 2642074
2 parents b7f7525 + fd0f480
commit 2642074
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/lib/plugins/input/cloudfoundry.js b/lib/plugins/input/cloudfoundry.js
@@ -115,7 +115,7 @@ InputCloudFoundry.prototype.cloudFoundryHandler = function (req, res) {
     }
 
     if ((self.config.useIndexFromUrlPath === true && !token) || self.tokenBlackList.isTokenInvalid(token)) {
-      res.statusCode = 404
+      res.statusCode = self.config.invalidTokenStatus || 403
       res.end(`invalid logs token in url ${req.url}\n`)
       return
     }

diff --git a/lib/plugins/input/heroku.js b/lib/plugins/input/heroku.js
@@ -114,14 +114,15 @@ InputHeroku.prototype.herokuHandler = function (req, res) {
       }
     }
 
-    if (!token) {
+    if (self.config.useIndexFromUrlPath && !token) {
+      res.statusCode = 404
       res.end('<html><head><link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"</head><body><div class="alert alert-danger" role="alert">Error: Missing Logsene Token ' +
         req.url + '. Please use /LOGSENE_TOKEN. More info: <ul><li><a href="https://github.com/sematext/logagent-js#logagent-as-heroku-log-drain">Heroku Log Drain for Logsene</a> </li><li><a href="https://www.sematext.com/logsene/">Logsene Log Management by Sematext</a></li></ul></div></body><html>')
       return
     }
 
     if ((self.config.useIndexFromUrlPath === true && !token) || self.tokenBlackList.isTokenInvalid(token)) {
-      res.statusCode = 404
+      res.statusCode = self.config.invalidTokenStatus || 403
       res.end(`invalid logs token in url ${req.url}\n`)
       return
     }

diff --git a/lib/plugins/input/journald-upload.js b/lib/plugins/input/journald-upload.js
@@ -72,6 +72,7 @@ class Parser {
   getLog () {
     return this.log
   }
+
   // lines from http stream are pushed here
   consume (data) {
     // make sure that multiLine status ends with a new __CURSOR line
@@ -245,8 +246,8 @@ JournaldUpload.prototype.journaldHttpHandler = function (req, res) {
     }
 
     if ((self.config.useIndexFromUrlPath === true && !token) || self.tokenBlackList.isTokenInvalid(token)) {
-      res.statusCode = 401
-      res.end(`invalid logs token in url ${req.url}`)
+      res.statusCode = self.config.invalidTokenStatus || 403
+      res.end(`invalid logs token in url ${req.url}\n`)
       return
     }
 

diff --git a/lib/plugins/input/kubernetesAudit.js b/lib/plugins/input/kubernetesAudit.js
@@ -106,7 +106,7 @@ KubernetesAudit.prototype.HttpHandler = function (req, res) {
       }
     }
     if ((self.config.useIndexFromUrlPath === true && !token) || self.tokenBlackList.isTokenInvalid(token)) {
-      res.statusCode = 401
+      res.statusCode = self.config.invalidTokenStatus || 403
       res.end(`invalid logs token in url ${req.url}`)
       return
     }