diff options
Diffstat (limited to 'src/internal-server/app/Controllers/Http/RecipeController.js')
-rw-r--r-- | src/internal-server/app/Controllers/Http/RecipeController.js | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/src/internal-server/app/Controllers/Http/RecipeController.js b/src/internal-server/app/Controllers/Http/RecipeController.js index 64838b338..37a62e2fa 100644 --- a/src/internal-server/app/Controllers/Http/RecipeController.js +++ b/src/internal-server/app/Controllers/Http/RecipeController.js | |||
@@ -89,18 +89,12 @@ class RecipeController { | |||
89 | // eslint-disable-next-line eqeqeq | 89 | // eslint-disable-next-line eqeqeq |
90 | if (Env.get('CONNECT_WITH_FRANZ') == 'true') { | 90 | if (Env.get('CONNECT_WITH_FRANZ') == 'true') { |
91 | const body = request.all(); | 91 | const body = request.all(); |
92 | try { | 92 | const remoteUpdates = await fetch(`${RECIPES_URL}/update`, { |
93 | const remoteUpdates = await fetch(`${RECIPES_URL}/update`, { | 93 | method: 'POST', |
94 | method: 'POST', | 94 | body: JSON.stringify(body), |
95 | body: JSON.stringify(body), | 95 | headers: {'Content-Type': 'application/json'} |
96 | headers: {'Content-Type': 'application/json'} | 96 | }); |
97 | }); | 97 | return response.send(await remoteUpdates.json()); |
98 | return response.send( | ||
99 | remoteUpdates.ok ? await remoteUpdates.json() : remoteUpdates, | ||
100 | ); | ||
101 | } catch (error) { | ||
102 | return response.send({ error }); | ||
103 | } | ||
104 | } | 98 | } |
105 | return response.send([]); | 99 | return response.send([]); |
106 | } | 100 | } |
@@ -129,14 +123,14 @@ class RecipeController { | |||
129 | 123 | ||
130 | const service = params.recipe; | 124 | const service = params.recipe; |
131 | 125 | ||
132 | // Check for invalid characters | ||
133 | if (/\.+/.test(service) || /\/+/.test(service)) { | ||
134 | return response.send('Invalid recipe name'); | ||
135 | } | ||
136 | // eslint-disable-next-line eqeqeq | 126 | // eslint-disable-next-line eqeqeq |
137 | if (Env.get('CONNECT_WITH_FRANZ') == 'true') { | 127 | if (Env.get('CONNECT_WITH_FRANZ') == 'true') { |
138 | return response.redirect(`${RECIPES_URL}/download/${service}`); | 128 | return response.redirect(`${RECIPES_URL}/download/${service}`); |
139 | } | 129 | } |
130 | // Check for invalid characters | ||
131 | if (/\.+/.test(service) || /\/+/.test(service)) { | ||
132 | return response.send('Invalid recipe name'); | ||
133 | } | ||
140 | // Check if recipe exists in recipes folder | 134 | // Check if recipe exists in recipes folder |
141 | if (await Drive.exists(`${service}.tar.gz`)) { | 135 | if (await Drive.exists(`${service}.tar.gz`)) { |
142 | return response.send(await Drive.get(`${service}.tar.gz`)); | 136 | return response.send(await Drive.get(`${service}.tar.gz`)); |