blsmedia/bot
2
0
Fork 0
Code Activity

Revert "fix(viewer): 🐛 Forwarded host checking"

Browse Source 
This reverts commit 37dea9c403.
This commit is contained in:
Baptiste Arnaud
2022-05-23 14:16:43 -07:00
parent faffcc69a7
commit a2dd26b60f
1 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
apps/viewer/pages/[[...publicId]].tsx
View File

@ -1,4 +1,3 @@
import { IncomingMessage } from 'http'
import { NotFoundPage } from 'layouts/NotFoundPage' import { NotFoundPage } from 'layouts/NotFoundPage'
import { PublicTypebot } from 'models' import { PublicTypebot } from 'models'
import { GetServerSideProps, GetServerSidePropsContext } from 'next' import { GetServerSideProps, GetServerSidePropsContext } from 'next'
@ -12,14 +11,17 @@ export const getServerSideProps: GetServerSideProps = async (
let typebot: Omit<PublicTypebot, 'createdAt' | 'updatedAt'> | null let typebot: Omit<PublicTypebot, 'createdAt' | 'updatedAt'> | null
const isIE = /MSIE|Trident/.test(context.req.headers['user-agent'] ?? '') const isIE = /MSIE|Trident/.test(context.req.headers['user-agent'] ?? '')
const pathname = context.resolvedUrl.split('?')[0] const pathname = context.resolvedUrl.split('?')[0]
const host = getHost(context.req)
try { try {
if (!host) return { props: {} } if (!context.req.headers.host) return { props: {} }
const viewerUrls = (process.env.NEXT_PUBLIC_VIEWER_URL ?? '').split(',') const viewerUrls = (process.env.NEXT_PUBLIC_VIEWER_URL ?? '').split(',')
const isMatchingViewerUrl = viewerUrls.some((url) => const isMatchingViewerUrl = viewerUrls.some((url) =>
host.split(':')[0].includes(url.split('//')[1].split(':')[0]) (context.req.headers.host ?? '')
.split(':')[0]
.includes(url.split('//')[1].split(':')[0])
) )
const customDomain = `${host}${pathname === '/' ? '' : pathname}` const customDomain = `${context.req.headers.host}${
pathname === '/' ? '' : pathname
}`
typebot = isMatchingViewerUrl typebot = isMatchingViewerUrl
? await getTypebotFromPublicId(context.query.publicId?.toString()) ? await getTypebotFromPublicId(context.query.publicId?.toString())
: await getTypebotFromCustomDomain(customDomain) : await getTypebotFromCustomDomain(customDomain)
@ -33,7 +35,7 @@ export const getServerSideProps: GetServerSideProps = async (
props: { props: {
typebot, typebot,
isIE, isIE,
url: `https://${host}${pathname}`, url: `https://${context.req.headers.host}${pathname}`,
}, },
} }
} catch (err) { } catch (err) {
@ -42,7 +44,7 @@ export const getServerSideProps: GetServerSideProps = async (
return { return {
props: { props: {
isIE, isIE,
url: `https://${host}${pathname}`, url: `https://${context.req.headers.host}${pathname}`,
}, },
} }
} }
@ -64,20 +66,6 @@ const getTypebotFromCustomDomain = async (customDomain: string) => {
return omit(typebot as unknown as PublicTypebot, 'createdAt', 'updatedAt') return omit(typebot as unknown as PublicTypebot, 'createdAt', 'updatedAt')
} }
const getHost = (req?: IncomingMessage): string | undefined => {
let host = req?.headers ? req.headers.host : window.location.host
if (!host) return
if (
req &&
req.headers['x-forwarded-host'] &&
typeof req.headers['x-forwarded-host'] === 'string'
) {
host = req.headers['x-forwarded-host']
}
return host
}
const App = ({ typebot, ...props }: TypebotPageProps) => const App = ({ typebot, ...props }: TypebotPageProps) =>
isDefined(typebot) ? ( isDefined(typebot) ? (
<TypebotPage typebot={typebot} {...props} /> <TypebotPage typebot={typebot} {...props} />