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

fix(auth): reup connectionId check #3413

Merged
merged 3 commits into from
Jan 30, 2025
Merged

fix(auth): reup connectionId check #3413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9a4079
fix(auth): reup connectionId check
bodinsamuel Jan 30, 2025
ab98387
missing one
bodinsamuel Jan 30, 2025
b0acce5
Merge branch 'master' into sam/25_01_30/fix/reup-connectionid-check
bodinsamuel Jan 30, 2025
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
10 changes: 5 additions & 5 deletions packages/server/lib/controllers/auth/postApiKey.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { hmacCheck } from '../../utils/hmac.js';
import { connectionCreated as connectionCreatedHook, connectionCreationFailed as connectionCreationFailedHook, connectionTest } from '../../hooks/hooks.js';
import { connectionCredential, connectionIdSchema, providerConfigKeySchema } from '../../helpers/validation.js';
import db from '@nangohq/database';
import { isIntegrationAllowed } from '../../utils/auth.js';
import { errorRestrictConnectionId, isIntegrationAllowed } from '../../utils/auth.js';

const bodyValidation = z
.object({
Expand Down Expand Up @@ -76,10 +76,10 @@ export const postPublicApiKeyAuthorization = asyncWrapper<PostPublicApiKeyAuthor
const hmac = 'hmac' in queryString ? queryString.hmac : undefined;
const isConnectSession = res.locals['authType'] === 'connectSession';

// if (isConnectSession && queryString.connection_id) {
// errorRestrictConnectionId(res);
// return;
// }
if (isConnectSession && queryString.connection_id) {
errorRestrictConnectionId(res);
return;
}

let logCtx: LogContext | undefined;
try {
Expand Down
10 changes: 5 additions & 5 deletions packages/server/lib/controllers/auth/postAppStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { hmacCheck } from '../../utils/hmac.js';
import { connectionCreated as connectionCreatedHook, connectionCreationFailed as connectionCreationFailedHook } from '../../hooks/hooks.js';
import { connectionCredential, connectionIdSchema, providerConfigKeySchema } from '../../helpers/validation.js';
import db from '@nangohq/database';
import { isIntegrationAllowed } from '../../utils/auth.js';
import { errorRestrictConnectionId, isIntegrationAllowed } from '../../utils/auth.js';

const bodyValidation = z
.object({
Expand Down Expand Up @@ -79,10 +79,10 @@ export const postPublicAppStoreAuthorization = asyncWrapper<PostPublicAppStoreAu
const hmac = 'hmac' in queryString ? queryString.hmac : undefined;
const isConnectSession = res.locals['authType'] === 'connectSession';

// if (isConnectSession && queryString.connection_id) {
// errorRestrictConnectionId(res);
// return;
// }
if (isConnectSession && queryString.connection_id) {
errorRestrictConnectionId(res);
return;
}

let logCtx: LogContext | undefined;
try {
Expand Down
10 changes: 5 additions & 5 deletions packages/server/lib/controllers/auth/postBasic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { hmacCheck } from '../../utils/hmac.js';
import { connectionCreated as connectionCreatedHook, connectionCreationFailed as connectionCreationFailedHook, connectionTest } from '../../hooks/hooks.js';
import { connectionCredential, connectionIdSchema, providerConfigKeySchema } from '../../helpers/validation.js';
import db from '@nangohq/database';
import { isIntegrationAllowed } from '../../utils/auth.js';
import { errorRestrictConnectionId, isIntegrationAllowed } from '../../utils/auth.js';

const bodyValidation = z
.object({
Expand Down Expand Up @@ -77,10 +77,10 @@ export const postPublicBasicAuthorization = asyncWrapper<PostPublicBasicAuthoriz
const hmac = 'hmac' in queryString ? queryString.hmac : undefined;
const isConnectSession = res.locals['authType'] === 'connectSession';

// if (isConnectSession && queryString.connection_id) {
// errorRestrictConnectionId(res);
// return;
// }
if (isConnectSession && queryString.connection_id) {
errorRestrictConnectionId(res);
return;
}

let logCtx: LogContext | undefined;
try {
Expand Down
10 changes: 5 additions & 5 deletions packages/server/lib/controllers/auth/postBill.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { hmacCheck } from '../../utils/hmac.js';
import { connectionCreated as connectionCreatedHook, connectionCreationFailed as connectionCreationFailedHook } from '../../hooks/hooks.js';
import { connectionCredential, connectionIdSchema, providerConfigKeySchema } from '../../helpers/validation.js';
import db from '@nangohq/database';
import { isIntegrationAllowed } from '../../utils/auth.js';
import { errorRestrictConnectionId, isIntegrationAllowed } from '../../utils/auth.js';

const bodyValidation = z
.object({
Expand Down Expand Up @@ -80,10 +80,10 @@ export const postPublicBillAuthorization = asyncWrapper<PostPublicBillAuthorizat
const hmac = 'hmac' in queryString ? queryString.hmac : undefined;
const isConnectSession = res.locals['authType'] === 'connectSession';

// if (isConnectSession && queryString.connection_id) {
// errorRestrictConnectionId(res);
// return;
// }
if (isConnectSession && queryString.connection_id) {
errorRestrictConnectionId(res);
return;
}

let logCtx: LogContext | undefined;

Expand Down
10 changes: 5 additions & 5 deletions packages/server/lib/controllers/auth/postJwt.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {
} from '../../hooks/hooks.js';
import { connectionCredential, connectionIdSchema, providerConfigKeySchema } from '../../helpers/validation.js';
import db from '@nangohq/database';
import { isIntegrationAllowed } from '../../utils/auth.js';
import { errorRestrictConnectionId, isIntegrationAllowed } from '../../utils/auth.js';

const bodyValidation = z
.object({
Expand Down Expand Up @@ -89,10 +89,10 @@ export const postPublicJwtAuthorization = asyncWrapper<PostPublicJwtAuthorizatio
const hmac = 'hmac' in queryString ? queryString.hmac : undefined;
const isConnectSession = res.locals['authType'] === 'connectSession';

// if (isConnectSession && queryString.connection_id) {
// errorRestrictConnectionId(res);
// return;
// }
if (isConnectSession && queryString.connection_id) {
errorRestrictConnectionId(res);
return;
}

let logCtx: LogContext | undefined;

Expand Down
10 changes: 5 additions & 5 deletions packages/server/lib/controllers/auth/postSignature.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {
} from '../../hooks/hooks.js';
import { connectionCredential, connectionIdSchema, providerConfigKeySchema } from '../../helpers/validation.js';
import db from '@nangohq/database';
import { isIntegrationAllowed } from '../../utils/auth.js';
import { errorRestrictConnectionId, isIntegrationAllowed } from '../../utils/auth.js';

const bodyValidation = z
.object({
Expand Down Expand Up @@ -83,10 +83,10 @@ export const postPublicSignatureAuthorization = asyncWrapper<PostPublicSignature
const hmac = 'hmac' in queryString ? queryString.hmac : undefined;
const isConnectSession = res.locals['authType'] === 'connectSession';

// if (isConnectSession && queryString.connection_id) {
// errorRestrictConnectionId(res);
// return;
// }
if (isConnectSession && queryString.connection_id) {
errorRestrictConnectionId(res);
return;
}

let logCtx: LogContext | undefined;

Expand Down
10 changes: 5 additions & 5 deletions packages/server/lib/controllers/auth/postTableau.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { hmacCheck } from '../../utils/hmac.js';
import { connectionCreated as connectionCreatedHook, connectionCreationFailed as connectionCreationFailedHook } from '../../hooks/hooks.js';
import { connectionCredential, connectionIdSchema, providerConfigKeySchema } from '../../helpers/validation.js';
import db from '@nangohq/database';
import { isIntegrationAllowed } from '../../utils/auth.js';
import { errorRestrictConnectionId, isIntegrationAllowed } from '../../utils/auth.js';

const bodyValidation = z
.object({
Expand Down Expand Up @@ -79,10 +79,10 @@ export const postPublicTableauAuthorization = asyncWrapper<PostPublicTableauAuth
const hmac = 'hmac' in queryString ? queryString.hmac : undefined;
const isConnectSession = res.locals['authType'] === 'connectSession';

// if (isConnectSession && queryString.connection_id) {
// errorRestrictConnectionId(res);
// return;
// }
if (isConnectSession && queryString.connection_id) {
errorRestrictConnectionId(res);
return;
}

let logCtx: LogContext | undefined;

Expand Down
10 changes: 5 additions & 5 deletions packages/server/lib/controllers/auth/postTba.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {
} from '../../hooks/hooks.js';
import { connectionCredential, connectionIdSchema, providerConfigKeySchema } from '../../helpers/validation.js';
import db from '@nangohq/database';
import { isIntegrationAllowed } from '../../utils/auth.js';
import { errorRestrictConnectionId, isIntegrationAllowed } from '../../utils/auth.js';

const bodyValidation = z
.object({
Expand Down Expand Up @@ -85,10 +85,10 @@ export const postPublicTbaAuthorization = asyncWrapper<PostPublicTbaAuthorizatio
const hmac = 'hmac' in queryString ? queryString.hmac : undefined;
const isConnectSession = res.locals['authType'] === 'connectSession';

// if (isConnectSession && queryString.connection_id) {
// errorRestrictConnectionId(res);
// return;
// }
if (isConnectSession && queryString.connection_id) {
errorRestrictConnectionId(res);
return;
}

let logCtx: LogContext | undefined;

Expand Down
10 changes: 5 additions & 5 deletions packages/server/lib/controllers/auth/postTwoStep.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { hmacCheck } from '../../utils/hmac.js';
import { connectionCreated as connectionCreatedHook, connectionCreationFailed as connectionCreationFailedHook } from '../../hooks/hooks.js';
import { connectionIdSchema, providerConfigKeySchema, connectionCredential } from '../../helpers/validation.js';
import db from '@nangohq/database';
import { isIntegrationAllowed } from '../../utils/auth.js';
import { errorRestrictConnectionId, isIntegrationAllowed } from '../../utils/auth.js';

const bodyValidation = z.object({}).catchall(z.any()).strict();

Expand Down Expand Up @@ -73,10 +73,10 @@ export const postPublicTwoStepAuthorization = asyncWrapper<PostPublicTwoStepAuth
const hmac = 'hmac' in queryString ? queryString.hmac : undefined;
const isConnectSession = res.locals['authType'] === 'connectSession';

// if (isConnectSession && queryString.connection_id) {
// errorRestrictConnectionId(res);
// return;
// }
if (isConnectSession && queryString.connection_id) {
errorRestrictConnectionId(res);
return;
}

let logCtx: LogContext | undefined;

Expand Down
2 changes: 1 addition & 1 deletion packages/server/lib/controllers/auth/postUnauthenticated.integration.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ describe(`GET ${endpoint}`, () => {
});
});

it.skip('should not be allowed to pass a connection_id with session token', async () => {
it('should not be allowed to pass a connection_id with session token', async () => {
const env = await seeders.createEnvironmentSeed();
const config = await seeders.createConfigSeed(env, 'unauthenticated', 'unauthenticated');

Expand Down
10 changes: 5 additions & 5 deletions packages/server/lib/controllers/auth/postUnauthenticated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import type { LogContext } from '@nangohq/logs';
import { hmacCheck } from '../../utils/hmac.js';
import { connectionCreated, connectionCreationFailed } from '../../hooks/hooks.js';
import db from '@nangohq/database';
import { isIntegrationAllowed } from '../../utils/auth.js';
import { errorRestrictConnectionId, isIntegrationAllowed } from '../../utils/auth.js';

const queryStringValidation = z
.object({
Expand Down Expand Up @@ -51,10 +51,10 @@ export const postPublicUnauthenticated = asyncWrapper<PostPublicUnauthenticatedA
const hmac = 'hmac' in queryString ? queryString.hmac : undefined;
const isConnectSession = res.locals['authType'] === 'connectSession';

// if (isConnectSession && queryString.connection_id) {
// errorRestrictConnectionId(res);
// return;
// }
if (isConnectSession && queryString.connection_id) {
errorRestrictConnectionId(res);
return;
}

let logCtx: LogContext | undefined;

Expand Down
18 changes: 9 additions & 9 deletions packages/server/lib/controllers/oauth.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ import db from '@nangohq/database';
import type { ConnectSessionAndEndUser } from '../services/connectSession.service.js';
import { getConnectSession } from '../services/connectSession.service.js';
import { hmacCheck } from '../utils/hmac.js';
import { isIntegrationAllowed } from '../utils/auth.js';
import { errorRestrictConnectionId, isIntegrationAllowed } from '../utils/auth.js';

class OAuthController {
public async oauthRequest(req: Request, res: Response<any, Required<RequestLocals>>, _next: NextFunction) {
Expand All @@ -65,10 +65,10 @@ class OAuthController {
let userScope = req.query['user_scope'] as string | undefined;
const isConnectSession = res.locals['authType'] === 'connectSession';

// if (isConnectSession && receivedConnectionId) {
// errorRestrictConnectionId(res);
// return;
// }
if (isConnectSession && receivedConnectionId) {
errorRestrictConnectionId(res);
return;
}

let logCtx: LogContext | undefined;

Expand Down Expand Up @@ -309,10 +309,10 @@ class OAuthController {

const { client_id, client_secret }: Record<string, string> = body;

// if (isConnectSession && receivedConnectionId) {
// errorRestrictConnectionId(res);
// return;
// }
if (isConnectSession && receivedConnectionId) {
errorRestrictConnectionId(res);
return;
}

let logCtx: LogContext | undefined;

Expand Down
Loading