Combine state & next

lib/resources/oidc.js

@@ -43,7 +43,7 @@ const ONE_HOUR = 60 * 60 * 1000;
 // * https://bugzilla.mozilla.org/show_bug.cgi?id=1648993
 // * https://bugs.chromium.org/p/chromium/issues/detail?id=1056543
 const CODE_VERIFIER_COOKIE = (HTTPS_ENABLED ? '__Secure-' : '') + 'ocv';
-const NEXT_COOKIE          = (HTTPS_ENABLED ? '__Secure-' : '') + 'next'; // eslint-disable-line no-multi-spaces
+const STATE_COOKIE         = (HTTPS_ENABLED ? '__Secure-' : '') + 'oidc'; // eslint-disable-line no-multi-spaces
 const callbackCookieProps = {
   httpOnly: true,
   secure: HTTPS_ENABLED,
@@ -95,6 +95,9 @@ const loaderTemplate = `
 `;
 parse(loaderTemplate); // caches template for future perf.
 
+const stateFor = next => [ generators.state(), next ].join(':');
+const nextFrom = state => state.substr(44);
+
 module.exports = (service, endpoint) => {
   if (!isEnabled()) return;
 
@@ -115,7 +118,8 @@ module.exports = (service, endpoint) => {
       res.cookie(CODE_VERIFIER_COOKIE, code_verifier, { ...callbackCookieProps, maxAge: ONE_HOUR });
 
       const { next } = req.query;
-      if (next) res.cookie(NEXT_COOKIE, next, { ...callbackCookieProps, maxAge: ONE_HOUR });
+      const state = stateFor(next);
+      res.cookie(STATE_COOKIE, state, { ...callbackCookieProps, maxAge: ONE_HOUR });
 
       redirect(307, authUrl);
     } catch (err) {
@@ -131,15 +135,15 @@ module.exports = (service, endpoint) => {
   service.get('/oidc/callback', endpoint.html(async (container, _, req, res) => {
     try {
       const code_verifier = req.cookies[CODE_VERIFIER_COOKIE]; // eslint-disable-line camelcase
-      const next          = req.cookies[NEXT_COOKIE];          // eslint-disable-line no-multi-spaces
+      const state         = req.cookies[STATE_COOKIE];          // eslint-disable-line no-multi-spaces
       res.clearCookie(CODE_VERIFIER_COOKIE, callbackCookieProps);
-      res.clearCookie(NEXT_COOKIE,          callbackCookieProps); // eslint-disable-line no-multi-spaces
+      res.clearCookie(STATE_COOKIE,         callbackCookieProps); // eslint-disable-line no-multi-spaces
 
       const client = await getClient();
 
       const params = client.callbackParams(req);
 
-      const tokenSet = await client.callback(getRedirectUri(), params, { response_type: RESPONSE_TYPE, code_verifier });
+      const tokenSet = await client.callback(getRedirectUri(), params, { response_type: RESPONSE_TYPE, code_verifier, state });
 
       const { access_token } = tokenSet;
 
@@ -157,7 +161,7 @@ module.exports = (service, endpoint) => {
 
       await initSession(container, req, res, user);
 
-      const nextPath = safeNextPathFrom(next);
+      const nextPath = safeNextPathFrom(nextFrom(state));
 
       // This redirect would be ideal, but breaks `SameSite: Secure` cookies.
       // return redirect(303, nextPath);
@@ -180,7 +184,7 @@ function errorToFrontend(req, res, errorCode) {
 
   loginUrl.searchParams.append('oidcError', errorCode);
 
-  const next = req.cookies[NEXT_COOKIE];
+  const next = nextFrom(req.cookies[STATE_COOKIE]);
   if (next && !Array.isArray(next)) loginUrl.searchParams.append('next', next);
 
   // Append query string manually, because Central Frontend expects search/hash