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

Poké: display list of blacklisted domains in the extension #9654

Merged
merged 1 commit into from
Dec 31, 2024
Merged
Show file tree
Hide file tree
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
16 changes: 15 additions & 1 deletion front/components/poke/workspace/table.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
import type { WorkspaceDomain, WorkspaceType } from "@dust-tt/types";
import type {
ExtensionConfigurationType,
WorkspaceDomain,
WorkspaceType,
} from "@dust-tt/types";

import {
PokeTable,
Expand All @@ -12,10 +16,12 @@ export function WorkspaceInfoTable({
owner,
workspaceVerifiedDomain,
worspaceCreationDay,
extensionConfig,
}: {
owner: WorkspaceType;
workspaceVerifiedDomain: WorkspaceDomain | null;
worspaceCreationDay: string;
extensionConfig: ExtensionConfigurationType | null;
}) {
return (
<div className="flex justify-between gap-3">
Expand Down Expand Up @@ -48,6 +54,14 @@ export function WorkspaceInfoTable({
</PokeTableCell>
<PokeTableCell>{workspaceVerifiedDomain?.domain}</PokeTableCell>
</PokeTableRow>
<PokeTableRow>
<PokeTableCell>Extension blacklisted domains</PokeTableCell>
<PokeTableCell>
{extensionConfig?.blacklistedDomains.length
? extensionConfig.blacklistedDomains.join(", ")
: "None"}
</PokeTableCell>
</PokeTableRow>
</PokeTableBody>
</PokeTable>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { Err, Ok } from "@dust-tt/types";

import { createPlugin } from "@app/lib/api/poke/types";
import { updateExtensionConfiguration } from "@app/lib/api/workspace";
import { isDomain } from "@app/lib/utils";

export const extensionBlacklistDomains = createPlugin(
{
Expand All @@ -14,7 +15,7 @@ export const extensionBlacklistDomains = createPlugin(
type: "string",
label: "Blacklisted domains",
description:
"Comma-separated list of domains to blacklist for the extension.",
"Comma-separated list of domains to blacklist for the extension. This will override the existing list (if any).",
},
},
},
Expand Down Expand Up @@ -51,21 +52,11 @@ function areDomainsValid(domains: string[]): boolean {
return true; // Empty domains array is valid
}

// Regular expression for domain validation
// - Starts with alphanumeric or hyphen
// - Can contain alphanumeric, hyphens
// - Must have at least one dot
// - TLD must be at least 2 characters
// - Cannot start or end with hyphen
// - Cannot have consecutive hyphens
const domainRegex =
/^(?!-)[A-Za-z0-9-]+(?:\.[A-Za-z0-9-]+)*\.[A-Za-z]{2,}(?!-)$/;

return domains.every((domain) => {
if (domain.length > 253) {
return false;
}
if (!domainRegex.test(domain)) {
if (!isDomain(domain)) {
return false;
}
const labels = domain.split(".");
Expand Down
9 changes: 9 additions & 0 deletions front/pages/poke/[wId]/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
} from "@dust-tt/sparkle";
import type {
DataSourceType,
ExtensionConfigurationType,
SubscriptionType,
WhitelistableFeature,
WorkspaceDomain,
Expand Down Expand Up @@ -46,6 +47,7 @@ import { Plan, Subscription } from "@app/lib/models/plan";
import { FREE_NO_PLAN_CODE } from "@app/lib/plans/plan_codes";
import { renderSubscriptionFromModels } from "@app/lib/plans/renderers";
import { DustProdActionRegistry } from "@app/lib/registry";
import { ExtensionConfigurationResource } from "@app/lib/resources/extension";

export const getServerSideProps = withSuperUserAuthRequirements<{
owner: WorkspaceType;
Expand All @@ -56,6 +58,7 @@ export const getServerSideProps = withSuperUserAuthRequirements<{
registry: typeof DustProdActionRegistry;
workspaceVerifiedDomain: WorkspaceDomain | null;
worspaceCreationDay: string;
extensionConfig: ExtensionConfigurationType | null;
baseUrl: string;
}>(async (context, auth) => {
const owner = auth.workspace();
Expand Down Expand Up @@ -93,6 +96,9 @@ export const getServerSideProps = withSuperUserAuthRequirements<{
const workspaceVerifiedDomain = await getWorkspaceVerifiedDomain(owner);
const worspaceCreationDate = await getWorkspaceCreationDate(owner.sId);

const extensionConfig =
await ExtensionConfigurationResource.fetchForWorkspace(auth);

return {
props: {
owner,
Expand All @@ -106,6 +112,7 @@ export const getServerSideProps = withSuperUserAuthRequirements<{
registry: DustProdActionRegistry,
workspaceVerifiedDomain,
worspaceCreationDay: format(worspaceCreationDate, "yyyy-MM-dd"),
extensionConfig: extensionConfig?.toJSON() ?? null,
baseUrl: config.getClientFacingUrl(),
},
};
Expand All @@ -120,6 +127,7 @@ const WorkspacePage = ({
registry,
workspaceVerifiedDomain,
worspaceCreationDay,
extensionConfig,
baseUrl,
}: InferGetServerSidePropsType<typeof getServerSideProps>) => {
const router = useRouter();
Expand Down Expand Up @@ -241,6 +249,7 @@ const WorkspacePage = ({
owner={owner}
workspaceVerifiedDomain={workspaceVerifiedDomain}
worspaceCreationDay={worspaceCreationDay}
extensionConfig={extensionConfig}
/>
<div className="flex flex-grow flex-col gap-4">
<PluginList
Expand Down
Loading