Browse Source

fix some errors

pull/1347/head
Bernd Storath 2 years ago
parent
commit
d6efb7eb94
  1. 5
      src/server/utils/WireGuard.ts
  2. 6
      src/services/database/migrations/1.ts

5
src/server/utils/WireGuard.ts

@ -175,13 +175,12 @@ Endpoint = ${system.wgHost}:${system.wgConfigPort}`;
}); });
const preSharedKey = await exec('wg genpsk'); const preSharedKey = await exec('wg genpsk');
// TODO: cidr
// Calculate next IP // Calculate next IP
const cidr = ip.cidrSubnet(system.userConfig.addressRange); const cidr = ip.cidrSubnet(system.userConfig.addressRange);
let address; let address;
for ( for (
let i = ip.toLong(cidr.firstAddress); let i = ip.toLong(cidr.firstAddress) + 1;
i <= ip.toLong(cidr.lastAddress); i <= ip.toLong(cidr.lastAddress) - 1;
i++ i++
) { ) {
const currentIp = ip.fromLong(i); const currentIp = ip.fromLong(i);

6
src/services/database/migrations/1.ts

@ -2,7 +2,7 @@ import type { Low } from 'lowdb';
import type { Database } from '../repositories/database'; import type { Database } from '../repositories/database';
import packageJson from '@@/package.json'; import packageJson from '@@/package.json';
import { ChartType } from '../repositories/system'; import { ChartType } from '../repositories/system';
import { cidrSubnet } from 'ip'; import ip from 'ip';
export async function run1(db: Low<Database>) { export async function run1(db: Low<Database>) {
const privateKey = await exec('wg genkey'); const privateKey = await exec('wg genkey');
@ -10,7 +10,7 @@ export async function run1(db: Low<Database>) {
log: 'echo ***hidden*** | wg pubkey', log: 'echo ***hidden*** | wg pubkey',
}); });
const addressRange = '10.8.0.0/24'; const addressRange = '10.8.0.0/24';
const cidr = cidrSubnet(addressRange); const cidr = ip.cidrSubnet(addressRange);
const database: Database = { const database: Database = {
migrations: [], migrations: [],
system: { system: {
@ -30,7 +30,7 @@ export async function run1(db: Low<Database>) {
defaultDns: ['1.1.1.1'], defaultDns: ['1.1.1.1'],
allowedIps: ['0.0.0.0/0', '::/0'], allowedIps: ['0.0.0.0/0', '::/0'],
}, },
wgDevice: 'wg0', wgDevice: 'eth0',
// TODO: wgHost has to be configured when onboarding // TODO: wgHost has to be configured when onboarding
wgHost: '', wgHost: '',
wgPort: 51820, wgPort: 51820,

Loading…
Cancel
Save