Skip to content

Require signed auth for Factory feed and messages #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lawyered0 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Require signed auth for Factory feed and messages #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 14 additions & 13 deletions apps/factory/api/routes/feed.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { Elysia, t } from 'elysia'
import type { Address, Hex } from 'viem'
import { CreateCastBodySchema, expectValid } from '../schemas'
import * as farcasterService from '../services/farcaster'
import { requireAuth } from '../validation/access-control'

const CastReactionBodySchema = t.Object({
castHash: t.String({ minLength: 3 }),
Expand Down Expand Up @@ -42,14 +43,14 @@ function getPagination(query: { cursor?: string; limit?: string }) {
}
}

function requireWalletAddress(
async function requireWalletAddress(
headers: Record<string, string | undefined>,
): Address {
const address = headers['x-wallet-address'] as Address | undefined
if (!address) {
): Promise<Address> {
const authResult = await requireAuth(headers)
if (!authResult.success) {
throw new Error('UNAUTHORIZED')
}
return address
return authResult.address
}

export const feedRoutes = new Elysia({ prefix: '/api/feed' })
Expand Down Expand Up @@ -141,7 +142,7 @@ export const feedRoutes = new Elysia({ prefix: '/api/feed' })
async ({ body, headers, set }) => {
let address: Address
try {
address = requireWalletAddress(headers)
address = await requireWalletAddress(headers)
} catch {
set.status = 401
return {
Expand Down Expand Up @@ -192,7 +193,7 @@ export const feedRoutes = new Elysia({ prefix: '/api/feed' })
async ({ params, headers, set }) => {
let address: Address
try {
address = requireWalletAddress(headers)
address = await requireWalletAddress(headers)
} catch {
set.status = 401
return {
Expand All @@ -218,7 +219,7 @@ export const feedRoutes = new Elysia({ prefix: '/api/feed' })
async ({ body, headers, set }) => {
let address: Address
try {
address = requireWalletAddress(headers)
address = await requireWalletAddress(headers)
} catch {
set.status = 401
return {
Expand Down Expand Up @@ -248,7 +249,7 @@ export const feedRoutes = new Elysia({ prefix: '/api/feed' })
async ({ body, headers, set }) => {
let address: Address
try {
address = requireWalletAddress(headers)
address = await requireWalletAddress(headers)
} catch {
set.status = 401
return {
Expand Down Expand Up @@ -278,7 +279,7 @@ export const feedRoutes = new Elysia({ prefix: '/api/feed' })
async ({ body, headers, set }) => {
let address: Address
try {
address = requireWalletAddress(headers)
address = await requireWalletAddress(headers)
} catch {
set.status = 401
return {
Expand Down Expand Up @@ -308,7 +309,7 @@ export const feedRoutes = new Elysia({ prefix: '/api/feed' })
async ({ body, headers, set }) => {
let address: Address
try {
address = requireWalletAddress(headers)
address = await requireWalletAddress(headers)
} catch {
set.status = 401
return {
Expand Down Expand Up @@ -357,7 +358,7 @@ export const feedRoutes = new Elysia({ prefix: '/api/feed' })
async ({ params, headers, set }) => {
let address: Address
try {
address = requireWalletAddress(headers)
address = await requireWalletAddress(headers)
} catch {
set.status = 401
return {
Expand All @@ -383,7 +384,7 @@ export const feedRoutes = new Elysia({ prefix: '/api/feed' })
async ({ params, headers, set }) => {
let address: Address
try {
address = requireWalletAddress(headers)
address = await requireWalletAddress(headers)
} catch {
set.status = 401
return {
Expand Down
45 changes: 33 additions & 12 deletions apps/factory/api/routes/messages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
getUser,
isFarcasterConnected,
} from '../services/farcaster'
import { requireAuth } from '../validation/access-control'

const SendMessageBodySchema = t.Object({
recipientFid: t.Number({ minimum: 1 }),
Expand All @@ -25,12 +26,22 @@ const MessagesQuerySchema = t.Object({
limit: t.Optional(t.String()),
})

async function getSignedAddress(
headers: Record<string, string | undefined>,
options?: { skipNonceCheck?: boolean },
): Promise<Address | null> {
const authResult = await requireAuth(headers, options)
return authResult.success ? authResult.address : null
}

export const messagesRoutes = new Elysia({ prefix: '/api/messages' })
// Get all conversations
.get(
'/',
async ({ headers, set }) => {
const address = headers['x-wallet-address'] as Address | undefined
const address = await getSignedAddress(headers, {
skipNonceCheck: true,
})
if (!address) {
set.status = 401
return {
Expand Down Expand Up @@ -105,7 +116,9 @@ export const messagesRoutes = new Elysia({ prefix: '/api/messages' })
.get(
'/status',
async ({ headers, set }) => {
const address = headers['x-wallet-address'] as Address | undefined
const address = await getSignedAddress(headers, {
skipNonceCheck: true,
})
if (!address) {
set.status = 401
return {
Expand Down Expand Up @@ -150,7 +163,9 @@ export const messagesRoutes = new Elysia({ prefix: '/api/messages' })
.get(
'/conversation/:fid',
async ({ params, headers, set }) => {
const address = headers['x-wallet-address'] as Address | undefined
const address = await getSignedAddress(headers, {
skipNonceCheck: true,
})
if (!address) {
set.status = 401
return {
Expand Down Expand Up @@ -217,7 +232,9 @@ export const messagesRoutes = new Elysia({ prefix: '/api/messages' })
.get(
'/conversation/:fid/messages',
async ({ params, query, headers, set }) => {
const address = headers['x-wallet-address'] as Address | undefined
const address = await getSignedAddress(headers, {
skipNonceCheck: true,
})
if (!address) {
set.status = 401
return {
Expand Down Expand Up @@ -277,7 +294,7 @@ export const messagesRoutes = new Elysia({ prefix: '/api/messages' })
.post(
'/',
async ({ body, headers, set }) => {
const address = headers['x-wallet-address'] as Address | undefined
const address = await getSignedAddress(headers)
if (!address) {
set.status = 401
return {
Expand Down Expand Up @@ -331,7 +348,7 @@ export const messagesRoutes = new Elysia({ prefix: '/api/messages' })
.post(
'/conversation/:fid/read',
async ({ params, headers, set }) => {
const address = headers['x-wallet-address'] as Address | undefined
const address = await getSignedAddress(headers)
if (!address) {
set.status = 401
return {
Expand All @@ -357,7 +374,7 @@ export const messagesRoutes = new Elysia({ prefix: '/api/messages' })
.post(
'/conversation/:fid/archive',
async ({ params, headers, set }) => {
const address = headers['x-wallet-address'] as Address | undefined
const address = await getSignedAddress(headers)
if (!address) {
set.status = 401
return {
Expand All @@ -383,7 +400,7 @@ export const messagesRoutes = new Elysia({ prefix: '/api/messages' })
.post(
'/conversation/:fid/mute',
async ({ params, body, headers, set }) => {
const address = headers['x-wallet-address'] as Address | undefined
const address = await getSignedAddress(headers)
if (!address) {
set.status = 401
return {
Expand All @@ -410,7 +427,7 @@ export const messagesRoutes = new Elysia({ prefix: '/api/messages' })
.post(
'/reconnect',
async ({ headers, set }) => {
const address = headers['x-wallet-address'] as Address | undefined
const address = await getSignedAddress(headers)
if (!address) {
set.status = 401
return {
Expand All @@ -434,7 +451,9 @@ export const messagesRoutes = new Elysia({ prefix: '/api/messages' })
.get(
'/encryption-key',
async ({ headers, set }) => {
const address = headers['x-wallet-address'] as Address | undefined
const address = await getSignedAddress(headers, {
skipNonceCheck: true,
})
if (!address) {
set.status = 401
return {
Expand All @@ -458,7 +477,7 @@ export const messagesRoutes = new Elysia({ prefix: '/api/messages' })
.post(
'/encryption-key/publish',
async ({ headers, set }) => {
const address = headers['x-wallet-address'] as Address | undefined
const address = await getSignedAddress(headers)
if (!address) {
set.status = 401
return {
Expand All @@ -482,7 +501,9 @@ export const messagesRoutes = new Elysia({ prefix: '/api/messages' })
.get(
'/search/users',
async ({ query, headers, set }) => {
const address = headers['x-wallet-address'] as Address | undefined
const address = await getSignedAddress(headers, {
skipNonceCheck: true,
})
if (!address) {
set.status = 401
return {
Expand Down
10 changes: 10 additions & 0 deletions apps/factory/api/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,16 @@ function createApp() {
`https://jeju.local:${CORE_PORTS.FACTORY.get()}`,
],
credentials: true,
allowedHeaders: [
'Content-Type',
'Authorization',
'X-Request-ID',
'X-Wallet-Address',
'X-Jeju-Address',
'X-Jeju-Timestamp',
'X-Jeju-Nonce',
'X-Jeju-Signature',
],
}),
)
.use(
Expand Down
10 changes: 10 additions & 0 deletions apps/factory/api/worker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,16 @@ export function createFactoryApp(env?: Partial<FactoryEnv>) {
getCoreAppUrl('FACTORY'),
],
credentials: true,
allowedHeaders: [
'Content-Type',
'Authorization',
'X-Request-ID',
'X-Wallet-Address',
'X-Jeju-Address',
'X-Jeju-Timestamp',
'X-Jeju-Nonce',
'X-Jeju-Signature',
],
}),
)
.use(
Expand Down
Loading