Skip to content

Commit 8330e26

Browse files
committed
Update routes to reflect daemon changes
1 parent 9c7b753 commit 8330e26

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

app/Http/Controllers/Server/ServerController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,11 +172,11 @@ public function getDownloadFile(Request $request, $uuid, $file)
172172

173173
$download->token = (string) Uuid::generate(4);
174174
$download->server = $server->uuid;
175-
$download->path = str_replace('../', '', $file);
175+
$download->path = $file;
176176

177177
$download->save();
178178

179-
return redirect( $node->scheme . '://' . $node->fqdn . ':' . $node->daemonListen . '/server/download/' . $download->token);
179+
return redirect( $node->scheme . '://' . $node->fqdn . ':' . $node->daemonListen . '/server/file/download/' . $download->token);
180180

181181
}
182182

app/Repositories/Daemon/FileRepository.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public function returnFileContents($file)
9898

9999
$file->dirname = (in_array($file->dirname, ['.', './', '/'])) ? null : trim($file->dirname, '/') . '/';
100100

101-
$res = $this->client->request('GET', '/server/files/stat/' . rawurlencode($file->dirname.$file->basename) , [
101+
$res = $this->client->request('GET', '/server/file/stat/' . rawurlencode($file->dirname.$file->basename) , [
102102
'headers' => $this->headers
103103
]);
104104

@@ -115,7 +115,7 @@ public function returnFileContents($file)
115115
throw new DisplayException('That file is too large to open in the browser, consider using a SFTP client.');
116116
}
117117

118-
$res = $this->client->request('GET', '/server/file/' . rawurlencode($file->dirname.$file->basename) , [
118+
$res = $this->client->request('GET', '/server/file/f/' . rawurlencode($file->dirname.$file->basename) , [
119119
'headers' => $this->headers
120120
]);
121121

@@ -149,9 +149,10 @@ public function saveFileContents($file, $content)
149149

150150
$file->dirname = (in_array($file->dirname, ['.', './', '/'])) ? null : trim($file->dirname, '/') . '/';
151151

152-
$res = $this->client->request('POST', '/server/file/' . rawurlencode($file->dirname.$file->basename), [
152+
$res = $this->client->request('POST', '/server/file/save', [
153153
'headers' => $this->headers,
154154
'json' => [
155+
'path' => rawurlencode($file->dirname.$file->basename),
155156
'content' => $content
156157
]
157158
]);

0 commit comments

Comments
 (0)