X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcore-utils.ts;h=4981bb4ecb4e64cee7566ed65673201a7f427ce2;hb=265ba139ebf56bbdc1c65f6ea4f367774c691fc0;hp=33bbdca8b6b44f1a95516fe93359d53da7a5f47e;hpb=49347a0a8b64559192d8f29f1237308025a48fd4;p=github%2FChocobozzz%2FPeerTube.git
diff --git a/server/helpers/core-utils.ts b/server/helpers/core-utils.ts
index 33bbdca8b..4981bb4ec 100644
--- a/server/helpers/core-utils.ts
+++ b/server/helpers/core-utils.ts
@@ -3,24 +3,34 @@
Useful to avoid circular dependencies.
*/
-import { join } from 'path'
-import { pseudoRandomBytes } from 'crypto'
-import {
- readdir,
- readFile,
- rename,
- unlink,
- writeFile,
- access,
- stat,
- Stats
-} from 'fs'
-import * as mkdirp from 'mkdirp'
import * as bcrypt from 'bcrypt'
import * as createTorrent from 'create-torrent'
+import { pseudoRandomBytes } from 'crypto'
+import { readdir, readFile, rename, stat, Stats, unlink, writeFile } from 'fs'
+import * as mkdirp from 'mkdirp'
+import { join } from 'path'
+import * as pem from 'pem'
import * as rimraf from 'rimraf'
-import * as openssl from 'openssl-wrapper'
-import * as Promise from 'bluebird'
+import { URL } from 'url'
+
+function sanitizeUrl (url: string) {
+ const urlObject = new URL(url)
+
+ if (urlObject.protocol === 'https:' && urlObject.port === '443') {
+ urlObject.port = ''
+ } else if (urlObject.protocol === 'http:' && urlObject.port === '80') {
+ urlObject.port = ''
+ }
+
+ return urlObject.href.replace(/\/$/, '')
+}
+
+// Don't import remote scheme from constants because we are in core utils
+function sanitizeHost (host: string, remoteScheme: string) {
+ const toRemove = remoteScheme === 'https' ? 443 : 80
+
+ return host.replace(new RegExp(`:${toRemove}$`), '')
+}
function isTestInstance () {
return process.env.NODE_ENV === 'test'
@@ -54,6 +64,12 @@ function escapeHTML (stringParam) {
return String(stringParam).replace(/[&<>"'`=\/]/g, s => entityMap[s])
}
+function pageToStartAndCount (page: number, itemsPerPage: number) {
+ const start = (page - 1) * itemsPerPage
+
+ return { start, count: itemsPerPage }
+}
+
function promisify0 (func: (cb: (err: any, result: A) => void) => void): () => Promise {
return function promisified (): Promise {
return new Promise((resolve: (arg: A) => void, reject: (err: any) => void) => {
@@ -95,7 +111,6 @@ function promisify2WithVoid (func: (arg1: T, arg2: U, cb: (err: any) => vo
}
}
-const readFilePromise = promisify2(readFile)
const readFileBufferPromise = promisify1(readFile)
const unlinkPromise = promisify1WithVoid(unlink)
const renamePromise = promisify2WithVoid(rename)
@@ -103,11 +118,11 @@ const writeFilePromise = promisify2WithVoid(writeFile)
const readdirPromise = promisify1(readdir)
const mkdirpPromise = promisify1(mkdirp)
const pseudoRandomBytesPromise = promisify1(pseudoRandomBytes)
-const accessPromise = promisify1WithVoid(access)
-const opensslExecPromise = promisify2WithVoid(openssl.exec)
+const createPrivateKey = promisify1(pem.createPrivateKey)
+const getPublicKey = promisify1(pem.getPublicKey)
const bcryptComparePromise = promisify2(bcrypt.compare)
const bcryptGenSaltPromise = promisify1(bcrypt.genSalt)
-const bcryptHashPromise = promisify2(bcrypt.hash)
+const bcryptHashPromise = promisify2(bcrypt.hash)
const createTorrentPromise = promisify2(createTorrent)
const rimrafPromise = promisify1WithVoid(rimraf)
const statPromise = promisify1(stat)
@@ -118,19 +133,22 @@ export {
isTestInstance,
root,
escapeHTML,
+ pageToStartAndCount,
+ sanitizeUrl,
+ sanitizeHost,
promisify0,
promisify1,
+
readdirPromise,
- readFilePromise,
readFileBufferPromise,
unlinkPromise,
renamePromise,
writeFilePromise,
mkdirpPromise,
pseudoRandomBytesPromise,
- accessPromise,
- opensslExecPromise,
+ createPrivateKey,
+ getPublicKey,
bcryptComparePromise,
bcryptGenSaltPromise,
bcryptHashPromise,