Skip to content

Commit

Permalink
Remove CAM token from JWT
Browse files Browse the repository at this point in the history 
* Remove CAM token check from session endpoint
* Remove CAM user profile call from user endpoint, and just get user from the JWT
* Remove logout endpoint, function, and type
* Remove unused res.locals.username settings in auth middleware
  • Loading branch information
@camargo
camargo committed Sep 12, 2023
1 parent ed97853 commit 0c7051f
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 166 deletions.
151 changes: 19 additions & 132 deletions src/packages/auth/functions.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import type {
JwtDecode,
JwtPayload,
JwtSecret,
LogoutResponse,
SessionResponse,
UserResponse,
} from './types.js';
Expand Down Expand Up @@ -102,7 +101,6 @@ export function decodeJwt(authorizationHeader: string | undefined): JwtDecode {

export function generateJwt(
username: string,
camToken: string,
defaultRole: string,
allowedRoles: string[],
activeRole?: string,
Expand All @@ -113,7 +111,6 @@ export function generateJwt(
const options: jwt.SignOptions = { algorithm: type as Algorithm, expiresIn: JWT_EXPIRATION };
const payload: JwtPayload = {
activeRole: activeRole && allowedRoles.includes(activeRole) ? activeRole : defaultRole,
camToken,
'https://hasura.io/jwt/claims': {
'x-hasura-allowed-roles': allowedRoles,
'x-hasura-default-role': defaultRole,
Expand Down Expand Up @@ -151,12 +148,11 @@ export async function login(username: string, password: string): Promise<AuthRes
token: null,
};
} else {
const { ssoCookieValue: camToken } = json;
const { allowed_roles, default_role } = await getUserRoles(username, DEFAULT_ROLE, ALLOWED_ROLES);
return {
message: 'Login successful',
success: true,
token: generateJwt(username, camToken, default_role, allowed_roles),
token: generateJwt(username, default_role, allowed_roles),
};
}
} catch (error) {
Expand All @@ -174,148 +170,44 @@ export async function login(username: string, password: string): Promise<AuthRes
return {
message: 'Authentication is disabled',
success: true,
token: generateJwt(username, '', default_role, allowed_roles),
token: generateJwt(username, default_role, allowed_roles),
};
}
}

export async function logout(authorizationHeader: string | undefined): Promise<LogoutResponse> {
const { AUTH_TYPE, AUTH_URL } = getEnv();

if (AUTH_TYPE === 'cam') {
let response: Response | undefined;
let json: any;

try {
const { jwtErrorMessage, jwtPayload } = decodeJwt(authorizationHeader);

if (jwtPayload) {
const { camToken } = jwtPayload;
const body = JSON.stringify({ ssoToken: camToken });
const url = `${AUTH_URL}/ssoToken?action=invalidate`;
response = await fetch(url, { body, method: 'DELETE' });
json = await response.json();
const { errorCode = false } = json;

if (errorCode) {
const { errorMessage } = json;
return { message: errorMessage, success: false };
} else {
return { message: 'Logout successful', success: true };
}
} else {
return { message: jwtErrorMessage, success: false };
}
} catch (error) {
logger.error(error);
logger.error(response);
logger.error(json);
return { message: 'An unexpected error occurred', success: false };
}
} else {
return { message: 'Authentication is disabled', success: true };
}
}

export async function session(authorizationHeader: string | undefined): Promise<SessionResponse> {
const { AUTH_TYPE, AUTH_URL } = getEnv();
const { AUTH_TYPE } = getEnv();

if (AUTH_TYPE === 'cam') {
let response: Response | undefined;
let json: any;

try {
const { jwtErrorMessage, jwtPayload } = decodeJwt(authorizationHeader);

if (jwtPayload) {
const { camToken } = jwtPayload;
const { jwtErrorMessage, jwtPayload } = decodeJwt(authorizationHeader);

const body = JSON.stringify({ ssoToken: camToken });
const url = `${AUTH_URL}/ssoToken?action=validate`;
response = await fetch(url, { body, method: 'POST' });
json = await response.json();
const { errorCode = false } = json;

if (errorCode) {
const { errorMessage } = json;
return { message: errorMessage, success: false };
} else {
const { validated } = json;
const valid = validated ? 'valid' : 'invalid';
const message = `Token is ${valid}`;
return { message, success: validated };
}
} else {
return { message: jwtErrorMessage, success: false };
}
} catch (error) {
logger.error(error);
logger.error(response);
logger.error(json);
return { message: 'An unexpected error occurred', success: false };
if (jwtPayload) {
return { message: 'Token is valid', success: true };
} else {
return { message: jwtErrorMessage, success: false };
}
} else {
return { message: `Authentication is disabled`, success: true };
}
}

export async function user(authorizationHeader: string | undefined): Promise<UserResponse> {
const { AUTH_TYPE, AUTH_URL } = getEnv();
const { AUTH_TYPE } = getEnv();

if (AUTH_TYPE === 'cam') {
let response: Response | undefined;
let json: any;

try {
const { jwtErrorMessage, jwtPayload } = decodeJwt(authorizationHeader);
const { jwtErrorMessage, jwtPayload } = decodeJwt(authorizationHeader);

if (jwtPayload) {
const { camToken } = jwtPayload;
const body = JSON.stringify({ ssoToken: camToken });
const url = `${AUTH_URL}/userProfile`;
response = await fetch(url, { body, method: 'POST' });
json = await response.json();
const { errorCode = false } = json;

if (errorCode) {
const { errorMessage } = json;
return { message: errorMessage, success: false, user: null };
} else {
const { filteredGroupList, fullName, groupList, userId } = json;
return {
message: 'User found',
success: true,
user: {
filteredGroupList,
fullName,
groupList,
userId,
},
};
}
} else {
return { message: jwtErrorMessage, success: false, user: null };
}
} catch (error) {
logger.error(error);
logger.error(response);
logger.error(json);
return {
message: 'An unexpected error occurred',
success: false,
user: null,
};
if (jwtPayload) {
const { username } = jwtPayload;
return { message: 'User found', success: true, user: { id: username } };
} else {
return { message: jwtErrorMessage, success: false, user: null };
}
} else {
return {
message: `Authentication is disabled`,
success: true,
user: {
filteredGroupList: [],
fullName: 'unknown',
groupList: [],
userId: 'unknown',
},
user: { id: 'unknown' },
};
}
}
Expand All @@ -327,39 +219,34 @@ export async function changeRole(
const { AUTH_TYPE } = getEnv();
const { jwtErrorMessage, jwtPayload } = decodeJwt(authorizationHeader);

let response: Response | undefined;
let json: any;

try {
if (jwtPayload) {
const {
camToken,
username,
'https://hasura.io/jwt/claims': {
'x-hasura-allowed-roles': allowedRoles,
'x-hasura-default-role': defaultRole,
},
} = jwtPayload;

if (AUTH_TYPE === 'cam') {
return {
message: 'Role change successful',
success: true,
token: generateJwt(username, camToken, defaultRole as string, allowedRoles as string[], role),
token: generateJwt(username, defaultRole as string, allowedRoles as string[], role),
};
} else {
return {
message: 'Authentication is disabled',
success: true,
token: generateJwt(username || 'unknown', '', defaultRole as string, allowedRoles as string[], role),
token: generateJwt(username, defaultRole as string, allowedRoles as string[], role),
};
}
} else {
return { message: jwtErrorMessage, success: false, token: null };
}
} catch (error) {
logger.error(error);
logger.error(response);
logger.error(json);
return {
message: 'An unexpected error occurred',
success: false,
Expand Down
2 changes: 0 additions & 2 deletions src/packages/auth/middleware.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,12 @@ export const auth = async (req: Request, res: Response, next: NextFunction) => {
const { AUTH_TYPE } = getEnv();

if (AUTH_TYPE === 'none') {
res.locals.username = 'unknown';
next();
} else {
const authorizationHeader = req.get('authorization');
const response = await user(authorizationHeader);

if (response.success) {
res.locals.username = response.user?.userId;
next();
} else {
res.status(401).send({ message: 'Unauthorized', success: false });
Expand Down
23 changes: 1 addition & 22 deletions src/packages/auth/routes.ts
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { Express } from 'express';
import rateLimit from 'express-rate-limit';
import { getEnv } from '../../env.js';
import { changeRole, login, logout, session, user } from './functions.js';
import { changeRole, login, session, user } from './functions.js';

export default (app: Express) => {
const { RATE_LIMITER_LOGIN_MAX } = getEnv();
Expand Down Expand Up @@ -47,27 +47,6 @@ export default (app: Express) => {
res.json(response);
});

/**
* @swagger
* /auth/logout:
* delete:
* security:
* - bearerAuth: []
* produces:
* - application/json
* responses:
* 200:
* description: LogoutResponse
* summary: Logout to terminate a session
* tags:
* - Auth
*/
app.delete('/auth/logout', async (req, res) => {
const authorizationHeader = req.get('authorization');
const response = await logout(authorizationHeader);
res.json(response);
});

/**
* @swagger
* /auth/session:
Expand Down
11 changes: 1 addition & 10 deletions src/packages/auth/types.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ export type JwtDecode = {

export type JwtPayload = {
activeRole: string;
camToken: string;
'https://hasura.io/jwt/claims': Record<string, string | string[]>;
username: string;
};
Expand All @@ -23,11 +22,6 @@ export type AuthResponse = {
token: JsonWebToken | null;
};

export type LogoutResponse = {
message: string;
success: boolean;
};

export type SessionResponse = {
message: string;
success: boolean;
Expand All @@ -40,8 +34,5 @@ export type UserResponse = {
};

export type User = {
filteredGroupList: string[];
fullName: string;
groupList: string[];
userId: string;
id: string;
};

0 comments on commit 0c7051f

Please sign in to comment.