diff --git a/ChangeLog.md b/ChangeLog.md index f918ac9a..33b2b94b 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,10 @@ +Version 1.7.2, December 4th, 2016 +================================== + +- Closes #183 (accessible document list) +- Closes #182 (case insensitive test on SHA-1 passwords) +- Reads Jingo version from packages.json (no manual edit for version bump) + Version 1.7.1, November 5th, 2016 ================================== diff --git a/jingo b/jingo index 118b3e64..1f594f15 100755 --- a/jingo +++ b/jingo @@ -4,7 +4,7 @@ * Jingo, wiki engine * http://github.com/claudioc/jingo * - * Copyright 2015 Claudio Cicali + * Copyright 2016 Claudio Cicali * Released under the MIT license */ var program = require('commander') @@ -14,10 +14,11 @@ var http = require('http') var fs = require('fs') var os = require('os') var semver = require('semver') +var pkg = require('./package') global.Git = require('./lib/gitmech') -program.version('1.7.1') +program.version(pkg.version) .option('-c, --config ', 'Specify the config file') .option('-#, --hash-string ', 'Create an hash for a string') .option('-l, --local', 'Listen on localhost only') diff --git a/lib/app.js b/lib/app.js index 3a9e1de4..a347a129 100644 --- a/lib/app.js +++ b/lib/app.js @@ -145,8 +145,8 @@ module.exports.initialize = function (config) { res.locals._script = components.customScript() if (/^\/auth\//.test(req.url) || - /^\/misc\//.test(req.url) || - (/^\/login/.test(req.url) && !config.get('authorization').anonRead) + /^\/misc\//.test(req.url) || + (/^\/login/.test(req.url) && !config.get('authorization').anonRead) ) { return next() } @@ -178,6 +178,7 @@ module.exports.initialize = function (config) { app.all('/pages/*', requireAuthentication) if (!app.locals.config.get('authorization').anonRead) { + app.all('/wiki', requireAuthentication) app.all('/wiki/*', requireAuthentication) app.all('/search', requireAuthentication) } diff --git a/package.json b/package.json index 2654d17c..a8c9d080 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jingo", - "version": "1.7.1", + "version": "1.7.2", "description": "A nodejs based wiki engine", "author": "Claudio Cicali ", "keywords": [ diff --git a/routes/auth.js b/routes/auth.js index ccba6092..c21ada08 100644 --- a/routes/auth.js +++ b/routes/auth.js @@ -131,7 +131,7 @@ if (auth.local.enabled) { var foundUser = _.find(auth.local.accounts, function (account) { return account.username.toLowerCase() === wantedUsername && - account.passwordHash === wantedPasswordHash + account.passwordHash.toLowerCase() === wantedPasswordHash.toLowerCase() }) if (!foundUser) {