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.

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

Release v3.1.1 #516

Merged
merged 1 commit into from
Feb 17, 2025
Merged
Changes from all commits
Commits
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
11 changes: 6 additions & 5 deletions src/hooks/redaction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { Redactable, RedactionPolicy, redactObject } from '../util/redaction'
import { SlimUser } from '../authentication'
import { AuthorizationBitmapsDTO, AuthorizationBitmapsKey, isAuthorizationBitmapsDTO } from '../models/authorization'
import { BufferUserPlanGuest } from '../models/user-bitmap.model'
import { OpenPermissions, bitmapsAlign as bitmapsAlignCheck } from '../util/bigint'

export type RedactCondition = (context: HookContext<ImpressoApplication>, redactable?: Redactable) => boolean

Expand Down Expand Up @@ -103,19 +104,19 @@ export const bitmapsAlign = (
const userBitmap = user?.bitmap ?? BufferUserPlanGuest

const contentBitmap =
contentBitmapExtractor != null && redactable != null ? contentBitmapExtractor(redactable) : BigInt(0)
contentBitmapExtractor != null && redactable != null ? contentBitmapExtractor(redactable) : OpenPermissions

return (contentBitmap & userBitmap) != BigInt(0)
return bitmapsAlignCheck(contentBitmap, userBitmap)
}

export type { RedactionPolicy }

const authBitmapExtractor = (redactable: Redactable, kind: keyof AuthorizationBitmapsDTO) => {
const authorizationBitmapDto = redactable[AuthorizationBitmapsKey]
if (isAuthorizationBitmapsDTO(authorizationBitmapDto)) {
return authorizationBitmapDto[kind] ?? BigInt(0)
return authorizationBitmapDto[kind] ?? OpenPermissions
}
return BigInt(0)
return OpenPermissions
}

/**
Expand All @@ -137,7 +138,7 @@ const webappAuthBitmapExtractor = (redactable: Redactable, kind: keyof Authoriza
}
const actualKey = `bitmap${kind.charAt(0).toUpperCase() + kind.slice(1)}`
const value = redactable[actualKey]
return value != null ? BigInt(value) : BigInt(0)
return value != null ? BigInt(value) : OpenPermissions
}

/**
Expand Down
Loading