Browse Source

fix: requests without user-agent causing error 500 (#7749)

pull/4092/merge
Craig Reyenga 1 month ago
committed by GitHub
parent
commit
cd77f36120
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 3 deletions
  1. 3
      server/controllers/auth.js
  2. 2
      server/controllers/common.js

3
server/controllers/auth.js

@ -94,8 +94,7 @@ router.all('/login/:strategy/callback', async (req, res, next) => {
*/
router.post('/login', bruteforce.prevent, async (req, res, next) => {
_.set(res.locals, 'pageMeta.title', 'Login')
if (req.query.legacy || req.get('user-agent').indexOf('Trident') >= 0) {
if (req.query.legacy || (req.get('user-agent') && req.get('user-agent').indexOf('Trident') >= 0)) {
try {
const authResult = await WIKI.models.users.login({
strategy: req.body.strategy,

2
server/controllers/common.js

@ -507,7 +507,7 @@ router.get('/*', async (req, res, next) => {
injectCode.body = `${injectCode.body}\n${page.extra.js}`
}
if (req.query.legacy || req.get('user-agent').indexOf('Trident') >= 0) {
if (req.query.legacy || (req.get('user-agent') && req.get('user-agent').indexOf('Trident') >= 0)) {
// -> Convert page TOC
if (_.isString(page.toc)) {
page.toc = JSON.parse(page.toc)

Loading…
Cancel
Save