Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/lib/auth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@ export function revokeSession(req: Request, res: Response, next: NextFunction) {
logger.info(`Revoking session for user ${req.user && req.user.username}`)
req.logout((err?: unknown) => {
if (err) return next(err);
res.redirect('/');
res.redirect('/auth');
});
}
11 changes: 9 additions & 2 deletions src/web/modules/layout/user_banner.njk
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,17 @@
</div>

<div class="user-profile__item right">
<span><a class="govuk-link govuk-link--no-visited-state" href="/logout">Clear session</a></span>
<span>
<form method="POST" action="/logout">
{{ govukButton({
text: "Sign out"
})
}}
</form>
</span>
</div>
{% else %}
<div class="user-profile__item">(OAUTH disabled)</div>
{% endif %}
</div>
</div>
</div>
23 changes: 18 additions & 5 deletions src/web/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,26 @@
const storage = multer.memoryStorage()
const upload = multer({storage})

router.get('/auth', passport.authenticate('github'))
const {
rateLimitMiddleware
} = require('@govuk-pay/pay-js-commons/lib/utils/middleware/csp')

router.get(
'/auth',
passport.authenticate('github', {
scope: ['user:email'],
prompt: 'consent',
})
);

router.get('/auth/github/callback', (req, res, next) => {
passport.authenticate('github', {
failureRedirect: '/auth/unauthorised',
successRedirect: req.session && req.session.authBlockedRedirectUrl || '/'
})(req, res, next)
})
successRedirect:
(req.session && req.session.authBlockedRedirectUrl) || '/',
})(req, res, next);
});

router.get('/auth/unauthorised', auth.unauthorised)

router.get('/', auth.secured(PermissionLevel.VIEW_ONLY), landing.root)
Expand Down Expand Up @@ -190,7 +203,7 @@
router.get('/parity-checker', auth.secured(PermissionLevel.USER_SUPPORT), events.parityCheckerPage)
router.post('/parity-checker', auth.secured(PermissionLevel.USER_SUPPORT), events.parityCheck)

router.get('/logout', auth.secured(PermissionLevel.VIEW_ONLY), auth.revokeSession)
router.post('/logout', rateLimitMiddleware, auth.secured(PermissionLevel.VIEW_ONLY), auth.revokeSession)

Check failure

Code scanning / CodeQL

Missing rate limiting High

This route handler performs
authorization
, but is not rate-limited.
Comment thread
hjvoid marked this conversation as resolved.
Dismissed

router.get('/healthcheck', healthcheck.response)

Expand Down
Loading