yetangitu/timelimit-server
1
0
Fork 0
mirror of https://codeberg.org/timelimit/timelimit-server.git synced 2025-10-03 09:49:32 +02:00
Code Issues Projects Releases Wiki Activity

Refactor exception usage

Browse source
This commit is contained in:
Jonas Lochmann 2020-09-28 02:00:00 +02:00
parent d68b425e0e
commit 8d65c5d777
No known key found for this signature in database
GPG key ID: 8B8C9AEE10FA5B36
148 changed files with 2061 additions and 769 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/action/addcategoryapps.ts
View file

@ -15,9 +15,10 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { assertNonEmptyListWithoutDuplicates } from '../util/list'
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { assertIdWithinFamily, assertNonEmptyListWithoutDuplicates } from './meta/util'
const actionType = 'AddCategoryApps'
export class AddCategoryAppsAction extends ParentAction {
readonly categoryId: string
@ -26,8 +27,8 @@ export class AddCategoryAppsAction extends ParentAction {
constructor ({ categoryId, packageNames }: {categoryId: string, packageNames: Array<string>}) {
super()
assertIdWithinFamily(categoryId)
assertNonEmptyListWithoutDuplicates(packageNames)
assertIdWithinFamily({ actionType, field: 'categoryId', value: categoryId })
assertNonEmptyListWithoutDuplicates({ actionType, field: 'packageNames', list: packageNames })
this.categoryId = categoryId
this.packageNames = packageNames

20
src/action/addcategorynetworkid.ts
View file

@ -16,9 +16,11 @@
*/
import { anonymizedNetworkIdLength } from '../database/categorynetworkid'
import { assertIsHexString } from '../util/hexstring'
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { InvalidActionParameterException } from './meta/exception'
import { assertHexString, assertIdWithinFamily } from './meta/util'
const actionType = 'AddCategoryNetworkIdAction'
export class AddCategoryNetworkIdAction extends ParentAction {
readonly categoryId: string
@ -32,10 +34,16 @@ export class AddCategoryNetworkIdAction extends ParentAction {
}) {
super()
assertIdWithinFamily(categoryId)
assertIdWithinFamily(itemId)
assertIsHexString(hashedNetworkId)
if (hashedNetworkId.length !== anonymizedNetworkIdLength) throw new Error('wrong network id length')
assertIdWithinFamily({ actionType, field: 'categoryId', value: categoryId })
assertIdWithinFamily({ actionType, field: 'itemId', value: itemId })
assertHexString({ actionType, field: 'hashedNetworkId', value: hashedNetworkId })
if (hashedNetworkId.length !== anonymizedNetworkIdLength) {
throw new InvalidActionParameterException({
actionType,
staticMessage: 'wrong network id length'
})
}
this.categoryId = categoryId
this.itemId = itemId

6
src/action/addinstalledapps.ts
View file

@ -16,8 +16,10 @@
*/
import { InstalledApp, SerializedInstalledApp } from '../model/installedapp'
import { assertNonEmptyListWithoutDuplicates } from '../util/list'
import { AppLogicAction } from './basetypes'
import { assertNonEmptyListWithoutDuplicates } from './meta/util'
const actionType = 'AddInstalledAppsAction'
export class AddInstalledAppsAction extends AppLogicAction {
readonly apps: Array<InstalledApp>
@ -25,7 +27,7 @@ export class AddInstalledAppsAction extends AppLogicAction {
constructor ({ apps }: {apps: Array<InstalledApp>}) {
super()
assertNonEmptyListWithoutDuplicates(apps.map((app) => app.packageName))
assertNonEmptyListWithoutDuplicates({ actionType, field: 'apps', list: apps.map((app) => app.packageName) })
this.apps = apps
}

25
src/action/addusedtime.ts
View file

@ -15,8 +15,11 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { assertIdWithinFamily } from '../util/token'
import { AppLogicAction } from './basetypes'
import { InvalidActionParameterException } from './meta/exception'
import { assertIdWithinFamily } from './meta/util'
const actionType = 'AddUsedTimeAction'
export class AddUsedTimeAction extends AppLogicAction {
readonly categoryId: string
@ -32,18 +35,30 @@ export class AddUsedTimeAction extends AppLogicAction {
}) {
super()
assertIdWithinFamily(categoryId)
assertIdWithinFamily({ actionType, field: 'categoryId', value: categoryId })
if (dayOfEpoch < 0 || (!Number.isSafeInteger(dayOfEpoch))) {
throw new Error('illegal dayOfEpoch')
throw new InvalidActionParameterException({
actionType,
staticMessage: 'invalid dayOfEpoch',
dynamicMessage: 'invalid dayOfEpoch: ' + dayOfEpoch
})
}
if (timeToAdd < 0 || (!Number.isSafeInteger(timeToAdd))) {
throw new Error('illegal timeToAdd')
throw new InvalidActionParameterException({
actionType,
staticMessage: 'illegal timeToAdd',
dynamicMessage: 'illegal timeToAdd: ' + timeToAdd
})
}
if (extraTimeToSubtract < 0 || (!Number.isSafeInteger(extraTimeToSubtract))) {
throw new Error('illegal extra time to subtract')
throw new InvalidActionParameterException({
actionType,
staticMessage: 'illegal extra time to subtract',
dynamicMessage: 'illegal extra time to subtract: ' + extraTimeToSubtract
})
}
this.categoryId = categoryId

87
src/action/addusedtime2.ts
View file

@ -15,10 +15,12 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { uniq } from 'lodash'
import { MinuteOfDay } from '../util/minuteofday'
import { assertIdWithinFamily } from '../util/token'
import { AppLogicAction } from './basetypes'
import { InvalidActionParameterException } from './meta/exception'
import { assertIdWithinFamily, assertListWithoutDuplicates, assertSafeInteger, throwOutOfRange } from './meta/util'
const actionType = 'AddUsedTimeActionVersion2'
export class AddUsedTimeActionVersion2 extends AppLogicAction {
readonly dayOfEpoch: number
@ -44,46 +46,54 @@ export class AddUsedTimeActionVersion2 extends AppLogicAction {
}) {
super()
if (dayOfEpoch < 0 || (!Number.isSafeInteger(dayOfEpoch))) {
throw new Error('illegal dayOfEpoch')
assertSafeInteger({ actionType, field: 'dayOfEpoch', value: dayOfEpoch })
if (dayOfEpoch < 0) {
throwOutOfRange({ actionType, field: 'dayOfEpoch', value: dayOfEpoch })
}
if (trustedTimestamp < 0 || (!Number.isSafeInteger(trustedTimestamp))) {
throw new Error('illegal trustedTimestamp')
assertSafeInteger({ actionType, field: 'trustedTimestamp', value: trustedTimestamp })
if (trustedTimestamp < 0) {
throwOutOfRange({ actionType, field: 'trustedTimestamp', value: trustedTimestamp })
}
if (items.length === 0) {
throw new Error('missing items')
throw new InvalidActionParameterException({ actionType, staticMessage: 'no items' })
}
if (items.length !== uniq(items.map((item) => item.categoryId)).length) {
throw new Error('duplicate category ids')
}
assertListWithoutDuplicates({
actionType,
field: 'categoryIds',
list: items.map((item) => item.categoryId)
})
items.forEach((item) => {
assertIdWithinFamily(item.categoryId)
assertIdWithinFamily({ actionType, field: 'categoryId', value: item.categoryId })
if (item.timeToAdd < 0 || (!Number.isSafeInteger(item.timeToAdd))) {
throw new Error('illegal timeToAdd')
assertSafeInteger({ actionType, field: 'timeToAdd', value: item.timeToAdd })
if (item.timeToAdd < 0) {
throwOutOfRange({ actionType, field: 'timeToAdd', value: item.timeToAdd })
}
if (item.extraTimeToSubtract < 0 || (!Number.isSafeInteger(item.extraTimeToSubtract))) {
throw new Error('illegal extra time to subtract')
assertSafeInteger({ actionType, field: 'extraTimeToSubtract', value: item.extraTimeToSubtract })
if (item.extraTimeToSubtract < 0) {
throwOutOfRange({ actionType, field: 'extraTimeToSubtract', value: item.extraTimeToSubtract })
}
if (
uniq(item.additionalCountingSlots.map((item) => JSON.stringify(item.serialize()))).length !==
item.additionalCountingSlots.length
) {
throw new Error()
}
assertListWithoutDuplicates({
actionType,
field: 'additionalCountingSlots',
list: item.additionalCountingSlots.map((item) => JSON.stringify(item.serialize()))
})
if (
uniq(item.sessionDurationLimits.map((item) => JSON.stringify(item.serialize()))).length !==
item.sessionDurationLimits.length
) {
throw new Error()
}
assertListWithoutDuplicates({
actionType,
field: 'sessionDurationLimits',
list: item.sessionDurationLimits.map((item) => JSON.stringify(item.serialize()))
})
})
this.dayOfEpoch = dayOfEpoch
@ -111,16 +121,15 @@ class AddUsedTimeActionItemAdditionalCountingSlot {
readonly end: number
constructor ({ start, end }: { start: number, end: number }) {
if ((!Number.isSafeInteger(start)) || (!Number.isSafeInteger(end))) {
throw new Error()
}
assertSafeInteger({ actionType, field: 'start', value: start })
assertSafeInteger({ actionType, field: 'end', value: end })
if (start < MinuteOfDay.MIN || end > MinuteOfDay.MAX || start > end) {
throw new Error()
throw new InvalidActionParameterException({ actionType, staticMessage: 'start or end out of range' })
}
if (start === MinuteOfDay.MIN && end === MinuteOfDay.MAX) {
throw new Error()
throw new InvalidActionParameterException({ actionType, staticMessage: 'couting slot can not fill the whole day' })
}
this.start = start
@ -139,19 +148,17 @@ class AddUsedTimeActionItemSessionDurationLimitSlot {
readonly pause: number
constructor ({ start, end, duration, pause }: { start: number, end: number, duration: number, pause: number }) {
if (
(!Number.isSafeInteger(start)) || (!Number.isSafeInteger(end)) ||
(!Number.isSafeInteger(duration)) || (!Number.isSafeInteger(pause))
) {
throw new Error()
}
assertSafeInteger({ actionType, field: 'start', value: start })
assertSafeInteger({ actionType, field: 'end', value: end })
assertSafeInteger({ actionType, field: 'duration', value: duration })
assertSafeInteger({ actionType, field: 'pause', value: pause })
if (start < MinuteOfDay.MIN || end > MinuteOfDay.MAX || start > end) {
throw new Error()
throw new InvalidActionParameterException({ actionType, staticMessage: 'start or end out of range' })
}
if (duration <= 0 || pause <= 0) {
throw new Error()
throw new InvalidActionParameterException({ actionType, staticMessage: 'duration and pause must not be zero or smaller' })
}
this.start = start

25
src/action/adduser.ts
View file

@ -15,9 +15,12 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { assertParentPasswordValid, ParentPassword } from '../api/schema'
import { assertIdWithinFamily } from '../util/token'
import { assertParentPasswordValid, ParentPassword, ParentPasswordValidationException } from '../api/schema'
import { ParentAction } from './basetypes'
import { InvalidActionParameterException } from './meta/exception'
import { assertIdWithinFamily } from './meta/util'
const actionType = 'AddUserAction'
export class AddUserAction extends ParentAction {
readonly userId: string
@ -35,7 +38,7 @@ export class AddUserAction extends ParentAction {
}) {
super()
assertIdWithinFamily(userId)
assertIdWithinFamily({ actionType, field: 'userId', value: userId })
this.userId = userId
this.name = name
@ -45,12 +48,24 @@ export class AddUserAction extends ParentAction {
if (userType === 'parent') {
if (!password) {
throw new Error('parent users must have got an password')
throw new InvalidActionParameterException({
actionType,
staticMessage: 'parent users must have got an password'
})
}
}
if (password) {
assertParentPasswordValid(password)
try {
assertParentPasswordValid(password)
} catch (ex) {
if (ex instanceof ParentPasswordValidationException) {
throw new InvalidActionParameterException({
actionType,
staticMessage: 'invalid password data'
})
} else throw ex
}
}
}

38
src/action/changeparentpassword.ts
View file

@ -16,9 +16,11 @@
*/
import { createDecipheriv, createHash } from 'crypto'
import { assertIsHexString } from '../util/hexstring'
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { InvalidActionParameterException } from './meta/exception'
import { assertHexString, assertIdWithinFamily } from './meta/util'
const actionType = 'ChangeParentPasswordAction'
export class ChangeParentPasswordAction extends ParentAction {
readonly parentUserId: string
@ -36,7 +38,7 @@ export class ChangeParentPasswordAction extends ParentAction {
}) {
super()
assertIdWithinFamily(parentUserId)
assertIdWithinFamily({ actionType, field: 'parentUserId', value: parentUserId })
if (
(!parentUserId) ||
@ -45,15 +47,25 @@ export class ChangeParentPasswordAction extends ParentAction {
(!newPasswordSecondHashEncrypted) ||
(!integrity)
) {
throw new Error('missing required parameter for change parent password')
throw new InvalidActionParameterException({
actionType,
staticMessage: 'missing required parameter for change parent password'
})
}
if (integrity.length !== 128) {
throw new Error('wrong length of integrity data')
throw new InvalidActionParameterException({
actionType,
staticMessage: 'wrong length of integrity data'
})
}
assertIsHexString(newPasswordSecondHashEncrypted)
assertIsHexString(integrity)
assertHexString({ actionType, field: 'newPasswordSecondHashEncrypted', value: newPasswordSecondHashEncrypted })
assertHexString({ actionType, field: 'integrity', value: integrity })
if (newPasswordSecondHashEncrypted.length <= 70) {
throw new InvalidActionParameterException({ actionType, staticMessage: 'wrong length of the new password' })
}
this.parentUserId = parentUserId
this.newPasswordFirstHash = newPasswordFirstHash
@ -82,15 +94,11 @@ export class ChangeParentPasswordAction extends ParentAction {
const expected = createHash('sha512').update(integrityData).digest('hex')
if (expected !== this.integrity) {
throw new Error('invalid integrity for change parent password action')
throw new InvalidChangeParentPasswordIntegrityException()
}
}
decryptSecondHash ({ oldPasswordSecondHash }: {oldPasswordSecondHash: string}) {
if (this.newPasswordSecondHashEncrypted.length <= 70) {
throw new Error('wrong length of the new password')
}
decryptSecondHash ({ oldPasswordSecondHash }: { oldPasswordSecondHash: string }) {
const ivHex = this.newPasswordSecondHashEncrypted.substring(0, 32)
const salt = this.newPasswordSecondHashEncrypted.substring(32, 64)
const encryptedData = this.newPasswordSecondHashEncrypted.substring(64)
@ -115,3 +123,7 @@ export interface SerializedChangeParentPasswordAction {
secondHashEncrypted: string
integrity: string
}
export class InvalidChangeParentPasswordIntegrityException extends Error {
constructor () { super('invalid integrity for change parent password action') }
}

16
src/action/childchangepassword.ts
View file

@ -15,8 +15,11 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { assertParentPasswordValid, ParentPassword } from '../api/schema'
import { assertParentPasswordValid, ParentPassword, ParentPasswordValidationException } from '../api/schema'
import { ChildAction } from './basetypes'
import { InvalidActionParameterException } from './meta/exception'
const actionType = 'ChildChangePasswordAction'
export class ChildChangePasswordAction extends ChildAction {
readonly password: ParentPassword
@ -26,7 +29,16 @@ export class ChildChangePasswordAction extends ChildAction {
}) {
super()
assertParentPasswordValid(password)
try {
assertParentPasswordValid(password)
} catch (ex) {
if (ex instanceof ParentPasswordValidationException) {
throw new InvalidActionParameterException({
actionType,
staticMessage: 'invalid password'
})
} else throw ex
}
this.password = password
}

2
src/action/childsignin.ts
View file

@ -22,7 +22,7 @@ export class ChildSignInAction extends ChildAction {
super()
}
static parse = (action: SerializedChildSignInAction) => (
static parse = (_: SerializedChildSignInAction) => (
new ChildSignInAction()
)
}

8
src/action/createcategory.ts
View file

@ -15,8 +15,10 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { assertIdWithinFamily } from './meta/util'
const actionType = 'CreateCategoryAction'
export class CreateCategoryAction extends ParentAction {
readonly categoryId: string
@ -26,8 +28,8 @@ export class CreateCategoryAction extends ParentAction {
constructor ({ categoryId, childId, title }: {categoryId: string, childId: string, title: string}) {
super()
assertIdWithinFamily(categoryId)
assertIdWithinFamily(childId)
assertIdWithinFamily({ actionType, field: 'categoryId', value: categoryId })
assertIdWithinFamily({ actionType, field: 'childId', value: childId })
this.categoryId = categoryId
this.childId = childId

25
src/action/createtimelimitrule.ts
View file

@ -15,8 +15,11 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { SerializedTimeLimitRule, TimelimitRule } from '../model/timelimitrule'
import { ParseTimeLimitRuleException, SerializedTimeLimitRule, TimelimitRule } from '../model/timelimitrule'
import { ParentAction } from './basetypes'
import { InvalidActionParameterException } from './meta/exception'
const actionType = 'CreateTimeLimitRuleAction'
export class CreateTimeLimitRuleAction extends ParentAction {
rule: TimelimitRule
@ -27,11 +30,21 @@ export class CreateTimeLimitRuleAction extends ParentAction {
this.rule = rule
}
static parse = ({ rule }: SerializedCreateTimelimtRuleAction) => (
new CreateTimeLimitRuleAction({
rule: TimelimitRule.parse(rule)
})
)
static parse = ({ rule }: SerializedCreateTimelimtRuleAction) => {
try {
return new CreateTimeLimitRuleAction({
rule: TimelimitRule.parse(rule)
})
} catch (ex) {
if (ex instanceof ParseTimeLimitRuleException) {
throw new InvalidActionParameterException({
actionType,
staticMessage: 'invalid time limit rule',
dynamicMessage: 'invalid time limit rule: ' + ex.toString()
})
} else throw ex
}
}
}
export interface SerializedCreateTimelimtRuleAction {

8
src/action/deletecategory.ts
View file

@ -15,16 +15,18 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { assertIdWithinFamily } from './meta/util'
const actionType = 'DeleteCategoryAction'
export class DeleteCategoryAction extends ParentAction {
readonly categoryId: string
constructor ({ categoryId }: {categoryId: string}) {
constructor ({ categoryId }: { categoryId: string }) {
super()
assertIdWithinFamily(categoryId)
assertIdWithinFamily({ actionType, field: 'categoryId', value: categoryId })
this.categoryId = categoryId
}

6
src/action/deletetimelimitrule.ts
View file

@ -15,8 +15,10 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { assertIdWithinFamily } from './meta/util'
const actionType = 'DeleteTimeLimitRuleAction'
export class DeleteTimeLimitRuleAction extends ParentAction {
readonly ruleId: string
@ -24,7 +26,7 @@ export class DeleteTimeLimitRuleAction extends ParentAction {
constructor ({ ruleId }: {ruleId: string}) {
super()
assertIdWithinFamily(ruleId)
assertIdWithinFamily({ actionType, field: 'ruleId', value: ruleId })
this.ruleId = ruleId
}

11
src/action/ignoremanipulation.ts
View file

@ -16,8 +16,10 @@
*/
import { DeviceHadManipulationFlags } from '../database/device'
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { assertIdWithinFamily, assertSafeInteger, throwOutOfRange } from './meta/util'
const actionType = 'IgnoreManipulationAction'
export class IgnoreManipulationAction extends ParentAction {
readonly deviceId: string
@ -51,13 +53,14 @@ export class IgnoreManipulationAction extends ParentAction {
}) {
super()
assertIdWithinFamily(deviceId)
assertIdWithinFamily({ actionType, field: 'deviceId', value: deviceId })
assertSafeInteger({ actionType, field: 'ignoreHadManipulationFlags', value: ignoreHadManipulationFlags })
if (
(!Number.isSafeInteger(ignoreHadManipulationFlags)) ||
ignoreHadManipulationFlags < 0 || ignoreHadManipulationFlags > DeviceHadManipulationFlags.ALL
) {
throw new Error('invalid ignoreHadManipulationFlags')
throwOutOfRange({ actionType, field: 'ignoreHadManipulationFlags', value: ignoreHadManipulationFlags })
}
this.deviceId = deviceId

18
src/action/incrementcategoryextratime.ts
View file

@ -15,8 +15,10 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { assertIdWithinFamily, assertSafeInteger, throwOutOfRange } from './meta/util'
const actionType = 'IncrementCategoryExtraTimeAction'
export class IncrementCategoryExtraTimeAction extends ParentAction {
readonly categoryId: string
@ -26,14 +28,18 @@ export class IncrementCategoryExtraTimeAction extends ParentAction {
constructor ({ categoryId, addedExtraTime, day }: {categoryId: string, addedExtraTime: number, day: number}) {
super()
assertIdWithinFamily(categoryId)
assertIdWithinFamily({ actionType, field: 'categoryId', value: categoryId })
if (addedExtraTime <= 0 || (!Number.isSafeInteger(addedExtraTime))) {
throw new Error('must add some extra time with IncrementCategoryExtraTimeAction')
assertSafeInteger({ actionType, field: 'addedExtraTime', value: addedExtraTime })
if (addedExtraTime < 0) {
throwOutOfRange({ actionType, field: 'addedExtraTime', value: addedExtraTime })
}
if (day < -1 || (!Number.isSafeInteger(day))) {
throw Error('day must be valid')
assertSafeInteger({ actionType, field: 'day', value: day })
if (day < -1) {
throwOutOfRange({ actionType, field: 'day', value: day })
}
this.categoryId = categoryId

40
src/action/meta/exception.ts Normal file
View file

@ -0,0 +1,40 @@
/*
* server component for the TimeLimit App
* Copyright (C) 2019 - 2020 Jonas Lochmann
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, version 3 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { StaticMessageException } from '../../exception'
export class InvalidActionParameterException extends StaticMessageException {
constructor ({ actionType, staticMessage, dynamicMessage }: {
actionType: string
staticMessage: string
dynamicMessage?: string
}) {
super({
staticMessage: 'invalid action paramters:' + actionType + ':' + staticMessage,
dynamicMessage: dynamicMessage ? 'invalid action paramters:' + actionType + ':' + dynamicMessage : undefined
})
}
}
export class UnknownActionTypeException extends InvalidActionParameterException {
constructor ({ group }: { group: string }) {
super({
actionType: group,
staticMessage: 'unknown action type'
})
}
}

104
src/action/meta/util.ts Normal file
View file

@ -0,0 +1,104 @@
/*
* server component for the TimeLimit App
* Copyright (C) 2019 - 2020 Jonas Lochmann
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, version 3 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { checkIfHexString } from '../../util/hexstring'
import { hasDuplicates } from '../../util/list'
import { isIdWithinFamily } from '../../util/token'
import { InvalidActionParameterException } from './exception'
export const assertIdWithinFamily = ({ value, actionType, field }: {
value: string
actionType: string
field: string
}) => {
if (!isIdWithinFamily(value)) {
throw new InvalidActionParameterException({
actionType,
staticMessage: 'invalid id within family for ' + field,
dynamicMessage: 'invalid id within family for ' + field + ': ' + value
})
}
}
export const assertHexString = ({ value, actionType, field }: {
value: string
actionType: string
field: string
}) => {
if (!checkIfHexString(value)) {
throw new InvalidActionParameterException({
actionType,
staticMessage: 'invalid hex string for ' + field,
dynamicMessage: 'invalid hex string for ' + field + ': ' + value
})
}
}
export const assertSafeInteger = ({ value, actionType, field }: {
value: number
actionType: string
field: string
}) => {
if (!Number.isSafeInteger(value)) {
throw new InvalidActionParameterException({
actionType,
staticMessage: 'require number for ' + field,
dynamicMessage: 'require number for ' + field + ': ' + value
})
}
}
export const throwOutOfRange = ({ value, actionType, field }: {
value: number
actionType: string
field: string
}) => {
throw new InvalidActionParameterException({
actionType,
staticMessage: field + ' out of range',
dynamicMessage: field + ' out of range: ' + value
})
}
export function assertNonEmptyListWithoutDuplicates ({ list, actionType, field }: {
list: Array<string>
actionType: string
field: string
}) {
assertListWithoutDuplicates({ list, actionType, field })
if (hasDuplicates(list)) {
throw new InvalidActionParameterException({
actionType,
staticMessage: 'empty list for ' + field
})
}
}
export function assertListWithoutDuplicates ({ list, actionType, field }: {
list: Array<string>
actionType: string
field: string
}) {
if (hasDuplicates(list)) {
throw new InvalidActionParameterException({
actionType,
staticMessage: 'list has duplicates for ' + field,
dynamicMessage: 'list has duplicates for ' + field + ': ' + list.join(';')
})
}
}

9
src/action/removecategoryapps.ts
View file

@ -15,9 +15,10 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { assertNonEmptyListWithoutDuplicates } from '../util/list'
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { assertIdWithinFamily, assertNonEmptyListWithoutDuplicates } from './meta/util'
const actionType = 'RemoveCategoryAppsAction'
export class RemoveCategoryAppsAction extends ParentAction {
readonly categoryId: string
@ -26,8 +27,8 @@ export class RemoveCategoryAppsAction extends ParentAction {
constructor ({ categoryId, packageNames }: {categoryId: string, packageNames: Array<string>}) {
super()
assertIdWithinFamily(categoryId)
assertNonEmptyListWithoutDuplicates(packageNames)
assertIdWithinFamily({ actionType, field: 'categoryId', value: categoryId })
assertNonEmptyListWithoutDuplicates({ actionType, field: 'packageNames', list: packageNames })
this.categoryId = categoryId
this.packageNames = packageNames

6
src/action/removeinstalledapps.ts
View file

@ -15,8 +15,10 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { assertNonEmptyListWithoutDuplicates } from '../util/list'
import { AppLogicAction } from './basetypes'
import { assertNonEmptyListWithoutDuplicates } from './meta/util'
const actionType = 'RemoveInstalledAppsAction'
export class RemoveInstalledAppsAction extends AppLogicAction {
readonly packageNames: Array<string>
@ -24,7 +26,7 @@ export class RemoveInstalledAppsAction extends AppLogicAction {
constructor ({ packageNames }: {packageNames: Array<string>}) {
super()
assertNonEmptyListWithoutDuplicates(packageNames)
assertNonEmptyListWithoutDuplicates({ actionType, field: 'packageNames', list: packageNames })
this.packageNames = packageNames
}

6
src/action/removeuser.ts
View file

@ -15,8 +15,10 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { assertIdWithinFamily } from './meta/util'
const actionType = 'RemoveUserAction'
export class RemoveUserAction extends ParentAction {
readonly userId: string
@ -31,7 +33,7 @@ export class RemoveUserAction extends ParentAction {
}) {
super()
assertIdWithinFamily(userId)
assertIdWithinFamily({ actionType, field: 'userId', value: userId })
this.userId = userId
this.authentication = authentication

12
src/action/renamechild.ts
View file

@ -15,8 +15,11 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { InvalidActionParameterException } from './meta/exception'
import { assertIdWithinFamily } from './meta/util'
const actionType = 'RenameChildAction'
export class RenameChildAction extends ParentAction {
readonly childId: string
@ -28,10 +31,13 @@ export class RenameChildAction extends ParentAction {
}) {
super()
assertIdWithinFamily(childId)
assertIdWithinFamily({ actionType, field: 'childId', value: childId })
if (newName === '') {
throw new Error('new name must not be empty')
throw new InvalidActionParameterException({
actionType,
staticMessage: 'new name must not be empty'
})
}
this.childId = childId

6
src/action/resetcategorynetworkids.ts
View file

@ -15,8 +15,10 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { assertIdWithinFamily } from './meta/util'
const actionType = 'ResetCategoryNetworkIdsAction'
export class ResetCategoryNetworkIdsAction extends ParentAction {
readonly categoryId: string
@ -26,7 +28,7 @@ export class ResetCategoryNetworkIdsAction extends ParentAction {
}) {
super()
assertIdWithinFamily(categoryId)
assertIdWithinFamily({ actionType, field: 'categoryId', value: categoryId })
this.categoryId = categoryId
}

6
src/action/resetparentblockedtimes.ts
View file

@ -15,8 +15,10 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { assertIdWithinFamily } from './meta/util'
const actionType = 'ResetParentBlockedTimesAction'
export class ResetParentBlockedTimesAction extends ParentAction {
readonly parentId: string
@ -26,7 +28,7 @@ export class ResetParentBlockedTimesAction extends ParentAction {
}) {
super()
assertIdWithinFamily(parentId)
assertIdWithinFamily({ actionType, field: 'parentId', value: parentId })
this.parentId = parentId
}

3
src/action/serialization/applogicaction.ts
View file

@ -20,6 +20,7 @@ import { AddUsedTimeAction, SerializedAddUsedTimeAction } from '../addusedtime'
import { AddUsedTimeActionVersion2, SerializedAddUsedTimeActionVersion2 } from '../addusedtime2'
import { AppLogicAction } from '../basetypes'
import { ForceSyncAction, SerializedForceSyncAction } from '../forcesync'
import { UnknownActionTypeException } from '../meta/exception'
import { RemoveInstalledAppsAction, SerializedRemoveInstalledAppsAction } from '../removeinstalledapps'
import { SerializedSignOutAtDeviceAction, SignOutAtDeviceAction } from '../signoutatdevice'
import { SerialiezdTriedDisablingDeviceAdminAction, TriedDisablingDeviceAdminAction } from '../trieddisablingdeviceadmin'
@ -57,6 +58,6 @@ export const parseAppLogicAction = (serialized: SerializedAppLogicAction): AppLo
} else if (serialized.type === 'UPDATE_DEVICE_STATUS') {
return UpdateDeviceStatusAction.parse(serialized)
} else {
throw new Error('illegal state: unsupported type at parseAppLogicAction')
throw new UnknownActionTypeException({ group: 'app logic' })
}
}

5
src/action/serialization/childaction.ts
View file

@ -1,6 +1,6 @@
/*
* server component for the TimeLimit App
* Copyright (C) 2019 Jonas Lochmann
* Copyright (C) 2019 - 2020 Jonas Lochmann
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
@ -17,6 +17,7 @@
import { ChildChangePasswordAction, SerializedChildChangePasswordAction } from '../childchangepassword'
import { ChildSignInAction, SerializedChildSignInAction } from '../childsignin'
import { UnknownActionTypeException } from '../meta/exception'
export type SerializedChildAction = SerializedChildChangePasswordAction | SerializedChildSignInAction
@ -26,6 +27,6 @@ export const parseChildAction = (serialized: SerializedChildAction) => {
} else if (serialized.type === 'CHILD_SIGN_IN') {
return ChildSignInAction.parse(serialized)
} else {
throw new Error('illegal state: unsupported type at parseChildAction')
throw new UnknownActionTypeException({ group: 'child' })
}
}

3
src/action/serialization/parentaction.ts
View file

@ -26,6 +26,7 @@ import { DeleteCategoryAction, SerializedDeleteCategoryAction } from '../deletec
import { DeleteTimeLimitRuleAction, SerializedDeleteTimeLimitRuleAction } from '../deletetimelimitrule'
import { IgnoreManipulationAction, SerializedIgnoreManipulationAction } from '../ignoremanipulation'
import { IncrementCategoryExtraTimeAction, SerializedIncrementCategoryExtraTimeAction } from '../incrementcategoryextratime'
import { UnknownActionTypeException } from '../meta/exception'
import { RemoveCategoryAppsAction, SerializedRemoveCategoryAppsAction } from '../removecategoryapps'
import { RemoveUserAction, SerializedRemoveUserAction } from '../removeuser'
import { RenameChildAction, SerializedRenameChildAction } from '../renamechild'
@ -193,6 +194,6 @@ export const parseParentAction = (action: SerializedParentAction): ParentAction
} else if (action.type === 'UPDATE_USER_LIMIT_LOGIN_CATEGORY') {
return UpdateUserLimitLoginCategory.parse(action)
} else {
throw new Error('illegal state: invalid type for action at parseParentAction')
throw new UnknownActionTypeException({ group: 'parent' })
}
}

18
src/action/setcategoryextratime.ts
View file

@ -15,8 +15,10 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { assertIdWithinFamily, assertSafeInteger, throwOutOfRange } from './meta/util'
const actionType = 'SetCategoryExtraTimeAction'
export class SetCategoryExtraTimeAction extends ParentAction {
readonly categoryId: string
@ -26,14 +28,18 @@ export class SetCategoryExtraTimeAction extends ParentAction {
constructor ({ categoryId, newExtraTime, day }: {categoryId: string, newExtraTime: number, day: number}) {
super()
assertIdWithinFamily(categoryId)
assertIdWithinFamily({ actionType, field: 'categoryId', value: categoryId })
if (newExtraTime < 0 || (!Number.isSafeInteger(newExtraTime))) {
throw Error('newExtraTime must be >= 0')
assertSafeInteger({ actionType, field: 'newExtraTime', value: newExtraTime })
if (newExtraTime < 0) {
throwOutOfRange({ actionType, field: 'newExtraTime', value: newExtraTime })
}
if (day < -1 || (!Number.isSafeInteger(day))) {
throw Error('day must be valid')
assertSafeInteger({ actionType, field: 'day', value: day })
if (day < -1) {
throwOutOfRange({ actionType, field: 'day', value: day })
}
this.categoryId = categoryId

8
src/action/setcategoryforunassignedapps.ts
View file

@ -15,8 +15,10 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { assertIdWithinFamily } from './meta/util'
const actionType = 'SetCategoryForUnassignedAppsAction'
export class SetCategoryForUnassignedAppsAction extends ParentAction {
readonly childId: string
@ -28,10 +30,10 @@ export class SetCategoryForUnassignedAppsAction extends ParentAction {
}) {
super()
assertIdWithinFamily(childId)
assertIdWithinFamily({ actionType, field: 'childId', value: childId })
if (categoryId !== '') {
assertIdWithinFamily(categoryId)
assertIdWithinFamily({ actionType, field: 'categoryId', value: categoryId })
}
this.childId = childId

21
src/action/setchildpassword.ts
View file

@ -15,9 +15,12 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { assertParentPasswordValid, ParentPassword } from '../api/schema'
import { assertIdWithinFamily } from '../util/token'
import { assertParentPasswordValid, ParentPassword, ParentPasswordValidationException } from '../api/schema'
import { ParentAction } from './basetypes'
import { InvalidActionParameterException } from './meta/exception'
import { assertIdWithinFamily } from './meta/util'
const actionType = 'SetChildPasswordAction'
export class SetChildPasswordAction extends ParentAction {
readonly childUserId: string
@ -29,8 +32,18 @@ export class SetChildPasswordAction extends ParentAction {
}) {
super()
assertIdWithinFamily(childUserId)
assertParentPasswordValid(newPassword)
assertIdWithinFamily({ actionType, field: 'childUserId', value: childUserId })
try {
assertParentPasswordValid(newPassword)
} catch (ex) {
if (ex instanceof ParentPasswordValidationException) {
throw new InvalidActionParameterException({
actionType,
staticMessage: 'invalid parent password'
})
} else throw ex
}
this.childUserId = childUserId
this.newPassword = newPassword

6
src/action/setconsiderrebootmanipulation.ts
View file

@ -15,8 +15,10 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { assertIdWithinFamily } from './meta/util'
const actionType = 'SetConsiderRebootManipulationAction'
export class SetConsiderRebootManipulationAction extends ParentAction {
readonly deviceId: string
@ -25,7 +27,7 @@ export class SetConsiderRebootManipulationAction extends ParentAction {
constructor ({ deviceId, enable }: {deviceId: string, enable: boolean}) {
super()
assertIdWithinFamily(deviceId)
assertIdWithinFamily({ actionType, field: 'deviceId', value: deviceId })
this.deviceId = deviceId
this.enable = enable

8
src/action/setdevicedefaultuser.ts
View file

@ -15,8 +15,10 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { assertIdWithinFamily } from './meta/util'
const actionType = 'SetDeviceDefaultUserAction'
export class SetDeviceDefaultUserAction extends ParentAction {
readonly deviceId: string
@ -28,10 +30,10 @@ export class SetDeviceDefaultUserAction extends ParentAction {
}) {
super()
assertIdWithinFamily(deviceId)
assertIdWithinFamily({ actionType, field: 'deviceId', value: deviceId })
if (defaultUserId !== '') {
assertIdWithinFamily(defaultUserId)
assertIdWithinFamily({ actionType, field: 'defaultUserId', value: defaultUserId })
}
this.deviceId = deviceId

16
src/action/setdevicedefaultusertimeout.ts
View file

@ -15,8 +15,11 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { InvalidActionParameterException } from './meta/exception'
import { assertIdWithinFamily, assertSafeInteger } from './meta/util'
const actionType = 'SetDeviceDefaultUserTimeoutAction'
export class SetDeviceDefaultUserTimeoutAction extends ParentAction {
readonly deviceId: string
@ -28,10 +31,15 @@ export class SetDeviceDefaultUserTimeoutAction extends ParentAction {
}) {
super()
assertIdWithinFamily(deviceId)
assertIdWithinFamily({ actionType, field: 'deviceId', value: deviceId })
assertSafeInteger({ actionType, field: 'timeout', value: timeout })
if ((!Number.isInteger(timeout)) || (timeout < 0)) {
throw new Error('timeout must be a non-negative integer')
if (timeout < 0) {
throw new InvalidActionParameterException({
actionType,
staticMessage: 'timeout must be a non-negative integer',
dynamicMessage: 'timeout must be a non-negative integer, was ' + timeout
})
}
this.deviceId = deviceId

8
src/action/setdeviceuser.ts
View file

@ -15,8 +15,10 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { assertIdWithinFamily } from './meta/util'
const actionType = 'SetDeviceUserAction'
export class SetDeviceUserAction extends ParentAction {
readonly deviceId: string
@ -28,10 +30,10 @@ export class SetDeviceUserAction extends ParentAction {
}) {
super()
assertIdWithinFamily(deviceId)
assertIdWithinFamily({ actionType, field: 'deviceId', value: deviceId })
if (userId !== '') {
assertIdWithinFamily(userId)
assertIdWithinFamily({ actionType, field: 'userId', value: userId })
}
this.deviceId = deviceId

6
src/action/setkeepsignedin.ts
View file

@ -15,8 +15,10 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { assertIdWithinFamily } from './meta/util'
const actionType = 'SetKeepSignedInAction'
export class SetKeepSignedInAction extends ParentAction {
readonly deviceId: string
@ -28,7 +30,7 @@ export class SetKeepSignedInAction extends ParentAction {
}) {
super()
assertIdWithinFamily(deviceId)
assertIdWithinFamily({ actionType, field: 'deviceId', value: deviceId })
this.deviceId = deviceId
this.keepSignedIn = keepSignedIn

8
src/action/setparentcategory.ts
View file

@ -15,8 +15,10 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { assertIdWithinFamily } from './meta/util'
const actionType = 'SetParentCategoryAction'
export class SetParentCategoryAction extends ParentAction {
readonly categoryId: string
@ -28,10 +30,10 @@ export class SetParentCategoryAction extends ParentAction {
}) {
super()
assertIdWithinFamily(categoryId)
assertIdWithinFamily({ actionType, field: 'categoryId', value: categoryId })
if (parentCategory !== '') {
assertIdWithinFamily(parentCategory)
assertIdWithinFamily({ actionType, field: 'parentCategory', value: parentCategory })
}
this.categoryId = categoryId

6
src/action/setrelaxprimarydevice.ts
View file

@ -15,8 +15,10 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { assertIdWithinFamily } from './meta/util'
const actionType = 'SetRelaxPrimaryDeviceAction'
export class SetRelaxPrimaryDeviceAction extends ParentAction {
readonly userId: string
@ -28,7 +30,7 @@ export class SetRelaxPrimaryDeviceAction extends ParentAction {
}) {
super()
assertIdWithinFamily(userId)
assertIdWithinFamily({ actionType, field: 'userId', value: userId })
this.userId = userId
this.relax = relax

6
src/action/setsenddeviceconnected.ts
View file

@ -15,8 +15,10 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { assertIdWithinFamily } from './meta/util'
const actionType = 'SetSendDeviceConnected'
export class SetSendDeviceConnected extends ParentAction {
readonly deviceId: string
@ -28,7 +30,7 @@ export class SetSendDeviceConnected extends ParentAction {
}) {
super()
assertIdWithinFamily(deviceId)
assertIdWithinFamily({ actionType, field: 'deviceId', value: deviceId })
this.deviceId = deviceId
this.enable = enable

16
src/action/setuserdisablelimitsuntil.ts
View file

@ -15,8 +15,11 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { InvalidActionParameterException } from './meta/exception'
import { assertIdWithinFamily, assertSafeInteger } from './meta/util'
const actionType = 'SetUserDisableLimitsUntilAction'
export class SetUserDisableLimitsUntilAction extends ParentAction {
readonly childId: string
@ -28,10 +31,15 @@ export class SetUserDisableLimitsUntilAction extends ParentAction {
}) {
super()
assertIdWithinFamily(childId)
assertIdWithinFamily({ actionType, field: 'childId', value: childId })
assertSafeInteger({ actionType, field: 'timestamp', value: timestamp })
if (timestamp < 0 || (!Number.isSafeInteger(timestamp))) {
throw new Error('timestamp for set user disabe limits until must be >= 0')
if (timestamp < 0) {
throw new InvalidActionParameterException({
actionType,
staticMessage: 'timestamp for set user disabe limits until must be >= 0',
dynamicMessage: 'timestamp for set user disabe limits until must be >= 0, but was ' + timestamp
})
}
this.childId = childId

6
src/action/setusertimezone.ts
View file

@ -15,8 +15,10 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { assertIdWithinFamily } from './meta/util'
const actionType = 'SetUserTimezoneAction'
export class SetUserTimezoneAction extends ParentAction {
readonly userId: string
@ -28,7 +30,7 @@ export class SetUserTimezoneAction extends ParentAction {
}) {
super()
assertIdWithinFamily(userId)
assertIdWithinFamily({ actionType, field: 'userId', value: userId })
this.userId = userId
this.timezone = timezone

2
src/action/signoutatdevice.ts
View file

@ -24,7 +24,7 @@ export class SignOutAtDeviceAction extends AppLogicAction {
super()
}
static parse = (action: SerializedSignOutAtDeviceAction) => SignOutAtDeviceAction.instance
static parse = (_: SerializedSignOutAtDeviceAction) => SignOutAtDeviceAction.instance
}
export interface SerializedSignOutAtDeviceAction {

48
src/action/updateappactivities.ts
View file

@ -15,9 +15,14 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { AppActivityItem, RemovedAppActivityItem, SerializedAppActivityItem, SerializedRemovedAppActivityItem } from '../model/appactivity'
import { assertListWithoutDuplicates } from '../util/list'
import {
AppActivityItem, IncompleteAppActivityItemException, RemovedAppActivityItem, SerializedAppActivityItem, SerializedRemovedAppActivityItem
} from '../model/appactivity'
import { AppLogicAction } from './basetypes'
import { InvalidActionParameterException } from './meta/exception'
import { assertListWithoutDuplicates } from './meta/util'
const actionType = 'UpdateAppActivitiesAction'
export class UpdateAppActivitiesAction extends AppLogicAction {
readonly removed: Array<RemovedAppActivityItem>
@ -29,23 +34,44 @@ export class UpdateAppActivitiesAction extends AppLogicAction {
}) {
super()
assertListWithoutDuplicates(removed.map((item) => item.packageName + ':' + item.activityName))
assertListWithoutDuplicates(updatedOrAdded.map((item) => item.packageName + ':' + item.activityName))
assertListWithoutDuplicates({
actionType,
field: 'removed',
list: removed.map((item) => item.packageName + ':' + item.activityName)
})
assertListWithoutDuplicates({
actionType,
field: 'updatedOrAdded',
list: updatedOrAdded.map((item) => item.packageName + ':' + item.activityName)
})
if (removed.length === 0 && updatedOrAdded.length === 0) {
throw new Error('UpdateAppActivitiesAction is empty')
throw new InvalidActionParameterException({
actionType,
staticMessage: 'UpdateAppActivitiesAction is empty'
})
}
this.removed = removed
this.updatedOrAdded = updatedOrAdded
}
static parse = ({ removed, updatedOrAdded }: SerializedUpdateAppActivitiesAction) => (
new UpdateAppActivitiesAction({
removed: removed.map((item) => RemovedAppActivityItem.parse(item)),
updatedOrAdded: updatedOrAdded.map((item) => AppActivityItem.parse(item))
})
)
static parse = ({ removed, updatedOrAdded }: SerializedUpdateAppActivitiesAction) => {
try {
return new UpdateAppActivitiesAction({
removed: removed.map((item) => RemovedAppActivityItem.parse(item)),
updatedOrAdded: updatedOrAdded.map((item) => AppActivityItem.parse(item))
})
} catch (ex) {
if (ex instanceof IncompleteAppActivityItemException) {
throw new InvalidActionParameterException({
actionType,
staticMessage: 'invalid app activity item'
})
} else throw ex
}
}
}
export interface SerializedUpdateAppActivitiesAction {

18
src/action/updatecategorybatterylimit.ts
View file

@ -15,8 +15,10 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { assertIdWithinFamily, assertSafeInteger, throwOutOfRange } from './meta/util'
const actionType = 'UpdateCategoryBatteryLimitAction'
export class UpdateCategoryBatteryLimitAction extends ParentAction {
readonly categoryId: string
@ -30,17 +32,21 @@ export class UpdateCategoryBatteryLimitAction extends ParentAction {
}) {
super()
assertIdWithinFamily(categoryId)
assertIdWithinFamily({ actionType, field: 'categoryId', value: categoryId })
if (chargeLimit !== undefined) {
if ((!Number.isSafeInteger(chargeLimit)) || chargeLimit < 0 || chargeLimit > 100) {
throw new Error('charge limit out of range')
assertSafeInteger({ actionType, field: 'chargeLimit', value: chargeLimit })
if (chargeLimit < 0 || chargeLimit > 100) {
throwOutOfRange({ actionType, field: 'chargeLimit', value: chargeLimit })
}
}
if (mobileLimit !== undefined) {
if ((!Number.isSafeInteger(mobileLimit)) || mobileLimit < 0 || mobileLimit > 100) {
throw new Error('mobile limit out of range')
assertSafeInteger({ actionType, field: 'mobileLimit', value: mobileLimit })
if (mobileLimit < 0 || mobileLimit > 100) {
throwOutOfRange({ actionType, field: 'mobileLimit', value: mobileLimit })
}
}

8
src/action/updatecategoryblockallnotifications.ts
View file

@ -1,6 +1,6 @@
/*
* server component for the TimeLimit App
* Copyright (C) 2019 Jonas Lochmann
* Copyright (C) 2019 - 2020 Jonas Lochmann
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
@ -15,8 +15,10 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { assertIdWithinFamily } from './meta/util'
const actionType = 'UpdateCategoryBlockAllNotificationsAction'
export class UpdateCategoryBlockAllNotificationsAction extends ParentAction {
readonly categoryId: string
@ -25,7 +27,7 @@ export class UpdateCategoryBlockAllNotificationsAction extends ParentAction {
constructor ({ categoryId, blocked }: {categoryId: string, blocked: boolean}) {
super()
assertIdWithinFamily(categoryId)
assertIdWithinFamily({ actionType, field: 'categoryId', value: categoryId })
this.categoryId = categoryId
this.blocked = blocked

21
src/action/updatecategoryblockedtimes.ts
View file

@ -15,12 +15,15 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { validateBitmask } from '../util/bitmask'
import { assertIdWithinFamily } from '../util/token'
import { BitmapValidationException, validateBitmask } from '../util/bitmask'
import { ParentAction } from './basetypes'
import { InvalidActionParameterException } from './meta/exception'
import { assertIdWithinFamily } from './meta/util'
export const blockedTimesBitmaskLength = 60 * 24 * 7 /* number of minutes per week */
const actionType = 'UpdateCategoryBlockedTimesAction'
export class UpdateCategoryBlockedTimesAction extends ParentAction {
readonly categoryId: string
readonly blockedTimes: string
@ -31,8 +34,18 @@ export class UpdateCategoryBlockedTimesAction extends ParentAction {
}) {
super()
assertIdWithinFamily(categoryId)
validateBitmask(blockedTimes, blockedTimesBitmaskLength)
assertIdWithinFamily({ actionType, field: 'categoryId', value: categoryId })
try {
validateBitmask(blockedTimes, blockedTimesBitmaskLength)
} catch (ex) {
if (ex instanceof BitmapValidationException) {
throw new InvalidActionParameterException({
actionType,
staticMessage: 'invalid bitmask'
})
} else throw ex
}
this.categoryId = categoryId
this.blockedTimes = blockedTimes

19
src/action/updatecategorysorting.ts
View file

@ -15,9 +15,10 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { uniq } from 'lodash'
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { assertIdWithinFamily, assertNonEmptyListWithoutDuplicates } from './meta/util'
const actionType = 'UpdateCategorySortingAction'
export class UpdateCategorySortingAction extends ParentAction {
readonly categoryIds: Array<string>
@ -27,15 +28,13 @@ export class UpdateCategorySortingAction extends ParentAction {
}) {
super()
if (categoryIds.length === 0) {
throw new Error('empty category sorting list')
}
assertNonEmptyListWithoutDuplicates({ actionType, field: 'categoryIds', list: categoryIds })
if (uniq(categoryIds).length !== categoryIds.length) {
throw new Error('category sorting list has duplicates')
}
categoryIds.forEach((categoryId) => assertIdWithinFamily(categoryId))
categoryIds.forEach((categoryId) => assertIdWithinFamily({
actionType,
field: 'categoryIds',
value: categoryId
}))
this.categoryIds = categoryIds
}

16
src/action/updatecategorytemporarilyblocked.ts
View file

@ -15,8 +15,11 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { InvalidActionParameterException } from './meta/exception'
import { assertIdWithinFamily, assertSafeInteger } from './meta/util'
const actionType = 'UpdateCategoryTemporarilyBlockedAction'
export class UpdateCategoryTemporarilyBlockedAction extends ParentAction {
readonly categoryId: string
@ -30,15 +33,16 @@ export class UpdateCategoryTemporarilyBlockedAction extends ParentAction {
}) {
super()
assertIdWithinFamily(categoryId)
assertIdWithinFamily({ actionType, field: 'categoryId', value: categoryId })
if (endTime !== undefined) {
if (!Number.isSafeInteger(endTime)) {
throw new Error()
}
assertSafeInteger({ actionType, field: 'endTime', value: endTime })
if (!blocked) {
throw new Error()
throw new InvalidActionParameterException({
actionType,
staticMessage: 'can not set a end time when disabling blocking'
})
}
}

9
src/action/updatecategorytimewarnings.ts
View file

@ -16,8 +16,10 @@
*/
import { allowedTimeWarningFlags } from '../database/category'
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { assertIdWithinFamily, assertSafeInteger, throwOutOfRange } from './meta/util'
const actionType = 'UpdateCategoryTimeWarningsAction'
export class UpdateCategoryTimeWarningsAction extends ParentAction {
readonly categoryId: string
@ -31,10 +33,11 @@ export class UpdateCategoryTimeWarningsAction extends ParentAction {
}) {
super()
assertIdWithinFamily(categoryId)
assertIdWithinFamily({ actionType, field: 'categoryId', value: categoryId })
assertSafeInteger({ actionType, field: 'flags', value: flags })
if ((flags & allowedTimeWarningFlags) !== flags) {
throw new Error('illegal flags')
throwOutOfRange({ actionType, field: 'flags', value: flags })
}
this.categoryId = categoryId

6
src/action/updatecategorytitle.ts
View file

@ -15,8 +15,10 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { assertIdWithinFamily } from './meta/util'
const actionType = 'UpdateCategoryTitleAction'
export class UpdateCategoryTitleAction extends ParentAction {
readonly categoryId: string
@ -25,7 +27,7 @@ export class UpdateCategoryTitleAction extends ParentAction {
constructor ({ categoryId, newTitle }: {categoryId: string, newTitle: string}) {
super()
assertIdWithinFamily(categoryId)
assertIdWithinFamily({ actionType, field: 'categoryId', value: categoryId })
this.categoryId = categoryId
this.newTitle = newTitle

12
src/action/updatedevicename.ts
View file

@ -15,8 +15,11 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { InvalidActionParameterException } from './meta/exception'
import { assertIdWithinFamily } from './meta/util'
const actionType = 'UpdateDeviceNameAction'
export class UpdateDeviceNameAction extends ParentAction {
readonly deviceId: string
@ -31,10 +34,13 @@ export class UpdateDeviceNameAction extends ParentAction {
this.deviceId = deviceId
this.name = name
assertIdWithinFamily(deviceId)
assertIdWithinFamily({ actionType, field: 'deviceId', value: deviceId })
if (name.trim().length === 0) {
throw new Error('new device name must not be blank')
throw new InvalidActionParameterException({
actionType,
staticMessage: 'new device name must not be blank'
})
}
}

9
src/action/updatedevicestatus.ts
View file

@ -19,6 +19,9 @@ import { NewPermissionStatus } from '../model/newpermissionstatus'
import { ProtectionLevel } from '../model/protectionlevel'
import { RuntimePermissionStatus } from '../model/runtimepermissionstatus'
import { AppLogicAction } from './basetypes'
import { assertSafeInteger, throwOutOfRange } from './meta/util'
const actionType = 'UpdateDeviceStatusAction'
export class UpdateDeviceStatusAction extends AppLogicAction {
readonly newProtetionLevel?: ProtectionLevel
@ -52,8 +55,10 @@ export class UpdateDeviceStatusAction extends AppLogicAction {
super()
if (newAppVersion !== undefined) {
if (!Number.isSafeInteger(newAppVersion) || (newAppVersion < 0)) {
throw new Error('invalid new ap version')
assertSafeInteger({ actionType, field: 'newAppVersion', value: newAppVersion })
if (newAppVersion < 0) {
throwOutOfRange({ actionType, field: 'newAppVersion', value: newAppVersion })
}
}

6
src/action/updateenableactivitylevelblocking.ts
View file

@ -15,8 +15,10 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { assertIdWithinFamily } from './meta/util'
const actionType = 'UpdateEnableActivityLevelBlockingAction'
export class UpdateEnableActivityLevelBlockingAction extends ParentAction {
readonly deviceId: string
@ -25,7 +27,7 @@ export class UpdateEnableActivityLevelBlockingAction extends ParentAction {
constructor ({ deviceId, enable }: {deviceId: string, enable: boolean}) {
super()
assertIdWithinFamily(deviceId)
assertIdWithinFamily({ actionType, field: 'deviceId', value: deviceId })
this.deviceId = deviceId
this.enable = enable

6
src/action/updatenetworktimeverification.ts
View file

@ -15,8 +15,10 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { assertIdWithinFamily } from './meta/util'
const actionType = 'UpdateNetworkTimeVerificationAction'
export class UpdateNetworkTimeVerificationAction extends ParentAction {
readonly deviceId: string
@ -28,7 +30,7 @@ export class UpdateNetworkTimeVerificationAction extends ParentAction {
}) {
super()
assertIdWithinFamily(deviceId)
assertIdWithinFamily({ actionType, field: 'deviceId', value: deviceId })
this.deviceId = deviceId
this.mode = mode

23
src/action/updateparentblockedtimes.ts
View file

@ -15,9 +15,12 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { validateAndParseBitmask } from '../util/bitmask'
import { assertIdWithinFamily } from '../util/token'
import { BitmapValidationException, validateAndParseBitmask } from '../util/bitmask'
import { ParentAction } from './basetypes'
import { InvalidActionParameterException } from './meta/exception'
import { assertIdWithinFamily } from './meta/util'
const actionType = 'UpdateParentBlockedTimesAction'
export class UpdateParentBlockedTimesAction extends ParentAction {
readonly parentId: string
@ -29,9 +32,9 @@ export class UpdateParentBlockedTimesAction extends ParentAction {
}) {
super()
assertIdWithinFamily(parentId)
assertIdWithinFamily({ actionType, field: 'parentId', value: parentId })
{
try {
const parsedBlockedTimes = validateAndParseBitmask(blockedTimes, 60 * 24 * 7 /* number of minutes per week */)
for (let day = 0; day < 7; day++) {
@ -44,9 +47,19 @@ export class UpdateParentBlockedTimesAction extends ParentAction {
}
if (blockedMinutes > 60 * 18 /* 18 hours */) {
throw new Error('too much blocked minutes per day')
throw new InvalidActionParameterException({
actionType,
staticMessage: 'too much blocked minutes per day'
})
}
}
} catch (ex) {
if (ex instanceof BitmapValidationException) {
throw new InvalidActionParameterException({
actionType,
staticMessage: 'invalid bitmask'
})
} else throw ex
}
this.parentId = parentId

12
src/action/updateparentnotificationflags.ts
View file

@ -15,8 +15,10 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { assertIdWithinFamily, assertSafeInteger, throwOutOfRange } from './meta/util'
const actionType = 'UpdateParentNotificationFlagsAction'
export class UpdateParentNotificationFlagsAction extends ParentAction {
readonly parentId: string
@ -30,14 +32,12 @@ export class UpdateParentNotificationFlagsAction extends ParentAction {
}) {
super()
assertIdWithinFamily(parentId)
assertIdWithinFamily({ actionType, field: 'parentId', value: parentId })
if (!Number.isSafeInteger(flags)) {
throw new Error('flags must be an integer')
}
assertSafeInteger({ actionType, field: 'flags', value: flags })
if (flags < 0 || flags > 1) {
throw new Error('flags are out of the valid range')
throwOutOfRange({ actionType, field: 'flags', value: flags })
}
this.parentId = parentId

45
src/action/updatetimelimitrule.ts
View file

@ -16,8 +16,11 @@
*/
import { MinuteOfDay } from '../util/minuteofday'
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { InvalidActionParameterException } from './meta/exception'
import { assertIdWithinFamily, assertSafeInteger, throwOutOfRange } from './meta/util'
const actionType = 'UpdateTimelimitRuleAction'
export class UpdateTimelimitRuleAction extends ParentAction {
readonly ruleId: string
@ -53,35 +56,37 @@ export class UpdateTimelimitRuleAction extends ParentAction {
this.sessionDurationMilliseconds = sessionDurationMilliseconds
this.sessionPauseMilliseconds = sessionPauseMilliseconds
assertIdWithinFamily(ruleId)
assertIdWithinFamily({ actionType, field: 'ruleId', value: ruleId })
if (maximumTimeInMillis < 0 || (!Number.isSafeInteger(maximumTimeInMillis))) {
throw new Error('maximumTimeInMillis must be >= 0')
assertSafeInteger({ actionType, field: 'maximumTimeInMillis', value: maximumTimeInMillis })
if (maximumTimeInMillis < 0) {
throwOutOfRange({ actionType, field: 'maximumTimeInMillis', value: maximumTimeInMillis })
}
if (!(
Number.isSafeInteger(dayMask) ||
dayMask < 0 ||
dayMask > (1 | 2 | 4 | 8 | 16 | 32 | 64)
)) {
throw new Error('invalid day mask')
assertSafeInteger({ actionType, field: 'dayMask', value: dayMask })
if (dayMask < 0 || dayMask > (1 | 2 | 4 | 8 | 16 | 32 | 64)) {
throwOutOfRange({ actionType, field: 'dayMask', value: dayMask })
}
if (
(!Number.isSafeInteger(start)) ||
(!Number.isSafeInteger(end)) ||
(!Number.isSafeInteger(sessionDurationMilliseconds)) ||
(!Number.isSafeInteger(sessionPauseMilliseconds))
) {
throw new Error()
}
assertSafeInteger({ actionType, field: 'start', value: start })
assertSafeInteger({ actionType, field: 'end', value: end })
assertSafeInteger({ actionType, field: 'sessionDurationMilliseconds', value: sessionDurationMilliseconds })
assertSafeInteger({ actionType, field: 'sessionPauseMilliseconds', value: sessionPauseMilliseconds })
if (start < MinuteOfDay.MIN || end > MinuteOfDay.MAX || start > end) {
throw new Error()
throw new InvalidActionParameterException({
actionType,
staticMessage: 'time slot out of range'
})
}
if (sessionDurationMilliseconds < 0 || sessionPauseMilliseconds < 0) {
throw new Error()
throw new InvalidActionParameterException({
actionType,
staticMessage: 'session duration lesser than zero'
})
}
}

19
src/action/updateuserflags.ts
View file

@ -16,8 +16,11 @@
*/
import { UserFlags } from '../model/userflags'
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { InvalidActionParameterException } from './meta/exception'
import { assertIdWithinFamily, assertSafeInteger } from './meta/util'
const actionType = 'UpdateUserFlagsAction'
export class UpdateUserFlagsAction extends ParentAction {
readonly userId: string
@ -31,14 +34,16 @@ export class UpdateUserFlagsAction extends ParentAction {
}) {
super()
assertIdWithinFamily(userId)
if ((!Number.isSafeInteger(modifiedBits)) || (!Number.isSafeInteger(newValues))) {
throw new Error('flags must be an integer')
}
assertIdWithinFamily({ actionType, field: 'userId', value: userId })
assertSafeInteger({ actionType, field: 'modifiedBits', value: modifiedBits })
assertSafeInteger({ actionType, field: 'newValues', value: newValues })
if ((modifiedBits | UserFlags.ALL_FLAGS) !== UserFlags.ALL_FLAGS || (modifiedBits | newValues) !== modifiedBits) {
throw new Error('flags are out of the valid range')
throw new InvalidActionParameterException({
actionType,
staticMessage: 'flags are out of the valid range',
dynamicMessage: 'flags are out of the valid range: ' + modifiedBits + ', ' + newValues
})
}
this.userId = userId

8
src/action/updateuserlimitlogincategory.ts
View file

@ -15,8 +15,10 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
import { assertIdWithinFamily } from './meta/util'
const actionType = 'UpdateUserLimitLoginCategory'
export class UpdateUserLimitLoginCategory extends ParentAction {
readonly userId: string
@ -28,10 +30,10 @@ export class UpdateUserLimitLoginCategory extends ParentAction {
}) {
super()
assertIdWithinFamily(userId)
assertIdWithinFamily({ actionType, field: 'userId', value: userId })
if (categoryId !== undefined) {
assertIdWithinFamily(categoryId)
assertIdWithinFamily({ actionType, field: 'categoryId', value: categoryId })
}
this.userId = userId

6
src/api/schema.ts
View file

@ -52,14 +52,16 @@ export interface ParentPassword {
export const assertParentPasswordValid = (password: ParentPassword) => {
if (password.hash === '' || password.secondHash === '' || password.secondSalt === '') {
throw new Error('missing fields at parent password')
throw new ParentPasswordValidationException('missing fields at parent password')
}
if (!(optionalPasswordRegex.test(password.hash) && optionalPasswordRegex.test(password.secondHash) && optionalSaltRegex.test(password.secondSalt))) {
throw new Error('invalid parent password')
throw new ParentPasswordValidationException('invalid parent password')
}
}
export class ParentPasswordValidationException extends Error {}
export interface CreateFamilyByMailTokenRequest {
mailAuthToken: string
parentPassword: ParentPassword

24
src/api/sync.ts
View file

@ -85,7 +85,7 @@ export const createSyncRouter = ({ database, websocket, connectedDevicesManager,
throw new BadRequest()
}
await database.transaction(async (transaction) => {
const serverStatus = await database.transaction(async (transaction) => {
const deviceEntryUnsafe = await database.device.findOne({
where: {
deviceAuthToken: body.deviceAuthToken
@ -112,23 +112,23 @@ export const createSyncRouter = ({ database, websocket, connectedDevicesManager,
})
}
const serverStatus = await generateServerDataStatus({
return generateServerDataStatus({
database,
familyId,
clientStatus: body.status,
transaction
})
if (serverStatus.devices) { eventHandler.countEvent('pullStatusRequest devices') }
if (serverStatus.apps) { eventHandler.countEvent('pullStatusRequest apps') }
if (serverStatus.categoryBase) { eventHandler.countEvent('pullStatusRequest categoryBase') }
if (serverStatus.categoryApp) { eventHandler.countEvent('pullStatusRequest categoryApp') }
if (serverStatus.usedTimes) { eventHandler.countEvent('pullStatusRequest usedTimes') }
if (serverStatus.rules) { eventHandler.countEvent('pullStatusRequest rules') }
if (serverStatus.users) { eventHandler.countEvent('pullStatusRequest users') }
res.json(serverStatus)
})
if (serverStatus.devices) { eventHandler.countEvent('pullStatusRequest devices') }
if (serverStatus.apps) { eventHandler.countEvent('pullStatusRequest apps') }
if (serverStatus.categoryBase) { eventHandler.countEvent('pullStatusRequest categoryBase') }
if (serverStatus.categoryApp) { eventHandler.countEvent('pullStatusRequest categoryApp') }
if (serverStatus.usedTimes) { eventHandler.countEvent('pullStatusRequest usedTimes') }
if (serverStatus.rules) { eventHandler.countEvent('pullStatusRequest rules') }
if (serverStatus.users) { eventHandler.countEvent('pullStatusRequest users') }
res.json(serverStatus)
} catch (ex) {
next(ex)
}

4
src/config.ts
View file

@ -29,7 +29,7 @@ function parseYesNo (value: string) {
} else if (value === 'no') {
return false
} else {
throw new Error('invalid value "' + value + '", expected "yes" or "no"')
throw new ParseYesNoException('invalid value "' + value + '", expected "yes" or "no"')
}
}
@ -39,3 +39,5 @@ export const config: Config = {
pingInterval: parseInt(process.env.PING_INTERVAL_SEC || '25', 10) * 1000,
alwaysPro: process.env.ALWAYS_PRO ? parseYesNo(process.env.ALWAYS_PRO) : false
}
class ParseYesNoException extends Error {}

5
src/database/sessionduration.ts
View file

@ -16,6 +16,7 @@
*/
import * as Sequelize from 'sequelize'
import { ValidationException } from '../exception'
import { MinuteOfDay } from '../util/minuteofday'
import { familyIdColumn, idWithinFamilyColumn, timestampColumn } from './columns'
import { SequelizeAttributes } from './types'
@ -85,11 +86,11 @@ export const attributesVersion1: SequelizeAttributes<SessionDurationAttributesVe
const startMinuteOfDay = this.startMinuteOfDay
if (typeof endMinuteOfDay !== 'number' || typeof startMinuteOfDay !== 'number') {
throw new Error('wrong data types')
throw new ValidationException({ staticMessage: 'wrong data types for start and end minute at the session duration' })
}
if (startMinuteOfDay > endMinuteOfDay) {
throw new Error('startMinuteOfDay must not be bigger than endMinuteOfDay')
throw new ValidationException({ staticMessage: 'startMinuteOfDay must not be bigger than endMinuteOfDay for a session duration' })
}
}
}

5
src/database/timelimitrule.ts
View file

@ -16,6 +16,7 @@
*/
import * as Sequelize from 'sequelize'
import { ValidationException } from '../exception'
import { MinuteOfDay } from '../util/minuteofday'
import { booleanColumn, familyIdColumn, idWithinFamilyColumn } from './columns'
import { SequelizeAttributes } from './types'
@ -90,11 +91,11 @@ export const attributesVersion2: SequelizeAttributes<TimelimitRuleAttributesVers
const startMinuteOfDay = this.startMinuteOfDay
if (typeof endMinuteOfDay !== 'number' || typeof startMinuteOfDay !== 'number') {
throw new Error('wrong data types')
throw new ValidationException({ staticMessage: 'wrong data types for start and end minute at the time limit rule' })
}
if (startMinuteOfDay > endMinuteOfDay) {
throw new Error('startMinuteOfDay must not be bigger than endMinuteOfDay')
throw new ValidationException({ staticMessage: 'startMinuteOfDay must not be bigger than endMinuteOfDay for a time limit rule' })
}
}
},

5
src/database/usedtime.ts
View file

@ -16,6 +16,7 @@
*/
import * as Sequelize from 'sequelize'
import { ValidationException } from '../exception'
import { MinuteOfDay } from '../util/minuteofday'
import { familyIdColumn, idWithinFamilyColumn, timestampColumn } from './columns'
import { SequelizeAttributes } from './types'
@ -100,11 +101,11 @@ export const attributesVersion3: SequelizeAttributes<UsedTimeAttributesVersion3>
const startMinuteOfDay = this.startMinuteOfDay
if (typeof endMinuteOfDay !== 'number' || typeof startMinuteOfDay !== 'number') {
throw new Error('wrong data types')
throw new ValidationException({ staticMessage: 'wrong data types for start and end minute at the used time' })
}
if (startMinuteOfDay > endMinuteOfDay) {
throw new Error('startMinuteOfDay must not be bigger than endMinuteOfDay')
throw new ValidationException({ staticMessage: 'startMinuteOfDay must not be bigger than endMinuteOfDay for a used time' })
}
}
}

19
src/exception/index.ts Normal file
View file

@ -0,0 +1,19 @@
/*
* server component for the TimeLimit App
* Copyright (C) 2019 - 2020 Jonas Lochmann
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, version 3 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
export { StaticMessageException, IllegalStateException } from './static-message-exception'
export { ValidationException } from './validation'

30
src/exception/static-message-exception.ts Normal file
View file

@ -0,0 +1,30 @@
/*
* server component for the TimeLimit App
* Copyright (C) 2019 - 2020 Jonas Lochmann
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, version 3 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
export class StaticMessageException extends Error {
readonly staticMessage: string
readonly dynamicMessage?: string
constructor ({ staticMessage, dynamicMessage }: { staticMessage: string, dynamicMessage?: string }) {
super(dynamicMessage || staticMessage)
this.staticMessage = staticMessage
this.dynamicMessage = dynamicMessage
}
}
export class IllegalStateException extends StaticMessageException {}

20
src/exception/validation.ts Normal file
View file

@ -0,0 +1,20 @@
/*
* server component for the TimeLimit App
* Copyright (C) 2019 - 2020 Jonas Lochmann
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, version 3 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { StaticMessageException } from './static-message-exception'
export class ValidationException extends StaticMessageException {}

4
src/function/child/set-primary-device.ts
View file

@ -15,7 +15,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { Conflict, Unauthorized } from 'http-errors'
import { Conflict, InternalServerError, Unauthorized } from 'http-errors'
import * as Sequelize from 'sequelize'
import { config } from '../../config'
import { Database } from '../../database'
@ -147,7 +147,7 @@ export const setPrimaryDevice = async ({ database, websocket, deviceAuthToken, c
throw new Conflict()
}
} else {
throw new Error('illegal state')
throw new InternalServerError('illegal state')
}
// invalidiate user list

3
src/function/device/report-device-removed.ts
View file

@ -15,6 +15,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { Unauthorized } from 'http-errors'
import { Database } from '../../database'
import { generateAuthToken, generateVersionId } from '../../util/token'
import { WebsocketApi } from '../../websocket'
@ -83,7 +84,7 @@ export async function reportDeviceRemoved ({ database, deviceAuthToken, websocke
})
if (!oldDeviceEntry) {
throw new Error('device not found')
throw new Unauthorized('device not found')
}
}
})

3
src/function/parent/get-status-by-mail-address.ts
View file

@ -16,13 +16,14 @@
*/
import { Database, Transaction } from '../../database'
import { StaticMessageException } from '../../exception'
import { requireMailByAuthToken } from '../authentication'
const getStatusByMailAddress = async ({
mail, database, transaction
}: { mail: string, database: Database, transaction: Transaction }) => {
if (!mail) {
throw new Error('no mail address')
throw new StaticMessageException({ staticMessage: 'getStatusByMailAddress: no mail address provided' })
}
const entry = await database.user.findOne({

72
src/function/sync/apply-actions/baseinfo.ts Normal file
View file

@ -0,0 +1,72 @@
/*
* server component for the TimeLimit App
* Copyright (C) 2019 - 2020 Jonas Lochmann
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, version 3 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { Unauthorized } from 'http-errors'
import { Database, Transaction } from '../../../database'
import { SourceFamilyNotFoundException } from './exception/illegal-state'
export interface ApplyActionBaseInfo {
familyId: string
deviceId: string
nextSequenceNumber: number
hasFullVersion: boolean
}
export async function getApplyActionBaseInfo ({ database, transaction, deviceAuthToken }: {
database: Database
transaction: Transaction
deviceAuthToken: string
}): Promise<ApplyActionBaseInfo> {
const deviceEntryUnsafe = await database.device.findOne({
where: { deviceAuthToken },
attributes: ['familyId', 'deviceId', 'nextSequenceNumber'],
transaction
})
if (!deviceEntryUnsafe) {
throw new Unauthorized()
}
const deviceEntry = {
familyId: deviceEntryUnsafe.familyId,
deviceId: deviceEntryUnsafe.deviceId,
nextSequenceNumber: deviceEntryUnsafe.nextSequenceNumber
}
const familyEntryUnsafe = await database.family.findOne({
where: {
familyId: deviceEntry.familyId
},
transaction,
attributes: ['hasFullVersion']
})
if (!familyEntryUnsafe) {
throw new SourceFamilyNotFoundException()
}
const familyEntry = {
hasFullVersion: familyEntryUnsafe.hasFullVersion
}
return {
familyId: deviceEntry.familyId,
deviceId: deviceEntry.deviceId,
nextSequenceNumber: deviceEntry.nextSequenceNumber,
hasFullVersion: familyEntry.hasFullVersion
}
}

8
src/function/sync/apply-actions/cache.ts
View file

@ -21,6 +21,8 @@ import { config } from '../../../config'
import { VisibleConnectedDevicesManager } from '../../../connected-devices'
import { Database } from '../../../database'
import { generateVersionId } from '../../../util/token'
import { SourceUserNotFoundException } from './exception/illegal-state'
import { InvalidChildActionIntegrityValue } from './exception/integrity'
export class Cache {
readonly familyId: string
@ -84,7 +86,7 @@ export class Cache {
})
if (!userEntryUnsafe) {
throw new Error('user not found')
throw new SourceUserNotFoundException()
}
return userEntryUnsafe.secondPasswordHash
@ -102,11 +104,11 @@ export class Cache {
})
if (!userEntryUnsafe) {
throw new Error('user not found')
throw new SourceUserNotFoundException()
}
if (!userEntryUnsafe.secondPasswordHash) {
throw new Error('user does not have a password')
throw new InvalidChildActionIntegrityValue()
}
return userEntryUnsafe.secondPasswordHash

5
src/function/sync/apply-actions/dispatch-app-logic-action/addusedtime.ts
View file

@ -19,6 +19,7 @@ import * as Sequelize from 'sequelize'
import { AddUsedTimeAction } from '../../../../action'
import { MinuteOfDay } from '../../../../util/minuteofday'
import { Cache } from '../cache'
import { MissingCategoryException } from '../exception/missing-item'
export const getRoundedTimestamp = () => {
const now = Date.now()
@ -29,7 +30,7 @@ export const getRoundedTimestamp = () => {
const dayLengthInMinutes = MinuteOfDay.LENGTH
const dayLengthInMs = dayLengthInMinutes * 1000 * 60
export async function dispatchAddUsedTime ({ deviceId, action, cache }: {
export async function dispatchAddUsedTime ({ action, cache }: {
deviceId: string
action: AddUsedTimeAction
cache: Cache
@ -50,7 +51,7 @@ export async function dispatchAddUsedTime ({ deviceId, action, cache }: {
})
// verify that the category exists
if (!categoryEntryUnsafe) {
throw new Error('invalid category id')
throw new MissingCategoryException()
}
const categoryEntry = {

10
src/function/sync/apply-actions/dispatch-app-logic-action/addusedtime2.ts
View file

@ -20,6 +20,7 @@ import { AddUsedTimeActionVersion2 } from '../../../../action'
import { EventHandler } from '../../../../monitoring/eventhandler'
import { MinuteOfDay } from '../../../../util/minuteofday'
import { Cache } from '../cache'
import { SourceDeviceNotFoundException } from '../exception/illegal-state'
import { getRoundedTimestamp as getRoundedTimestampForUsedTime } from './addusedtime'
export const getRoundedTimestampForSessionDuration = () => {
@ -44,7 +45,7 @@ export async function dispatchAddUsedTimeVersion2 ({ deviceId, action, cache, ev
})
if (!deviceEntryUnsafe) {
throw new Error('source device not found')
throw new SourceDeviceNotFoundException()
}
const deviceEntry = {
@ -56,9 +57,7 @@ export async function dispatchAddUsedTimeVersion2 ({ deviceId, action, cache, ev
let addUsedTimeForADifferentUserThanTheCurrentUserOfTheDevice = false
for (let i = 0; i < action.items.length; i++) {
const item = action.items[i]
for (const item of action.items) {
const categoryEntryUnsafe = await cache.database.category.findOne({
where: {
familyId: cache.familyId,
@ -73,9 +72,10 @@ export async function dispatchAddUsedTimeVersion2 ({ deviceId, action, cache, ev
// verify that the category exists
if (!categoryEntryUnsafe) {
eventHandler.countEvent('add used time category to add time for not found')
cache.requireFullSync()
return
continue
}
const categoryEntry = {

3
src/function/sync/apply-actions/dispatch-app-logic-action/index.ts
View file

@ -29,6 +29,7 @@ import {
} from '../../../../action'
import { EventHandler } from '../../../../monitoring/eventhandler'
import { Cache } from '../cache'
import { ActionObjectTypeNotHandledException } from '../exception/illegal-state'
import { dispatchAddInstalledApps } from './addinstalledapps'
import { dispatchAddUsedTime } from './addusedtime'
import { dispatchAddUsedTimeVersion2 } from './addusedtime2'
@ -64,6 +65,6 @@ export const dispatchAppLogicAction = async ({ action, deviceId, cache, eventHan
} else if (action instanceof TriedDisablingDeviceAdminAction) {
await dispatchTriedDisablingDeviceAdmin({ deviceId, action, cache })
} else {
throw new Error('unsupported action type')
throw new ActionObjectTypeNotHandledException()
}
}

14
src/function/sync/apply-actions/dispatch-app-logic-action/signoutatdevice.ts
View file

@ -1,6 +1,6 @@
/*
* server component for the TimeLimit App
* Copyright (C) 2019 Jonas Lochmann
* Copyright (C) 2019 - 2020 Jonas Lochmann
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
@ -18,14 +18,16 @@
import { SetDeviceUserAction, SignOutAtDeviceAction } from '../../../../action'
import { Cache } from '../cache'
import { dispatchSetDeviceUser } from '../dispatch-parent-action/setdeviceuser'
import { IllegalStateException, SourceDeviceNotFoundException } from '../exception/illegal-state'
import { PremiumVersionMissingException } from '../exception/premium'
export async function dispatchSignOutAtDevice ({ deviceId, action, cache }: {
export async function dispatchSignOutAtDevice ({ deviceId, cache }: {
deviceId: string
action: SignOutAtDeviceAction
cache: Cache
}) {
if (!cache.hasFullVersion) {
throw new Error('action requires full version')
throw new PremiumVersionMissingException()
}
const deviceEntry = await cache.database.device.findOne({
@ -37,11 +39,13 @@ export async function dispatchSignOutAtDevice ({ deviceId, action, cache }: {
})
if (!deviceEntry) {
throw new Error('illegal state: missing device which dispatched the action')
throw new SourceDeviceNotFoundException()
}
if (deviceEntry.defaultUserId === '') {
throw new Error('no default user available')
throw new IllegalStateException({
staticMessage: 'tried to switch to the default user where it does not exist'
})
}
if (deviceEntry.currentUserId !== deviceEntry.defaultUserId) {

7
src/function/sync/apply-actions/dispatch-app-logic-action/trieddisablingdeviceadmin.ts
View file

@ -1,6 +1,6 @@
/*
* server component for the TimeLimit App
* Copyright (C) 2019 Jonas Lochmann
* Copyright (C) 2019 - 2020 Jonas Lochmann
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
@ -19,8 +19,9 @@ import { TriedDisablingDeviceAdminAction } from '../../../../action'
import { hasDeviceManipulation } from '../../../../database/device'
import { sendManipulationWarnings } from '../../../warningmail/manipulation'
import { Cache } from '../cache'
import { SourceDeviceNotFoundException } from '../exception/illegal-state'
export async function dispatchTriedDisablingDeviceAdmin ({ deviceId, action, cache }: {
export async function dispatchTriedDisablingDeviceAdmin ({ deviceId, cache }: {
deviceId: string
action: TriedDisablingDeviceAdminAction
cache: Cache
@ -34,7 +35,7 @@ export async function dispatchTriedDisablingDeviceAdmin ({ deviceId, action, cac
})
if (deviceEntry === null) {
throw new Error('illegal state: missing device which dispatched the action')
throw new SourceDeviceNotFoundException()
}
const hadManipulationBefore = hasDeviceManipulation(deviceEntry)

10
src/function/sync/apply-actions/dispatch-app-logic-action/updateappactivities.ts
View file

@ -1,6 +1,6 @@
/*
* server component for the TimeLimit App
* Copyright (C) 2019 Jonas Lochmann
* Copyright (C) 2019 - 2020 Jonas Lochmann
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
@ -29,9 +29,7 @@ export async function dispatchUpdateAppActivities ({ deviceId, action, cache }:
if (action.updatedOrAdded.length > 0) {
const chuncks = chunk(action.updatedOrAdded, 500)
for (let i = 0; i < chuncks.length; i++) {
const items = chuncks[i]
for (const items of chuncks) {
await cache.database.appActivity.destroy({
where: {
familyId: cache.familyId,
@ -62,9 +60,7 @@ export async function dispatchUpdateAppActivities ({ deviceId, action, cache }:
if (action.removed.length > 0) {
const chunks = chunk(action.removed, 500)
for (let i = 0; i < chunks.length; i++) {
const items = chunks[i]
for (const items of chunks) {
await cache.database.appActivity.destroy({
where: {
familyId: cache.familyId,

5
src/function/sync/apply-actions/dispatch-app-logic-action/updatedevicestatus.ts
View file

@ -1,6 +1,6 @@
/*
* server component for the TimeLimit App
* Copyright (C) 2019 Jonas Lochmann
* Copyright (C) 2019 - 2020 Jonas Lochmann
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
@ -23,6 +23,7 @@ import { runtimePermissionStatusValues } from '../../../../model/runtimepermissi
import { enumMax } from '../../../../util/enum'
import { sendManipulationWarnings } from '../../../warningmail/manipulation'
import { Cache } from '../cache'
import { SourceDeviceNotFoundException } from '../exception/illegal-state'
export async function dispatchUpdateDeviceStatus ({ deviceId, action, cache }: {
deviceId: string
@ -38,7 +39,7 @@ export async function dispatchUpdateDeviceStatus ({ deviceId, action, cache }: {
})
if (!deviceEntry) {
throw new Error('device not found')
throw new SourceDeviceNotFoundException()
}
const hadManipulationBefore = hasDeviceManipulation(deviceEntry)

5
src/function/sync/apply-actions/dispatch-child-action/childchangepassword.ts
View file

@ -1,6 +1,6 @@
/*
* server component for the TimeLimit App
* Copyright (C) 2019 Jonas Lochmann
* Copyright (C) 2019 - 2020 Jonas Lochmann
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
@ -18,6 +18,7 @@
import * as Sequelize from 'sequelize'
import { ChildChangePasswordAction } from '../../../../action'
import { Cache } from '../cache'
import { SourceUserNotFoundException } from '../exception/illegal-state'
export const dispatchChildChangePassword = async ({ action, childUserId, cache }: {
action: ChildChangePasswordAction
@ -35,7 +36,7 @@ export const dispatchChildChangePassword = async ({ action, childUserId, cache }
})
if (!childEntry) {
throw new Error('child entry not found')
throw new SourceUserNotFoundException()
}
childEntry.passwordHash = action.password.hash

10
src/function/sync/apply-actions/dispatch-child-action/childsignin.ts
View file

@ -1,6 +1,6 @@
/*
* server component for the TimeLimit App
* Copyright (C) 2019 Jonas Lochmann
* Copyright (C) 2019 - 2020 Jonas Lochmann
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
@ -18,15 +18,17 @@
import { ChildSignInAction, SetDeviceUserAction } from '../../../../action'
import { Cache } from '../cache'
import { dispatchSetDeviceUser } from '../dispatch-parent-action/setdeviceuser'
import { SourceUserNotFoundException } from '../exception/illegal-state'
import { PremiumVersionMissingException } from '../exception/premium'
export const dispatchChildSignIn = async ({ action, deviceId, childUserId, cache }: {
export const dispatchChildSignIn = async ({ deviceId, childUserId, cache }: {
action: ChildSignInAction
deviceId: string
childUserId: string
cache: Cache
}) => {
if (!cache.hasFullVersion) {
throw new Error('action requires full version')
throw new PremiumVersionMissingException()
}
await dispatchSetDeviceUser({
@ -50,7 +52,7 @@ export const dispatchChildSignIn = async ({ action, deviceId, childUserId, cache
})
if (!userEntryUnsafe) {
throw new Error('illegal state')
throw new SourceUserNotFoundException()
}
if (userEntryUnsafe.currentDevice === deviceId) {

5
src/function/sync/apply-actions/dispatch-child-action/index.ts
View file

@ -1,6 +1,6 @@
/*
* server component for the TimeLimit App
* Copyright (C) 2019 Jonas Lochmann
* Copyright (C) 2019 - 2020 Jonas Lochmann
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
@ -21,6 +21,7 @@ import {
ChildSignInAction
} from '../../../../action'
import { Cache } from '../cache'
import { ActionObjectTypeNotHandledException } from '../exception/illegal-state'
import { dispatchChildChangePassword } from './childchangepassword'
import { dispatchChildSignIn } from './childsignin'
@ -35,6 +36,6 @@ export const dispatchChildAction = async ({ action, deviceId, childUserId, cache
} else if (action instanceof ChildSignInAction) {
await dispatchChildSignIn({ action, childUserId, deviceId, cache })
} else {
throw new Error('unsupported action type')
throw new ActionObjectTypeNotHandledException()
}
}

42
src/function/sync/apply-actions/dispatch-helper/app-logic-action.ts Normal file
View file

@ -0,0 +1,42 @@
/*
* server component for the TimeLimit App
* Copyright (C) 2019 - 2020 Jonas Lochmann
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, version 3 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { parseAppLogicAction } from '../../../../action/serialization'
import { ClientPushChangesRequestAction } from '../../../../api/schema'
import { isSerializedAppLogicAction } from '../../../../api/validator'
import { EventHandler } from '../../../../monitoring/eventhandler'
import { Cache } from '../cache'
import { dispatchAppLogicAction as dispatchAppLogicActionInternal } from '../dispatch-app-logic-action'
import { dispatch } from './helper'
export async function dispatchAppLogicAction ({ action, eventHandler, deviceId, cache }: {
action: ClientPushChangesRequestAction
deviceId: string
cache: Cache
eventHandler: EventHandler
}) {
return dispatch({
action,
eventHandler,
type: 'app logic',
validator: isSerializedAppLogicAction,
parser: parseAppLogicAction,
applier: async (action) => {
await dispatchAppLogicActionInternal({ action, cache, eventHandler, deviceId })
}
})
}

43
src/function/sync/apply-actions/dispatch-helper/child-action.ts Normal file
View file

@ -0,0 +1,43 @@
/*
* server component for the TimeLimit App
* Copyright (C) 2019 - 2020 Jonas Lochmann
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, version 3 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { parseChildAction } from '../../../../action/serialization'
import { ClientPushChangesRequestAction } from '../../../../api/schema'
import { isSerializedChildAction } from '../../../../api/validator'
import { EventHandler } from '../../../../monitoring/eventhandler'
import { Cache } from '../cache'
import { dispatchChildAction as dispatchChildActionInternal } from '../dispatch-child-action'
import { dispatch } from './helper'
export async function dispatchChildAction ({ action, eventHandler, deviceId, cache, childUserId }: {
action: ClientPushChangesRequestAction
deviceId: string
cache: Cache
eventHandler: EventHandler
childUserId: string
}) {
return dispatch({
action,
eventHandler,
type: 'child',
validator: isSerializedChildAction,
parser: parseChildAction,
applier: async (action) => {
await dispatchChildActionInternal({ action, cache, deviceId, childUserId })
}
})
}

54
src/function/sync/apply-actions/dispatch-helper/helper.ts Normal file
View file

@ -0,0 +1,54 @@
/*
* server component for the TimeLimit App
* Copyright (C) 2019 - 2020 Jonas Lochmann
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, version 3 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { ClientPushChangesRequestAction } from '../../../../api/schema'
import { EventHandler } from '../../../../monitoring/eventhandler'
import { ApplyActionException } from '../exception/index'
import { EncodedActionSchemaMismatchException } from '../exception/invalidaction'
import { parseEncodedAction } from '../parse-encoded-action'
export async function dispatch<T1 extends { type: string }, T2> ({ type, action, validator, parser, applier, eventHandler }: {
type: 'app logic' | 'parent' | 'child'
action: ClientPushChangesRequestAction
validator: (input: any) => input is T1
parser: (input: T1) => T2
applier: (input: T2) => Promise<void>
eventHandler: EventHandler
}) {
const parsedSerializedAction = parseEncodedAction(action)
if (!validator(parsedSerializedAction)) {
throw new EncodedActionSchemaMismatchException({ type, action: parsedSerializedAction })
}
const actionType = parsedSerializedAction.type
try {
const parsedAction = parser(parsedSerializedAction)
await applier(parsedAction)
eventHandler.countEvent('dispatched action:' + actionType)
} catch (ex) {
if (ex instanceof ApplyActionException) {
throw new ApplyActionException({
staticMessage: 'error during dispatching ' + actionType + ': ' + ex.staticMessage,
dynamicMessage: ex.dynamicMessage ? 'error during dispatching ' + actionType + ': ' + ex.dynamicMessage : undefined
})
} else throw ex
}
}

20
src/function/sync/apply-actions/dispatch-helper/index.ts Normal file
View file

@ -0,0 +1,20 @@
/*
* server component for the TimeLimit App
* Copyright (C) 2019 - 2020 Jonas Lochmann
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, version 3 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
export { dispatchAppLogicAction } from './app-logic-action'
export { dispatchChildAction } from './child-action'
export { dispatchParentAction } from './parent-action'

106
src/function/sync/apply-actions/dispatch-helper/parent-action.ts Normal file
View file

@ -0,0 +1,106 @@
/*
* server component for the TimeLimit App
* Copyright (C) 2019 - 2020 Jonas Lochmann
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, version 3 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { parseParentAction } from '../../../../action/serialization'
import { ClientPushChangesRequestAction } from '../../../../api/schema'
import { isSerializedParentAction } from '../../../../api/validator'
import { UserFlags } from '../../../../model/userflags'
import { EventHandler } from '../../../../monitoring/eventhandler'
import { Cache } from '../cache'
import { dispatchParentAction as dispatchParentActionInternal } from '../dispatch-parent-action'
import { SourceDeviceNotFoundException } from '../exception/illegal-state'
import { SelfLimitNotPossibleException } from '../exception/self-limit'
import { dispatch } from './helper'
export async function dispatchParentAction ({ action, eventHandler, cache, isChildLimitAdding, deviceId }: {
action: ClientPushChangesRequestAction
cache: Cache
eventHandler: EventHandler
isChildLimitAdding: boolean
deviceId: string
}) {
return dispatch({
action,
eventHandler,
type: 'parent',
validator: isSerializedParentAction,
parser: parseParentAction,
applier: async (parsedAction) => {
if (isChildLimitAdding) {
const deviceEntryUnsafe = await cache.database.device.findOne({
attributes: ['currentUserId'],
where: {
familyId: cache.familyId,
deviceId,
currentUserId: action.userId
},
transaction: cache.transaction
})
if (!deviceEntryUnsafe) {
throw new SourceDeviceNotFoundException()
}
const deviceUserId = deviceEntryUnsafe.currentUserId
if (!deviceUserId) {
throw new SelfLimitNotPossibleException({
staticMessage: 'no device user id set but child add self limit action requested'
})
}
const deviceUserEntryUnsafe = await cache.database.user.findOne({
attributes: ['flags'],
where: {
familyId: cache.familyId,
userId: deviceUserId,
type: 'child'
},
transaction: cache.transaction
})
if (!deviceUserEntryUnsafe) {
throw new SelfLimitNotPossibleException({
staticMessage: 'no child user found for child limit adding action'
})
}
if ((parseInt(deviceUserEntryUnsafe.flags, 10) & UserFlags.ALLOW_SELF_LIMIT_ADD) !== UserFlags.ALLOW_SELF_LIMIT_ADD) {
throw new SelfLimitNotPossibleException({
staticMessage: 'child add limit action found but not allowed'
})
}
await dispatchParentActionInternal({
action: parsedAction,
cache,
parentUserId: action.userId,
sourceDeviceId: deviceId,
fromChildSelfLimitAddChildUserId: deviceUserId
})
} else {
await dispatchParentActionInternal({
action: parsedAction,
cache,
parentUserId: action.userId,
sourceDeviceId: deviceId,
fromChildSelfLimitAddChildUserId: null
})
}
}
})
}

109
src/function/sync/apply-actions/dispatch-parent-action/addcategoryapps.ts
View file

@ -18,8 +18,11 @@
import * as Sequelize from 'sequelize'
import { AddCategoryAppsAction } from '../../../../action'
import { CategoryAppAttributes } from '../../../../database/categoryapp'
import { getCategoryWithParentCategories } from '../../../../util/category'
import { getCategoryWithParentCategories, GetParentCategoriesException } from '../../../../util/category'
import { Cache } from '../cache'
import { SourceUserNotFoundException } from '../exception/illegal-state'
import { MissingCategoryException } from '../exception/missing-item'
import { CanNotModifyOtherUsersBySelfLimitationException, SelfLimitationException } from '../exception/self-limit'
export async function dispatchAddCategoryApps ({ action, cache, fromChildSelfLimitAddChildUserId }: {
action: AddCategoryAppsAction
@ -36,14 +39,14 @@ export async function dispatchAddCategoryApps ({ action, cache, fromChildSelfLim
})
if (!categoryEntryUnsafe) {
throw new Error('invalid category id')
throw new MissingCategoryException()
}
const { childId } = categoryEntryUnsafe
if (fromChildSelfLimitAddChildUserId !== null) {
if (childId !== fromChildSelfLimitAddChildUserId) {
throw new Error('can not add apps to other users')
throw new CanNotModifyOtherUsersBySelfLimitationException()
}
}
@ -77,64 +80,74 @@ export async function dispatchAddCategoryApps ({ action, cache, fromChildSelfLim
}).map((item) => item.categoryId)
if (fromChildSelfLimitAddChildUserId !== null) {
const parentCategoriesOfTargetCategory = getCategoryWithParentCategories(categoriesOfSameChild, action.categoryId)
const userEntryUnsafe = await cache.database.user.findOne({
attributes: [ 'categoryForNotAssignedApps' ],
where: {
familyId: cache.familyId,
userId: fromChildSelfLimitAddChildUserId
},
transaction: cache.transaction
})
if (!userEntryUnsafe) {
throw new Error('illegal state')
}
const userEntry = { categoryForNotAssignedApps: userEntryUnsafe.categoryForNotAssignedApps }
const validatedDefaultCategoryId = categoriesOfSameChild.find((item) => item.categoryId === userEntry.categoryForNotAssignedApps)?.categoryId
const allowUnassignedElements = validatedDefaultCategoryId !== undefined &&
parentCategoriesOfTargetCategory.indexOf(validatedDefaultCategoryId) !== -1
const assertCanAddApp = async (packageName: string, isApp: boolean) => {
const categoryAppEntryUnsafe = await cache.database.categoryApp.findOne({
attributes: [ 'categoryId' ],
try {
const parentCategoriesOfTargetCategory = getCategoryWithParentCategories(categoriesOfSameChild, action.categoryId)
const userEntryUnsafe = await cache.database.user.findOne({
attributes: [ 'categoryForNotAssignedApps' ],
where: {
familyId: cache.familyId,
categoryId: {
[Sequelize.Op.in]: userCategoryIds
},
packageName: packageName
userId: fromChildSelfLimitAddChildUserId
},
transaction: cache.transaction
})
const categoryAppEntry = categoryAppEntryUnsafe ? { categoryId: categoryAppEntryUnsafe.categoryId } : null
if (!userEntryUnsafe) {
throw new SourceUserNotFoundException()
}
if (categoryAppEntry === null) {
if ((isApp && allowUnassignedElements) || (!isApp)) {
// allow
const userEntry = { categoryForNotAssignedApps: userEntryUnsafe.categoryForNotAssignedApps }
const validatedDefaultCategoryId = categoriesOfSameChild.find((item) => item.categoryId === userEntry.categoryForNotAssignedApps)?.categoryId
const allowUnassignedElements = validatedDefaultCategoryId !== undefined &&
parentCategoriesOfTargetCategory.indexOf(validatedDefaultCategoryId) !== -1
const assertCanAddApp = async (packageName: string, isApp: boolean) => {
const categoryAppEntryUnsafe = await cache.database.categoryApp.findOne({
attributes: [ 'categoryId' ],
where: {
familyId: cache.familyId,
categoryId: {
[Sequelize.Op.in]: userCategoryIds
},
packageName: packageName
},
transaction: cache.transaction
})
const categoryAppEntry = categoryAppEntryUnsafe ? { categoryId: categoryAppEntryUnsafe.categoryId } : null
if (categoryAppEntry === null) {
if ((isApp && allowUnassignedElements) || (!isApp)) {
// allow
} else {
throw new SelfLimitationException({
staticMessage: 'can not assign apps without category as child'
})
}
} else {
throw new Error('can not assign apps without category as child')
}
} else {
if (parentCategoriesOfTargetCategory.indexOf(categoryAppEntry.categoryId) !== -1) {
// allow
} else {
throw new Error('can not add app which is not contained in the parent category')
if (parentCategoriesOfTargetCategory.indexOf(categoryAppEntry.categoryId) !== -1) {
// allow
} else {
throw new SelfLimitationException({
staticMessage: 'can not add app which is not contained in the parent category as child'
})
}
}
}
}
for (let i = 0; i < action.packageNames.length; i++) {
const packageName = action.packageNames[i]
for (let i = 0; i < action.packageNames.length; i++) {
const packageName = action.packageNames[i]
if (packageName.indexOf(':') !== -1) {
await assertCanAddApp(packageName.substring(0, packageName.indexOf(':')), true)
await assertCanAddApp(packageName, false)
} else {
await assertCanAddApp(packageName, true)
if (packageName.indexOf(':') !== -1) {
await assertCanAddApp(packageName.substring(0, packageName.indexOf(':')), true)
await assertCanAddApp(packageName, false)
} else {
await assertCanAddApp(packageName, true)
}
}
} catch (ex) {
if (ex instanceof GetParentCategoriesException) {
throw new MissingCategoryException()
} else throw ex
}
}

12
src/function/sync/apply-actions/dispatch-parent-action/addcategorynetworkid.ts
View file

@ -18,6 +18,8 @@
import { AddCategoryNetworkIdAction } from '../../../../action'
import { maxNetworkIdsPerCategory } from '../../../../database/categorynetworkid'
import { Cache } from '../cache'
import { ApplyActionException } from '../exception/index'
import { MissingCategoryException } from '../exception/missing-item'
export async function dispatchAddCategoryNetworkId ({ action, cache }: {
action: AddCategoryNetworkIdAction
@ -33,7 +35,7 @@ export async function dispatchAddCategoryNetworkId ({ action, cache }: {
})
if (!categoryEntryUnsafe) {
throw new Error('invalid category id for new rule')
throw new MissingCategoryException()
}
const count = await cache.database.categoryNetworkId.count({
@ -45,7 +47,9 @@ export async function dispatchAddCategoryNetworkId ({ action, cache }: {
})
if (count + 1 > maxNetworkIdsPerCategory) {
throw new Error('category network limit reached')
throw new ApplyActionException({
staticMessage: 'can not add a category network id because the category network limit reached'
})
}
const hasOldItem = (await cache.database.categoryNetworkId.count({
@ -58,7 +62,9 @@ export async function dispatchAddCategoryNetworkId ({ action, cache }: {
})) !== 0
if (hasOldItem) {
throw new Error('id already used')
throw new ApplyActionException({
staticMessage: 'can not add a category network id because the id is already used'
})
}
await cache.database.categoryNetworkId.create({

17
src/function/sync/apply-actions/dispatch-parent-action/changeparentpassword.ts
View file

@ -1,6 +1,6 @@
/*
* server component for the TimeLimit App
* Copyright (C) 2019 Jonas Lochmann
* Copyright (C) 2019 - 2020 Jonas Lochmann
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
@ -16,8 +16,10 @@
*/
import * as Sequelize from 'sequelize'
import { ChangeParentPasswordAction } from '../../../../action'
import { ChangeParentPasswordAction, InvalidChangeParentPasswordIntegrityException } from '../../../../action/changeparentpassword'
import { Cache } from '../cache'
import { ApplyActionException } from '../exception/index'
import { MissingUserException } from '../exception/missing-item'
export async function dispatchChangeParentPassword ({ action, cache }: {
action: ChangeParentPasswordAction
@ -34,10 +36,17 @@ export async function dispatchChangeParentPassword ({ action, cache }: {
})
if (!parentEntry) {
throw new Error('parent entry not found')
throw new MissingUserException()
}
try {
action.assertIntegrityValid({ oldPasswordSecondHash: parentEntry.secondPasswordHash })
} catch (ex) {
if (ex instanceof InvalidChangeParentPasswordIntegrityException) {
throw new ApplyActionException({ staticMessage: 'invalid new password integrity' })
} else throw ex
}
action.assertIntegrityValid({ oldPasswordSecondHash: parentEntry.secondPasswordHash })
const newSecondPasswordHash = action.decryptSecondHash({ oldPasswordSecondHash: parentEntry.secondPasswordHash })
parentEntry.passwordHash = action.newPasswordFirstHash

6
src/function/sync/apply-actions/dispatch-parent-action/createcategory.ts
View file

@ -18,6 +18,8 @@
import { CreateCategoryAction } from '../../../../action'
import { generateVersionId } from '../../../../util/token'
import { Cache } from '../cache'
import { MissingUserException } from '../exception/missing-item'
import { CanNotModifyOtherUsersBySelfLimitationException } from '../exception/self-limit'
export async function dispatchCreateCategory ({ action, cache, fromChildSelfLimitAddChildUserId }: {
action: CreateCategoryAction
@ -26,7 +28,7 @@ export async function dispatchCreateCategory ({ action, cache, fromChildSelfLimi
}) {
if (fromChildSelfLimitAddChildUserId !== null) {
if (fromChildSelfLimitAddChildUserId !== action.childId) {
throw new Error('can not create categories for other child users')
throw new CanNotModifyOtherUsersBySelfLimitationException()
}
}
@ -41,7 +43,7 @@ export async function dispatchCreateCategory ({ action, cache, fromChildSelfLimi
})
if (!childEntry) {
throw new Error('missing child for new category')
throw new MissingUserException()
}
const oldMaxSort: number = await cache.database.category.max('sort', {

6
src/function/sync/apply-actions/dispatch-parent-action/createtimelimitrule.ts
View file

@ -17,6 +17,8 @@
import { CreateTimeLimitRuleAction } from '../../../../action'
import { Cache } from '../cache'
import { MissingCategoryException } from '../exception/missing-item'
import { CanNotModifyOtherUsersBySelfLimitationException } from '../exception/self-limit'
export async function dispatchCreateTimeLimitRule ({ action, cache, fromChildSelfLimitAddChildUserId }: {
action: CreateTimeLimitRuleAction
@ -33,12 +35,12 @@ export async function dispatchCreateTimeLimitRule ({ action, cache, fromChildSel
})
if (!categoryEntryUnsafe) {
throw new Error('invalid category id for new rule')
throw new MissingCategoryException()
}
if (fromChildSelfLimitAddChildUserId !== null) {
if (fromChildSelfLimitAddChildUserId !== categoryEntryUnsafe.childId) {
throw new Error('can not add rules for other users')
throw new CanNotModifyOtherUsersBySelfLimitationException()
}
}

16
src/function/sync/apply-actions/dispatch-parent-action/deletecategory.ts
View file

@ -1,6 +1,6 @@
/*
* server component for the TimeLimit App
* Copyright (C) 2019 Jonas Lochmann
* Copyright (C) 2019 - 2020 Jonas Lochmann
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
@ -17,15 +17,25 @@
import { DeleteCategoryAction } from '../../../../action'
import { Cache } from '../cache'
import { MissingCategoryException } from '../exception/missing-item'
export async function dispatchDeleteCategory ({ action, cache }: {
action: DeleteCategoryAction
cache: Cache
}) {
// no version number needs to be updated
const { familyId, transaction } = cache
const { categoryId } = action
const categoryEntry = await cache.database.category.findOne({
where: {
familyId,
categoryId
},
transaction
})
if (!categoryEntry) { throw new MissingCategoryException() }
await cache.database.timelimitRule.destroy({
where: {
familyId,
@ -75,4 +85,6 @@ export async function dispatchDeleteCategory ({ action, cache }: {
if (affectedUserRows !== 0) {
cache.invalidiateUserList = true
}
// no version number needs to be updated
}

15
src/function/sync/apply-actions/dispatch-parent-action/deletetimelimitrule.ts
View file

@ -1,6 +1,6 @@
/*
* server component for the TimeLimit App
* Copyright (C) 2019 Jonas Lochmann
* Copyright (C) 2019 - 2020 Jonas Lochmann
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
@ -17,6 +17,7 @@
import { DeleteTimeLimitRuleAction } from '../../../../action'
import { Cache } from '../cache'
import { MissingRuleException } from '../exception/missing-item'
export async function dispatchDeleteTimeLimitRule ({ action, cache }: {
action: DeleteTimeLimitRuleAction
@ -30,10 +31,12 @@ export async function dispatchDeleteTimeLimitRule ({ action, cache }: {
transaction: cache.transaction
})
if (ruleEntry) {
await ruleEntry.destroy({ transaction: cache.transaction })
cache.categoriesWithModifiedTimeLimitRules.push(ruleEntry.categoryId)
cache.areChangesImportant = true
if (!ruleEntry) {
throw new MissingRuleException()
}
await ruleEntry.destroy({ transaction: cache.transaction })
cache.categoriesWithModifiedTimeLimitRules.push(ruleEntry.categoryId)
cache.areChangesImportant = true
}

5
src/function/sync/apply-actions/dispatch-parent-action/ignoremanipulation.ts
View file

@ -1,6 +1,6 @@
/*
* server component for the TimeLimit App
* Copyright (C) 2019 Jonas Lochmann
* Copyright (C) 2019 - 2020 Jonas Lochmann
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
@ -17,6 +17,7 @@
import { IgnoreManipulationAction } from '../../../../action'
import { Cache } from '../cache'
import { SourceDeviceNotFoundException } from '../exception/illegal-state'
export async function dispatchIgnoreManipulation ({ action, cache }: {
action: IgnoreManipulationAction
@ -31,7 +32,7 @@ export async function dispatchIgnoreManipulation ({ action, cache }: {
})
if (deviceEntry === null) {
throw new Error('illegal state: missing device which dispatched the action')
throw new SourceDeviceNotFoundException()
}
if (action.ignoreDeviceAdminManipulation) {

6
src/function/sync/apply-actions/dispatch-parent-action/incrementcategoryextratime.ts
View file

@ -18,13 +18,15 @@
import { IncrementCategoryExtraTimeAction } from '../../../../action'
import { CategoryModel } from '../../../../database/category'
import { Cache } from '../cache'
import { MissingCategoryException } from '../exception/missing-item'
import { PremiumVersionMissingException } from '../exception/premium'
export async function dispatchIncrementCategoryExtraTime ({ action, cache }: {
action: IncrementCategoryExtraTimeAction
cache: Cache
}) {
if (!cache.hasFullVersion) {
throw new Error('action requires full version')
throw new PremiumVersionMissingException()
}
async function handleCategory (category: CategoryModel) {
@ -51,7 +53,7 @@ export async function dispatchIncrementCategoryExtraTime ({ action, cache }: {
})
if (!categoryEntry) {
throw new Error(`tried to add extra time to ${action.categoryId} but it does not exist`)
throw new MissingCategoryException()
}
await handleCategory(categoryEntry)

10
src/function/sync/apply-actions/dispatch-parent-action/index.ts
View file

@ -62,6 +62,8 @@ import {
UpdateUserLimitLoginCategory
} from '../../../../action'
import { Cache } from '../cache'
import { ActionObjectTypeNotHandledException } from '../exception/illegal-state'
import { ActionNotSupportedBySelfLimitationException } from '../exception/self-limit'
import { dispatchAddCategoryApps } from './addcategoryapps'
import { dispatchAddCategoryNetworkId } from './addcategorynetworkid'
import { dispatchAddUser } from './adduser'
@ -129,7 +131,9 @@ export const dispatchParentAction = async ({ action, cache, parentUserId, source
return dispatchUpdateCategoryBlockedTimes({ action, cache, fromChildSelfLimitAddChildUserId })
}
if (fromChildSelfLimitAddChildUserId === null) {
if (fromChildSelfLimitAddChildUserId !== null) {
throw new ActionNotSupportedBySelfLimitationException()
} else {
if (action instanceof AddCategoryNetworkIdAction) {
return dispatchAddCategoryNetworkId({ action, cache })
} else if (action instanceof AddUserAction) {
@ -202,8 +206,8 @@ export const dispatchParentAction = async ({ action, cache, parentUserId, source
return dispatchUpdateUserFlagsAction({ action, cache })
} else if (action instanceof UpdateUserLimitLoginCategory) {
return dispatchUpdateUserLimitLoginCategoryAction({ action, cache, parentUserId })
} else {
throw new ActionObjectTypeNotHandledException()
}
} else {
throw new Error('unsupported action type')
}
}

7
src/function/sync/apply-actions/dispatch-parent-action/removecategoryapps.ts
View file

@ -1,6 +1,6 @@
/*
* server component for the TimeLimit App
* Copyright (C) 2019 Jonas Lochmann
* Copyright (C) 2019 - 2020 Jonas Lochmann
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
@ -18,6 +18,7 @@
import * as Sequelize from 'sequelize'
import { RemoveCategoryAppsAction } from '../../../../action'
import { Cache } from '../cache'
import { MissingItemException } from '../exception/missing-item'
export async function dispatchRemoveCategoryApps ({ action, cache }: {
action: RemoveCategoryAppsAction
@ -35,7 +36,9 @@ export async function dispatchRemoveCategoryApps ({ action, cache }: {
})
if (affectedRows !== action.packageNames.length) {
throw new Error('could not delete as much entries as requested')
throw new MissingItemException({
staticMessage: 'could not remove all requested category app items'
})
}
cache.categoriesWithModifiedApps.push(action.categoryId)

15
src/function/sync/apply-actions/dispatch-parent-action/removeuser.ts
View file

@ -1,6 +1,6 @@
/*
* server component for the TimeLimit App
* Copyright (C) 2019 Jonas Lochmann
* Copyright (C) 2019 - 2020 Jonas Lochmann
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
@ -21,6 +21,9 @@ import { difference } from 'lodash'
import * as Sequelize from 'sequelize'
import { RemoveUserAction } from '../../../../action'
import { Cache } from '../cache'
import { ApplyActionException } from '../exception/index'
import { ApplyActionIntegrityException } from '../exception/integrity'
import { MissingUserException } from '../exception/missing-item'
export async function dispatchRemoveUser ({ action, cache, parentUserId }: {
action: RemoveUserAction
@ -36,7 +39,7 @@ export async function dispatchRemoveUser ({ action, cache, parentUserId }: {
})
if (!user) {
throw new Error('invalid user id')
throw new MissingUserException()
}
if (user.type === 'parent') {
@ -45,7 +48,7 @@ export async function dispatchRemoveUser ({ action, cache, parentUserId }: {
}
if (parentUserId === action.userId) {
throw new Error('users can not delete themself')
throw new ApplyActionException({ staticMessage: 'users can not delete themself' })
}
const expectedIntegrityValue = createHash('sha512').update(
@ -53,7 +56,7 @@ export async function dispatchRemoveUser ({ action, cache, parentUserId }: {
).digest('hex').substring(0, 16)
if (expectedIntegrityValue !== action.authentication) {
throw new Error('invalid authentication value')
throw new ApplyActionIntegrityException({ staticMessage: 'invalid authentication value for removing a user' })
}
if (user.mail !== '') {
@ -69,7 +72,7 @@ export async function dispatchRemoveUser ({ action, cache, parentUserId }: {
})
if (usersWithLinkedMail <= 1) {
throw new Error('this user is the last one with a linked mail address')
throw new ApplyActionException({ staticMessage: 'this user is the last one with a linked mail address' })
}
}
@ -93,7 +96,7 @@ export async function dispatchRemoveUser ({ action, cache, parentUserId }: {
const allOtherParentUserIds = allParentUserIds.filter((item) => item !== action.userId)
if (difference(allOtherParentUserIds, usersWithLimitLoginCategories).length === 0) {
throw new Error('can not delete the last user without limit login category')
throw new ApplyActionException({ staticMessage: 'can not delete the last user without limit login category' })
}
}

22
src/function/sync/apply-actions/dispatch-parent-action/renamechild.ts
View file

@ -1,6 +1,6 @@
/*
* server component for the TimeLimit App
* Copyright (C) 2019 Jonas Lochmann
* Copyright (C) 2019 - 2020 Jonas Lochmann
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
@ -17,12 +17,26 @@
import { RenameChildAction } from '../../../../action'
import { Cache } from '../cache'
import { MissingUserException } from '../exception/missing-item'
export async function dispatchRenameChild ({ action, cache }: {
action: RenameChildAction
cache: Cache
}) {
const [affectedRows] = await cache.database.user.update({
const oldItem = await cache.database.user.findOne({
where: {
familyId: cache.familyId,
userId: action.childId,
type: 'child'
},
transaction: cache.transaction
})
if (!oldItem) {
throw new MissingUserException()
}
await cache.database.user.update({
name: action.newName
}, {
where: {
@ -33,10 +47,6 @@ export async function dispatchRenameChild ({ action, cache }: {
transaction: cache.transaction
})
if (affectedRows !== 1) {
throw new Error('can not update child name if child does not exist')
}
cache.invalidiateUserList = true
cache.doesUserExist.cache.set(action.childId, false)
}

3
src/function/sync/apply-actions/dispatch-parent-action/resetcategorynetworkids.ts
View file

@ -17,6 +17,7 @@
import { ResetCategoryNetworkIdsAction } from '../../../../action'
import { Cache } from '../cache'
import { MissingCategoryException } from '../exception/missing-item'
export async function dispatchResetCategoryNetworkIds ({ action, cache }: {
action: ResetCategoryNetworkIdsAction
@ -32,7 +33,7 @@ export async function dispatchResetCategoryNetworkIds ({ action, cache }: {
})
if (!categoryEntryUnsafe) {
throw new Error('invalid category id for new rule')
throw new MissingCategoryException()
}
await cache.database.categoryNetworkId.destroy({

Some files were not shown because too many files have changed in this diff Show more