-import { exists, isArray, isSafePath } from './misc'
-import * as validator from 'validator'
+import validator from 'validator'
+import { PluginPackageJSON } from '../../../shared/models/plugins/plugin-package-json.model'
import { PluginType } from '../../../shared/models/plugins/plugin.type'
import { CONSTRAINTS_FIELDS } from '../../initializers/constants'
-import { PluginPackageJson } from '../../../shared/models/plugins/plugin-package-json.model'
import { isUrlValid } from './activitypub/misc'
+import { exists, isArray, isSafePath } from './misc'
const PLUGINS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.PLUGINS
function isPluginTypeValid (value: any) {
- return exists(value) && validator.isInt('' + value) && PluginType[value] !== undefined
+ return exists(value) &&
+ (value === PluginType.PLUGIN || value === PluginType.THEME)
}
function isPluginNameValid (value: string) {
return exists(value) &&
validator.isLength(value, PLUGINS_CONSTRAINTS_FIELDS.NAME) &&
- validator.matches(value, /^[a-z\-]+$/)
+ validator.matches(value, /^[a-z-0-9]+$/)
}
function isNpmPluginNameValid (value: string) {
return exists(value) &&
validator.isLength(value, PLUGINS_CONSTRAINTS_FIELDS.NAME) &&
- validator.matches(value, /^[a-z\-]+$/) &&
+ validator.matches(value, /^[a-z\-._0-9]+$/) &&
(value.startsWith('peertube-plugin-') || value.startsWith('peertube-theme-'))
}
return exists(value) && validator.isLength(value, PLUGINS_CONSTRAINTS_FIELDS.DESCRIPTION)
}
-function isPluginVersionValid (value: string) {
+function isPluginStableVersionValid (value: string) {
if (!exists(value)) return false
const parts = (value + '').split('.')
return parts.length === 3 && parts.every(p => validator.isInt(p))
}
+function isPluginStableOrUnstableVersionValid (value: string) {
+ if (!exists(value)) return false
+
+ // suffix is beta.x or alpha.x
+ const [ stable, suffix ] = value.split('-')
+ if (!isPluginStableVersionValid(stable)) return false
+
+ const suffixRegex = /^(rc|alpha|beta)\.\d+$/
+ if (suffix && !suffixRegex.test(suffix)) return false
+
+ return true
+}
+
function isPluginEngineValid (engine: any) {
return exists(engine) && exists(engine.peertube)
}
return isPluginNameValid(name)
}
-function isPackageJSONValid (packageJSON: PluginPackageJson, pluginType: PluginType) {
+function isPackageJSONValid (packageJSON: PluginPackageJSON, pluginType: PluginType) {
let result = true
const badFields: string[] = []
}
function isLibraryCodeValid (library: any) {
- return typeof library.register === 'function'
- && typeof library.unregister === 'function'
+ return typeof library.register === 'function' &&
+ typeof library.unregister === 'function'
}
export {
isPackageJSONValid,
isThemeNameValid,
isPluginHomepage,
- isPluginVersionValid,
+ isPluginStableVersionValid,
+ isPluginStableOrUnstableVersionValid,
isPluginNameValid,
isPluginDescriptionValid,
isLibraryCodeValid,