forked from naturalcrit/homebrewery
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Removing the admin key, switching to full basic auth
- Loading branch information
1 parent
7656e53
commit 1184fe8
Showing
5 changed files
with
82 additions
and
72 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,97 +1,88 @@ | ||
| const _ = require('lodash'); | ||
| const auth = require('basic-auth'); | ||
| //const auth = require('basic-auth'); | ||
| const HomebrewModel = require('./homebrew.model.js').model; | ||
| const router = require('express').Router(); | ||
| const Moment = require('moment'); | ||
| const render = require('vitreum/steps/render'); | ||
| const templateFn = require('../client/template.js'); | ||
|
|
||
|
|
||
| process.env.ADMIN_USER = process.env.ADMIN_USER || 'admin'; | ||
| process.env.ADMIN_PASS = process.env.ADMIN_PASS || 'password3'; | ||
| //process.env.ADMIN_KEY = process.env.ADMIN_KEY || 'admin_key'; | ||
|
|
||
| //FIXME: remove this whole 'ADMIN_KEY' buulshit | ||
|
|
||
| const mw = { | ||
| adminOnly : (req, res, next)=>{ | ||
| if(req.query && req.query.admin_key == process.env.ADMIN_KEY) return next(); | ||
| if(!req.get('authorization')){ | ||
| return res | ||
| .set('WWW-Authenticate', 'Basic realm="Authorization Required"') | ||
| .status(401) | ||
| .send('Authorization Required'); | ||
| } | ||
| const [username, password] = new Buffer(req.get('authorization').split(' ').pop(), 'base64') | ||
| .toString('ascii') | ||
| .split(':'); | ||
| if(process.env.ADMIN_USER === username && process.env.ADMIN_PASS === password){ | ||
| return next(); | ||
| } | ||
| return res.status(401).send('Access denied'); | ||
| } | ||
| }; | ||
|
|
||
| process.env.ADMIN_USER = process.env.ADMIN_USER || 'admin'; | ||
| process.env.ADMIN_PASS = process.env.ADMIN_PASS || 'password'; | ||
| process.env.ADMIN_KEY = process.env.ADMIN_KEY || 'admin_key'; | ||
|
|
||
|
|
||
|
|
||
| /* Removes all empty brews that are older than 3 days and that are shorter than a tweet */ | ||
| router.get('/admin/clear_invalid', mw.adminOnly, (req, res)=>{ | ||
| const invalidBrewQuery = HomebrewModel.find({ | ||
| '$where' : 'this.text.length < 140', | ||
| createdAt : { | ||
| $lt : Moment().subtract(3, 'days').toDate() | ||
| } | ||
| }); | ||
|
|
||
| if(req.query.do_it){ | ||
| invalidBrewQuery.remove().exec((err, objs)=>{ | ||
| if(err) return res.status(500).send(err); | ||
| return res.send(200); | ||
| }); | ||
| } else { | ||
| invalidBrewQuery.exec((err, objs)=>{ | ||
| if(err) return res.status(500).send(err); | ||
| return res.json({ | ||
| count : objs.length | ||
| }); | ||
| }); | ||
| const junkBrewQuery = HomebrewModel.find({ | ||
| '$where' : 'this.text.length < 140', | ||
| createdAt : { | ||
| $lt : Moment().subtract(3, 'days').toDate() | ||
| } | ||
| }); | ||
| router.get('/admin/cleanup', mw.adminOnly, (req, res)=>{ | ||
| junkBrewQuery.exec((err, objs)=>{ | ||
| if(err) return res.status(500).send(err); | ||
| return res.json({ count : objs.length }); | ||
| }); | ||
| }); | ||
| /* Removes all empty brews that are older than 3 days and that are shorter than a tweet */ | ||
| router.post('/admin/cleanup', mw.adminOnly, (req, res)=>{ | ||
| junkBrewQuery.remove().exec((err, objs)=>{ | ||
| if(err) return res.status(500).send(err); | ||
| return res.json({ count : objs.length }); | ||
| }); | ||
| }) | ||
|
|
||
| /* Searches for matching edit or share id, also attempts to partial match */ | ||
| router.get('/admin/lookup/:id', mw.adminOnly, (req, res, next)=>{ | ||
|
|
||
| console.log('lookup'); | ||
|
|
||
|
|
||
| HomebrewModel.findOne({ $or : [ | ||
| { editId: { '$regex': req.params.id, '$options': 'i' } }, | ||
| { editId: { '$regex': req.params.id, '$options': 'i' } }, | ||
| { shareId: { '$regex': req.params.id, '$options': 'i' } }, | ||
| ] }).exec((err, brew)=>{ | ||
| ]}).exec((err, brew)=>{ | ||
| return res.json(brew); | ||
| }); | ||
| }); | ||
|
|
||
| router.get('/admin/stats', mw.adminOnly, (req, res)=>{ | ||
| console.log('hittting stats'); | ||
|
|
||
| router.get('/admin/stats', mw.adminOnly, (req, res)=>{ | ||
| HomebrewModel.count({}, (err, count)=>{ | ||
| return res.json({ | ||
| totalBrews : count | ||
| }) | ||
| }) | ||
|
|
||
| }); | ||
|
|
||
|
|
||
|
|
||
| //Admin route | ||
|
|
||
| const render = require('vitreum/steps/render'); | ||
| const templateFn = require('../client/template.js'); | ||
| router.get('/admin', function(req, res){ | ||
| const credentials = auth(req); | ||
| if(!credentials || credentials.name !== process.env.ADMIN_USER || credentials.pass !== process.env.ADMIN_PASS) { | ||
| res.setHeader('WWW-Authenticate', 'Basic realm="example"'); | ||
| return res.status(401).send('Access denied'); | ||
| } | ||
| router.get('/admin', mw.adminOnly, (req, res)=>{ | ||
| // const credentials = auth(req); | ||
| // if(!credentials || credentials.name !== process.env.ADMIN_USER || credentials.pass !== process.env.ADMIN_PASS) { | ||
| // res.setHeader('WWW-Authenticate', 'Basic realm="example"'); | ||
| // return res.status(401).send('Access denied'); | ||
| // } | ||
| render('admin', templateFn, { | ||
| url : req.originalUrl, | ||
| adminKey : process.env.ADMIN_KEY | ||
| }) | ||
| .then((page)=>{ | ||
| return res.send(page); | ||
| }) | ||
| .catch((err)=>{ | ||
| console.log(err); | ||
| return res.sendStatus(500); | ||
| }); | ||
| .then((page)=>res.send(page)) | ||
| .catch((err)=>res.sendStatus(500)) | ||
| }); | ||
|
|
||
|
|
||
|
|
||
|
|
||
| module.exports = router; |