fix(security): remediate audit vulnerabilities SEC-001 through SEC-023
This commit is contained in:
1 parent
dc88677169
commit
bd49fbc4a0
31 files changed
+867
-114
No files matched your search
@@ -50,29 +50,97 @@ api.interceptors.request.use(
|
||||
(error) => Promise.reject(error)
|
||||
);
|
||||
|
||||
// Interceptor to handle 401/403 and present standardized Farsi toasts
|
||||
// Interceptor to handle 401/403, automatic refresh token rotation, and standardized toasts
|
||||
let isRefreshing = false;
|
||||
let failedQueue: Array<{
|
||||
resolve: (value: unknown) => void;
|
||||
reject: (reason?: unknown) => void;
|
||||
}> = [];
|
||||
|
||||
const processQueue = (error: unknown, token: string | null = null) => {
|
||||
failedQueue.forEach((prom) => {
|
||||
if (error) {
|
||||
prom.reject(error);
|
||||
} else {
|
||||
prom.resolve(token);
|
||||
}
|
||||
});
|
||||
failedQueue = [];
|
||||
};
|
||||
|
||||
api.interceptors.response.use(
|
||||
(response) => response,
|
||||
(error) => {
|
||||
async (error) => {
|
||||
const originalRequest = error.config;
|
||||
|
||||
// Handle 401 Unauthorized with token refresh retry
|
||||
if (
|
||||
typeof window !== 'undefined' &&
|
||||
error.response?.status === 401 &&
|
||||
!originalRequest?._retry &&
|
||||
!originalRequest?.url?.includes('/auth/')
|
||||
) {
|
||||
if (isRefreshing) {
|
||||
return new Promise((resolve, reject) => {
|
||||
failedQueue.push({ resolve, reject });
|
||||
})
|
||||
.then((token) => {
|
||||
originalRequest.headers.Authorization = `Bearer ${token}`;
|
||||
return api(originalRequest);
|
||||
})
|
||||
.catch((err) => Promise.reject(err));
|
||||
}
|
||||
|
||||
originalRequest._retry = true;
|
||||
isRefreshing = true;
|
||||
|
||||
const refreshToken = localStorage.getItem('refreshToken');
|
||||
if (refreshToken) {
|
||||
try {
|
||||
const res = await axios.post(
|
||||
`${baseURL}/auth/refresh-token`,
|
||||
{ refreshToken },
|
||||
{ headers: { 'Content-Type': 'application/json' } }
|
||||
);
|
||||
|
||||
const { accessToken, refreshToken: newRefreshToken } = res.data?.data || {};
|
||||
if (accessToken) {
|
||||
localStorage.setItem('accessToken', accessToken);
|
||||
if (newRefreshToken) {
|
||||
localStorage.setItem('refreshToken', newRefreshToken);
|
||||
}
|
||||
api.defaults.headers.common.Authorization = `Bearer ${accessToken}`;
|
||||
originalRequest.headers.Authorization = `Bearer ${accessToken}`;
|
||||
processQueue(null, accessToken);
|
||||
isRefreshing = false;
|
||||
return api(originalRequest);
|
||||
}
|
||||
} catch (refreshErr) {
|
||||
processQueue(refreshErr, null);
|
||||
isRefreshing = false;
|
||||
}
|
||||
} else {
|
||||
isRefreshing = false;
|
||||
}
|
||||
|
||||
// If refresh failed or no refresh token exists, clear state and logout
|
||||
if (window.localStorage) {
|
||||
try {
|
||||
localStorage.removeItem('accessToken');
|
||||
localStorage.removeItem('refreshToken');
|
||||
} catch {}
|
||||
}
|
||||
try {
|
||||
useUserStore.getState().logout();
|
||||
} catch {}
|
||||
}
|
||||
|
||||
if (typeof window !== 'undefined') {
|
||||
const responseData = error.response?.data as ApiErrorPayload | undefined;
|
||||
const status = error.response?.status;
|
||||
const farsiMessage = responseData?.message || 'خطایی در ارتباط با سرور رخ داده است.';
|
||||
|
||||
// Handle 401 Unauthorized globally - trigger Auth Modal
|
||||
if (status === 401) {
|
||||
if (window.localStorage) {
|
||||
try {
|
||||
localStorage.removeItem('accessToken');
|
||||
localStorage.removeItem('refreshToken');
|
||||
} catch {}
|
||||
}
|
||||
try {
|
||||
useUserStore.getState().logout();
|
||||
} catch {
|
||||
// Ignore if store not ready
|
||||
}
|
||||
} else if (status === 403) {
|
||||
if (status === 403) {
|
||||
if (window.localStorage) {
|
||||
try {
|
||||
localStorage.removeItem('accessToken');
|
||||
|
||||
@@ -23,6 +23,7 @@ export interface AuthResponse {
|
||||
data: {
|
||||
user: User;
|
||||
accessToken: string;
|
||||
refreshToken?: string;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -71,6 +72,9 @@ export class AuthService {
|
||||
if (data?.accessToken) {
|
||||
localStorage.setItem('accessToken', data.accessToken);
|
||||
}
|
||||
if (data?.refreshToken) {
|
||||
localStorage.setItem('refreshToken', data.refreshToken);
|
||||
}
|
||||
return response.data;
|
||||
} catch (error) {
|
||||
const err = error as ApiErr;
|
||||
@@ -89,6 +93,9 @@ export class AuthService {
|
||||
if (resData?.accessToken) {
|
||||
localStorage.setItem('accessToken', resData.accessToken);
|
||||
}
|
||||
if (resData?.refreshToken) {
|
||||
localStorage.setItem('refreshToken', resData.refreshToken);
|
||||
}
|
||||
return response.data;
|
||||
} catch (error) {
|
||||
const err = error as ApiErr;
|
||||
@@ -107,6 +114,9 @@ export class AuthService {
|
||||
if (data?.accessToken) {
|
||||
localStorage.setItem('accessToken', data.accessToken);
|
||||
}
|
||||
if (data?.refreshToken) {
|
||||
localStorage.setItem('refreshToken', data.refreshToken);
|
||||
}
|
||||
return response.data;
|
||||
} catch (error) {
|
||||
const err = error as ApiErr;
|
||||
@@ -115,6 +125,29 @@ export class AuthService {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Refresh auth tokens using the stored refresh token
|
||||
*/
|
||||
public async refreshAuthToken(): Promise<string | null> {
|
||||
try {
|
||||
const refreshToken = typeof window !== 'undefined' ? localStorage.getItem('refreshToken') : null;
|
||||
if (!refreshToken) return null;
|
||||
|
||||
const response = await api.post('/auth/refresh-token', { refreshToken }, { hideErrorToast: true } as unknown as import('axios').AxiosRequestConfig);
|
||||
const { data } = response.data;
|
||||
if (data?.accessToken) {
|
||||
localStorage.setItem('accessToken', data.accessToken);
|
||||
}
|
||||
if (data?.refreshToken) {
|
||||
localStorage.setItem('refreshToken', data.refreshToken);
|
||||
}
|
||||
return data?.accessToken || null;
|
||||
} catch {
|
||||
this.logout();
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get current user profile
|
||||
*/
|
||||
@@ -150,7 +183,16 @@ export class AuthService {
|
||||
* Logout user and clear tokens
|
||||
*/
|
||||
public logout(): void {
|
||||
localStorage.removeItem('accessToken');
|
||||
if (typeof window !== 'undefined') {
|
||||
try {
|
||||
const token = localStorage.getItem('accessToken');
|
||||
if (token) {
|
||||
api.post('/auth/logout').catch(() => {});
|
||||
}
|
||||
} catch {}
|
||||
localStorage.removeItem('accessToken');
|
||||
localStorage.removeItem('refreshToken');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user