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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added
- Added seperate page for signup. [#311](https://github.com/sourcebot-dev/sourcebot/pull/331)
- Fix repo images in authed instance case and add manifest json. [#332](https://github.com/sourcebot-dev/sourcebot/pull/332)
- Added encryption logic for license keys. [#335](https://github.com/sourcebot-dev/sourcebot/pull/335)

## [4.1.1] - 2025-06-03
Expand Down
44 changes: 10 additions & 34 deletions packages/backend/src/utils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,7 @@ import { Logger } from "winston";
import { AppContext } from "./types.js";
import path from 'path';
import { PrismaClient, Repo } from "@sourcebot/db";
import { decrypt } from "@sourcebot/crypto";
import { Token } from "@sourcebot/schemas/v3/shared.type";
import { getTokenFromConfig as getTokenFromConfigBase } from "@sourcebot/crypto";
import { BackendException, BackendError } from "@sourcebot/error";
import * as Sentry from "@sentry/node";

Expand All@@ -25,44 +24,21 @@ export const isRemotePath = (path: string) => {
return path.startsWith('https://') || path.startsWith('http://');
}

export const getTokenFromConfig = async (token: Token, orgId: number, db: PrismaClient, logger?: Logger) => {
if ('secret' in token) {
const secretKey = token.secret;
const secret = await db.secret.findUnique({
where: {
orgId_key: {
key: secretKey,
orgId
}
}
});

if (!secret) {
export const getTokenFromConfig = async (token: any, orgId: number, db: PrismaClient, logger?: Logger) => {
try {
return await getTokenFromConfigBase(token, orgId, db);
} catch (error: unknown) {
if (error instanceof Error) {
const e = new BackendException(BackendError.CONNECTION_SYNC_SECRET_DNE, {
message: `Secret with key ${secretKey} not found for org ${orgId}`,
message: error.message,
});
Sentry.captureException(e);
logger?.error(e.metadata.message);
logger?.error(error.message);
throw e;
}

const decryptedToken = decrypt(secret.iv, secret.encryptedValue);
return decryptedToken;
} else {
const envToken = process.env[token.env];
if (!envToken) {
const e = new BackendException(BackendError.CONNECTION_SYNC_SECRET_DNE, {
message: `Environment variable ${token.env} not found.`,
});
Sentry.captureException(e);
logger?.error(e.metadata.message);
throw e;
}

return envToken;
throw error;
}
}

};

export const resolvePathRelativeToConfig = (localPath: string, configPath: string) => {
let absolutePath = localPath;
Expand Down
2 changes: 2 additions & 0 deletions packages/crypto/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,8 @@
"postinstall": "yarn build"
},
"dependencies": {
"@sourcebot/db": "*",
"@sourcebot/schemas": "*",
"dotenv": "^16.4.5"
},
"devDependencies": {
Expand Down
4 changes: 3 additions & 1 deletion packages/crypto/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@ export function verifySignature(data: string, signature: string, publicKeyPath:
publicKey = fs.readFileSync(publicKeyPath, 'utf8');
publicKeyCache.set(publicKeyPath, publicKey);
}

// Convert base64url signature to base64 if needed
const base64Signature = signature.replace(/-/g, '+').replace(/_/g, '/');
const paddedSignature = base64Signature + '='.repeat((4 - base64Signature.length % 4) % 4);
Expand All@@ -91,3 +91,5 @@ export function verifySignature(data: string, signature: string, publicKeyPath:
return false;
}
}

export { getTokenFromConfig } from './tokenUtils.js';
33 changes: 33 additions & 0 deletions packages/crypto/src/tokenUtils.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import { PrismaClient } from "@sourcebot/db";
import { Token } from "@sourcebot/schemas/v3/shared.type";
import { decrypt } from "./index.js";

export const getTokenFromConfig = async (token: Token, orgId: number, db: PrismaClient) => {
if ('secret' in token) {
const secretKey = token.secret;
const secret = await db.secret.findUnique({
where: {
orgId_key: {
key: secretKey,
orgId
}
}
});

if (!secret) {
throw new Error(`Secret with key ${secretKey} not found for org ${orgId}`);
}

const decryptedToken = decrypt(secret.iv, secret.encryptedValue);
return decryptedToken;
} else if ('env' in token) {
const envToken = process.env[token.env];
if (!envToken) {
throw new Error(`Environment variable ${token.env} not found.`);
}

return envToken;
} else {
throw new Error('Invalid token configuration');
}
};
11 changes: 6 additions & 5 deletions packages/crypto/tsconfig.json
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
{
"compilerOptions": {
"target": "ES6",
"module": "CommonJS",
"lib": ["ES6"],
"target": "ES2022",
"module": "Node16",
"lib": ["ES2023"],
"outDir": "dist",
"rootDir": "src",
"declaration": true,
Expand All@@ -11,11 +11,12 @@
"strict": true,
"noImplicitAny": true,
"strictNullChecks": true,
"moduleResolution": "node",
"moduleResolution": "Node16",
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"skipLibCheck": true,
"isolatedModules": true
"isolatedModules": true,
"resolveJsonModule": true
},
"include": ["src/**/*"],
"exclude": ["node_modules", "dist"]
Expand Down
Binary file addedpackages/web/public/logo_512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions packages/web/public/manifest.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
{
"name": "Sourcebot",
"short_name": "Sourcebot",
"display": "standalone",
"start_url": "/",
"icons": [
{
"src": "/logo_512.png",
"sizes": "512x512",
"type": "image/png"
}
]
}

75 changes: 74 additions & 1 deletion packages/web/src/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,16 @@ import { CodeHostType, isServiceError } from "@/lib/utils";
import { prisma } from "@/prisma";
import { render } from "@react-email/components";
import * as Sentry from '@sentry/nextjs';
import { decrypt, encrypt, generateApiKey, hashSecret } from "@sourcebot/crypto";
import { decrypt, encrypt, generateApiKey, hashSecret, getTokenFromConfig } from "@sourcebot/crypto";
import { ConnectionSyncStatus, OrgRole, Prisma, RepoIndexingStatus, StripeSubscriptionStatus, Org, ApiKey } from "@sourcebot/db";
import { ConnectionConfig } from "@sourcebot/schemas/v3/connection.type";
import { gerritSchema } from "@sourcebot/schemas/v3/gerrit.schema";
import { giteaSchema } from "@sourcebot/schemas/v3/gitea.schema";
import { githubSchema } from "@sourcebot/schemas/v3/github.schema";
import { gitlabSchema } from "@sourcebot/schemas/v3/gitlab.schema";
import { GithubConnectionConfig } from "@sourcebot/schemas/v3/github.type";
import { GitlabConnectionConfig } from "@sourcebot/schemas/v3/gitlab.type";
import { GiteaConnectionConfig } from "@sourcebot/schemas/v3/gitea.type";
import Ajv from "ajv";
import { StatusCodes } from "http-status-codes";
import { cookies, headers } from "next/headers";
Expand DownExpand Up@@ -1712,6 +1715,76 @@ export const getSearchContexts = async (domain: string) => sew(() =>
}, /* minRequiredRole = */ OrgRole.GUEST), /* allowSingleTenantUnauthedAccess = */ true
));

export const getRepoImage = async (repoId: number, domain: string): Promise<ArrayBuffer | ServiceError> => sew(async () => {
return await withAuth(async (userId) => {
return await withOrgMembership(userId, domain, async ({ org }) => {
const repo = await prisma.repo.findUnique({
where: {
id: repoId,
orgId: org.id,
},
include: {
connections: {
include: {
connection: true,
}
}
}
});

if (!repo || !repo.imageUrl) {
return notFound();
}

const authHeaders: Record<string, string> = {};
for (const { connection } of repo.connections) {
try {
if (connection.connectionType === 'github') {
const config = connection.config as unknown as GithubConnectionConfig;
if (config.token) {
const token = await getTokenFromConfig(config.token, connection.orgId, prisma);
authHeaders['Authorization'] = `token ${token}`;
break;
}
} else if (connection.connectionType === 'gitlab') {
const config = connection.config as unknown as GitlabConnectionConfig;
if (config.token) {
const token = await getTokenFromConfig(config.token, connection.orgId, prisma);
authHeaders['PRIVATE-TOKEN'] = token;
break;
}
} else if (connection.connectionType === 'gitea') {
const config = connection.config as unknown as GiteaConnectionConfig;
if (config.token) {
const token = await getTokenFromConfig(config.token, connection.orgId, prisma);
authHeaders['Authorization'] = `token ${token}`;
break;
}
}
} catch (error) {
logger.warn(`Failed to get token for connection ${connection.id}:`, error);
}
}

try {
const response = await fetch(repo.imageUrl, {
headers: authHeaders,
});

if (!response.ok) {
logger.warn(`Failed to fetch image from ${repo.imageUrl}: ${response.status}`);
return notFound();
}

const imageBuffer = await response.arrayBuffer();
return imageBuffer;
} catch (error) {
logger.error(`Error proxying image for repo ${repoId}:`, error);
return notFound();
}
}, /* minRequiredRole = */ OrgRole.GUEST);
}, /* allowSingleTenantUnauthedAccess = */ true);
});

////// Helpers ///////

Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
'use client';

import { getDisplayTime } from "@/lib/utils";
import { getDisplayTime, getRepoImageSrc } from "@/lib/utils";
import Image from "next/image";
import { StatusIcon } from "../../components/statusIcon";
import { RepoIndexingStatus } from "@sourcebot/db";
Expand DownExpand Up@@ -46,14 +46,16 @@ export const RepoListItem = ({
}
}, [status]);

const imageSrc = getRepoImageSrc(imageUrl, repoId, domain);
Comment thread
msukkari marked this conversation as resolved.

return (
<div
className="flex flex-row items-center p-4 border rounded-lg bg-background justify-between"
>
<div className="flex flex-row items-center gap-2">
{imageUrl ? (
{imageSrc ? (
<Image
src={imageUrl}
src={imageSrc}
alt={name}
width={32}
height={32}
Expand Down
5 changes: 3 additions & 2 deletions packages/web/src/app/[domain]/repos/columns.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,12 +6,13 @@ import { ArrowUpDown, ExternalLink, Clock, Loader2, CheckCircle2, XCircle, Trash
import Image from "next/image"
import { Badge } from "@/components/ui/badge"
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip"
import { cn } from "@/lib/utils"
import { cn, getRepoImageSrc } from "@/lib/utils"
import { RepoIndexingStatus } from "@sourcebot/db";
import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "@/components/ui/dropdown-menu"
import { AddRepoButton } from "./addRepoButton"

export type RepositoryColumnInfo = {
repoId: number
name: string
imageUrl?: string
connections: {
Expand DownExpand Up@@ -112,7 +113,7 @@ export const columns = (domain: string): ColumnDef<RepositoryColumnInfo>[] => [
<div className="relative h-8 w-8 overflow-hidden rounded-md border bg-muted">
{repo.imageUrl ? (
<Image
src={repo.imageUrl || "/placeholder.svg"}
src={getRepoImageSrc(repo.imageUrl, repo.repoId, domain) || "/placeholder.svg"}
alt={`${repo.name} logo`}
width={32}
height={32}
Expand Down
2 changes: 2 additions & 0 deletions packages/web/src/app/[domain]/repos/repositoryTable.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ export const RepositoryTable = () => {

const tableRepos = useMemo(() => {
if (reposLoading) return Array(4).fill(null).map(() => ({
repoId: 0,
name: "",
connections: [],
repoIndexingStatus: RepoIndexingStatus.NEW,
Expand All@@ -35,6 +36,7 @@ export const RepositoryTable = () => {

if (!repos) return [];
return repos.map((repo): RepositoryColumnInfo => ({
repoId: repo.repoId,
name: repo.repoDisplayName ?? repo.repoName,
imageUrl: repo.imageUrl,
connections: repo.linkedConnections,
Expand Down
27 changes: 27 additions & 0 deletions packages/web/src/app/api/[domain]/repos/[repoId]/image/route.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
import { getRepoImage } from "@/actions";
import { isServiceError } from "@/lib/utils";
import { NextRequest } from "next/server";

export async function GET(
request: NextRequest,
{ params }: { params: { domain: string; repoId: string } }
) {
const { domain, repoId } = params;
const repoIdNum = parseInt(repoId);

if (isNaN(repoIdNum)) {
return new Response("Invalid repo ID", { status: 400 });
}

const result = await getRepoImage(repoIdNum, domain);
if (isServiceError(result)) {
return new Response(result.message, { status: result.statusCode });
}

return new Response(result, {
headers: {
'Content-Type': 'image/png',
'Cache-Control': 'public, max-age=3600',
},
});
}
1 change: 1 addition & 0 deletions packages/web/src/app/layout.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import { getEntitlements } from "@/features/entitlements/server";
export const metadata: Metadata = {
title: "Sourcebot",
description: "Sourcebot",
manifest: "/manifest.json",
};

export default function RootLayout({
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added
- Added seperate page for signup. [#311](https://github.com/sourcebot-dev/sourcebot/pull/331)
- Fix repo images in authed instance case and add manifest json. [#332](https://github.com/sourcebot-dev/sourcebot/pull/332)
- Added encryption logic for license keys. [#335](https://github.com/sourcebot-dev/sourcebot/pull/335)

## [4.1.1] - 2025-06-03
Expand Down
44 changes: 10 additions & 34 deletions packages/backend/src/utils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,7 @@ import { Logger } from "winston";
import { AppContext } from "./types.js";
import path from 'path';
import { PrismaClient, Repo } from "@sourcebot/db";
import { decrypt } from "@sourcebot/crypto";
import { Token } from "@sourcebot/schemas/v3/shared.type";
import { getTokenFromConfig as getTokenFromConfigBase } from "@sourcebot/crypto";
import { BackendException, BackendError } from "@sourcebot/error";
import * as Sentry from "@sentry/node";

Expand All@@ -25,44 +24,21 @@ export const isRemotePath = (path: string) => {
return path.startsWith('https://') || path.startsWith('http://');
}

export const getTokenFromConfig = async (token: Token, orgId: number, db: PrismaClient, logger?: Logger) => {
if ('secret' in token) {
const secretKey = token.secret;
const secret = await db.secret.findUnique({
where: {
orgId_key: {
key: secretKey,
orgId
}
}
});

if (!secret) {
export const getTokenFromConfig = async (token: any, orgId: number, db: PrismaClient, logger?: Logger) => {
try {
return await getTokenFromConfigBase(token, orgId, db);
} catch (error: unknown) {
if (error instanceof Error) {
const e = new BackendException(BackendError.CONNECTION_SYNC_SECRET_DNE, {
message: `Secret with key ${secretKey} not found for org ${orgId}`,
message: error.message,
});
Sentry.captureException(e);
logger?.error(e.metadata.message);
logger?.error(error.message);
throw e;
}

const decryptedToken = decrypt(secret.iv, secret.encryptedValue);
return decryptedToken;
} else {
const envToken = process.env[token.env];
if (!envToken) {
const e = new BackendException(BackendError.CONNECTION_SYNC_SECRET_DNE, {
message: `Environment variable ${token.env} not found.`,
});
Sentry.captureException(e);
logger?.error(e.metadata.message);
throw e;
}

return envToken;
throw error;
}
}

};

export const resolvePathRelativeToConfig = (localPath: string, configPath: string) => {
let absolutePath = localPath;
Expand Down
2 changes: 2 additions & 0 deletions packages/crypto/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,8 @@
"postinstall": "yarn build"
},
"dependencies": {
"@sourcebot/db": "*",
"@sourcebot/schemas": "*",
"dotenv": "^16.4.5"
},
"devDependencies": {
Expand Down
4 changes: 3 additions & 1 deletion packages/crypto/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@ export function verifySignature(data: string, signature: string, publicKeyPath:
publicKey = fs.readFileSync(publicKeyPath, 'utf8');
publicKeyCache.set(publicKeyPath, publicKey);
}

// Convert base64url signature to base64 if needed
const base64Signature = signature.replace(/-/g, '+').replace(/_/g, '/');
const paddedSignature = base64Signature + '='.repeat((4 - base64Signature.length % 4) % 4);
Expand All@@ -91,3 +91,5 @@ export function verifySignature(data: string, signature: string, publicKeyPath:
return false;
}
}

export { getTokenFromConfig } from './tokenUtils.js';
33 changes: 33 additions & 0 deletions packages/crypto/src/tokenUtils.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import { PrismaClient } from "@sourcebot/db";
import { Token } from "@sourcebot/schemas/v3/shared.type";
import { decrypt } from "./index.js";

export const getTokenFromConfig = async (token: Token, orgId: number, db: PrismaClient) => {
if ('secret' in token) {
const secretKey = token.secret;
const secret = await db.secret.findUnique({
where: {
orgId_key: {
key: secretKey,
orgId
}
}
});

if (!secret) {
throw new Error(`Secret with key ${secretKey} not found for org ${orgId}`);
}

const decryptedToken = decrypt(secret.iv, secret.encryptedValue);
return decryptedToken;
} else if ('env' in token) {
const envToken = process.env[token.env];
if (!envToken) {
throw new Error(`Environment variable ${token.env} not found.`);
}

return envToken;
} else {
throw new Error('Invalid token configuration');
}
};
11 changes: 6 additions & 5 deletions packages/crypto/tsconfig.json
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
{
"compilerOptions": {
"target": "ES6",
"module": "CommonJS",
"lib": ["ES6"],
"target": "ES2022",
"module": "Node16",
"lib": ["ES2023"],
"outDir": "dist",
"rootDir": "src",
"declaration": true,
Expand All@@ -11,11 +11,12 @@
"strict": true,
"noImplicitAny": true,
"strictNullChecks": true,
"moduleResolution": "node",
"moduleResolution": "Node16",
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"skipLibCheck": true,
"isolatedModules": true
"isolatedModules": true,
"resolveJsonModule": true
},
"include": ["src/**/*"],
"exclude": ["node_modules", "dist"]
Expand Down
Binary file addedpackages/web/public/logo_512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions packages/web/public/manifest.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
{
"name": "Sourcebot",
"short_name": "Sourcebot",
"display": "standalone",
"start_url": "/",
"icons": [
{
"src": "/logo_512.png",
"sizes": "512x512",
"type": "image/png"
}
]
}

75 changes: 74 additions & 1 deletion packages/web/src/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,16 @@ import { CodeHostType, isServiceError } from "@/lib/utils";
import { prisma } from "@/prisma";
import { render } from "@react-email/components";
import * as Sentry from '@sentry/nextjs';
import { decrypt, encrypt, generateApiKey, hashSecret } from "@sourcebot/crypto";
import { decrypt, encrypt, generateApiKey, hashSecret, getTokenFromConfig } from "@sourcebot/crypto";
import { ConnectionSyncStatus, OrgRole, Prisma, RepoIndexingStatus, StripeSubscriptionStatus, Org, ApiKey } from "@sourcebot/db";
import { ConnectionConfig } from "@sourcebot/schemas/v3/connection.type";
import { gerritSchema } from "@sourcebot/schemas/v3/gerrit.schema";
import { giteaSchema } from "@sourcebot/schemas/v3/gitea.schema";
import { githubSchema } from "@sourcebot/schemas/v3/github.schema";
import { gitlabSchema } from "@sourcebot/schemas/v3/gitlab.schema";
import { GithubConnectionConfig } from "@sourcebot/schemas/v3/github.type";
import { GitlabConnectionConfig } from "@sourcebot/schemas/v3/gitlab.type";
import { GiteaConnectionConfig } from "@sourcebot/schemas/v3/gitea.type";
import Ajv from "ajv";
import { StatusCodes } from "http-status-codes";
import { cookies, headers } from "next/headers";
Expand DownExpand Up@@ -1712,6 +1715,76 @@ export const getSearchContexts = async (domain: string) => sew(() =>
}, /* minRequiredRole = */ OrgRole.GUEST), /* allowSingleTenantUnauthedAccess = */ true
));

export const getRepoImage = async (repoId: number, domain: string): Promise<ArrayBuffer | ServiceError> => sew(async () => {
return await withAuth(async (userId) => {
return await withOrgMembership(userId, domain, async ({ org }) => {
const repo = await prisma.repo.findUnique({
where: {
id: repoId,
orgId: org.id,
},
include: {
connections: {
include: {
connection: true,
}
}
}
});

if (!repo || !repo.imageUrl) {
return notFound();
}

const authHeaders: Record<string, string> = {};
for (const { connection } of repo.connections) {
try {
if (connection.connectionType === 'github') {
const config = connection.config as unknown as GithubConnectionConfig;
if (config.token) {
const token = await getTokenFromConfig(config.token, connection.orgId, prisma);
authHeaders['Authorization'] = `token ${token}`;
break;
}
} else if (connection.connectionType === 'gitlab') {
const config = connection.config as unknown as GitlabConnectionConfig;
if (config.token) {
const token = await getTokenFromConfig(config.token, connection.orgId, prisma);
authHeaders['PRIVATE-TOKEN'] = token;
break;
}
} else if (connection.connectionType === 'gitea') {
const config = connection.config as unknown as GiteaConnectionConfig;
if (config.token) {
const token = await getTokenFromConfig(config.token, connection.orgId, prisma);
authHeaders['Authorization'] = `token ${token}`;
break;
}
}
} catch (error) {
logger.warn(`Failed to get token for connection ${connection.id}:`, error);
}
}

try {
const response = await fetch(repo.imageUrl, {
headers: authHeaders,
});

if (!response.ok) {
logger.warn(`Failed to fetch image from ${repo.imageUrl}: ${response.status}`);
return notFound();
}

const imageBuffer = await response.arrayBuffer();
return imageBuffer;
} catch (error) {
logger.error(`Error proxying image for repo ${repoId}:`, error);
return notFound();
}
}, /* minRequiredRole = */ OrgRole.GUEST);
}, /* allowSingleTenantUnauthedAccess = */ true);
});

////// Helpers ///////

Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
'use client';

import { getDisplayTime } from "@/lib/utils";
import { getDisplayTime, getRepoImageSrc } from "@/lib/utils";
import Image from "next/image";
import { StatusIcon } from "../../components/statusIcon";
import { RepoIndexingStatus } from "@sourcebot/db";
Expand DownExpand Up@@ -46,14 +46,16 @@ export const RepoListItem = ({
}
}, [status]);

const imageSrc = getRepoImageSrc(imageUrl, repoId, domain);
Comment thread
msukkari marked this conversation as resolved.

return (
<div
className="flex flex-row items-center p-4 border rounded-lg bg-background justify-between"
>
<div className="flex flex-row items-center gap-2">
{imageUrl ? (
{imageSrc ? (
<Image
src={imageUrl}
src={imageSrc}
alt={name}
width={32}
height={32}
Expand Down
5 changes: 3 additions & 2 deletions packages/web/src/app/[domain]/repos/columns.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,12 +6,13 @@ import { ArrowUpDown, ExternalLink, Clock, Loader2, CheckCircle2, XCircle, Trash
import Image from "next/image"
import { Badge } from "@/components/ui/badge"
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip"
import { cn } from "@/lib/utils"
import { cn, getRepoImageSrc } from "@/lib/utils"
import { RepoIndexingStatus } from "@sourcebot/db";
import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "@/components/ui/dropdown-menu"
import { AddRepoButton } from "./addRepoButton"

export type RepositoryColumnInfo = {
repoId: number
name: string
imageUrl?: string
connections: {
Expand DownExpand Up@@ -112,7 +113,7 @@ export const columns = (domain: string): ColumnDef<RepositoryColumnInfo>[] => [
<div className="relative h-8 w-8 overflow-hidden rounded-md border bg-muted">
{repo.imageUrl ? (
<Image
src={repo.imageUrl || "/placeholder.svg"}
src={getRepoImageSrc(repo.imageUrl, repo.repoId, domain) || "/placeholder.svg"}
alt={`${repo.name} logo`}
width={32}
height={32}
Expand Down
2 changes: 2 additions & 0 deletions packages/web/src/app/[domain]/repos/repositoryTable.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ export const RepositoryTable = () => {

const tableRepos = useMemo(() => {
if (reposLoading) return Array(4).fill(null).map(() => ({
repoId: 0,
name: "",
connections: [],
repoIndexingStatus: RepoIndexingStatus.NEW,
Expand All@@ -35,6 +36,7 @@ export const RepositoryTable = () => {

if (!repos) return [];
return repos.map((repo): RepositoryColumnInfo => ({
repoId: repo.repoId,
name: repo.repoDisplayName ?? repo.repoName,
imageUrl: repo.imageUrl,
connections: repo.linkedConnections,
Expand Down
27 changes: 27 additions & 0 deletions packages/web/src/app/api/[domain]/repos/[repoId]/image/route.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
import { getRepoImage } from "@/actions";
import { isServiceError } from "@/lib/utils";
import { NextRequest } from "next/server";

export async function GET(
request: NextRequest,
{ params }: { params: { domain: string; repoId: string } }
) {
const { domain, repoId } = params;
const repoIdNum = parseInt(repoId);

if (isNaN(repoIdNum)) {
return new Response("Invalid repo ID", { status: 400 });
}

const result = await getRepoImage(repoIdNum, domain);
if (isServiceError(result)) {
return new Response(result.message, { status: result.statusCode });
}

return new Response(result, {
headers: {
'Content-Type': 'image/png',
'Cache-Control': 'public, max-age=3600',
},
});
}
1 change: 1 addition & 0 deletions packages/web/src/app/layout.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import { getEntitlements } from "@/features/entitlements/server";
export const metadata: Metadata = {
title: "Sourcebot",
description: "Sourcebot",
manifest: "/manifest.json",
};

export default function RootLayout({
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added
- Added seperate page for signup. [#311](https://github.com/sourcebot-dev/sourcebot/pull/331)
- Fix repo images in authed instance case and add manifest json. [#332](https://github.com/sourcebot-dev/sourcebot/pull/332)
- Added encryption logic for license keys. [#335](https://github.com/sourcebot-dev/sourcebot/pull/335)

## [4.1.1] - 2025-06-03
Expand Down
44 changes: 10 additions & 34 deletions packages/backend/src/utils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,7 @@ import { Logger } from "winston";
import { AppContext } from "./types.js";
import path from 'path';
import { PrismaClient, Repo } from "@sourcebot/db";
import { decrypt } from "@sourcebot/crypto";
import { Token } from "@sourcebot/schemas/v3/shared.type";
import { getTokenFromConfig as getTokenFromConfigBase } from "@sourcebot/crypto";
import { BackendException, BackendError } from "@sourcebot/error";
import * as Sentry from "@sentry/node";

Expand All@@ -25,44 +24,21 @@ export const isRemotePath = (path: string) => {
return path.startsWith('https://') || path.startsWith('http://');
}

export const getTokenFromConfig = async (token: Token, orgId: number, db: PrismaClient, logger?: Logger) => {
if ('secret' in token) {
const secretKey = token.secret;
const secret = await db.secret.findUnique({
where: {
orgId_key: {
key: secretKey,
orgId
}
}
});

if (!secret) {
export const getTokenFromConfig = async (token: any, orgId: number, db: PrismaClient, logger?: Logger) => {
try {
return await getTokenFromConfigBase(token, orgId, db);
} catch (error: unknown) {
if (error instanceof Error) {
const e = new BackendException(BackendError.CONNECTION_SYNC_SECRET_DNE, {
message: `Secret with key ${secretKey} not found for org ${orgId}`,
message: error.message,
});
Sentry.captureException(e);
logger?.error(e.metadata.message);
logger?.error(error.message);
throw e;
}

const decryptedToken = decrypt(secret.iv, secret.encryptedValue);
return decryptedToken;
} else {
const envToken = process.env[token.env];
if (!envToken) {
const e = new BackendException(BackendError.CONNECTION_SYNC_SECRET_DNE, {
message: `Environment variable ${token.env} not found.`,
});
Sentry.captureException(e);
logger?.error(e.metadata.message);
throw e;
}

return envToken;
throw error;
}
}

};

export const resolvePathRelativeToConfig = (localPath: string, configPath: string) => {
let absolutePath = localPath;
Expand Down
2 changes: 2 additions & 0 deletions packages/crypto/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,8 @@
"postinstall": "yarn build"
},
"dependencies": {
"@sourcebot/db": "*",
"@sourcebot/schemas": "*",
"dotenv": "^16.4.5"
},
"devDependencies": {
Expand Down
4 changes: 3 additions & 1 deletion packages/crypto/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@ export function verifySignature(data: string, signature: string, publicKeyPath:
publicKey = fs.readFileSync(publicKeyPath, 'utf8');
publicKeyCache.set(publicKeyPath, publicKey);
}

// Convert base64url signature to base64 if needed
const base64Signature = signature.replace(/-/g, '+').replace(/_/g, '/');
const paddedSignature = base64Signature + '='.repeat((4 - base64Signature.length % 4) % 4);
Expand All@@ -91,3 +91,5 @@ export function verifySignature(data: string, signature: string, publicKeyPath:
return false;
}
}

export { getTokenFromConfig } from './tokenUtils.js';
33 changes: 33 additions & 0 deletions packages/crypto/src/tokenUtils.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import { PrismaClient } from "@sourcebot/db";
import { Token } from "@sourcebot/schemas/v3/shared.type";
import { decrypt } from "./index.js";

export const getTokenFromConfig = async (token: Token, orgId: number, db: PrismaClient) => {
if ('secret' in token) {
const secretKey = token.secret;
const secret = await db.secret.findUnique({
where: {
orgId_key: {
key: secretKey,
orgId
}
}
});

if (!secret) {
throw new Error(`Secret with key ${secretKey} not found for org ${orgId}`);
}

const decryptedToken = decrypt(secret.iv, secret.encryptedValue);
return decryptedToken;
} else if ('env' in token) {
const envToken = process.env[token.env];
if (!envToken) {
throw new Error(`Environment variable ${token.env} not found.`);
}

return envToken;
} else {
throw new Error('Invalid token configuration');
}
};
11 changes: 6 additions & 5 deletions packages/crypto/tsconfig.json
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
{
"compilerOptions": {
"target": "ES6",
"module": "CommonJS",
"lib": ["ES6"],
"target": "ES2022",
"module": "Node16",
"lib": ["ES2023"],
"outDir": "dist",
"rootDir": "src",
"declaration": true,
Expand All@@ -11,11 +11,12 @@
"strict": true,
"noImplicitAny": true,
"strictNullChecks": true,
"moduleResolution": "node",
"moduleResolution": "Node16",
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"skipLibCheck": true,
"isolatedModules": true
"isolatedModules": true,
"resolveJsonModule": true
},
"include": ["src/**/*"],
"exclude": ["node_modules", "dist"]
Expand Down
Binary file addedpackages/web/public/logo_512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions packages/web/public/manifest.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
{
"name": "Sourcebot",
"short_name": "Sourcebot",
"display": "standalone",
"start_url": "/",
"icons": [
{
"src": "/logo_512.png",
"sizes": "512x512",
"type": "image/png"
}
]
}

75 changes: 74 additions & 1 deletion packages/web/src/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,16 @@ import { CodeHostType, isServiceError } from "@/lib/utils";
import { prisma } from "@/prisma";
import { render } from "@react-email/components";
import * as Sentry from '@sentry/nextjs';
import { decrypt, encrypt, generateApiKey, hashSecret } from "@sourcebot/crypto";
import { decrypt, encrypt, generateApiKey, hashSecret, getTokenFromConfig } from "@sourcebot/crypto";
import { ConnectionSyncStatus, OrgRole, Prisma, RepoIndexingStatus, StripeSubscriptionStatus, Org, ApiKey } from "@sourcebot/db";
import { ConnectionConfig } from "@sourcebot/schemas/v3/connection.type";
import { gerritSchema } from "@sourcebot/schemas/v3/gerrit.schema";
import { giteaSchema } from "@sourcebot/schemas/v3/gitea.schema";
import { githubSchema } from "@sourcebot/schemas/v3/github.schema";
import { gitlabSchema } from "@sourcebot/schemas/v3/gitlab.schema";
import { GithubConnectionConfig } from "@sourcebot/schemas/v3/github.type";
import { GitlabConnectionConfig } from "@sourcebot/schemas/v3/gitlab.type";
import { GiteaConnectionConfig } from "@sourcebot/schemas/v3/gitea.type";
import Ajv from "ajv";
import { StatusCodes } from "http-status-codes";
import { cookies, headers } from "next/headers";
Expand DownExpand Up@@ -1712,6 +1715,76 @@ export const getSearchContexts = async (domain: string) => sew(() =>
}, /* minRequiredRole = */ OrgRole.GUEST), /* allowSingleTenantUnauthedAccess = */ true
));

export const getRepoImage = async (repoId: number, domain: string): Promise<ArrayBuffer | ServiceError> => sew(async () => {
return await withAuth(async (userId) => {
return await withOrgMembership(userId, domain, async ({ org }) => {
const repo = await prisma.repo.findUnique({
where: {
id: repoId,
orgId: org.id,
},
include: {
connections: {
include: {
connection: true,
}
}
}
});

if (!repo || !repo.imageUrl) {
return notFound();
}

const authHeaders: Record<string, string> = {};
for (const { connection } of repo.connections) {
try {
if (connection.connectionType === 'github') {
const config = connection.config as unknown as GithubConnectionConfig;
if (config.token) {
const token = await getTokenFromConfig(config.token, connection.orgId, prisma);
authHeaders['Authorization'] = `token ${token}`;
break;
}
} else if (connection.connectionType === 'gitlab') {
const config = connection.config as unknown as GitlabConnectionConfig;
if (config.token) {
const token = await getTokenFromConfig(config.token, connection.orgId, prisma);
authHeaders['PRIVATE-TOKEN'] = token;
break;
}
} else if (connection.connectionType === 'gitea') {
const config = connection.config as unknown as GiteaConnectionConfig;
if (config.token) {
const token = await getTokenFromConfig(config.token, connection.orgId, prisma);
authHeaders['Authorization'] = `token ${token}`;
break;
}
}
} catch (error) {
logger.warn(`Failed to get token for connection ${connection.id}:`, error);
}
}

try {
const response = await fetch(repo.imageUrl, {
headers: authHeaders,
});

if (!response.ok) {
logger.warn(`Failed to fetch image from ${repo.imageUrl}: ${response.status}`);
return notFound();
}

const imageBuffer = await response.arrayBuffer();
return imageBuffer;
} catch (error) {
logger.error(`Error proxying image for repo ${repoId}:`, error);
return notFound();
}
}, /* minRequiredRole = */ OrgRole.GUEST);
}, /* allowSingleTenantUnauthedAccess = */ true);
});

////// Helpers ///////

Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
'use client';

import { getDisplayTime } from "@/lib/utils";
import { getDisplayTime, getRepoImageSrc } from "@/lib/utils";
import Image from "next/image";
import { StatusIcon } from "../../components/statusIcon";
import { RepoIndexingStatus } from "@sourcebot/db";
Expand DownExpand Up@@ -46,14 +46,16 @@ export const RepoListItem = ({
}
}, [status]);

const imageSrc = getRepoImageSrc(imageUrl, repoId, domain);
Comment thread
msukkari marked this conversation as resolved.

return (
<div
className="flex flex-row items-center p-4 border rounded-lg bg-background justify-between"
>
<div className="flex flex-row items-center gap-2">
{imageUrl ? (
{imageSrc ? (
<Image
src={imageUrl}
src={imageSrc}
alt={name}
width={32}
height={32}
Expand Down
5 changes: 3 additions & 2 deletions packages/web/src/app/[domain]/repos/columns.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,12 +6,13 @@ import { ArrowUpDown, ExternalLink, Clock, Loader2, CheckCircle2, XCircle, Trash
import Image from "next/image"
import { Badge } from "@/components/ui/badge"
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip"
import { cn } from "@/lib/utils"
import { cn, getRepoImageSrc } from "@/lib/utils"
import { RepoIndexingStatus } from "@sourcebot/db";
import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "@/components/ui/dropdown-menu"
import { AddRepoButton } from "./addRepoButton"

export type RepositoryColumnInfo = {
repoId: number
name: string
imageUrl?: string
connections: {
Expand DownExpand Up@@ -112,7 +113,7 @@ export const columns = (domain: string): ColumnDef<RepositoryColumnInfo>[] => [
<div className="relative h-8 w-8 overflow-hidden rounded-md border bg-muted">
{repo.imageUrl ? (
<Image
src={repo.imageUrl || "/placeholder.svg"}
src={getRepoImageSrc(repo.imageUrl, repo.repoId, domain) || "/placeholder.svg"}
alt={`${repo.name} logo`}
width={32}
height={32}
Expand Down
2 changes: 2 additions & 0 deletions packages/web/src/app/[domain]/repos/repositoryTable.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ export const RepositoryTable = () => {

const tableRepos = useMemo(() => {
if (reposLoading) return Array(4).fill(null).map(() => ({
repoId: 0,
name: "",
connections: [],
repoIndexingStatus: RepoIndexingStatus.NEW,
Expand All@@ -35,6 +36,7 @@ export const RepositoryTable = () => {

if (!repos) return [];
return repos.map((repo): RepositoryColumnInfo => ({
repoId: repo.repoId,
name: repo.repoDisplayName ?? repo.repoName,
imageUrl: repo.imageUrl,
connections: repo.linkedConnections,
Expand Down
27 changes: 27 additions & 0 deletions packages/web/src/app/api/[domain]/repos/[repoId]/image/route.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
import { getRepoImage } from "@/actions";
import { isServiceError } from "@/lib/utils";
import { NextRequest } from "next/server";

export async function GET(
request: NextRequest,
{ params }: { params: { domain: string; repoId: string } }
) {
const { domain, repoId } = params;
const repoIdNum = parseInt(repoId);

if (isNaN(repoIdNum)) {
return new Response("Invalid repo ID", { status: 400 });
}

const result = await getRepoImage(repoIdNum, domain);
if (isServiceError(result)) {
return new Response(result.message, { status: result.statusCode });
}

return new Response(result, {
headers: {
'Content-Type': 'image/png',
'Cache-Control': 'public, max-age=3600',
},
});
}
1 change: 1 addition & 0 deletions packages/web/src/app/layout.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import { getEntitlements } from "@/features/entitlements/server";
export const metadata: Metadata = {
title: "Sourcebot",
description: "Sourcebot",
manifest: "/manifest.json",
};

export default function RootLayout({
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added
- Added seperate page for signup. [#311](https://github.com/sourcebot-dev/sourcebot/pull/331)
- Fix repo images in authed instance case and add manifest json. [#332](https://github.com/sourcebot-dev/sourcebot/pull/332)
- Added encryption logic for license keys. [#335](https://github.com/sourcebot-dev/sourcebot/pull/335)

## [4.1.1] - 2025-06-03
Expand Down
44 changes: 10 additions & 34 deletions packages/backend/src/utils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,7 @@ import { Logger } from "winston";
import { AppContext } from "./types.js";
import path from 'path';
import { PrismaClient, Repo } from "@sourcebot/db";
import { decrypt } from "@sourcebot/crypto";
import { Token } from "@sourcebot/schemas/v3/shared.type";
import { getTokenFromConfig as getTokenFromConfigBase } from "@sourcebot/crypto";
import { BackendException, BackendError } from "@sourcebot/error";
import * as Sentry from "@sentry/node";

Expand All@@ -25,44 +24,21 @@ export const isRemotePath = (path: string) => {
return path.startsWith('https://') || path.startsWith('http://');
}

export const getTokenFromConfig = async (token: Token, orgId: number, db: PrismaClient, logger?: Logger) => {
if ('secret' in token) {
const secretKey = token.secret;
const secret = await db.secret.findUnique({
where: {
orgId_key: {
key: secretKey,
orgId
}
}
});

if (!secret) {
export const getTokenFromConfig = async (token: any, orgId: number, db: PrismaClient, logger?: Logger) => {
try {
return await getTokenFromConfigBase(token, orgId, db);
} catch (error: unknown) {
if (error instanceof Error) {
const e = new BackendException(BackendError.CONNECTION_SYNC_SECRET_DNE, {
message: `Secret with key ${secretKey} not found for org ${orgId}`,
message: error.message,
});
Sentry.captureException(e);
logger?.error(e.metadata.message);
logger?.error(error.message);
throw e;
}

const decryptedToken = decrypt(secret.iv, secret.encryptedValue);
return decryptedToken;
} else {
const envToken = process.env[token.env];
if (!envToken) {
const e = new BackendException(BackendError.CONNECTION_SYNC_SECRET_DNE, {
message: `Environment variable ${token.env} not found.`,
});
Sentry.captureException(e);
logger?.error(e.metadata.message);
throw e;
}

return envToken;
throw error;
}
}

};

export const resolvePathRelativeToConfig = (localPath: string, configPath: string) => {
let absolutePath = localPath;
Expand Down
2 changes: 2 additions & 0 deletions packages/crypto/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,8 @@
"postinstall": "yarn build"
},
"dependencies": {
"@sourcebot/db": "*",
"@sourcebot/schemas": "*",
"dotenv": "^16.4.5"
},
"devDependencies": {
Expand Down
4 changes: 3 additions & 1 deletion packages/crypto/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@ export function verifySignature(data: string, signature: string, publicKeyPath:
publicKey = fs.readFileSync(publicKeyPath, 'utf8');
publicKeyCache.set(publicKeyPath, publicKey);
}

// Convert base64url signature to base64 if needed
const base64Signature = signature.replace(/-/g, '+').replace(/_/g, '/');
const paddedSignature = base64Signature + '='.repeat((4 - base64Signature.length % 4) % 4);
Expand All@@ -91,3 +91,5 @@ export function verifySignature(data: string, signature: string, publicKeyPath:
return false;
}
}

export { getTokenFromConfig } from './tokenUtils.js';
33 changes: 33 additions & 0 deletions packages/crypto/src/tokenUtils.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import { PrismaClient } from "@sourcebot/db";
import { Token } from "@sourcebot/schemas/v3/shared.type";
import { decrypt } from "./index.js";

export const getTokenFromConfig = async (token: Token, orgId: number, db: PrismaClient) => {
if ('secret' in token) {
const secretKey = token.secret;
const secret = await db.secret.findUnique({
where: {
orgId_key: {
key: secretKey,
orgId
}
}
});

if (!secret) {
throw new Error(`Secret with key ${secretKey} not found for org ${orgId}`);
}

const decryptedToken = decrypt(secret.iv, secret.encryptedValue);
return decryptedToken;
} else if ('env' in token) {
const envToken = process.env[token.env];
if (!envToken) {
throw new Error(`Environment variable ${token.env} not found.`);
}

return envToken;
} else {
throw new Error('Invalid token configuration');
}
};
11 changes: 6 additions & 5 deletions packages/crypto/tsconfig.json
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
{
"compilerOptions": {
"target": "ES6",
"module": "CommonJS",
"lib": ["ES6"],
"target": "ES2022",
"module": "Node16",
"lib": ["ES2023"],
"outDir": "dist",
"rootDir": "src",
"declaration": true,
Expand All@@ -11,11 +11,12 @@
"strict": true,
"noImplicitAny": true,
"strictNullChecks": true,
"moduleResolution": "node",
"moduleResolution": "Node16",
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"skipLibCheck": true,
"isolatedModules": true
"isolatedModules": true,
"resolveJsonModule": true
},
"include": ["src/**/*"],
"exclude": ["node_modules", "dist"]
Expand Down
Binary file addedpackages/web/public/logo_512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions packages/web/public/manifest.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
{
"name": "Sourcebot",
"short_name": "Sourcebot",
"display": "standalone",
"start_url": "/",
"icons": [
{
"src": "/logo_512.png",
"sizes": "512x512",
"type": "image/png"
}
]
}

75 changes: 74 additions & 1 deletion packages/web/src/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,16 @@ import { CodeHostType, isServiceError } from "@/lib/utils";
import { prisma } from "@/prisma";
import { render } from "@react-email/components";
import * as Sentry from '@sentry/nextjs';
import { decrypt, encrypt, generateApiKey, hashSecret } from "@sourcebot/crypto";
import { decrypt, encrypt, generateApiKey, hashSecret, getTokenFromConfig } from "@sourcebot/crypto";
import { ConnectionSyncStatus, OrgRole, Prisma, RepoIndexingStatus, StripeSubscriptionStatus, Org, ApiKey } from "@sourcebot/db";
import { ConnectionConfig } from "@sourcebot/schemas/v3/connection.type";
import { gerritSchema } from "@sourcebot/schemas/v3/gerrit.schema";
import { giteaSchema } from "@sourcebot/schemas/v3/gitea.schema";
import { githubSchema } from "@sourcebot/schemas/v3/github.schema";
import { gitlabSchema } from "@sourcebot/schemas/v3/gitlab.schema";
import { GithubConnectionConfig } from "@sourcebot/schemas/v3/github.type";
import { GitlabConnectionConfig } from "@sourcebot/schemas/v3/gitlab.type";
import { GiteaConnectionConfig } from "@sourcebot/schemas/v3/gitea.type";
import Ajv from "ajv";
import { StatusCodes } from "http-status-codes";
import { cookies, headers } from "next/headers";
Expand DownExpand Up@@ -1712,6 +1715,76 @@ export const getSearchContexts = async (domain: string) => sew(() =>
}, /* minRequiredRole = */ OrgRole.GUEST), /* allowSingleTenantUnauthedAccess = */ true
));

export const getRepoImage = async (repoId: number, domain: string): Promise<ArrayBuffer | ServiceError> => sew(async () => {
return await withAuth(async (userId) => {
return await withOrgMembership(userId, domain, async ({ org }) => {
const repo = await prisma.repo.findUnique({
where: {
id: repoId,
orgId: org.id,
},
include: {
connections: {
include: {
connection: true,
}
}
}
});

if (!repo || !repo.imageUrl) {
return notFound();
}

const authHeaders: Record<string, string> = {};
for (const { connection } of repo.connections) {
try {
if (connection.connectionType === 'github') {
const config = connection.config as unknown as GithubConnectionConfig;
if (config.token) {
const token = await getTokenFromConfig(config.token, connection.orgId, prisma);
authHeaders['Authorization'] = `token ${token}`;
break;
}
} else if (connection.connectionType === 'gitlab') {
const config = connection.config as unknown as GitlabConnectionConfig;
if (config.token) {
const token = await getTokenFromConfig(config.token, connection.orgId, prisma);
authHeaders['PRIVATE-TOKEN'] = token;
break;
}
} else if (connection.connectionType === 'gitea') {
const config = connection.config as unknown as GiteaConnectionConfig;
if (config.token) {
const token = await getTokenFromConfig(config.token, connection.orgId, prisma);
authHeaders['Authorization'] = `token ${token}`;
break;
}
}
} catch (error) {
logger.warn(`Failed to get token for connection ${connection.id}:`, error);
}
}

try {
const response = await fetch(repo.imageUrl, {
headers: authHeaders,
});

if (!response.ok) {
logger.warn(`Failed to fetch image from ${repo.imageUrl}: ${response.status}`);
return notFound();
}

const imageBuffer = await response.arrayBuffer();
return imageBuffer;
} catch (error) {
logger.error(`Error proxying image for repo ${repoId}:`, error);
return notFound();
}
}, /* minRequiredRole = */ OrgRole.GUEST);
}, /* allowSingleTenantUnauthedAccess = */ true);
});

////// Helpers ///////

Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
'use client';

import { getDisplayTime } from "@/lib/utils";
import { getDisplayTime, getRepoImageSrc } from "@/lib/utils";
import Image from "next/image";
import { StatusIcon } from "../../components/statusIcon";
import { RepoIndexingStatus } from "@sourcebot/db";
Expand DownExpand Up@@ -46,14 +46,16 @@ export const RepoListItem = ({
}
}, [status]);

const imageSrc = getRepoImageSrc(imageUrl, repoId, domain);
Comment thread
msukkari marked this conversation as resolved.

return (
<div
className="flex flex-row items-center p-4 border rounded-lg bg-background justify-between"
>
<div className="flex flex-row items-center gap-2">
{imageUrl ? (
{imageSrc ? (
<Image
src={imageUrl}
src={imageSrc}
alt={name}
width={32}
height={32}
Expand Down
5 changes: 3 additions & 2 deletions packages/web/src/app/[domain]/repos/columns.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,12 +6,13 @@ import { ArrowUpDown, ExternalLink, Clock, Loader2, CheckCircle2, XCircle, Trash
import Image from "next/image"
import { Badge } from "@/components/ui/badge"
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip"
import { cn } from "@/lib/utils"
import { cn, getRepoImageSrc } from "@/lib/utils"
import { RepoIndexingStatus } from "@sourcebot/db";
import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "@/components/ui/dropdown-menu"
import { AddRepoButton } from "./addRepoButton"

export type RepositoryColumnInfo = {
repoId: number
name: string
imageUrl?: string
connections: {
Expand DownExpand Up@@ -112,7 +113,7 @@ export const columns = (domain: string): ColumnDef<RepositoryColumnInfo>[] => [
<div className="relative h-8 w-8 overflow-hidden rounded-md border bg-muted">
{repo.imageUrl ? (
<Image
src={repo.imageUrl || "/placeholder.svg"}
src={getRepoImageSrc(repo.imageUrl, repo.repoId, domain) || "/placeholder.svg"}
alt={`${repo.name} logo`}
width={32}
height={32}
Expand Down
2 changes: 2 additions & 0 deletions packages/web/src/app/[domain]/repos/repositoryTable.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ export const RepositoryTable = () => {

const tableRepos = useMemo(() => {
if (reposLoading) return Array(4).fill(null).map(() => ({
repoId: 0,
name: "",
connections: [],
repoIndexingStatus: RepoIndexingStatus.NEW,
Expand All@@ -35,6 +36,7 @@ export const RepositoryTable = () => {

if (!repos) return [];
return repos.map((repo): RepositoryColumnInfo => ({
repoId: repo.repoId,
name: repo.repoDisplayName ?? repo.repoName,
imageUrl: repo.imageUrl,
connections: repo.linkedConnections,
Expand Down
27 changes: 27 additions & 0 deletions packages/web/src/app/api/[domain]/repos/[repoId]/image/route.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
import { getRepoImage } from "@/actions";
import { isServiceError } from "@/lib/utils";
import { NextRequest } from "next/server";

export async function GET(
request: NextRequest,
{ params }: { params: { domain: string; repoId: string } }
) {
const { domain, repoId } = params;
const repoIdNum = parseInt(repoId);

if (isNaN(repoIdNum)) {
return new Response("Invalid repo ID", { status: 400 });
}

const result = await getRepoImage(repoIdNum, domain);
if (isServiceError(result)) {
return new Response(result.message, { status: result.statusCode });
}

return new Response(result, {
headers: {
'Content-Type': 'image/png',
'Cache-Control': 'public, max-age=3600',
},
});
}
1 change: 1 addition & 0 deletions packages/web/src/app/layout.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import { getEntitlements } from "@/features/entitlements/server";
export const metadata: Metadata = {
title: "Sourcebot",
description: "Sourcebot",
manifest: "/manifest.json",
};

export default function RootLayout({
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added
- Added seperate page for signup. [#311](https://github.com/sourcebot-dev/sourcebot/pull/331)
- Fix repo images in authed instance case and add manifest json. [#332](https://github.com/sourcebot-dev/sourcebot/pull/332)
- Added encryption logic for license keys. [#335](https://github.com/sourcebot-dev/sourcebot/pull/335)

## [4.1.1] - 2025-06-03
Expand Down
44 changes: 10 additions & 34 deletions packages/backend/src/utils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,7 @@ import { Logger } from "winston";
import { AppContext } from "./types.js";
import path from 'path';
import { PrismaClient, Repo } from "@sourcebot/db";
import { decrypt } from "@sourcebot/crypto";
import { Token } from "@sourcebot/schemas/v3/shared.type";
import { getTokenFromConfig as getTokenFromConfigBase } from "@sourcebot/crypto";
import { BackendException, BackendError } from "@sourcebot/error";
import * as Sentry from "@sentry/node";

Expand All@@ -25,44 +24,21 @@ export const isRemotePath = (path: string) => {
return path.startsWith('https://') || path.startsWith('http://');
}

export const getTokenFromConfig = async (token: Token, orgId: number, db: PrismaClient, logger?: Logger) => {
if ('secret' in token) {
const secretKey = token.secret;
const secret = await db.secret.findUnique({
where: {
orgId_key: {
key: secretKey,
orgId
}
}
});

if (!secret) {
export const getTokenFromConfig = async (token: any, orgId: number, db: PrismaClient, logger?: Logger) => {
try {
return await getTokenFromConfigBase(token, orgId, db);
} catch (error: unknown) {
if (error instanceof Error) {
const e = new BackendException(BackendError.CONNECTION_SYNC_SECRET_DNE, {
message: `Secret with key ${secretKey} not found for org ${orgId}`,
message: error.message,
});
Sentry.captureException(e);
logger?.error(e.metadata.message);
logger?.error(error.message);
throw e;
}

const decryptedToken = decrypt(secret.iv, secret.encryptedValue);
return decryptedToken;
} else {
const envToken = process.env[token.env];
if (!envToken) {
const e = new BackendException(BackendError.CONNECTION_SYNC_SECRET_DNE, {
message: `Environment variable ${token.env} not found.`,
});
Sentry.captureException(e);
logger?.error(e.metadata.message);
throw e;
}

return envToken;
throw error;
}
}

};

export const resolvePathRelativeToConfig = (localPath: string, configPath: string) => {
let absolutePath = localPath;
Expand Down
2 changes: 2 additions & 0 deletions packages/crypto/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,8 @@
"postinstall": "yarn build"
},
"dependencies": {
"@sourcebot/db": "*",
"@sourcebot/schemas": "*",
"dotenv": "^16.4.5"
},
"devDependencies": {
Expand Down
4 changes: 3 additions & 1 deletion packages/crypto/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@ export function verifySignature(data: string, signature: string, publicKeyPath:
publicKey = fs.readFileSync(publicKeyPath, 'utf8');
publicKeyCache.set(publicKeyPath, publicKey);
}

// Convert base64url signature to base64 if needed
const base64Signature = signature.replace(/-/g, '+').replace(/_/g, '/');
const paddedSignature = base64Signature + '='.repeat((4 - base64Signature.length % 4) % 4);
Expand All@@ -91,3 +91,5 @@ export function verifySignature(data: string, signature: string, publicKeyPath:
return false;
}
}

export { getTokenFromConfig } from './tokenUtils.js';
33 changes: 33 additions & 0 deletions packages/crypto/src/tokenUtils.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import { PrismaClient } from "@sourcebot/db";
import { Token } from "@sourcebot/schemas/v3/shared.type";
import { decrypt } from "./index.js";

export const getTokenFromConfig = async (token: Token, orgId: number, db: PrismaClient) => {
if ('secret' in token) {
const secretKey = token.secret;
const secret = await db.secret.findUnique({
where: {
orgId_key: {
key: secretKey,
orgId
}
}
});

if (!secret) {
throw new Error(`Secret with key ${secretKey} not found for org ${orgId}`);
}

const decryptedToken = decrypt(secret.iv, secret.encryptedValue);
return decryptedToken;
} else if ('env' in token) {
const envToken = process.env[token.env];
if (!envToken) {
throw new Error(`Environment variable ${token.env} not found.`);
}

return envToken;
} else {
throw new Error('Invalid token configuration');
}
};
11 changes: 6 additions & 5 deletions packages/crypto/tsconfig.json
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
{
"compilerOptions": {
"target": "ES6",
"module": "CommonJS",
"lib": ["ES6"],
"target": "ES2022",
"module": "Node16",
"lib": ["ES2023"],
"outDir": "dist",
"rootDir": "src",
"declaration": true,
Expand All@@ -11,11 +11,12 @@
"strict": true,
"noImplicitAny": true,
"strictNullChecks": true,
"moduleResolution": "node",
"moduleResolution": "Node16",
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"skipLibCheck": true,
"isolatedModules": true
"isolatedModules": true,
"resolveJsonModule": true
},
"include": ["src/**/*"],
"exclude": ["node_modules", "dist"]
Expand Down
Binary file addedpackages/web/public/logo_512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions packages/web/public/manifest.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
{
"name": "Sourcebot",
"short_name": "Sourcebot",
"display": "standalone",
"start_url": "/",
"icons": [
{
"src": "/logo_512.png",
"sizes": "512x512",
"type": "image/png"
}
]
}

75 changes: 74 additions & 1 deletion packages/web/src/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,16 @@ import { CodeHostType, isServiceError } from "@/lib/utils";
import { prisma } from "@/prisma";
import { render } from "@react-email/components";
import * as Sentry from '@sentry/nextjs';
import { decrypt, encrypt, generateApiKey, hashSecret } from "@sourcebot/crypto";
import { decrypt, encrypt, generateApiKey, hashSecret, getTokenFromConfig } from "@sourcebot/crypto";
import { ConnectionSyncStatus, OrgRole, Prisma, RepoIndexingStatus, StripeSubscriptionStatus, Org, ApiKey } from "@sourcebot/db";
import { ConnectionConfig } from "@sourcebot/schemas/v3/connection.type";
import { gerritSchema } from "@sourcebot/schemas/v3/gerrit.schema";
import { giteaSchema } from "@sourcebot/schemas/v3/gitea.schema";
import { githubSchema } from "@sourcebot/schemas/v3/github.schema";
import { gitlabSchema } from "@sourcebot/schemas/v3/gitlab.schema";
import { GithubConnectionConfig } from "@sourcebot/schemas/v3/github.type";
import { GitlabConnectionConfig } from "@sourcebot/schemas/v3/gitlab.type";
import { GiteaConnectionConfig } from "@sourcebot/schemas/v3/gitea.type";
import Ajv from "ajv";
import { StatusCodes } from "http-status-codes";
import { cookies, headers } from "next/headers";
Expand DownExpand Up@@ -1712,6 +1715,76 @@ export const getSearchContexts = async (domain: string) => sew(() =>
}, /* minRequiredRole = */ OrgRole.GUEST), /* allowSingleTenantUnauthedAccess = */ true
));

export const getRepoImage = async (repoId: number, domain: string): Promise<ArrayBuffer | ServiceError> => sew(async () => {
return await withAuth(async (userId) => {
return await withOrgMembership(userId, domain, async ({ org }) => {
const repo = await prisma.repo.findUnique({
where: {
id: repoId,
orgId: org.id,
},
include: {
connections: {
include: {
connection: true,
}
}
}
});

if (!repo || !repo.imageUrl) {
return notFound();
}

const authHeaders: Record<string, string> = {};
for (const { connection } of repo.connections) {
try {
if (connection.connectionType === 'github') {
const config = connection.config as unknown as GithubConnectionConfig;
if (config.token) {
const token = await getTokenFromConfig(config.token, connection.orgId, prisma);
authHeaders['Authorization'] = `token ${token}`;
break;
}
} else if (connection.connectionType === 'gitlab') {
const config = connection.config as unknown as GitlabConnectionConfig;
if (config.token) {
const token = await getTokenFromConfig(config.token, connection.orgId, prisma);
authHeaders['PRIVATE-TOKEN'] = token;
break;
}
} else if (connection.connectionType === 'gitea') {
const config = connection.config as unknown as GiteaConnectionConfig;
if (config.token) {
const token = await getTokenFromConfig(config.token, connection.orgId, prisma);
authHeaders['Authorization'] = `token ${token}`;
break;
}
}
} catch (error) {
logger.warn(`Failed to get token for connection ${connection.id}:`, error);
}
}

try {
const response = await fetch(repo.imageUrl, {
headers: authHeaders,
});

if (!response.ok) {
logger.warn(`Failed to fetch image from ${repo.imageUrl}: ${response.status}`);
return notFound();
}

const imageBuffer = await response.arrayBuffer();
return imageBuffer;
} catch (error) {
logger.error(`Error proxying image for repo ${repoId}:`, error);
return notFound();
}
}, /* minRequiredRole = */ OrgRole.GUEST);
}, /* allowSingleTenantUnauthedAccess = */ true);
});

////// Helpers ///////

Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
'use client';

import { getDisplayTime } from "@/lib/utils";
import { getDisplayTime, getRepoImageSrc } from "@/lib/utils";
import Image from "next/image";
import { StatusIcon } from "../../components/statusIcon";
import { RepoIndexingStatus } from "@sourcebot/db";
Expand DownExpand Up@@ -46,14 +46,16 @@ export const RepoListItem = ({
}
}, [status]);

const imageSrc = getRepoImageSrc(imageUrl, repoId, domain);
Comment thread
msukkari marked this conversation as resolved.

return (
<div
className="flex flex-row items-center p-4 border rounded-lg bg-background justify-between"
>
<div className="flex flex-row items-center gap-2">
{imageUrl ? (
{imageSrc ? (
<Image
src={imageUrl}
src={imageSrc}
alt={name}
width={32}
height={32}
Expand Down
5 changes: 3 additions & 2 deletions packages/web/src/app/[domain]/repos/columns.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,12 +6,13 @@ import { ArrowUpDown, ExternalLink, Clock, Loader2, CheckCircle2, XCircle, Trash
import Image from "next/image"
import { Badge } from "@/components/ui/badge"
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip"
import { cn } from "@/lib/utils"
import { cn, getRepoImageSrc } from "@/lib/utils"
import { RepoIndexingStatus } from "@sourcebot/db";
import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "@/components/ui/dropdown-menu"
import { AddRepoButton } from "./addRepoButton"

export type RepositoryColumnInfo = {
repoId: number
name: string
imageUrl?: string
connections: {
Expand DownExpand Up@@ -112,7 +113,7 @@ export const columns = (domain: string): ColumnDef<RepositoryColumnInfo>[] => [
<div className="relative h-8 w-8 overflow-hidden rounded-md border bg-muted">
{repo.imageUrl ? (
<Image
src={repo.imageUrl || "/placeholder.svg"}
src={getRepoImageSrc(repo.imageUrl, repo.repoId, domain) || "/placeholder.svg"}
alt={`${repo.name} logo`}
width={32}
height={32}
Expand Down
2 changes: 2 additions & 0 deletions packages/web/src/app/[domain]/repos/repositoryTable.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ export const RepositoryTable = () => {

const tableRepos = useMemo(() => {
if (reposLoading) return Array(4).fill(null).map(() => ({
repoId: 0,
name: "",
connections: [],
repoIndexingStatus: RepoIndexingStatus.NEW,
Expand All@@ -35,6 +36,7 @@ export const RepositoryTable = () => {

if (!repos) return [];
return repos.map((repo): RepositoryColumnInfo => ({
repoId: repo.repoId,
name: repo.repoDisplayName ?? repo.repoName,
imageUrl: repo.imageUrl,
connections: repo.linkedConnections,
Expand Down
27 changes: 27 additions & 0 deletions packages/web/src/app/api/[domain]/repos/[repoId]/image/route.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
import { getRepoImage } from "@/actions";
import { isServiceError } from "@/lib/utils";
import { NextRequest } from "next/server";

export async function GET(
request: NextRequest,
{ params }: { params: { domain: string; repoId: string } }
) {
const { domain, repoId } = params;
const repoIdNum = parseInt(repoId);

if (isNaN(repoIdNum)) {
return new Response("Invalid repo ID", { status: 400 });
}

const result = await getRepoImage(repoIdNum, domain);
if (isServiceError(result)) {
return new Response(result.message, { status: result.statusCode });
}

return new Response(result, {
headers: {
'Content-Type': 'image/png',
'Cache-Control': 'public, max-age=3600',
},
});
}
1 change: 1 addition & 0 deletions packages/web/src/app/layout.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import { getEntitlements } from "@/features/entitlements/server";
export const metadata: Metadata = {
title: "Sourcebot",
description: "Sourcebot",
manifest: "/manifest.json",
};

export default function RootLayout({
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added
- Added seperate page for signup. [#311](https://github.com/sourcebot-dev/sourcebot/pull/331)
- Fix repo images in authed instance case and add manifest json. [#332](https://github.com/sourcebot-dev/sourcebot/pull/332)
- Added encryption logic for license keys. [#335](https://github.com/sourcebot-dev/sourcebot/pull/335)

## [4.1.1] - 2025-06-03
Expand Down
44 changes: 10 additions & 34 deletions packages/backend/src/utils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,7 @@ import { Logger } from "winston";
import { AppContext } from "./types.js";
import path from 'path';
import { PrismaClient, Repo } from "@sourcebot/db";
import { decrypt } from "@sourcebot/crypto";
import { Token } from "@sourcebot/schemas/v3/shared.type";
import { getTokenFromConfig as getTokenFromConfigBase } from "@sourcebot/crypto";
import { BackendException, BackendError } from "@sourcebot/error";
import * as Sentry from "@sentry/node";

Expand All@@ -25,44 +24,21 @@ export const isRemotePath = (path: string) => {
return path.startsWith('https://') || path.startsWith('http://');
}

export const getTokenFromConfig = async (token: Token, orgId: number, db: PrismaClient, logger?: Logger) => {
if ('secret' in token) {
const secretKey = token.secret;
const secret = await db.secret.findUnique({
where: {
orgId_key: {
key: secretKey,
orgId
}
}
});

if (!secret) {
export const getTokenFromConfig = async (token: any, orgId: number, db: PrismaClient, logger?: Logger) => {
try {
return await getTokenFromConfigBase(token, orgId, db);
} catch (error: unknown) {
if (error instanceof Error) {
const e = new BackendException(BackendError.CONNECTION_SYNC_SECRET_DNE, {
message: `Secret with key ${secretKey} not found for org ${orgId}`,
message: error.message,
});
Sentry.captureException(e);
logger?.error(e.metadata.message);
logger?.error(error.message);
throw e;
}

const decryptedToken = decrypt(secret.iv, secret.encryptedValue);
return decryptedToken;
} else {
const envToken = process.env[token.env];
if (!envToken) {
const e = new BackendException(BackendError.CONNECTION_SYNC_SECRET_DNE, {
message: `Environment variable ${token.env} not found.`,
});
Sentry.captureException(e);
logger?.error(e.metadata.message);
throw e;
}

return envToken;
throw error;
}
}

};

export const resolvePathRelativeToConfig = (localPath: string, configPath: string) => {
let absolutePath = localPath;
Expand Down
2 changes: 2 additions & 0 deletions packages/crypto/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,8 @@
"postinstall": "yarn build"
},
"dependencies": {
"@sourcebot/db": "*",
"@sourcebot/schemas": "*",
"dotenv": "^16.4.5"
},
"devDependencies": {
Expand Down
4 changes: 3 additions & 1 deletion packages/crypto/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@ export function verifySignature(data: string, signature: string, publicKeyPath:
publicKey = fs.readFileSync(publicKeyPath, 'utf8');
publicKeyCache.set(publicKeyPath, publicKey);
}

// Convert base64url signature to base64 if needed
const base64Signature = signature.replace(/-/g, '+').replace(/_/g, '/');
const paddedSignature = base64Signature + '='.repeat((4 - base64Signature.length % 4) % 4);
Expand All@@ -91,3 +91,5 @@ export function verifySignature(data: string, signature: string, publicKeyPath:
return false;
}
}

export { getTokenFromConfig } from './tokenUtils.js';
33 changes: 33 additions & 0 deletions packages/crypto/src/tokenUtils.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import { PrismaClient } from "@sourcebot/db";
import { Token } from "@sourcebot/schemas/v3/shared.type";
import { decrypt } from "./index.js";

export const getTokenFromConfig = async (token: Token, orgId: number, db: PrismaClient) => {
if ('secret' in token) {
const secretKey = token.secret;
const secret = await db.secret.findUnique({
where: {
orgId_key: {
key: secretKey,
orgId
}
}
});

if (!secret) {
throw new Error(`Secret with key ${secretKey} not found for org ${orgId}`);
}

const decryptedToken = decrypt(secret.iv, secret.encryptedValue);
return decryptedToken;
} else if ('env' in token) {
const envToken = process.env[token.env];
if (!envToken) {
throw new Error(`Environment variable ${token.env} not found.`);
}

return envToken;
} else {
throw new Error('Invalid token configuration');
}
};
11 changes: 6 additions & 5 deletions packages/crypto/tsconfig.json
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
{
"compilerOptions": {
"target": "ES6",
"module": "CommonJS",
"lib": ["ES6"],
"target": "ES2022",
"module": "Node16",
"lib": ["ES2023"],
"outDir": "dist",
"rootDir": "src",
"declaration": true,
Expand All@@ -11,11 +11,12 @@
"strict": true,
"noImplicitAny": true,
"strictNullChecks": true,
"moduleResolution": "node",
"moduleResolution": "Node16",
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"skipLibCheck": true,
"isolatedModules": true
"isolatedModules": true,
"resolveJsonModule": true
},
"include": ["src/**/*"],
"exclude": ["node_modules", "dist"]
Expand Down
Binary file addedpackages/web/public/logo_512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions packages/web/public/manifest.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
{
"name": "Sourcebot",
"short_name": "Sourcebot",
"display": "standalone",
"start_url": "/",
"icons": [
{
"src": "/logo_512.png",
"sizes": "512x512",
"type": "image/png"
}
]
}

75 changes: 74 additions & 1 deletion packages/web/src/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,16 @@ import { CodeHostType, isServiceError } from "@/lib/utils";
import { prisma } from "@/prisma";
import { render } from "@react-email/components";
import * as Sentry from '@sentry/nextjs';
import { decrypt, encrypt, generateApiKey, hashSecret } from "@sourcebot/crypto";
import { decrypt, encrypt, generateApiKey, hashSecret, getTokenFromConfig } from "@sourcebot/crypto";
import { ConnectionSyncStatus, OrgRole, Prisma, RepoIndexingStatus, StripeSubscriptionStatus, Org, ApiKey } from "@sourcebot/db";
import { ConnectionConfig } from "@sourcebot/schemas/v3/connection.type";
import { gerritSchema } from "@sourcebot/schemas/v3/gerrit.schema";
import { giteaSchema } from "@sourcebot/schemas/v3/gitea.schema";
import { githubSchema } from "@sourcebot/schemas/v3/github.schema";
import { gitlabSchema } from "@sourcebot/schemas/v3/gitlab.schema";
import { GithubConnectionConfig } from "@sourcebot/schemas/v3/github.type";
import { GitlabConnectionConfig } from "@sourcebot/schemas/v3/gitlab.type";
import { GiteaConnectionConfig } from "@sourcebot/schemas/v3/gitea.type";
import Ajv from "ajv";
import { StatusCodes } from "http-status-codes";
import { cookies, headers } from "next/headers";
Expand DownExpand Up@@ -1712,6 +1715,76 @@ export const getSearchContexts = async (domain: string) => sew(() =>
}, /* minRequiredRole = */ OrgRole.GUEST), /* allowSingleTenantUnauthedAccess = */ true
));

export const getRepoImage = async (repoId: number, domain: string): Promise<ArrayBuffer | ServiceError> => sew(async () => {
return await withAuth(async (userId) => {
return await withOrgMembership(userId, domain, async ({ org }) => {
const repo = await prisma.repo.findUnique({
where: {
id: repoId,
orgId: org.id,
},
include: {
connections: {
include: {
connection: true,
}
}
}
});

if (!repo || !repo.imageUrl) {
return notFound();
}

const authHeaders: Record<string, string> = {};
for (const { connection } of repo.connections) {
try {
if (connection.connectionType === 'github') {
const config = connection.config as unknown as GithubConnectionConfig;
if (config.token) {
const token = await getTokenFromConfig(config.token, connection.orgId, prisma);
authHeaders['Authorization'] = `token ${token}`;
break;
}
} else if (connection.connectionType === 'gitlab') {
const config = connection.config as unknown as GitlabConnectionConfig;
if (config.token) {
const token = await getTokenFromConfig(config.token, connection.orgId, prisma);
authHeaders['PRIVATE-TOKEN'] = token;
break;
}
} else if (connection.connectionType === 'gitea') {
const config = connection.config as unknown as GiteaConnectionConfig;
if (config.token) {
const token = await getTokenFromConfig(config.token, connection.orgId, prisma);
authHeaders['Authorization'] = `token ${token}`;
break;
}
}
} catch (error) {
logger.warn(`Failed to get token for connection ${connection.id}:`, error);
}
}

try {
const response = await fetch(repo.imageUrl, {
headers: authHeaders,
});

if (!response.ok) {
logger.warn(`Failed to fetch image from ${repo.imageUrl}: ${response.status}`);
return notFound();
}

const imageBuffer = await response.arrayBuffer();
return imageBuffer;
} catch (error) {
logger.error(`Error proxying image for repo ${repoId}:`, error);
return notFound();
}
}, /* minRequiredRole = */ OrgRole.GUEST);
}, /* allowSingleTenantUnauthedAccess = */ true);
});

////// Helpers ///////

Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
'use client';

import { getDisplayTime } from "@/lib/utils";
import { getDisplayTime, getRepoImageSrc } from "@/lib/utils";
import Image from "next/image";
import { StatusIcon } from "../../components/statusIcon";
import { RepoIndexingStatus } from "@sourcebot/db";
Expand DownExpand Up@@ -46,14 +46,16 @@ export const RepoListItem = ({
}
}, [status]);

const imageSrc = getRepoImageSrc(imageUrl, repoId, domain);
Comment thread
msukkari marked this conversation as resolved.

return (
<div
className="flex flex-row items-center p-4 border rounded-lg bg-background justify-between"
>
<div className="flex flex-row items-center gap-2">
{imageUrl ? (
{imageSrc ? (
<Image
src={imageUrl}
src={imageSrc}
alt={name}
width={32}
height={32}
Expand Down
5 changes: 3 additions & 2 deletions packages/web/src/app/[domain]/repos/columns.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,12 +6,13 @@ import { ArrowUpDown, ExternalLink, Clock, Loader2, CheckCircle2, XCircle, Trash
import Image from "next/image"
import { Badge } from "@/components/ui/badge"
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip"
import { cn } from "@/lib/utils"
import { cn, getRepoImageSrc } from "@/lib/utils"
import { RepoIndexingStatus } from "@sourcebot/db";
import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "@/components/ui/dropdown-menu"
import { AddRepoButton } from "./addRepoButton"

export type RepositoryColumnInfo = {
repoId: number
name: string
imageUrl?: string
connections: {
Expand DownExpand Up@@ -112,7 +113,7 @@ export const columns = (domain: string): ColumnDef<RepositoryColumnInfo>[] => [
<div className="relative h-8 w-8 overflow-hidden rounded-md border bg-muted">
{repo.imageUrl ? (
<Image
src={repo.imageUrl || "/placeholder.svg"}
src={getRepoImageSrc(repo.imageUrl, repo.repoId, domain) || "/placeholder.svg"}
alt={`${repo.name} logo`}
width={32}
height={32}
Expand Down
2 changes: 2 additions & 0 deletions packages/web/src/app/[domain]/repos/repositoryTable.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ export const RepositoryTable = () => {

const tableRepos = useMemo(() => {
if (reposLoading) return Array(4).fill(null).map(() => ({
repoId: 0,
name: "",
connections: [],
repoIndexingStatus: RepoIndexingStatus.NEW,
Expand All@@ -35,6 +36,7 @@ export const RepositoryTable = () => {

if (!repos) return [];
return repos.map((repo): RepositoryColumnInfo => ({
repoId: repo.repoId,
name: repo.repoDisplayName ?? repo.repoName,
imageUrl: repo.imageUrl,
connections: repo.linkedConnections,
Expand Down
27 changes: 27 additions & 0 deletions packages/web/src/app/api/[domain]/repos/[repoId]/image/route.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
import { getRepoImage } from "@/actions";
import { isServiceError } from "@/lib/utils";
import { NextRequest } from "next/server";

export async function GET(
request: NextRequest,
{ params }: { params: { domain: string; repoId: string } }
) {
const { domain, repoId } = params;
const repoIdNum = parseInt(repoId);

if (isNaN(repoIdNum)) {
return new Response("Invalid repo ID", { status: 400 });
}

const result = await getRepoImage(repoIdNum, domain);
if (isServiceError(result)) {
return new Response(result.message, { status: result.statusCode });
}

return new Response(result, {
headers: {
'Content-Type': 'image/png',
'Cache-Control': 'public, max-age=3600',
},
});
}
1 change: 1 addition & 0 deletions packages/web/src/app/layout.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import { getEntitlements } from "@/features/entitlements/server";
export const metadata: Metadata = {
title: "Sourcebot",
description: "Sourcebot",
manifest: "/manifest.json",
};

export default function RootLayout({
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added
- Added seperate page for signup. [#311](https://github.com/sourcebot-dev/sourcebot/pull/331)
- Fix repo images in authed instance case and add manifest json. [#332](https://github.com/sourcebot-dev/sourcebot/pull/332)
- Added encryption logic for license keys. [#335](https://github.com/sourcebot-dev/sourcebot/pull/335)

## [4.1.1] - 2025-06-03
Expand Down
44 changes: 10 additions & 34 deletions packages/backend/src/utils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,7 @@ import { Logger } from "winston";
import { AppContext } from "./types.js";
import path from 'path';
import { PrismaClient, Repo } from "@sourcebot/db";
import { decrypt } from "@sourcebot/crypto";
import { Token } from "@sourcebot/schemas/v3/shared.type";
import { getTokenFromConfig as getTokenFromConfigBase } from "@sourcebot/crypto";
import { BackendException, BackendError } from "@sourcebot/error";
import * as Sentry from "@sentry/node";

Expand All@@ -25,44 +24,21 @@ export const isRemotePath = (path: string) => {
return path.startsWith('https://') || path.startsWith('http://');
}

export const getTokenFromConfig = async (token: Token, orgId: number, db: PrismaClient, logger?: Logger) => {
if ('secret' in token) {
const secretKey = token.secret;
const secret = await db.secret.findUnique({
where: {
orgId_key: {
key: secretKey,
orgId
}
}
});

if (!secret) {
export const getTokenFromConfig = async (token: any, orgId: number, db: PrismaClient, logger?: Logger) => {
try {
return await getTokenFromConfigBase(token, orgId, db);
} catch (error: unknown) {
if (error instanceof Error) {
const e = new BackendException(BackendError.CONNECTION_SYNC_SECRET_DNE, {
message: `Secret with key ${secretKey} not found for org ${orgId}`,
message: error.message,
});
Sentry.captureException(e);
logger?.error(e.metadata.message);
logger?.error(error.message);
throw e;
}

const decryptedToken = decrypt(secret.iv, secret.encryptedValue);
return decryptedToken;
} else {
const envToken = process.env[token.env];
if (!envToken) {
const e = new BackendException(BackendError.CONNECTION_SYNC_SECRET_DNE, {
message: `Environment variable ${token.env} not found.`,
});
Sentry.captureException(e);
logger?.error(e.metadata.message);
throw e;
}

return envToken;
throw error;
}
}

};

export const resolvePathRelativeToConfig = (localPath: string, configPath: string) => {
let absolutePath = localPath;
Expand Down
2 changes: 2 additions & 0 deletions packages/crypto/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,8 @@
"postinstall": "yarn build"
},
"dependencies": {
"@sourcebot/db": "*",
"@sourcebot/schemas": "*",
"dotenv": "^16.4.5"
},
"devDependencies": {
Expand Down
4 changes: 3 additions & 1 deletion packages/crypto/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@ export function verifySignature(data: string, signature: string, publicKeyPath:
publicKey = fs.readFileSync(publicKeyPath, 'utf8');
publicKeyCache.set(publicKeyPath, publicKey);
}

// Convert base64url signature to base64 if needed
const base64Signature = signature.replace(/-/g, '+').replace(/_/g, '/');
const paddedSignature = base64Signature + '='.repeat((4 - base64Signature.length % 4) % 4);
Expand All@@ -91,3 +91,5 @@ export function verifySignature(data: string, signature: string, publicKeyPath:
return false;
}
}

export { getTokenFromConfig } from './tokenUtils.js';
33 changes: 33 additions & 0 deletions packages/crypto/src/tokenUtils.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import { PrismaClient } from "@sourcebot/db";
import { Token } from "@sourcebot/schemas/v3/shared.type";
import { decrypt } from "./index.js";

export const getTokenFromConfig = async (token: Token, orgId: number, db: PrismaClient) => {
if ('secret' in token) {
const secretKey = token.secret;
const secret = await db.secret.findUnique({
where: {
orgId_key: {
key: secretKey,
orgId
}
}
});

if (!secret) {
throw new Error(`Secret with key ${secretKey} not found for org ${orgId}`);
}

const decryptedToken = decrypt(secret.iv, secret.encryptedValue);
return decryptedToken;
} else if ('env' in token) {
const envToken = process.env[token.env];
if (!envToken) {
throw new Error(`Environment variable ${token.env} not found.`);
}

return envToken;
} else {
throw new Error('Invalid token configuration');
}
};
11 changes: 6 additions & 5 deletions packages/crypto/tsconfig.json
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
{
"compilerOptions": {
"target": "ES6",
"module": "CommonJS",
"lib": ["ES6"],
"target": "ES2022",
"module": "Node16",
"lib": ["ES2023"],
"outDir": "dist",
"rootDir": "src",
"declaration": true,
Expand All@@ -11,11 +11,12 @@
"strict": true,
"noImplicitAny": true,
"strictNullChecks": true,
"moduleResolution": "node",
"moduleResolution": "Node16",
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"skipLibCheck": true,
"isolatedModules": true
"isolatedModules": true,
"resolveJsonModule": true
},
"include": ["src/**/*"],
"exclude": ["node_modules", "dist"]
Expand Down
Binary file addedpackages/web/public/logo_512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions packages/web/public/manifest.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
{
"name": "Sourcebot",
"short_name": "Sourcebot",
"display": "standalone",
"start_url": "/",
"icons": [
{
"src": "/logo_512.png",
"sizes": "512x512",
"type": "image/png"
}
]
}

75 changes: 74 additions & 1 deletion packages/web/src/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,16 @@ import { CodeHostType, isServiceError } from "@/lib/utils";
import { prisma } from "@/prisma";
import { render } from "@react-email/components";
import * as Sentry from '@sentry/nextjs';
import { decrypt, encrypt, generateApiKey, hashSecret } from "@sourcebot/crypto";
import { decrypt, encrypt, generateApiKey, hashSecret, getTokenFromConfig } from "@sourcebot/crypto";
import { ConnectionSyncStatus, OrgRole, Prisma, RepoIndexingStatus, StripeSubscriptionStatus, Org, ApiKey } from "@sourcebot/db";
import { ConnectionConfig } from "@sourcebot/schemas/v3/connection.type";
import { gerritSchema } from "@sourcebot/schemas/v3/gerrit.schema";
import { giteaSchema } from "@sourcebot/schemas/v3/gitea.schema";
import { githubSchema } from "@sourcebot/schemas/v3/github.schema";
import { gitlabSchema } from "@sourcebot/schemas/v3/gitlab.schema";
import { GithubConnectionConfig } from "@sourcebot/schemas/v3/github.type";
import { GitlabConnectionConfig } from "@sourcebot/schemas/v3/gitlab.type";
import { GiteaConnectionConfig } from "@sourcebot/schemas/v3/gitea.type";
import Ajv from "ajv";
import { StatusCodes } from "http-status-codes";
import { cookies, headers } from "next/headers";
Expand DownExpand Up@@ -1712,6 +1715,76 @@ export const getSearchContexts = async (domain: string) => sew(() =>
}, /* minRequiredRole = */ OrgRole.GUEST), /* allowSingleTenantUnauthedAccess = */ true
));

export const getRepoImage = async (repoId: number, domain: string): Promise<ArrayBuffer | ServiceError> => sew(async () => {
return await withAuth(async (userId) => {
return await withOrgMembership(userId, domain, async ({ org }) => {
const repo = await prisma.repo.findUnique({
where: {
id: repoId,
orgId: org.id,
},
include: {
connections: {
include: {
connection: true,
}
}
}
});

if (!repo || !repo.imageUrl) {
return notFound();
}

const authHeaders: Record<string, string> = {};
for (const { connection } of repo.connections) {
try {
if (connection.connectionType === 'github') {
const config = connection.config as unknown as GithubConnectionConfig;
if (config.token) {
const token = await getTokenFromConfig(config.token, connection.orgId, prisma);
authHeaders['Authorization'] = `token ${token}`;
break;
}
} else if (connection.connectionType === 'gitlab') {
const config = connection.config as unknown as GitlabConnectionConfig;
if (config.token) {
const token = await getTokenFromConfig(config.token, connection.orgId, prisma);
authHeaders['PRIVATE-TOKEN'] = token;
break;
}
} else if (connection.connectionType === 'gitea') {
const config = connection.config as unknown as GiteaConnectionConfig;
if (config.token) {
const token = await getTokenFromConfig(config.token, connection.orgId, prisma);
authHeaders['Authorization'] = `token ${token}`;
break;
}
}
} catch (error) {
logger.warn(`Failed to get token for connection ${connection.id}:`, error);
}
}

try {
const response = await fetch(repo.imageUrl, {
headers: authHeaders,
});

if (!response.ok) {
logger.warn(`Failed to fetch image from ${repo.imageUrl}: ${response.status}`);
return notFound();
}

const imageBuffer = await response.arrayBuffer();
return imageBuffer;
} catch (error) {
logger.error(`Error proxying image for repo ${repoId}:`, error);
return notFound();
}
}, /* minRequiredRole = */ OrgRole.GUEST);
}, /* allowSingleTenantUnauthedAccess = */ true);
});

////// Helpers ///////

Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
'use client';

import { getDisplayTime } from "@/lib/utils";
import { getDisplayTime, getRepoImageSrc } from "@/lib/utils";
import Image from "next/image";
import { StatusIcon } from "../../components/statusIcon";
import { RepoIndexingStatus } from "@sourcebot/db";
Expand DownExpand Up@@ -46,14 +46,16 @@ export const RepoListItem = ({
}
}, [status]);

const imageSrc = getRepoImageSrc(imageUrl, repoId, domain);
Comment thread
msukkari marked this conversation as resolved.

return (
<div
className="flex flex-row items-center p-4 border rounded-lg bg-background justify-between"
>
<div className="flex flex-row items-center gap-2">
{imageUrl ? (
{imageSrc ? (
<Image
src={imageUrl}
src={imageSrc}
alt={name}
width={32}
height={32}
Expand Down
5 changes: 3 additions & 2 deletions packages/web/src/app/[domain]/repos/columns.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,12 +6,13 @@ import { ArrowUpDown, ExternalLink, Clock, Loader2, CheckCircle2, XCircle, Trash
import Image from "next/image"
import { Badge } from "@/components/ui/badge"
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip"
import { cn } from "@/lib/utils"
import { cn, getRepoImageSrc } from "@/lib/utils"
import { RepoIndexingStatus } from "@sourcebot/db";
import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "@/components/ui/dropdown-menu"
import { AddRepoButton } from "./addRepoButton"

export type RepositoryColumnInfo = {
repoId: number
name: string
imageUrl?: string
connections: {
Expand DownExpand Up@@ -112,7 +113,7 @@ export const columns = (domain: string): ColumnDef<RepositoryColumnInfo>[] => [
<div className="relative h-8 w-8 overflow-hidden rounded-md border bg-muted">
{repo.imageUrl ? (
<Image
src={repo.imageUrl || "/placeholder.svg"}
src={getRepoImageSrc(repo.imageUrl, repo.repoId, domain) || "/placeholder.svg"}
alt={`${repo.name} logo`}
width={32}
height={32}
Expand Down
2 changes: 2 additions & 0 deletions packages/web/src/app/[domain]/repos/repositoryTable.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ export const RepositoryTable = () => {

const tableRepos = useMemo(() => {
if (reposLoading) return Array(4).fill(null).map(() => ({
repoId: 0,
name: "",
connections: [],
repoIndexingStatus: RepoIndexingStatus.NEW,
Expand All@@ -35,6 +36,7 @@ export const RepositoryTable = () => {

if (!repos) return [];
return repos.map((repo): RepositoryColumnInfo => ({
repoId: repo.repoId,
name: repo.repoDisplayName ?? repo.repoName,
imageUrl: repo.imageUrl,
connections: repo.linkedConnections,
Expand Down
27 changes: 27 additions & 0 deletions packages/web/src/app/api/[domain]/repos/[repoId]/image/route.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
import { getRepoImage } from "@/actions";
import { isServiceError } from "@/lib/utils";
import { NextRequest } from "next/server";

export async function GET(
request: NextRequest,
{ params }: { params: { domain: string; repoId: string } }
) {
const { domain, repoId } = params;
const repoIdNum = parseInt(repoId);

if (isNaN(repoIdNum)) {
return new Response("Invalid repo ID", { status: 400 });
}

const result = await getRepoImage(repoIdNum, domain);
if (isServiceError(result)) {
return new Response(result.message, { status: result.statusCode });
}

return new Response(result, {
headers: {
'Content-Type': 'image/png',
'Cache-Control': 'public, max-age=3600',
},
});
}
1 change: 1 addition & 0 deletions packages/web/src/app/layout.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import { getEntitlements } from "@/features/entitlements/server";
export const metadata: Metadata = {
title: "Sourcebot",
description: "Sourcebot",
manifest: "/manifest.json",
};

export default function RootLayout({
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added
- Added seperate page for signup. [#311](https://github.com/sourcebot-dev/sourcebot/pull/331)
- Fix repo images in authed instance case and add manifest json. [#332](https://github.com/sourcebot-dev/sourcebot/pull/332)
- Added encryption logic for license keys. [#335](https://github.com/sourcebot-dev/sourcebot/pull/335)

## [4.1.1] - 2025-06-03
Expand Down
44 changes: 10 additions & 34 deletions packages/backend/src/utils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,7 @@ import { Logger } from "winston";
import { AppContext } from "./types.js";
import path from 'path';
import { PrismaClient, Repo } from "@sourcebot/db";
import { decrypt } from "@sourcebot/crypto";
import { Token } from "@sourcebot/schemas/v3/shared.type";
import { getTokenFromConfig as getTokenFromConfigBase } from "@sourcebot/crypto";
import { BackendException, BackendError } from "@sourcebot/error";
import * as Sentry from "@sentry/node";

Expand All@@ -25,44 +24,21 @@ export const isRemotePath = (path: string) => {
return path.startsWith('https://') || path.startsWith('http://');
}

export const getTokenFromConfig = async (token: Token, orgId: number, db: PrismaClient, logger?: Logger) => {
if ('secret' in token) {
const secretKey = token.secret;
const secret = await db.secret.findUnique({
where: {
orgId_key: {
key: secretKey,
orgId
}
}
});

if (!secret) {
export const getTokenFromConfig = async (token: any, orgId: number, db: PrismaClient, logger?: Logger) => {
try {
return await getTokenFromConfigBase(token, orgId, db);
} catch (error: unknown) {
if (error instanceof Error) {
const e = new BackendException(BackendError.CONNECTION_SYNC_SECRET_DNE, {
message: `Secret with key ${secretKey} not found for org ${orgId}`,
message: error.message,
});
Sentry.captureException(e);
logger?.error(e.metadata.message);
logger?.error(error.message);
throw e;
}

const decryptedToken = decrypt(secret.iv, secret.encryptedValue);
return decryptedToken;
} else {
const envToken = process.env[token.env];
if (!envToken) {
const e = new BackendException(BackendError.CONNECTION_SYNC_SECRET_DNE, {
message: `Environment variable ${token.env} not found.`,
});
Sentry.captureException(e);
logger?.error(e.metadata.message);
throw e;
}

return envToken;
throw error;
}
}

};

export const resolvePathRelativeToConfig = (localPath: string, configPath: string) => {
let absolutePath = localPath;
Expand Down
2 changes: 2 additions & 0 deletions packages/crypto/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,8 @@
"postinstall": "yarn build"
},
"dependencies": {
"@sourcebot/db": "*",
"@sourcebot/schemas": "*",
"dotenv": "^16.4.5"
},
"devDependencies": {
Expand Down
4 changes: 3 additions & 1 deletion packages/crypto/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@ export function verifySignature(data: string, signature: string, publicKeyPath:
publicKey = fs.readFileSync(publicKeyPath, 'utf8');
publicKeyCache.set(publicKeyPath, publicKey);
}

// Convert base64url signature to base64 if needed
const base64Signature = signature.replace(/-/g, '+').replace(/_/g, '/');
const paddedSignature = base64Signature + '='.repeat((4 - base64Signature.length % 4) % 4);
Expand All@@ -91,3 +91,5 @@ export function verifySignature(data: string, signature: string, publicKeyPath:
return false;
}
}

export { getTokenFromConfig } from './tokenUtils.js';
33 changes: 33 additions & 0 deletions packages/crypto/src/tokenUtils.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import { PrismaClient } from "@sourcebot/db";
import { Token } from "@sourcebot/schemas/v3/shared.type";
import { decrypt } from "./index.js";

export const getTokenFromConfig = async (token: Token, orgId: number, db: PrismaClient) => {
if ('secret' in token) {
const secretKey = token.secret;
const secret = await db.secret.findUnique({
where: {
orgId_key: {
key: secretKey,
orgId
}
}
});

if (!secret) {
throw new Error(`Secret with key ${secretKey} not found for org ${orgId}`);
}

const decryptedToken = decrypt(secret.iv, secret.encryptedValue);
return decryptedToken;
} else if ('env' in token) {
const envToken = process.env[token.env];
if (!envToken) {
throw new Error(`Environment variable ${token.env} not found.`);
}

return envToken;
} else {
throw new Error('Invalid token configuration');
}
};
11 changes: 6 additions & 5 deletions packages/crypto/tsconfig.json
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
{
"compilerOptions": {
"target": "ES6",
"module": "CommonJS",
"lib": ["ES6"],
"target": "ES2022",
"module": "Node16",
"lib": ["ES2023"],
"outDir": "dist",
"rootDir": "src",
"declaration": true,
Expand All@@ -11,11 +11,12 @@
"strict": true,
"noImplicitAny": true,
"strictNullChecks": true,
"moduleResolution": "node",
"moduleResolution": "Node16",
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"skipLibCheck": true,
"isolatedModules": true
"isolatedModules": true,
"resolveJsonModule": true
},
"include": ["src/**/*"],
"exclude": ["node_modules", "dist"]
Expand Down
Binary file addedpackages/web/public/logo_512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions packages/web/public/manifest.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
{
"name": "Sourcebot",
"short_name": "Sourcebot",
"display": "standalone",
"start_url": "/",
"icons": [
{
"src": "/logo_512.png",
"sizes": "512x512",
"type": "image/png"
}
]
}

75 changes: 74 additions & 1 deletion packages/web/src/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,16 @@ import { CodeHostType, isServiceError } from "@/lib/utils";
import { prisma } from "@/prisma";
import { render } from "@react-email/components";
import * as Sentry from '@sentry/nextjs';
import { decrypt, encrypt, generateApiKey, hashSecret } from "@sourcebot/crypto";
import { decrypt, encrypt, generateApiKey, hashSecret, getTokenFromConfig } from "@sourcebot/crypto";
import { ConnectionSyncStatus, OrgRole, Prisma, RepoIndexingStatus, StripeSubscriptionStatus, Org, ApiKey } from "@sourcebot/db";
import { ConnectionConfig } from "@sourcebot/schemas/v3/connection.type";
import { gerritSchema } from "@sourcebot/schemas/v3/gerrit.schema";
import { giteaSchema } from "@sourcebot/schemas/v3/gitea.schema";
import { githubSchema } from "@sourcebot/schemas/v3/github.schema";
import { gitlabSchema } from "@sourcebot/schemas/v3/gitlab.schema";
import { GithubConnectionConfig } from "@sourcebot/schemas/v3/github.type";
import { GitlabConnectionConfig } from "@sourcebot/schemas/v3/gitlab.type";
import { GiteaConnectionConfig } from "@sourcebot/schemas/v3/gitea.type";
import Ajv from "ajv";
import { StatusCodes } from "http-status-codes";
import { cookies, headers } from "next/headers";
Expand DownExpand Up@@ -1712,6 +1715,76 @@ export const getSearchContexts = async (domain: string) => sew(() =>
}, /* minRequiredRole = */ OrgRole.GUEST), /* allowSingleTenantUnauthedAccess = */ true
));

export const getRepoImage = async (repoId: number, domain: string): Promise<ArrayBuffer | ServiceError> => sew(async () => {
return await withAuth(async (userId) => {
return await withOrgMembership(userId, domain, async ({ org }) => {
const repo = await prisma.repo.findUnique({
where: {
id: repoId,
orgId: org.id,
},
include: {
connections: {
include: {
connection: true,
}
}
}
});

if (!repo || !repo.imageUrl) {
return notFound();
}

const authHeaders: Record<string, string> = {};
for (const { connection } of repo.connections) {
try {
if (connection.connectionType === 'github') {
const config = connection.config as unknown as GithubConnectionConfig;
if (config.token) {
const token = await getTokenFromConfig(config.token, connection.orgId, prisma);
authHeaders['Authorization'] = `token ${token}`;
break;
}
} else if (connection.connectionType === 'gitlab') {
const config = connection.config as unknown as GitlabConnectionConfig;
if (config.token) {
const token = await getTokenFromConfig(config.token, connection.orgId, prisma);
authHeaders['PRIVATE-TOKEN'] = token;
break;
}
} else if (connection.connectionType === 'gitea') {
const config = connection.config as unknown as GiteaConnectionConfig;
if (config.token) {
const token = await getTokenFromConfig(config.token, connection.orgId, prisma);
authHeaders['Authorization'] = `token ${token}`;
break;
}
}
} catch (error) {
logger.warn(`Failed to get token for connection ${connection.id}:`, error);
}
}

try {
const response = await fetch(repo.imageUrl, {
headers: authHeaders,
});

if (!response.ok) {
logger.warn(`Failed to fetch image from ${repo.imageUrl}: ${response.status}`);
return notFound();
}

const imageBuffer = await response.arrayBuffer();
return imageBuffer;
} catch (error) {
logger.error(`Error proxying image for repo ${repoId}:`, error);
return notFound();
}
}, /* minRequiredRole = */ OrgRole.GUEST);
}, /* allowSingleTenantUnauthedAccess = */ true);
});

////// Helpers ///////

Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
'use client';

import { getDisplayTime } from "@/lib/utils";
import { getDisplayTime, getRepoImageSrc } from "@/lib/utils";
import Image from "next/image";
import { StatusIcon } from "../../components/statusIcon";
import { RepoIndexingStatus } from "@sourcebot/db";
Expand DownExpand Up@@ -46,14 +46,16 @@ export const RepoListItem = ({
}
}, [status]);

const imageSrc = getRepoImageSrc(imageUrl, repoId, domain);
Comment thread
msukkari marked this conversation as resolved.

return (
<div
className="flex flex-row items-center p-4 border rounded-lg bg-background justify-between"
>
<div className="flex flex-row items-center gap-2">
{imageUrl ? (
{imageSrc ? (
<Image
src={imageUrl}
src={imageSrc}
alt={name}
width={32}
height={32}
Expand Down
5 changes: 3 additions & 2 deletions packages/web/src/app/[domain]/repos/columns.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,12 +6,13 @@ import { ArrowUpDown, ExternalLink, Clock, Loader2, CheckCircle2, XCircle, Trash
import Image from "next/image"
import { Badge } from "@/components/ui/badge"
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip"
import { cn } from "@/lib/utils"
import { cn, getRepoImageSrc } from "@/lib/utils"
import { RepoIndexingStatus } from "@sourcebot/db";
import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "@/components/ui/dropdown-menu"
import { AddRepoButton } from "./addRepoButton"

export type RepositoryColumnInfo = {
repoId: number
name: string
imageUrl?: string
connections: {
Expand DownExpand Up@@ -112,7 +113,7 @@ export const columns = (domain: string): ColumnDef<RepositoryColumnInfo>[] => [
<div className="relative h-8 w-8 overflow-hidden rounded-md border bg-muted">
{repo.imageUrl ? (
<Image
src={repo.imageUrl || "/placeholder.svg"}
src={getRepoImageSrc(repo.imageUrl, repo.repoId, domain) || "/placeholder.svg"}
alt={`${repo.name} logo`}
width={32}
height={32}
Expand Down
2 changes: 2 additions & 0 deletions packages/web/src/app/[domain]/repos/repositoryTable.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ export const RepositoryTable = () => {

const tableRepos = useMemo(() => {
if (reposLoading) return Array(4).fill(null).map(() => ({
repoId: 0,
name: "",
connections: [],
repoIndexingStatus: RepoIndexingStatus.NEW,
Expand All@@ -35,6 +36,7 @@ export const RepositoryTable = () => {

if (!repos) return [];
return repos.map((repo): RepositoryColumnInfo => ({
repoId: repo.repoId,
name: repo.repoDisplayName ?? repo.repoName,
imageUrl: repo.imageUrl,
connections: repo.linkedConnections,
Expand Down
27 changes: 27 additions & 0 deletions packages/web/src/app/api/[domain]/repos/[repoId]/image/route.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
import { getRepoImage } from "@/actions";
import { isServiceError } from "@/lib/utils";
import { NextRequest } from "next/server";

export async function GET(
request: NextRequest,
{ params }: { params: { domain: string; repoId: string } }
) {
const { domain, repoId } = params;
const repoIdNum = parseInt(repoId);

if (isNaN(repoIdNum)) {
return new Response("Invalid repo ID", { status: 400 });
}

const result = await getRepoImage(repoIdNum, domain);
if (isServiceError(result)) {
return new Response(result.message, { status: result.statusCode });
}

return new Response(result, {
headers: {
'Content-Type': 'image/png',
'Cache-Control': 'public, max-age=3600',
},
});
}
1 change: 1 addition & 0 deletions packages/web/src/app/layout.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import { getEntitlements } from "@/features/entitlements/server";
export const metadata: Metadata = {
title: "Sourcebot",
description: "Sourcebot",
manifest: "/manifest.json",
};

export default function RootLayout({
Expand Down
Loading