Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Store state data in '__session' cookie instead of 'state' cookie #852

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Store state data in '__session' cookie instead of 'state' cookie #852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions instagram-auth/functions/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,16 @@ function instagramOAuth2Client() {
}

/**
* Redirects the User to the Instagram authentication consent screen. Also the 'state' cookie is set for later state
* Redirects the User to the Instagram authentication consent screen. Also the '__session' cookie is set for later state
* verification.
*/
exports.redirect = functions.https.onRequest((req, res) => {
const oauth2 = instagramOAuth2Client();

cookieParser()(req, res, () => {
const state = req.cookies.state || crypto.randomBytes(20).toString('hex');
const state = req.cookies.__session || crypto.randomBytes(20).toString('hex');
functions.logger.log('Setting verification state:', state);
res.cookie('state', state.toString(), {
res.cookie('__session', state.toString(), {
maxAge: 3600000,
secure: true,
httpOnly: true,
Expand All @@ -77,7 +77,7 @@ exports.redirect = functions.https.onRequest((req, res) => {

/**
* Exchanges a given Instagram auth code passed in the 'code' URL query parameter for a Firebase auth token.
* The request also needs to specify a 'state' query parameter which will be checked against the 'state' cookie.
* The request also needs to specify a 'state' query parameter which will be checked against the '__session' cookie.
* The Firebase custom auth token, display name, photo URL and Instagram acces token are sent back in a JSONP callback
* function with function name defined by the 'callback' query parameter.
*/
Expand All @@ -86,11 +86,11 @@ exports.token = functions.https.onRequest(async (req, res) => {

try {
return cookieParser()(req, res, async () => {
functions.logger.log('Received verification state:', req.cookies.state);
functions.logger.log('Received verification state:', req.cookies.__session);
functions.logger.log('Received state:', req.query.state);
if (!req.cookies.state) {
if (!req.cookies.__session) {
throw new Error('State cookie not set or expired. Maybe you took too long to authorize. Please try again.');
} else if (req.cookies.state !== req.query.state) {
} else if (req.cookies.__session !== req.query.state) {
throw new Error('State validation failed');
}
functions.logger.log('Received auth code:', req.query.code);
Expand Down
16 changes: 8 additions & 8 deletions linkedin-auth/functions/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,16 @@ function linkedInClient() {
}

/**
* Redirects the User to the LinkedIn authentication consent screen. ALso the 'state' cookie is set for later state
* Redirects the User to the LinkedIn authentication consent screen. ALso the '__session' cookie is set for later state
* verification.
*/
exports.redirect = functions.https.onRequest((req, res) => {
const Linkedin = linkedInClient();

cookieParser()(req, res, () => {
const state = req.cookies.state || crypto.randomBytes(20).toString('hex');
const state = req.cookies.__session || crypto.randomBytes(20).toString('hex');
functions.logger.log('Setting verification state:', state);
res.cookie('state', state.toString(), {
res.cookie('__session', state.toString(), {
maxAge: 3600000,
secure: true,
httpOnly: true,
Expand All @@ -63,7 +63,7 @@ exports.redirect = functions.https.onRequest((req, res) => {

/**
* Exchanges a given LinkedIn auth code passed in the 'code' URL query parameter for a Firebase auth token.
* The request also needs to specify a 'state' query parameter which will be checked against the 'state' cookie.
* The request also needs to specify a 'state' query parameter which will be checked against the '__session' cookie.
* The Firebase custom auth token is sent back in a JSONP callback function with function name defined by the
* 'callback' query parameter.
*/
Expand All @@ -72,11 +72,11 @@ exports.token = functions.https.onRequest((req, res) => {

try {
return cookieParser()(req, res, () => {
if (!req.cookies.state) {
throw new Error('State cookie not set or expired. Maybe you took too long to authorize. Please try again.');
if (!req.cookies.__session) {
throw new Error('__session cookie not set or expired. Maybe you took too long to authorize. Please try again.');
}
functions.logger.log('Received verification state:', req.cookies.state);
Linkedin.auth.authorize(OAUTH_SCOPES, req.cookies.state); // Makes sure the state parameter is set
functions.logger.log('Received verification state:', req.cookies.__session);
Linkedin.auth.authorize(OAUTH_SCOPES, req.cookies.__session); // Makes sure the state parameter is set
functions.logger.log('Received auth code:', req.query.code);
functions.logger.log('Received state:', req.query.state);
Linkedin.auth.getAccessToken(res, req.query.code, req.query.state, (error, results) => {
Expand Down