add instancer support

Author: Aplet123

client/src/api/challenges.js

@@ -1,5 +1,4 @@
 import { request, handleResponse } from './util'
-import { privateProfile } from './profile'
 
 export const getChallenges = async () => {
   const resp = await request('GET', '/challs')
@@ -13,20 +12,6 @@ export const getChallenges = async () => {
   return handleResponse({ resp, valid: ['goodChallenges'] })
 }
 
-export const getPrivateSolves = async () => {
-  const { data, error } = await privateProfile()
-
-  if (error) {
-    return { error }
-  }
-  return {
-    solves: data.solves,
-    // LA CTF: track bloods
-    bloods: data.bloods
-    // --------------------
-  }
-}
-
 export const getSolves = ({ challId, limit, offset }) => {
   return request('GET', `/challs/${encodeURIComponent(challId)}/solves`, {
     limit,

client/src/routes/challs.js

@@ -6,7 +6,8 @@ import Problem from '../components/problem'
 import NotStarted from '../components/not-started'
 import { useToast } from '../components/toast'
 
-import { getChallenges, getPrivateSolves } from '../api/challenges'
+import { privateProfile } from '../api/profile'
+import { getChallenges } from '../api/challenges'
 
 const loadStates = {
   pending: 0,
@@ -84,25 +85,30 @@ const Challenges = ({ classes }) => {
         }
       })
 
-      setProblems(data)
-      setCategories(newCategories)
-    }
-    action()
-  }, [toast, categories, problems])
-
-  useEffect(() => {
-    const action = async () => {
-      const { solves, bloods, error } = await getPrivateSolves()
-      if (error) {
-        toast({ body: error, type: 'error' })
+      const { data: profileData, error: profileError } = await privateProfile()
+      if (profileError) {
+        toast({ body: profileError, type: 'error' })
         return
       }
 
-      setSolveIDs(solves.map(solve => solve.id))
-      setBloods(new Map(bloods.map(x => [x.id, x.rank])))
+      setSolveIDs(profileData.solves.map(solve => solve.id))
+      setBloods(new Map(profileData.bloods.map(x => [x.id, x.rank])))
+
+      const instancerPlaceholderRegex = /\{instancer:([a-zA-Z0-9-]+)\}/g
+      if (config.instancerUrl !== '') {
+        data.forEach(problem => {
+          problem.description = problem.description.replaceAll('{instancer}', `[Deploy challenge](${encodeURI(config.instancerUrl)}/chall/${problem.id}?token=${encodeURIComponent(profileData.instancerToken)})`)
+          problem.description = problem.description.replaceAll('{instancer_token}', encodeURIComponent(profileData.instancerToken))
+          problem.description = problem.description.replaceAll('{instancer_url}', encodeURI(config.instancerUrl))
+          problem.description = problem.description.replaceAll(instancerPlaceholderRegex, `${encodeURI(config.instancerUrl)}/chall/$1?token=${encodeURIComponent(profileData.instancerToken)}`)
+        })
+      }
+
+      setProblems(data)
+      setCategories(newCategories)
     }
     action()
-  }, [toast])
+  }, [toast, categories, problems])
 
   useEffect(() => {
     localStorage.challPageState = JSON.stringify({ categories, showSolved })

client/src/routes/profile.js

@@ -150,6 +150,27 @@ const TeamCodeCard = withStyles({
   )
 })
 
+const InstancerCodeCard = withStyles({
+  btn: {
+    marginRight: '10px'
+  }
+}, ({ instancerToken, classes }) => {
+  const instancerURL = `${config.instancerUrl}/login?token=${encodeURIComponent(instancerToken)}`
+
+  return (
+    <div class='card'>
+      <div class='content'>
+        <p>Instancer Login</p>
+        <p class='font-thin'>Use this link to login to the challenge instancer.</p>
+
+        <a href={instancerURL} target='_blank' rel='noreferrer'>
+          <button class={`${classes.btn} btn-info u-center`} name='btn' value='submit' type='button'>Instancer Login</button>
+        </a>
+      </div>
+    </div>
+  )
+})
+
 const UpdateCard = withStyles({
   form: {
     '& button': {
@@ -303,6 +324,7 @@ const Profile = ({ uuid, classes }) => {
     score,
     solves,
     teamToken,
+    instancerToken,
     ctftimeId,
     allowedDivisions
   } = data
@@ -371,6 +393,7 @@ const Profile = ({ uuid, classes }) => {
       {isPrivate && (
         <div class={classes.privateCol}>
           <TeamCodeCard {...{ teamToken }} />
+          { config.instancerUrl !== '' && <InstancerCodeCard instancerToken={instancerToken} /> }
           <UpdateCard {...{ name, email, divisionId, allowedDivisions, onUpdate: onProfileUpdate }} />
           {config.ctftime && (
             <CtftimeCard {...{ ctftimeId, onUpdate: onProfileUpdate }} />

server/api/users/me.js

@@ -15,9 +15,16 @@ export default {
 
     const allowedDivisions = util.restrict.allowedDivisions(user.email)
 
+    const instancerToken = await auth.token.getToken(auth.token.tokenKinds.instancer, {
+      teamId: uuid,
+      email: user.email,
+      name: user.name
+    })
+
     return [responses.goodUserData, {
       ...userData,
       teamToken,
+      instancerToken,
       allowedDivisions,
       id: uuid,
       email: user.email

server/auth/token.ts

@@ -11,7 +11,8 @@ export enum tokenKinds {
   auth = 0,
   team = 1,
   verify = 2,
-  ctftimeAuth = 4
+  ctftimeAuth = 4,
+  instancer = 8
 }
 
 export type VerifyTokenKinds = 'update' | 'register' | 'recover'
@@ -20,6 +21,12 @@ export type AuthTokenData = string
 
 export type TeamTokenData = string
 
+export type InstancerAuthTokenData = {
+  teamId: string
+  email: User['email']
+  name: User['name']
+}
+
 interface BaseVerifyTokenData {
   verifyId: string
   kind: VerifyTokenKinds
@@ -59,6 +66,7 @@ type TokenDataTypes = {
   [tokenKinds.team]: TeamTokenData;
   [tokenKinds.verify]: VerifyTokenData;
   [tokenKinds.ctftimeAuth]: CtftimeAuthTokenData;
+  [tokenKinds.instancer]: InstancerAuthTokenData;
 }
 
 export type Token = string
@@ -73,7 +81,8 @@ const tokenExpiries: Record<ValueOf<typeof tokenKinds>, number> = {
   [tokenKinds.auth]: Infinity,
   [tokenKinds.team]: Infinity,
   [tokenKinds.verify]: config.loginTimeout,
-  [tokenKinds.ctftimeAuth]: config.loginTimeout
+  [tokenKinds.ctftimeAuth]: config.loginTimeout,
+  [tokenKinds.instancer]: Infinity
 }
 
 const timeNow = () => Math.floor(Date.now() / 1000)

server/config/client.ts

@@ -13,11 +13,12 @@ export type ClientConfig = Pick<ServerConfig,
   'startTime' |
   'endTime' |
   'userMembers' |
-  'faviconUrl'
+  'faviconUrl' |
+  'instancerUrl'
 > & {
   emailEnabled: boolean;
-  ctftime?: Pick<NonNullable<ServerConfig['ctftime']>, 'clientId'>
-  recaptcha?: Pick<NonNullable<ServerConfig['recaptcha']>, 'siteKey' | 'protectedActions'>
+  ctftime?: Pick<NonNullable<ServerConfig['ctftime']>, 'clientId'>;
+  recaptcha?: Pick<NonNullable<ServerConfig['recaptcha']>, 'siteKey' | 'protectedActions'>;
 }
 
 const config: ClientConfig = {
@@ -45,7 +46,8 @@ const config: ClientConfig = {
     : {
         siteKey: server.recaptcha.siteKey,
         protectedActions: server.recaptcha.protectedActions
-      }
+      },
+  instancerUrl: server.instancerUrl
 }
 
 export default config

server/config/server.ts

@@ -96,6 +96,8 @@ export type ServerConfig = {
     graphSampleTime: number;
   }
   loginTimeout: number;
+
+  instancerUrl: string;
 }
 
 const jsonLoader = (file: string) => JSON.parse(file) as PartialDeep<ServerConfig>
@@ -183,7 +185,8 @@ const envConfig: PartialDeep<ServerConfig> = {
     graphMaxTeams: nullsafeParseInt(process.env.RCTF_LEADERBOARD_GRAPH_MAX_TEAMS),
     graphSampleTime: nullsafeParseInt(process.env.RCTF_LEADERBOARD_GRAPH_SAMPLE_TIME)
   },
-  loginTimeout: nullsafeParseInt(process.env.RCTF_LOGIN_TIMEOUT)
+  loginTimeout: nullsafeParseInt(process.env.RCTF_LOGIN_TIMEOUT),
+  instancerUrl: process.env.RCTF_INSTANCER_URL
 }
 
 const defaultConfig: PartialDeep<ServerConfig> = {
@@ -216,7 +219,8 @@ const defaultConfig: PartialDeep<ServerConfig> = {
     graphMaxTeams: 10,
     graphSampleTime: 1800000
   },
-  loginTimeout: 3600000
+  loginTimeout: 3600000,
+  instancerUrl: ''
 }
 
 const config = deepMerge.all([defaultConfig, ...fileConfigs, removeUndefined(envConfig)]) as ServerConfig