mirror of
https://codeberg.org/timelimit/timelimit-server.git
synced 2026-08-31 19:03:45 +02:00
Add generating dh keys
This commit is contained in:
@@ -0,0 +1,81 @@
|
||||
/*
|
||||
* server component for the TimeLimit App
|
||||
* Copyright (C) 2019 - 2022 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 * as Sequelize from 'sequelize'
|
||||
import { familyIdColumn, idWithinFamilyColumn, versionColumn, timestampColumn } from './columns'
|
||||
import { SequelizeAttributes } from './types'
|
||||
|
||||
export const config = {
|
||||
generateNewKeyAfterAge: 1000 * 60 * 60 * 24,
|
||||
generationTimeRounding: 1000 * 60 * 60,
|
||||
expireDelay: 1000 * 60 * 60 * 2,
|
||||
expireTimeRounding: 1000 * 60 * 15
|
||||
}
|
||||
|
||||
export function calculateExpireTime(now: bigint): BigInt {
|
||||
const expireBaseTime = now + BigInt(config.expireDelay)
|
||||
const expireTime = expireBaseTime - expireBaseTime % BigInt(config.expireTimeRounding) + BigInt(config.expireTimeRounding)
|
||||
|
||||
return expireTime
|
||||
}
|
||||
|
||||
export interface DeviceDhKeyAttributes {
|
||||
familyId: string
|
||||
deviceId: string
|
||||
version: string
|
||||
createdAt: string
|
||||
expireAt: string | null
|
||||
publicKey: Buffer
|
||||
privateKey: Buffer
|
||||
}
|
||||
|
||||
export type DeviceDhKeyModel = Sequelize.Model<DeviceDhKeyAttributes> & DeviceDhKeyAttributes
|
||||
export type DeviceDhKeyModelStatic = typeof Sequelize.Model & {
|
||||
new (values?: object, options?: Sequelize.BuildOptions): DeviceDhKeyModel;
|
||||
}
|
||||
|
||||
export const attributes: SequelizeAttributes<DeviceDhKeyAttributes> = {
|
||||
familyId: {
|
||||
...familyIdColumn,
|
||||
primaryKey: true
|
||||
},
|
||||
deviceId: {
|
||||
...idWithinFamilyColumn,
|
||||
primaryKey: true
|
||||
},
|
||||
version: {
|
||||
...versionColumn,
|
||||
primaryKey: true
|
||||
},
|
||||
createdAt: {
|
||||
...timestampColumn
|
||||
},
|
||||
expireAt: {
|
||||
...timestampColumn,
|
||||
allowNull: true
|
||||
},
|
||||
publicKey: {
|
||||
type: Sequelize.BLOB,
|
||||
allowNull: false
|
||||
},
|
||||
privateKey: {
|
||||
type: Sequelize.BLOB,
|
||||
allowNull: false
|
||||
}
|
||||
}
|
||||
|
||||
export const createDeviceDhKey = (sequelize: Sequelize.Sequelize): DeviceDhKeyModelStatic => sequelize.define('DeviceDhKey', attributes) as DeviceDhKeyModelStatic
|
||||
@@ -27,6 +27,7 @@ import { CategoryTimeWarningModelStatic, createCategoryTimeWarningModel } from '
|
||||
import { ChildTaskModelStatic, createChildTaskModel } from './childtask'
|
||||
import { ConfigModelStatic, createConfigModel } from './config'
|
||||
import { createDeviceModel, DeviceModelStatic } from './device'
|
||||
import { createDeviceDhKey, DeviceDhKeyModelStatic } from './devicedhkey'
|
||||
import { createEncryptedAppListModel, EncryptedAppListModelStatic } from './encryptedapplist'
|
||||
import { createFamilyModel, FamilyModelStatic } from './family'
|
||||
import { createKeyRequestModel, KeyRequestModelStatic } from './keyrequest'
|
||||
@@ -55,6 +56,7 @@ export interface Database {
|
||||
childTask: ChildTaskModelStatic
|
||||
config: ConfigModelStatic
|
||||
device: DeviceModelStatic
|
||||
deviceDhKey: DeviceDhKeyModelStatic
|
||||
encryptedAppList: EncryptedAppListModelStatic
|
||||
family: FamilyModelStatic
|
||||
keyRequest: KeyRequestModelStatic
|
||||
@@ -83,6 +85,7 @@ const createDatabase = (sequelize: Sequelize.Sequelize): Database => ({
|
||||
categoryTimeWarning: createCategoryTimeWarningModel(sequelize),
|
||||
config: createConfigModel(sequelize),
|
||||
device: createDeviceModel(sequelize),
|
||||
deviceDhKey: createDeviceDhKey(sequelize),
|
||||
encryptedAppList: createEncryptedAppListModel(sequelize),
|
||||
family: createFamilyModel(sequelize),
|
||||
keyRequest: createKeyRequestModel(sequelize),
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
/*
|
||||
* server component for the TimeLimit App
|
||||
* Copyright (C) 2019 - 2022 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 { QueryInterface, Sequelize, Transaction } from 'sequelize'
|
||||
|
||||
export async function up (queryInterface: QueryInterface, sequelize: Sequelize) {
|
||||
await sequelize.transaction({
|
||||
type: Transaction.TYPES.EXCLUSIVE
|
||||
}, async (transaction) => {
|
||||
const dialect = sequelize.getDialect()
|
||||
const isMysql = dialect === 'mysql' || dialect === 'mariadb'
|
||||
const isPosgresql = dialect === 'postgres'
|
||||
|
||||
if (isMysql) {
|
||||
await sequelize.query(
|
||||
'CREATE TABLE `DeviceDhKeys` ' +
|
||||
'(`familyId` VARCHAR(10) NOT NULL,' +
|
||||
'`deviceId` VARCHAR(6) NOT NULL,' +
|
||||
'`version` VARCHAR(4) NOT NULL,' +
|
||||
'`createdAt` BIGINT NOT NULL, ' +
|
||||
'`expireAt` BIGINT NULL, ' +
|
||||
'`publicKey` BLOB NOT NULL, ' +
|
||||
'`privateKey` BLOB NOT NULL, ' +
|
||||
'PRIMARY KEY (`familyId`, `deviceId`, `version`),' +
|
||||
'FOREIGN KEY (`familyId`, `deviceId`) REFERENCES `Devices` (`familyId`, `deviceId`) ON UPDATE CASCADE ON DELETE CASCADE' +
|
||||
')',
|
||||
{ transaction }
|
||||
)
|
||||
} else {
|
||||
await sequelize.query(
|
||||
'CREATE TABLE "DeviceDhKeys" ' +
|
||||
'("familyId" VARCHAR(10) NOT NULL,' +
|
||||
'"deviceId" VARCHAR(6) NOT NULL,' +
|
||||
'"version" VARCHAR(4) NOT NULL,' +
|
||||
'"createdAt" ' + (isPosgresql ? 'BIGINT' : 'LONG') + ' NOT NULL, ' +
|
||||
'"expireAt" ' + (isPosgresql ? 'BIGINT' : 'LONG') + ' NULL, ' +
|
||||
'"publicKey" ' + (isPosgresql ? 'BYTEA' : 'BLOB') + ' NOT NULL, ' +
|
||||
'"privateKey" ' + (isPosgresql ? 'BYTEA' : 'BLOB') + ' NOT NULL, ' +
|
||||
'PRIMARY KEY ("familyId", "deviceId", "version"),' +
|
||||
'FOREIGN KEY ("familyId", "deviceId") REFERENCES "Devices" ("familyId", "deviceId") ON UPDATE CASCADE ON DELETE CASCADE' +
|
||||
')',
|
||||
{ transaction }
|
||||
)
|
||||
}
|
||||
|
||||
await queryInterface.addIndex('DeviceDhKeys', ['expireAt'], { transaction })
|
||||
})
|
||||
}
|
||||
|
||||
export async function down (queryInterface: QueryInterface, sequelize: Sequelize) {
|
||||
await sequelize.transaction({
|
||||
type: Transaction.TYPES.EXCLUSIVE
|
||||
}, async (transaction) => {
|
||||
await queryInterface.dropTable('DeviceDhKeys', { transaction })
|
||||
})
|
||||
}
|
||||
Reference in New Issue
Block a user