Merge pull request #1141 from hedgedoc/mediaBackend/webDAV

This commit is contained in:
David Mehren 2021-04-18 22:22:28 +02:00 committed by GitHub
commit 32d9f21630
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 219 additions and 0 deletions

View file

@ -0,0 +1,46 @@
# WebDAV
You can use any [WebDAV](https://en.wikipedia.org/wiki/WebDAV) server to handle your image uploads in HedgeDoc.
The WebDAV server must host the files in a way that allows HedgeDoc to request and receive them.
You just add the following lines to your configuration:
<small>(with the appropriate substitution for `<CONNECTION_STRING>`, `<UPLOAD_DIR>`, and `<PUBLIC_URL>` of course)</small>
```
HD_MEDIA_BACKEND="webdav"
HD_MEDIA_BACKEND_WEBDAV_CONNECTION_STRING="<CONNECTION_STRING>"
HD_MEDIA_BACKEND_WEBDAV_UPLOAD_DIR="<UPLOAD_DIR>"
HD_MEDIA_BACKEND_WEBDAV_PUBLIC_URL="<PUBLIC_URL>"
```
The `<CONNECTION_STRING>` should include the username and password (if needed) in the familiar way of `schema://user:password@url`.
With `<UPLOAD_DIR>` you can specify a folder you want to upload to, but you can also omit this (just don't spcify this value at all), if you prefer to upload directly to the root of the WebDAV server.
Finally, `<PUBLIC_URL>` specifies with which url HedgeDoc can access the upload. For this purpose the filename will be appended to `<PUBLIC_URL>`. So the file `test.png` with `<PUBLIC_URL>` `https://dav.example.com` should be accessible via `https://dav.example.com/test.png`.
## Using Nextcloud
If you want to use Nextcloud as a WebDAV server, follow the following instructions:
This guide was written using Nextcloud 21 in April 2021.
Because the username and app password will be included in the config, we suggest using a dedicated Nextcloud user for the uploads.
In this example the username will be `TestUser`.
1. Create an app password by going to `Settings` > `Security`. Nextcloud will generate a password for you. Let's assume it's `passw0rd`.
2. In the Files app [create a new folder](https://docs.nextcloud.com/server/latest/user_manual/en/files/access_webgui.html#creating-or-uploading-files-and-directories) that will hold your uploads (e.g `HedgeDoc`).
3. [Share](https://docs.nextcloud.com/server/latest/user_manual/en/files/sharing.html#public-link-shares) the newly created folder. The folder should (per default) be configured with the option `Read Only` (which we will assume in this guide), but `Allow upload and editing` should be fine, too.
4. Get the public link of the share. It should be in your clipboard after creation. If not you can copy it by clicking the clipboard icon at the end of the line of `Share link`. We'll assume it is `https://cloud.example.com/s/some-id` in the following.
5. Append `/download?path=%2F&files=` to this URL. To continue with our example the url should now be `https://cloud.example.com/s/some-id/download?path=%2F&files=`.
6. Get the [WebDAV url of you Nextcloud server](https://docs.nextcloud.com/server/latest/user_manual/en/files/access_webdav.html). It should be located in the Files app in the bottom left corner under `Settings` > `WebDAV`. We'll assume it is `https://cloud.example.com/remote.php/dav/files/TestUser/` in the following.
7. Add your login information to the link. This is done by adding `username:password@` in between the url schema (typically `https://`) and the rest of the url (`cloud.example.com/remote.php/dav/files/TestUser/` in our example). The WebDAV url in our example should now look like this `https://TestUser:passw0rd@cloud.example.com/remote.php/dav/files/TestUser/`.
8. Configure HedgeDoc:
```
HD_MEDIA_BACKEND="webdav"
HD_MEDIA_BACKEND_WEBDAV_CONNECTION_STRING="https://TestUser:passw0rd@cloud.example.com/remote.php/dav/files/TestUser/"
HD_MEDIA_BACKEND_WEBDAV_UPLOAD_DIR="HedgeDoc"
HD_MEDIA_BACKEND_WEBDAV_PUBLIC_URL="https://cloud.example.com/s/some-id/download?path=%2F&files="
```
Start using image uploads backed by Nextclouds WebDAV server.

View file

@ -28,6 +28,11 @@ export interface MediaConfig {
imgur: { imgur: {
clientID: string; clientID: string;
}; };
webdav: {
connectionString: string;
uploadDir: string;
publicUrl: string;
};
}; };
} }
@ -70,6 +75,21 @@ const mediaSchema = Joi.object({
}), }),
otherwise: Joi.optional(), otherwise: Joi.optional(),
}), }),
webdav: Joi.when('use', {
is: Joi.valid(BackendType.WEBDAV),
then: Joi.object({
connectionString: Joi.string()
.uri()
.label('HD_MEDIA_BACKEND_WEBDAV_CONNECTION_STRING'),
uploadDir: Joi.string()
.optional()
.label('HD_MEDIA_BACKEND_WEBDAV_UPLOAD_DIR'),
publicUrl: Joi.string()
.uri()
.label('HD_MEDIA_BACKEND_WEBDAV_PUBLIC_URL'),
}),
otherwise: Joi.optional(),
}),
}, },
}); });
@ -95,6 +115,12 @@ export default registerAs('mediaConfig', () => {
imgur: { imgur: {
clientID: process.env.HD_MEDIA_BACKEND_IMGUR_CLIENT_ID, clientID: process.env.HD_MEDIA_BACKEND_IMGUR_CLIENT_ID,
}, },
webdav: {
connectionString:
process.env.HD_MEDIA_BACKEND_WEBDAV_CONNECTION_STRING,
uploadDir: process.env.HD_MEDIA_BACKEND_WEBDAV_UPLOAD_DIR,
publicUrl: process.env.HD_MEDIA_BACKEND_WEBDAV_PUBLIC_URL,
},
}, },
}, },
{ {

View file

@ -9,4 +9,5 @@ export enum BackendType {
S3 = 's3', S3 = 's3',
IMGUR = 'imgur', IMGUR = 'imgur',
AZURE = 'azure', AZURE = 'azure',
WEBDAV = 'webdav',
} }

View file

@ -0,0 +1,139 @@
/*
* SPDX-FileCopyrightText: 2021 The HedgeDoc developers (see AUTHORS file)
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
import { Inject, Injectable } from '@nestjs/common';
import mediaConfiguration from '../../config/media.config';
import { ConsoleLoggerService } from '../../logger/console-logger.service';
import { MediaBackend } from '../media-backend.interface';
import { BackendData } from '../media-upload.entity';
import { MediaConfig } from '../../config/media.config';
import { MediaBackendError } from '../../errors/errors';
import { BackendType } from './backend-type.enum';
import fetch, { Response } from 'node-fetch';
@Injectable()
export class WebdavBackend implements MediaBackend {
private config: MediaConfig['backend']['webdav'];
private authHeader: string;
private baseUrl: string;
constructor(
private readonly logger: ConsoleLoggerService,
@Inject(mediaConfiguration.KEY)
private mediaConfig: MediaConfig,
) {
this.logger.setContext(WebdavBackend.name);
if (mediaConfig.backend.use === BackendType.WEBDAV) {
this.config = mediaConfig.backend.webdav;
const url = new URL(this.config.connectionString);
const port = url.port !== '' ? `:${url.port}` : '';
this.baseUrl = `${url.protocol}//${url.hostname}${port}${url.pathname}`;
if (this.config.uploadDir && this.config.uploadDir !== '') {
this.baseUrl = WebdavBackend.joinURL(
this.baseUrl,
this.config.uploadDir,
);
}
this.authHeader = WebdavBackend.generateBasicAuthHeader(
url.username,
url.password,
);
fetch(this.baseUrl, {
method: 'PROPFIND',
headers: {
Accept: 'text/plain', // eslint-disable-line @typescript-eslint/naming-convention
Authorization: this.authHeader, // eslint-disable-line @typescript-eslint/naming-convention
Depth: '0', // eslint-disable-line @typescript-eslint/naming-convention
},
})
.then((response) => {
if (!response.ok) {
throw new Error(`Can't access ${this.baseUrl}`);
}
})
.catch(() => {
throw new Error(`Can't access ${this.baseUrl}`);
});
}
}
async saveFile(
buffer: Buffer,
fileName: string,
): Promise<[string, BackendData]> {
try {
const contentLength = buffer.length;
await fetch(WebdavBackend.joinURL(this.baseUrl, '/', fileName), {
method: 'PUT',
body: buffer,
headers: {
Authorization: this.authHeader, // eslint-disable-line @typescript-eslint/naming-convention
'Content-Type': 'application/octet-stream', // eslint-disable-line @typescript-eslint/naming-convention
'Content-Length': `${contentLength}`, // eslint-disable-line @typescript-eslint/naming-convention
// eslint-disable-next-line @typescript-eslint/naming-convention
'If-None-Match': '*', // Don't overwrite already existing files
},
}).then((res) => WebdavBackend.checkStatus(res));
this.logger.log(`Uploaded file ${fileName}`, 'saveFile');
return [this.getUrl(fileName), null];
} catch (e) {
this.logger.error((e as Error).message, (e as Error).stack, 'saveFile');
throw new MediaBackendError(`Could not save '${fileName}' on WebDav`);
}
}
async deleteFile(fileName: string, _: BackendData): Promise<void> {
try {
await fetch(WebdavBackend.joinURL(this.baseUrl, '/', fileName), {
method: 'DELETE',
headers: {
// eslint-disable-next-line @typescript-eslint/naming-convention
Authorization: this.authHeader,
},
}).then((res) => WebdavBackend.checkStatus(res));
const url = this.getUrl(fileName);
this.logger.log(`Deleted ${url}`, 'saveFile');
return;
} catch (e) {
this.logger.error((e as Error).message, (e as Error).stack, 'saveFile');
throw new MediaBackendError(`Could not delete '${fileName}' on WebDav`);
}
}
private getUrl(fileName: string): string {
return WebdavBackend.joinURL(this.config.publicUrl, '/', fileName);
}
private static generateBasicAuthHeader(
username: string,
password: string,
): string {
const encoded = Buffer.from(`${username}:${password}`).toString('base64');
return `Basic ${encoded}`;
}
private static joinURL(...urlParts: Array<string>): string {
return urlParts.reduce((output, next, index) => {
if (
index === 0 ||
next !== '/' ||
(next === '/' && output[output.length - 1] !== '/')
) {
output += next;
}
return output;
}, '');
}
private static checkStatus(res: Response): Response {
if (res.ok) {
// res.status >= 200 && res.status < 300
return res;
} else {
throw new MediaBackendError(res.statusText);
}
}
}

View file

@ -16,6 +16,7 @@ import { MediaService } from './media.service';
import { S3Backend } from './backends/s3-backend'; import { S3Backend } from './backends/s3-backend';
import { ImgurBackend } from './backends/imgur-backend'; import { ImgurBackend } from './backends/imgur-backend';
import { AzureBackend } from './backends/azure-backend'; import { AzureBackend } from './backends/azure-backend';
import { WebdavBackend } from './backends/webdav-backend';
@Module({ @Module({
imports: [ imports: [
@ -31,6 +32,7 @@ import { AzureBackend } from './backends/azure-backend';
AzureBackend, AzureBackend,
ImgurBackend, ImgurBackend,
S3Backend, S3Backend,
WebdavBackend,
], ],
exports: [MediaService], exports: [MediaService],
}) })

View file

@ -25,6 +25,7 @@ import { ImgurBackend } from './backends/imgur-backend';
import { User } from '../users/user.entity'; import { User } from '../users/user.entity';
import { MediaUploadDto } from './media-upload.dto'; import { MediaUploadDto } from './media-upload.dto';
import { Note } from '../notes/note.entity'; import { Note } from '../notes/note.entity';
import { WebdavBackend } from './backends/webdav-backend';
@Injectable() @Injectable()
export class MediaService { export class MediaService {
@ -203,6 +204,8 @@ export class MediaService {
return BackendType.IMGUR; return BackendType.IMGUR;
case 's3': case 's3':
return BackendType.S3; return BackendType.S3;
case 'webdav':
return BackendType.WEBDAV;
} }
} }
@ -216,6 +219,8 @@ export class MediaService {
return this.moduleRef.get(AzureBackend); return this.moduleRef.get(AzureBackend);
case BackendType.IMGUR: case BackendType.IMGUR:
return this.moduleRef.get(ImgurBackend); return this.moduleRef.get(ImgurBackend);
case BackendType.WEBDAV:
return this.moduleRef.get(WebdavBackend);
} }
} }