Browse Source

remove newlines in client config

pull/2522/head
Bernd Storath 4 months ago
parent
commit
c8d409ccf6
  1. 2
      src/server/utils/template.ts
  2. 12
      src/server/utils/wgHelper.ts

2
src/server/utils/template.ts

@ -1,3 +1,5 @@
// ! Auto Imports are not supported in this file
import type { InterfaceType } from '#db/repositories/interface/types';
/**

12
src/server/utils/wgHelper.ts

@ -1,5 +1,9 @@
// ! Auto Imports are not supported in this file
import { parseCidr } from 'cidr-tools';
import { stringifyIp } from 'ip-bigint';
import { removeNewlines } from './template';
import type { ClientType } from '#db/repositories/client/types';
import type { InterfaceType } from '#db/repositories/interface/types';
import type { UserConfigType } from '#db/repositories/userConfig/types';
@ -112,10 +116,10 @@ PostDown = ${iptablesTemplate(hooks.postDown, wgInterface)}`;
(enableIpv6 ? `, ${client.ipv6Address}/128` : '');
const hookLines = [
client.preUp ? `PreUp = ${client.preUp}` : null,
client.postUp ? `PostUp = ${client.postUp}` : null,
client.preDown ? `PreDown = ${client.preDown}` : null,
client.postDown ? `PostDown = ${client.postDown}` : null,
client.preUp ? `PreUp = ${removeNewlines(client.preUp)}` : null,
client.postUp ? `PostUp = ${removeNewlines(client.postUp)}` : null,
client.preDown ? `PreDown = ${removeNewlines(client.preDown)}` : null,
client.postDown ? `PostDown = ${removeNewlines(client.postDown)}` : null,
];
const dnsServers = client.dns ?? userConfig.defaultDns;

Loading…
Cancel
Save