zoriya/flood
1
0
Fork 0
mirror of https://github.com/zoriya/flood.git synced 2026-06-03 11:16:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

API: torrents: schema validate add-urls and add-files endpoints

Browse Source 
Those endpoints use extensive amount of user-provided properties
and will be frequently used by third party developers. With Node
15, unhandled promise rejections directly crash the server, as
such, it is safer to schema validate the request before processing
it.

This change also prepares the code paths for later change that adds
destination fallbacks.
This commit is contained in:
Jesse Chan
2020-11-13 01:43:05 +08:00
parent 7abeede3c6
commit 80ffb24d8d
22 changed files with 290 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/services/Transmission/clientGatewayService.ts
+13 -14
View File
@@ -1,15 +1,7 @@
import geoip from 'geoip-country';
import type {ClientSettings} from '@shared/types/ClientSettings';
import type {TorrentContent} from '@shared/types/TorrentContent';
import type {TorrentList, TorrentListSummary, TorrentProperties} from '@shared/types/Torrent';
import type {TorrentPeer} from '@shared/types/TorrentPeer';
import type {TorrentTracker} from '@shared/types/TorrentTracker';
import type {TransferSummary} from '@shared/types/TransferData';
import type {TransmissionConnectionSettings} from '@shared/schema/ClientConnectionSettings';
import type {AddTorrentByFileOptions, AddTorrentByURLOptions} from '@shared/schema/api/torrents';
import type {
AddTorrentByFileOptions,
AddTorrentByURLOptions,
CheckTorrentsOptions,
DeleteTorrentsOptions,
MoveTorrentsOptions,
@@ -20,6 +12,13 @@ import type {
StartTorrentsOptions,
StopTorrentsOptions,
} from '@shared/types/api/torrents';
import type {ClientSettings} from '@shared/types/ClientSettings';
import type {TorrentContent} from '@shared/types/TorrentContent';
import type {TorrentList, TorrentListSummary, TorrentProperties} from '@shared/types/Torrent';
import type {TorrentPeer} from '@shared/types/TorrentPeer';
import type {TorrentTracker} from '@shared/types/TorrentTracker';
import type {TransferSummary} from '@shared/types/TransferData';
import type {TransmissionConnectionSettings} from '@shared/schema/ClientConnectionSettings';
import type {SetClientSettingsOptions} from '@shared/types/api/client';
import ClientGatewayService from '../interfaces/clientGatewayService';
@@ -34,7 +33,7 @@ import {TransmissionPriority, TransmissionTorrentsSetArguments} from './types/Tr
class TransmissionClientGatewayService extends ClientGatewayService {
clientRequestManager = new ClientRequestManager(this.user.client as TransmissionConnectionSettings);
async addTorrentsByFile({files, destination, tags, start}: AddTorrentByFileOptions): Promise<void> {
async addTorrentsByFile({files, destination, tags, start}: Required<AddTorrentByFileOptions>): Promise<void> {
const addedTorrents: Array<string> = (
await Promise.all(
files.map(async (file) => {
@@ -48,12 +47,12 @@ class TransmissionClientGatewayService extends ClientGatewayService {
)
).filter((hash) => hash != null) as Array<string>;
if (tags?.length) {
if (tags.length > 0) {
await this.setTorrentsTags({hashes: addedTorrents, tags});
}
}
async addTorrentsByURL({urls, cookies, destination, tags, start}: AddTorrentByURLOptions): Promise<void> {
async addTorrentsByURL({urls, cookies, destination, tags, start}: Required<AddTorrentByURLOptions>): Promise<void> {
const addedTorrents: Array<string> = (
await Promise.all(
urls.map(async (url) => {
@@ -62,7 +61,7 @@ class TransmissionClientGatewayService extends ClientGatewayService {
(await this.clientRequestManager
.addTorrent({
filename: url,
cookies: cookies?.[domain] != null ? `${cookies[domain].join('; ')};` : undefined,
cookies: cookies[domain] != null ? `${cookies[domain].join('; ')};` : undefined,
'download-dir': destination,
paused: !start,
})
@@ -73,7 +72,7 @@ class TransmissionClientGatewayService extends ClientGatewayService {
)
).filter((hash) => hash != null) as Array<string>;
if (tags?.length) {
if (tags.length > 0) {
await this.setTorrentsTags({hashes: addedTorrents, tags});
}
}