Merge pull request #1010 from rust-lang/parse-responses

Parse the HTTP responses instead of assuming they are valid
rust-lang · Dec 1, 2023 · 7b99a67 · 7b99a67
2 parents ac0aeb9 + 04051ca
commit 7b99a67
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 29 deletions.
diff --git a/ui/frontend/actions.ts b/ui/frontend/actions.ts
@@ -150,13 +150,13 @@ export const reExecuteWithBacktrace = (): ThunkAction => dispatch => {
 
 type FetchArg = Parameters<typeof fetch>[0];
 
-export function jsonGet(url: FetchArg) {
+export function jsonGet(url: FetchArg): Promise<unknown> {
   return fetchJson(url, {
     method: 'get',
   });
 }
 
-export function jsonPost<T>(url: FetchArg, body: Record<string, any>): Promise<T> {
+export function jsonPost(url: FetchArg, body: Record<string, any>): Promise<unknown> {
   return fetchJson(url, {
     method: 'post',
     body: JSON.stringify(body),

diff --git a/ui/frontend/compileActions.ts b/ui/frontend/compileActions.ts
@@ -1,4 +1,5 @@
 import { AsyncThunk, createAsyncThunk } from '@reduxjs/toolkit';
+import * as z from 'zod';
 
 import { SimpleThunkAction, adaptFetchError, jsonPost, routes } from './actions';
 import { compileRequestPayloadSelector } from './selectors';
@@ -17,11 +18,12 @@ interface CompileRequestBody {
   processAssembly: string;
 }
 
-interface CompileResponseBody {
-  code: string;
-  stdout: string;
-  stderr: string;
-}
+const CompileResponseBody = z.object({
+  code: z.string(),
+  stdout: z.string(),
+  stderr: z.string(),
+});
+type CompileResponseBody = z.infer<typeof CompileResponseBody>;
 
 interface Props {
   sliceName: string;
@@ -34,9 +36,10 @@ interface CompileActions {
 }
 
 export const makeCompileActions = ({ sliceName, target }: Props): CompileActions => {
-  const action = createAsyncThunk(sliceName, async (payload: CompileRequestBody) =>
-    adaptFetchError(() => jsonPost<CompileResponseBody>(routes.compile, payload)),
-  );
+  const action = createAsyncThunk(sliceName, async (payload: CompileRequestBody) => {
+    const d = await adaptFetchError(() => jsonPost(routes.compile, payload));
+    return CompileResponseBody.parseAsync(d);
+  });
 
   const performCompile = (): SimpleThunkAction => (dispatch, getState) => {
     const state = getState();

diff --git a/ui/frontend/reducers/output/execute.ts b/ui/frontend/reducers/output/execute.ts
@@ -67,16 +67,18 @@ export interface ExecuteRequestBody {
   backtrace: boolean;
 }
 
-interface ExecuteResponseBody {
-  success: boolean;
-  exitDetail: string;
-  stdout: string;
-  stderr: string;
-}
+const ExecuteResponseBody = z.object({
+  success: z.boolean(),
+  exitDetail: z.string(),
+  stdout: z.string(),
+  stderr: z.string(),
+});
+type ExecuteResponseBody = z.infer<typeof ExecuteResponseBody>;
 
-export const performExecute = createAsyncThunk(sliceName, async (payload: ExecuteRequestBody) =>
-  adaptFetchError(() => jsonPost<ExecuteResponseBody>(routes.execute, payload)),
-);
+export const performExecute = createAsyncThunk(sliceName, async (payload: ExecuteRequestBody) => {
+  const d = await adaptFetchError(() => jsonPost(routes.execute, payload));
+  return ExecuteResponseBody.parseAsync(d);
+});
 
 const prepareWithCurrentSequenceNumber = <P>(payload: P, sequenceNumber: number) => ({
   payload,

diff --git a/ui/frontend/reducers/output/gist.ts b/ui/frontend/reducers/output/gist.ts
@@ -1,6 +1,7 @@
 import { Draft, PayloadAction, createAsyncThunk, createSlice } from '@reduxjs/toolkit';
+import * as z from 'zod';
 
-import { jsonGet, jsonPost, routes } from '../../actions';
+import { adaptFetchError, jsonGet, jsonPost, routes } from '../../actions';
 import { baseUrlSelector, codeSelector } from '../../selectors';
 import RootState from '../../state';
 import { Channel, Edition, Mode } from '../../types';
@@ -39,11 +40,12 @@ type PerformGistLoadProps = Pick<
   Exclude<keyof SuccessProps, 'url' | 'code' | 'stdout' | 'stderr'>
 >;
 
-interface GistResponseBody {
-  id: string;
-  url: string;
-  code: string;
-}
+const GistResponseBody = z.object({
+  id: z.string(),
+  url: z.string(),
+  code: z.string(),
+});
+type GistResponseBody = z.infer<typeof GistResponseBody>;
 
 export const performGistLoad = createAsyncThunk<
   SuccessProps,
@@ -55,8 +57,9 @@ export const performGistLoad = createAsyncThunk<
   const gistUrl = new URL(routes.meta.gistLoad, baseUrl);
   const u = new URL(id, gistUrl);
 
-  const gist = await jsonGet(u);
-  return { channel, mode, edition, ...gist };
+  const d = await adaptFetchError(() => jsonGet(u));
+  const gist = await GistResponseBody.parseAsync(d);
+  return { ...gist, channel, mode, edition, stdout: '', stderr: '' };
 });
 
 export const performGistSave = createAsyncThunk<SuccessProps, void, { state: RootState }>(
@@ -71,8 +74,9 @@ export const performGistSave = createAsyncThunk<SuccessProps, void, { state: Roo
       },
     } = state;
 
-    const json = await jsonPost<GistResponseBody>(routes.meta.gistSave, { code });
-    return { ...json, code, stdout, stderr, channel, mode, edition };
+    const d = await adaptFetchError(() => jsonPost(routes.meta.gistSave, { code }));
+    const gist = await GistResponseBody.parseAsync(d);
+    return { ...gist, code, stdout, stderr, channel, mode, edition };
   },
 );