"string-replace-loader": "^1.0.3",
"style-loader": "^0.18.2",
"tslib": "^1.5.0",
- "tslint": "^5.4.3",
+ "tslint": "^5.7.0",
"tslint-loader": "^3.3.0",
- "typescript": "~2.4.0",
+ "typescript": "^2.5.2",
"url-loader": "^0.5.7",
"video.js": "^6.2.0",
"videojs-dock": "^2.0.2",
import 'rxjs/add/operator/catch'
import 'rxjs/add/operator/map'
+import { BytesPipe } from 'angular-pipes/src/math/bytes.pipe'
+
import { AuthHttp, RestExtractor, RestDataSource, User } from '../../../shared'
import { UserCreate } from '../../../../../../shared'
@Injectable()
export class UserService {
private static BASE_USERS_URL = API_URL + '/api/v1/users/'
+ private bytesPipe = new BytesPipe()
constructor (
private authHttp: AuthHttp,
}
getDataSource () {
- return new RestDataSource(this.authHttp, UserService.BASE_USERS_URL)
+ return new RestDataSource(this.authHttp, UserService.BASE_USERS_URL, this.formatDataSource.bind(this))
}
removeUser (user: User) {
return this.authHttp.delete(UserService.BASE_USERS_URL + user.id)
}
+
+ private formatDataSource (users: User[]) {
+ const newUsers = []
+
+ users.forEach(user => {
+ let videoQuota
+ if (user.videoQuota === -1) {
+ videoQuota = 'Unlimited'
+ } else {
+ videoQuota = this.bytesPipe.transform(user.videoQuota)
+ }
+
+ const newUser = Object.assign(user, {
+ videoQuota
+ })
+ newUsers.push(newUser)
+ })
+
+ return newUsers
+ }
}
<div class="form-group">
<label for="username">Username</label>
<input
- type="text" class="form-control" id="username" placeholder="Username"
+ type="text" class="form-control" id="username" placeholder="john"
formControlName="username"
>
<div *ngIf="formErrors.username" class="alert alert-danger">
<div class="form-group">
<label for="email">Email</label>
<input
- type="text" class="form-control" id="email" placeholder="Email"
+ type="text" class="form-control" id="email" placeholder="mail@example.com"
formControlName="email"
>
<div *ngIf="formErrors.email" class="alert alert-danger">
<div class="form-group">
<label for="password">Password</label>
<input
- type="password" class="form-control" id="password" placeholder="Password"
+ type="password" class="form-control" id="password"
formControlName="password"
>
<div *ngIf="formErrors.password" class="alert alert-danger">
</div>
</div>
+ <div class="form-group">
+ <label for="videoQuota">Video quota</label>
+ <select class="form-control" id="videoQuota" formControlName="videoQuota">
+ <option value="-1">Unlimited</option>
+ <option value="100000000">100MB</option>
+ <option value="500000000">500MB</option>
+ <option value="1000000000">1GB</option>
+ <option value="5000000000">5GB</option>
+ <option value="20000000000">20GB</option>
+ <option value="50000000000">50GB</option>
+ </select>
+ </div>
+
<input type="submit" value="Add user" class="btn btn-default" [disabled]="!form.valid">
</form>
</div>
FormReactive,
USER_USERNAME,
USER_EMAIL,
- USER_PASSWORD
+ USER_PASSWORD,
+ USER_VIDEO_QUOTA
} from '../../../shared'
import { UserCreate } from '../../../../../../shared'
formErrors = {
'username': '',
'email': '',
- 'password': ''
+ 'password': '',
+ 'videoQuota': ''
}
validationMessages = {
'username': USER_USERNAME.MESSAGES,
'email': USER_EMAIL.MESSAGES,
- 'password': USER_PASSWORD.MESSAGES
+ 'password': USER_PASSWORD.MESSAGES,
+ 'videoQuota': USER_VIDEO_QUOTA.MESSAGES
}
constructor (
this.form = this.formBuilder.group({
username: [ '', USER_USERNAME.VALIDATORS ],
email: [ '', USER_EMAIL.VALIDATORS ],
- password: [ '', USER_PASSWORD.VALIDATORS ]
+ password: [ '', USER_PASSWORD.VALIDATORS ],
+ videoQuota: [ '-1', USER_VIDEO_QUOTA.VALIDATORS ]
})
this.form.valueChanges.subscribe(data => this.onValueChanged(data))
const userCreate: UserCreate = this.form.value
+ // A select in HTML is always mapped as a string, we convert it to number
+ userCreate.videoQuota = parseInt(this.form.value['videoQuota'], 10)
+
this.userService.addUser(userCreate).subscribe(
() => {
this.notificationsService.success('Success', `User ${userCreate.username} created.`)
},
pager: {
display: true,
- perPage: 10
+ perPage: 1
},
columns: {
id: {
email: {
title: 'Email'
},
+ videoQuota: {
+ title: 'Video quota'
+ },
role: {
title: 'Role',
sort: false
'minlength': 'Password must be at least 6 characters long.'
}
}
+export const USER_VIDEO_QUOTA = {
+ VALIDATORS: [ Validators.required, Validators.min(-1) ],
+ MESSAGES: {
+ 'required': 'Video quota is required.',
+ 'min': 'Quota must be greater than -1.'
+ }
+}
\ No newline at end of file
import { ServerDataSource } from 'ng2-smart-table'
export class RestDataSource extends ServerDataSource {
- constructor (http: Http, endpoint: string) {
+ private updateResponse: (input: any[]) => any[]
+
+ constructor (http: Http, endpoint: string, updateResponse?: (input: any[]) => any[]) {
const options = {
endPoint: endpoint,
sortFieldKey: 'sort',
dataKey: 'data'
}
-
super(http, options)
+
+ if (updateResponse) {
+ this.updateResponse = updateResponse
+ }
+ }
+
+ protected extractDataFromResponse (res: Response) {
+ const json = res.json()
+ if (!json) return []
+ let data = json.data
+
+ if (this.updateResponse !== undefined) {
+ data = this.updateResponse(data)
+ }
+
+ return data
}
protected extractTotalFromResponse (res: Response) {
email: string
role: UserRole
displayNSFW: boolean
+ videoQuota: number
createdAt: Date
constructor (hash: {
username: string,
email: string,
role: UserRole,
+ videoQuota?: number,
displayNSFW?: boolean,
createdAt?: Date
}) {
this.username = hash.username
this.email = hash.email
this.role = hash.role
- this.displayNSFW = hash.displayNSFW
- if (hash.createdAt) {
+ if (hash.videoQuota !== undefined) {
+ this.videoQuota = hash.videoQuota
+ }
+
+ if (hash.displayNSFW !== undefined) {
+ this.displayNSFW = hash.displayNSFW
+ }
+
+ if (hash.createdAt !== undefined) {
this.createdAt = hash.createdAt
}
}
"rules": {
"no-inferrable-types": true,
"eofline": true,
- "indent": ["spaces"],
"max-line-length": [true, 140],
"no-floating-promises": false,
"no-unused-variable": false, // Bug, wait TypeScript 2.4
rimraf "^2.4.4"
semver "^5.3.0"
-tslint@^5.4.3:
- version "5.6.0"
- resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.6.0.tgz#088aa6c6026623338650b2900828ab3edf59f6cf"
+tslint@^5.7.0:
+ version "5.7.0"
+ resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.7.0.tgz#c25e0d0c92fa1201c2bc30e844e08e682b4f3552"
dependencies:
babel-code-frame "^6.22.0"
colors "^1.1.2"
resolve "^1.3.2"
semver "^5.3.0"
tslib "^1.7.1"
- tsutils "^2.7.1"
+ tsutils "^2.8.1"
tsml@1.0.1:
version "1.0.1"
version "1.9.1"
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-1.9.1.tgz#b9f9ab44e55af9681831d5f28d0aeeaf5c750cb0"
-tsutils@^2.7.1:
- version "2.8.1"
- resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.8.1.tgz#3771404e7ca9f0bedf5d919a47a4b1890a68efff"
+tsutils@^2.8.1:
+ version "2.8.2"
+ resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.8.2.tgz#2c1486ba431260845b0ac6f902afd9d708a8ea6a"
dependencies:
tslib "^1.7.1"
version "0.0.6"
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
-typescript@~2.4.0:
- version "2.4.2"
- resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.4.2.tgz#f8395f85d459276067c988aa41837a8f82870844"
+typescript@^2.5.2:
+ version "2.5.2"
+ resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.5.2.tgz#038a95f7d9bbb420b1bf35ba31d4c5c1dd3ffe34"
uglify-js@3.0.x, uglify-js@^3.0.6:
version "3.0.28"
enabled: false
limit: 10 # When the limit is reached, registrations are disabled. -1 == unlimited
+user:
+ # Default value of maximum video BYTES the user can upload (does not take into account transcoded files).
+ # -1 == unlimited
+ video_quota: -1
+
# If enabled, the video will be transcoded to mp4 (x264) with "faststart" flag
# Uses a lot of CPU!
transcoding:
enabled: false
limit: 10 # When the limit is reached, registrations are disabled. -1 == unlimited
+user:
+ # Default value of maximum video BYTES the user can upload (does not take into account transcoded files).
+ # -1 == unlimited
+ video_quota: -1
+
# If enabled, the video will be transcoded to mp4 (x264) with "faststart" flag
# Uses a lot of CPU!
transcoding:
"scripty": "^1.5.0",
"sequelize": "^4.7.5",
"ts-node": "^3.0.6",
- "typescript": "^2.4.1",
+ "typescript": "^2.5.2",
"validator": "^8.1.0",
"winston": "^2.1.1",
"ws": "^3.1.0"
"source-map-support": "^0.4.15",
"standard": "^10.0.0",
"supertest": "^3.0.0",
- "tslint": "^5.2.0",
+ "tslint": "^5.7.0",
"tslint-config-standard": "^6.0.0",
"webtorrent": "^0.98.0"
},
import * as express from 'express'
import { database as db } from '../../initializers/database'
-import { USER_ROLES } from '../../initializers'
+import { USER_ROLES, CONFIG } from '../../initializers'
import { logger, getFormattedObjects } from '../../helpers'
import {
authenticate,
function createUser (req: express.Request, res: express.Response, next: express.NextFunction) {
const body: UserCreate = req.body
+ // On registration, we set the user video quota
+ if (body.videoQuota === undefined) {
+ body.videoQuota = CONFIG.USER.VIDEO_QUOTA
+ }
+
const user = db.User.build({
username: body.username,
password: body.password,
email: body.email,
displayNSFW: false,
- role: USER_ROLES.USER
+ role: USER_ROLES.USER,
+ videoQuota: body.videoQuota
})
user.save()
.then(user => {
if (body.password) user.password = body.password
if (body.displayNSFW !== undefined) user.displayNSFW = body.displayNSFW
+ if (body.videoQuota !== undefined) user.videoQuota = body.videoQuota
return user.save()
})
return values(USER_ROLES).indexOf(value as UserRole) !== -1
}
+function isUserVideoQuotaValid (value: string) {
+ return exists(value) && validator.isInt(value + '', USERS_CONSTRAINTS_FIELDS.VIDEO_QUOTA)
+}
+
function isUserUsernameValid (value: string) {
const max = USERS_CONSTRAINTS_FIELDS.USERNAME.max
const min = USERS_CONSTRAINTS_FIELDS.USERNAME.min
export {
isUserPasswordValid,
isUserRoleValid,
+ isUserVideoQuotaValid,
isUserUsernameValid,
isUserDisplayNSFWValid
}
isUserPasswordValid,
isUserRoleValid,
isUserUsernameValid,
- isUserDisplayNSFWValid
+ isUserDisplayNSFWValid,
+ isUserVideoQuotaValid
}
}
// ---------------------------------------------------------------------------
-const LAST_MIGRATION_VERSION = 65
+const LAST_MIGRATION_VERSION = 70
// ---------------------------------------------------------------------------
},
SIGNUP: {
ENABLED: config.get<boolean>('signup.enabled'),
- LIMIT: config.get<number>('signup.limit')
+ LIMIT: config.get<number>('signup.limit'),
+ },
+ USER: {
+ VIDEO_QUOTA: config.get<number>('user.video_quota')
},
TRANSCODING: {
ENABLED: config.get<boolean>('transcoding.enabled'),
const CONSTRAINTS_FIELDS = {
USERS: {
USERNAME: { min: 3, max: 20 }, // Length
- PASSWORD: { min: 6, max: 255 } // Length
+ PASSWORD: { min: 6, max: 255 }, // Length
+ VIDEO_QUOTA: { min: -1 }
},
VIDEO_ABUSES: {
REASON: { min: 2, max: 300 } // Length
import { join } from 'path'
import { flattenDepth } from 'lodash'
+require('pg').defaults.parseInt8 = true // Avoid BIGINT to be converted to string
import * as Sequelize from 'sequelize'
import * as Promise from 'bluebird'
}
function createDirectoriesIfNotExist () {
- const storages = CONFIG.STORAGE
+ const storage = CONFIG.STORAGE
const cacheDirectories = CACHE.DIRECTORIES
const tasks = []
- Object.keys(storages).forEach(key => {
- const dir = storages[key]
+ Object.keys(storage).forEach(key => {
+ const dir = storage[key]
tasks.push(mkdirpPromise(dir))
})
username,
email,
password,
- role
+ role,
+ videoQuota: -1
}
return db.User.create(userData, createOptions).then(createdUser => {
--- /dev/null
+import * as Sequelize from 'sequelize'
+import * as Promise from 'bluebird'
+
+function up (utils: {
+ transaction: Sequelize.Transaction,
+ queryInterface: Sequelize.QueryInterface,
+ sequelize: Sequelize.Sequelize,
+ db: any
+}): Promise<void> {
+ const q = utils.queryInterface
+
+ const data = {
+ type: Sequelize.BIGINT,
+ allowNull: false,
+ defaultValue: -1
+ }
+
+ return q.addColumn('Users', 'videoQuota', data)
+ .then(() => {
+ data.defaultValue = null
+ return q.changeColumn('Users', 'videoQuota', data)
+ })
+}
+
+function down (options) {
+ throw new Error('Not implemented.')
+}
+
+export {
+ up,
+ down
+}
req.checkBody('username', 'Should have a valid username').isUserUsernameValid()
req.checkBody('password', 'Should have a valid password').isUserPasswordValid()
req.checkBody('email', 'Should have a valid email').isEmail()
+ req.checkBody('videoQuota', 'Should have a valid user quota').isUserVideoQuotaValid()
logger.debug('Checking usersAdd parameters', { parameters: req.body })
// Add old password verification
req.checkBody('password', 'Should have a valid password').optional().isUserPasswordValid()
req.checkBody('displayNSFW', 'Should have a valid display Not Safe For Work attribute').optional().isUserDisplayNSFWValid()
+ req.checkBody('videoQuota', 'Should have a valid user quota').optional().isUserVideoQuotaValid()
logger.debug('Checking usersUpdate parameters', { parameters: req.body })
logger.debug('Checking videosAdd parameters', { parameters: req.body, files: req.files })
checkErrors(req, res, () => {
- const videoFile = req.files['videofile'][0]
+ const videoFile: Express.Multer.File = req.files['videofile'][0]
+ const user = res.locals.oauth.token.User
- db.Video.getDurationFromFile(videoFile.path)
+ user.isAbleToUploadVideo(videoFile)
+ .then(isAble => {
+ if (isAble === false) {
+ res.status(403).send('The user video quota is exceeded with this video.')
+
+ return undefined
+ }
+
+ return db.Video.getDurationFromFile(videoFile.path)
+ })
.then(duration => {
+ // Previous test failed, abort
+ if (duration === undefined) return
+
if (!isVideoDurationValid('' + duration)) {
return res.status(400).send('Duration of the video file is too big (max: ' + CONSTRAINTS_FIELDS.VIDEOS.DURATION.max + 's).')
}
export type ToFormattedJSON = (this: UserInstance) => FormattedUser
export type IsAdmin = (this: UserInstance) => boolean
+ export type IsAbleToUploadVideo = (this: UserInstance, videoFile: Express.Multer.File) => Promise<boolean>
export type CountTotal = () => Promise<number>
isPasswordMatch: UserMethods.IsPasswordMatch,
toFormattedJSON: UserMethods.ToFormattedJSON,
isAdmin: UserMethods.IsAdmin,
+ isAbleToUploadVideo: UserMethods.IsAbleToUploadVideo,
countTotal: UserMethods.CountTotal,
getByUsername: UserMethods.GetByUsername,
}
export interface UserAttributes {
+ id?: number
password: string
username: string
email: string
displayNSFW?: boolean
role: UserRole
+ videoQuota: number
}
export interface UserInstance extends UserClass, UserAttributes, Sequelize.Instance<UserAttributes> {
import { values } from 'lodash'
import * as Sequelize from 'sequelize'
+import * as Promise from 'bluebird'
import { getSort } from '../utils'
import { USER_ROLES } from '../../initializers'
comparePassword,
isUserPasswordValid,
isUserUsernameValid,
- isUserDisplayNSFWValid
+ isUserDisplayNSFWValid,
+ isUserVideoQuotaValid
} from '../../helpers'
import { addMethodsToModel } from '../utils'
let loadById: UserMethods.LoadById
let loadByUsername: UserMethods.LoadByUsername
let loadByUsernameOrEmail: UserMethods.LoadByUsernameOrEmail
+let isAbleToUploadVideo: UserMethods.IsAbleToUploadVideo
export default function (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.DataTypes) {
User = sequelize.define<UserInstance, UserAttributes>('User',
role: {
type: DataTypes.ENUM(values(USER_ROLES)),
allowNull: false
+ },
+ videoQuota: {
+ type: DataTypes.BIGINT,
+ allowNull: false,
+ validate: {
+ videoQuotaValid: value => {
+ const res = isUserVideoQuotaValid(value)
+ if (res === false) throw new Error('Video quota is not valid.')
+ }
+ }
}
},
{
const instanceMethods = [
isPasswordMatch,
toFormattedJSON,
- isAdmin
+ isAdmin,
+ isAbleToUploadVideo
]
addMethodsToModel(User, classMethods, instanceMethods)
email: this.email,
displayNSFW: this.displayNSFW,
role: this.role,
+ videoQuota: this.videoQuota,
createdAt: this.createdAt
}
}
return this.role === USER_ROLES.ADMIN
}
+isAbleToUploadVideo = function (this: UserInstance, videoFile: Express.Multer.File) {
+ if (this.videoQuota === -1) return Promise.resolve(true)
+
+ return getOriginalVideoFileTotalFromUser(this).then(totalBytes => {
+ return (videoFile.size + totalBytes) < this.videoQuota
+ })
+}
+
// ------------------------------ STATICS ------------------------------
function associate (models) {
// FIXME: https://github.com/DefinitelyTyped/DefinitelyTyped/issues/18387
return (User as any).findOne(query)
}
+
+// ---------------------------------------------------------------------------
+
+function getOriginalVideoFileTotalFromUser (user: UserInstance) {
+ const query = {
+ attributes: [
+ Sequelize.fn('COUNT', Sequelize.col('VideoFile.size'), 'totalVideoBytes')
+ ],
+ where: {
+ id: user.id
+ },
+ include: [
+ {
+ model: User['sequelize'].models.Author,
+ include: [
+ {
+ model: User['sequelize'].models.Video,
+ include: [
+ {
+ model: User['sequelize'].models.VideoFile
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ }
+
+ // FIXME: cast to any because of bad typing...
+ return User.findAll(query).then((res: any) => {
+ return res.totalVideoBytes
+ })
+}
import * as Promise from 'bluebird'
import { TagInstance } from './tag-interface'
+import { UserInstance } from '../user/user-interface'
import {
logger,
isVideoNameValid,
return res()
})
.catch(err => {
- // Autodestruction...
+ // Auto destruction...
this.destroy().catch(err => logger.error('Cannot destruct video after transcoding failure.', err))
return rej(err)
}
removeTorrent = function (this: VideoInstance, videoFile: VideoFileInstance) {
- const torrenPath = join(CONFIG.STORAGE.TORRENTS_DIR, this.getTorrentFileName(videoFile))
- return unlinkPromise(torrenPath)
+ const torrentPath = join(CONFIG.STORAGE.TORRENTS_DIR, this.getTorrentFileName(videoFile))
+ return unlinkPromise(torrentPath)
}
// ------------------------------ STATICS ------------------------------
username: string
password: string
email: string
+ videoQuota: number
}
export interface UserUpdate {
displayNSFW?: boolean
password?: string
+ videoQuota?: number
}
email: string
displayNSFW: boolean
role: UserRole
+ videoQuota: number
createdAt: Date
}
"no-inferrable-types": true,
"eofline": true,
"indent": ["spaces"],
+ "ter-indent": [true, 2],
"max-line-length": [true, 140],
"no-floating-promises": false
}
tslib "^1.0.0"
tsutils "^1.4.0"
-tslint@^5.2.0:
- version "5.6.0"
- resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.6.0.tgz#088aa6c6026623338650b2900828ab3edf59f6cf"
+tslint@^5.7.0:
+ version "5.7.0"
+ resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.7.0.tgz#c25e0d0c92fa1201c2bc30e844e08e682b4f3552"
dependencies:
babel-code-frame "^6.22.0"
colors "^1.1.2"
resolve "^1.3.2"
semver "^5.3.0"
tslib "^1.7.1"
- tsutils "^2.7.1"
+ tsutils "^2.8.1"
tsutils@^1.4.0:
version "1.9.1"
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-1.9.1.tgz#b9f9ab44e55af9681831d5f28d0aeeaf5c750cb0"
-tsutils@^2.7.1:
- version "2.8.1"
- resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.8.1.tgz#3771404e7ca9f0bedf5d919a47a4b1890a68efff"
+tsutils@^2.8.1:
+ version "2.8.2"
+ resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.8.2.tgz#2c1486ba431260845b0ac6f902afd9d708a8ea6a"
dependencies:
tslib "^1.7.1"
version "0.0.6"
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
-typescript@^2.4.1:
- version "2.5.1"
- resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.5.1.tgz#ce7cc93ada3de19475cc9d17e3adea7aee1832aa"
+typescript@^2.5.2:
+ version "2.5.2"
+ resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.5.2.tgz#038a95f7d9bbb420b1bf35ba31d4c5c1dd3ffe34"
uid-number@^0.0.6:
version "0.0.6"
projects / github / Chocobozzz / PeerTube.git / commitdiff
